Backed out changeset d3d6344cc744 (bug 1259089) for bustage
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 07 Apr 2016 05:59:08 +0200
changeset 323835 2355485d9a8e09c7cfe47063bd192b72ec34d286
parent 323834 2247fe982ba5ab3b29769d939fbe078f380f8d7e
child 323836 c774432aac6d549fd420103f314694608a19e4d6
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1259089
milestone47.0a2
backs outd3d6344cc744aee65be009f5c23287ae9e1ab1c8
Backed out changeset d3d6344cc744 (bug 1259089) for bustage
netwerk/base/nsSocketTransport2.cpp
--- a/netwerk/base/nsSocketTransport2.cpp
+++ b/netwerk/base/nsSocketTransport2.cpp
@@ -1414,29 +1414,16 @@ nsSocketTransport::InitiateSocket()
                 return NS_ERROR_FAILURE;
             }
             mBindAddr = nullptr;
         }
     }
 
     NetAddrToPRNetAddr(&mNetAddr, &prAddr);
 
-#ifdef XP_WIN
-    // Find the real tcp socket and set non-blocking once again!
-    PRFileDesc *bottom = PR_GetIdentitiesLayer(fd, PR_NSPR_IO_LAYER);
-    if (bottom) {
-      PROsfd osfd = PR_FileDesc2NativeHandle(bottom); 
-      uint32_t nonblocking = 1;
-      if (ioctlsocket(osfd, FIONBIO, &nonblocking) != 0) {
-        NS_WARNING("Socket could not be set non-blocking!");
-        return NS_ERROR_FAILURE;
-      }
-    }
-#endif
-
     // We use PRIntervalTime here because we need
     // nsIOService::LastOfflineStateChange time and
     // nsIOService::LastConectivityChange time to be atomic.
     PRIntervalTime connectStarted = 0;
     if (gSocketTransportService->IsTelemetryEnabled()) {
         connectStarted = PR_IntervalNow();
     }