summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--netwerk/base/nsSocketTransport2.cpp16
-rw-r--r--netwerk/base/nsSocketTransportService2.cpp11
-rw-r--r--netwerk/test/TestUDPSocket.cpp13
3 files changed, 1 insertions, 39 deletions
diff --git a/netwerk/base/nsSocketTransport2.cpp b/netwerk/base/nsSocketTransport2.cpp
index 1bfd1fc91..184757d33 100644
--- a/netwerk/base/nsSocketTransport2.cpp
+++ b/netwerk/base/nsSocketTransport2.cpp
@@ -40,7 +40,6 @@
#include "xpcpublic.h"
#if defined(XP_WIN)
-#include "mozilla/WindowsVersion.h"
#include "ShutdownLayer.h"
#endif
@@ -1724,21 +1723,6 @@ nsSocketTransport::OnSocketConnected()
NS_ASSERTION(mFDref == 1, "wrong socket ref count");
SetSocketName(mFD);
mFDconnected = true;
-
-#ifdef XP_WIN
- if (!IsWin2003OrLater()) { // windows xp
- PRSocketOptionData opt;
- opt.option = PR_SockOpt_RecvBufferSize;
- if (PR_GetSocketOption(mFD, &opt) == PR_SUCCESS) {
- SOCKET_LOG(("%p checking rwin on xp originally=%u\n",
- this, opt.value.recv_buffer_size));
- if (opt.value.recv_buffer_size < 65535) {
- opt.value.recv_buffer_size = 65535;
- PR_SetSocketOption(mFD, &opt);
- }
- }
- }
-#endif
}
// Ensure keepalive is configured correctly if previously enabled.
diff --git a/netwerk/base/nsSocketTransportService2.cpp b/netwerk/base/nsSocketTransportService2.cpp
index d2f20651e..068bf0eca 100644
--- a/netwerk/base/nsSocketTransportService2.cpp
+++ b/netwerk/base/nsSocketTransportService2.cpp
@@ -28,10 +28,6 @@
#include "nsIWidget.h"
#include "mozilla/dom/FlyWebService.h"
-#if defined(XP_WIN)
-#include "mozilla/WindowsVersion.h"
-#endif
-
namespace mozilla {
namespace net {
@@ -1204,12 +1200,7 @@ nsSocketTransportService::UpdateSendBufferPref(nsIPrefBranch *pref)
}
#if defined(XP_WIN)
- // If the pref is not set but this is windows set it depending on windows version
- if (!IsWin2003OrLater()) { // windows xp
- mSendBufferSize = 131072;
- } else { // vista or later
- mSendBufferSize = 131072 * 4;
- }
+ mSendBufferSize = 131072 * 4;
#endif
}
diff --git a/netwerk/test/TestUDPSocket.cpp b/netwerk/test/TestUDPSocket.cpp
index 9236d2ea3..0ec43a650 100644
--- a/netwerk/test/TestUDPSocket.cpp
+++ b/netwerk/test/TestUDPSocket.cpp
@@ -13,9 +13,6 @@
#include "nsIScriptSecurityManager.h"
#include "nsITimer.h"
#include "mozilla/net/DNS.h"
-#ifdef XP_WIN
-#include "mozilla/WindowsVersion.h"
-#endif
#include "prerror.h"
#define REQUEST 0x68656c6f
@@ -334,16 +331,6 @@ main(int32_t argc, char *argv[])
}
RefPtr<MulticastTimerCallback> timerCb = new MulticastTimerCallback();
- // The following multicast tests using multiple sockets require a firewall
- // exception on Windows XP (the earliest version of Windows we now support)
- // before they pass. For now, we'll skip them here. Later versions of Windows
- // (Win2003 and onward) don't seem to have this issue.
-#ifdef XP_WIN
- if (!mozilla::IsWin2003OrLater()) { // i.e. if it is WinXP
- goto close;
- }
-#endif
-
// Join multicast group
printf("Joining multicast group\n");
phase = TEST_MULTICAST;