Bug 1026987 - Give the MOZ_DISABLE_NONLOCAL_CONNECTIONS error a TBPL-parsable prefix. r=froydnj, a=NPOTB
authorEd Morley <emorley@mozilla.com>
Mon, 04 Aug 2014 15:21:35 +0100
changeset 208326 92aead6bd5fb
parent 208325 353ade05d903
child 208327 e0e150f31ffe
push id3826
push userryanvm@gmail.com
push date2014-08-18 20:39 +0000
treeherdermozilla-beta@45953c4613d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj, NPOTB
bugs1026987
milestone32.0
Bug 1026987 - Give the MOZ_DISABLE_NONLOCAL_CONNECTIONS error a TBPL-parsable prefix. r=froydnj, a=NPOTB
netwerk/base/src/nsSocketTransport2.cpp
--- a/netwerk/base/src/nsSocketTransport2.cpp
+++ b/netwerk/base/src/nsSocketTransport2.cpp
@@ -1184,21 +1184,21 @@ nsSocketTransport::InitiateSocket()
     } else if (!isLocal) {
         if (NS_SUCCEEDED(mCondition) &&
             crashOnNonLocalConnections &&
             !(IsIPAddrAny(&mNetAddr) || IsIPAddrLocal(&mNetAddr))) {
             nsAutoCString ipaddr;
             nsRefPtr<nsNetAddr> netaddr = new nsNetAddr(&mNetAddr);
             netaddr->GetAddress(ipaddr);
             fprintf_stderr(stderr,
-                           "Non-local network connections are disabled and a connection "
-                           "attempt to %s (%s) was made.  You should only access hostnames "
+                           "FATAL ERROR: Non-local network connections are disabled and a connection "
+                           "attempt to %s (%s) was made.\nYou should only access hostnames "
                            "available via the test networking proxy (if running mochitests) "
-                           "or from a test-specific httpd.js server (if running xpcshell tests)."
-                           " Browser services should be disabled or redirected to a local server.\n",
+                           "or from a test-specific httpd.js server (if running xpcshell tests). "
+                           "Browser services should be disabled or redirected to a local server.\n",
                            mHost.get(), ipaddr.get());
             MOZ_CRASH("Attempting to connect to non-local address!");
         }
     }
 
     // Hosts/Proxy Hosts that are Local IP Literals should not be speculatively
     // connected - Bug 853423.
     if (mConnectionFlags & nsISocketTransport::DISABLE_RFC1918 &&