Blame SOURCES/mod_revocator-waitpid.patch

e7e179
diff -rupN mod_revocator-1.0.3.orig/exec-client.cpp mod_revocator-1.0.3/exec-client.cpp
e7e179
--- mod_revocator-1.0.3.orig/exec-client.cpp	2006-10-16 11:16:35.000000000 -0700
e7e179
+++ mod_revocator-1.0.3/exec-client.cpp	2012-10-08 13:36:11.093881000 -0700
e7e179
@@ -36,6 +36,8 @@
e7e179
 #ifdef XP_UNIX
e7e179
 #include <sys/types.h>
e7e179
 #include <unistd.h>
e7e179
+#include <sys/wait.h>
e7e179
+#include <syslog.h>
e7e179
 #endif
e7e179
 
e7e179
 #include "client.h"
e7e179
@@ -50,6 +52,7 @@ PR_IMPLEMENT(void *)exec_client(const ch
e7e179
     char * separator;
e7e179
     int pfildes[2];
e7e179
     int pid;
e7e179
+    int status;
e7e179
     char * tmpurl = NULL;
e7e179
     int ldap = 0;
e7e179
     char * arg;
e7e179
@@ -105,12 +108,10 @@ PR_IMPLEMENT(void *)exec_client(const ch
e7e179
         int done = 0;
e7e179
 
e7e179
         close(pfildes[1]);
e7e179
-        dup2(pfildes[0],0);
e7e179
-        close(pfildes[0]);
e7e179
 
e7e179
         totalread = 0;
e7e179
         do {
e7e179
-            numbytes = read(0, buffer, (BIG_LINE * 4) - 1);
e7e179
+            numbytes = read(pfildes[0], buffer, (BIG_LINE * 4) - 1);
e7e179
             if (numbytes > 0) {
e7e179
                 buffer[numbytes] = '\0';
e7e179
                 totalread += numbytes;
e7e179
@@ -125,6 +126,8 @@ PR_IMPLEMENT(void *)exec_client(const ch
e7e179
                         }
e7e179
                         *errnum = CL_OUT_OF_MEMORY;
e7e179
                         free(tmpurl);
e7e179
+                        close(pfildes[0]);
e7e179
+                        waitpid(pid, &status, WNOHANG);
e7e179
                         return NULL;
e7e179
                     }
e7e179
                     sz += (BIG_LINE * 4);
e7e179
@@ -135,6 +138,8 @@ PR_IMPLEMENT(void *)exec_client(const ch
e7e179
                 if (data) free(data);
e7e179
                 data = 0;
e7e179
                 free(tmpurl);
e7e179
+                close(pfildes[0]);
e7e179
+                waitpid(pid, &status, WNOHANG);
e7e179
                 return NULL;
e7e179
             } else if (numbytes == 0) {
e7e179
                 done = 1;
e7e179
@@ -148,6 +153,8 @@ PR_IMPLEMENT(void *)exec_client(const ch
e7e179
         }
e7e179
         free(tmpurl);
e7e179
         *len = totalread;
e7e179
+        close(pfildes[0]);
e7e179
+        waitpid(pid, &status, 0);
e7e179
         return data;
e7e179
     }
e7e179
 }