diff options
| author | Mohan Embar <gnustuff@thisiscool.com> | 2003-10-31 03:19:51 +0000 |
|---|---|---|
| committer | Mohan Embar <membar@gcc.gnu.org> | 2003-10-31 03:19:51 +0000 |
| commit | 76506a3ee30287c5fa06eab73e9bece391c4b89c (patch) | |
| tree | 4426464511640314c34c7b7f1e95a5d6e30f4b1a /libjava | |
| parent | b82183ab3ffc0a17b38c7d1f18377049e70459a1 (diff) | |
| download | gcc-76506a3ee30287c5fa06eab73e9bece391c4b89c.zip gcc-76506a3ee30287c5fa06eab73e9bece391c4b89c.tar.gz gcc-76506a3ee30287c5fa06eab73e9bece391c4b89c.tar.bz2 | |
re PR libgcj/11521 ([win32] can install server socket on same port twice)
PR libgcj/11521:
* gnu/java/net/natPlainSocketImplWin32.cc
(bind): Don't use SO_REUSEADDR
From-SVN: r73116
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/gnu/java/net/natPlainSocketImplWin32.cc | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b6f7e23..db88090 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,11 @@ 2003-10-30 Mohan Embar <gnustuff@thisiscool.com> + PR libgcj/11521: + * gnu/java/net/natPlainSocketImplWin32.cc + (bind): Don't use SO_REUSEADDR + +2003-10-30 Mohan Embar <gnustuff@thisiscool.com> + PR libgcj/6652: * java/io/natFileWin32.cc (getCanonicalPath): Treat "" like ".". diff --git a/libjava/gnu/java/net/natPlainSocketImplWin32.cc b/libjava/gnu/java/net/natPlainSocketImplWin32.cc index 411acfa..9637381 100644 --- a/libjava/gnu/java/net/natPlainSocketImplWin32.cc +++ b/libjava/gnu/java/net/natPlainSocketImplWin32.cc @@ -67,7 +67,6 @@ gnu::java::net::PlainSocketImpl::bind (::java::net::InetAddress *host, jint lpor jbyteArray haddress = host->addr; jbyte *bytes = elements (haddress); int len = haddress->length; - int i = 1; if (len == 4) { @@ -93,9 +92,6 @@ gnu::java::net::PlainSocketImpl::bind (::java::net::InetAddress *host, jint lpor else throw new ::java::net::SocketException (JvNewStringUTF ("invalid length")); - // Enable SO_REUSEADDR, so that servers can reuse ports left in TIME_WAIT. - ::setsockopt(native_fd, SOL_SOCKET, SO_REUSEADDR, (char *) &i, sizeof(i)); - if (::bind (native_fd, ptr, len) != SOCKET_ERROR) { address = host; |