Changeset 384 for trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.cc

Timestamp:

Jun 29, 2012, 10:06:36 PM (13 years ago)

Author:

dmik

Message:

icedtea-web: Make sure parent ends of pipes are not inherited by child.

This is necessary for read() on the child's side to abort when the parent
closes its ends. This fixes the JAVA process hang when the browser
terminates.

File:

• trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.cc (modified) (2 diffs)

trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.cc

@@ -45 +45 @@
 #include <emx/startup.h>
 #include <sys/socket.h>
+#include <fcntl.h>
 #include "OS_OS2.h"
 #endif
@@ -545 +546 @@
   // change this behaviour if we find pages with multiple applets that
   // rely on being run in the same VM.
+
+#ifdef __OS2__
+  // make sure parent ends are not inherited by the child (otherwise read() on
+  // the child's side will not be aborted when the parent closes its end)
+  fcntl (in_pipe [0], F_SETFD, FD_CLOEXEC);
+  fcntl (out_pipe [0], F_SETFD, FD_CLOEXEC);
+#endif
 
   np_error = plugin_start_appletviewer (data);