PR 27459

       * native/jni/java-net/javanet.c (_javanet_accept): Reset the
       inherited timeout on socket.

2 files changed, 9 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index b6ce8e776..ecbd80b19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-14  Mark Wielaard  <mark@klomp.org>
+
+	PR 27459
+	* native/jni/java-net/javanet.c (_javanet_accept): Reset the
+	inherited timeout on socket.
+
 2006-05-14  Lillian Angel  <langel@redhat.com>
 
 	* java/util/SimpleTimeZone.java: Reverted patch.
diff --git a/native/jni/java-net/javanet.c b/native/jni/java-net/javanet.c
index 0a1b84a8e..969f9c9fe 100644
--- a/native/jni/java-net/javanet.c
+++ b/native/jni/java-net/javanet.c
@@ -835,6 +835,9 @@ _javanet_accept (JNIEnv * env, jobject this, jobject impl)
     }
   while (result != TARGET_NATIVE_OK);
 
+  // Reset the inherited timeout
+  TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_TIMEOUT (newfd, 0, result);
+
   /* Populate instance variables */
   _javanet_set_int_field (env, impl, "gnu/java/net/PlainSocketImpl",
 			  "native_fd", newfd);