sockfilt will quit when orphaned

diff --git a/configure.ac b/configure.ac
index b34ef784c0881e5fe0e8f0773bc86529934fb6ac..0f41900055ac9fdc8909c38c8ea42cc8630cd8d9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2002,6 +2002,7 @@ AC_CHECK_FUNCS( strtoll \
                 strlcat \
                 getpwuid \
                 geteuid \
+                getppid \
                 utime \
                 sigsetjmp \
                 basename \

diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c
index 9962a4c405c579551183c15a9ceb942829d25f72..7c3404c1f8741468604d04046db2ad90f69a13be 100644 (file)
--- a/tests/server/sockfilt.c
+++ b/tests/server/sockfilt.c
@@ -181,6 +181,13 @@ static int juggle(curl_socket_t *sockfdp,
   unsigned char buffer[17010];
   char data[16];
 
+#ifdef HAVE_GETPPID
+  /* As a last resort, quit if sockfilt process becomes orphan. Just in case
+     parent ftpserver process has died without killing its sockfilt children */
+  if(getppid() <= 1)
+    return FALSE;
+#endif
+
   timeout.tv_sec = 120;
   timeout.tv_usec = 0;