From: Roy T. Fielding <fielding@apache.org>
Date: Thu, 26 Aug 1999 17:38:57 +0000 (+0000)
Subject: Changes for thread safety in pthreads.
X-Git-Tag: PRE_APR_CHANGES~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5bfbb0bc1f8471b0af0cc1570d193311faf4696f;p=apache

Changes for thread safety in pthreads.

Submitted by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83795 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/metadata/mod_mime_magic.c b/modules/metadata/mod_mime_magic.c
index 7f4d6ba6e3..5f23c34cca 100644
--- a/modules/metadata/mod_mime_magic.c
+++ b/modules/metadata/mod_mime_magic.c
@@ -2145,32 +2145,25 @@ struct uncompress_parms {
 static int uncompress_child(void *data, child_info *pinfo)
 {
     struct uncompress_parms *parm = data;
-	char *new_argv[4];
-
-	new_argv[0] = compr[parm->method].argv[0];
-	new_argv[1] = compr[parm->method].argv[1];
-	new_argv[2] = parm->r->filename;
-	new_argv[3] = NULL;
-
-#if defined(WIN32)
     int child_pid;
-#endif
+    char *new_argv[4];
+
+    new_argv[0] = compr[parm->method].argv[0];
+    new_argv[1] = compr[parm->method].argv[1];
+    new_argv[2] = parm->r->filename;
+    new_argv[3] = NULL;
 
     if (compr[parm->method].silent) {
 	close(STDERR_FILENO);
     }
 
-#if defined(WIN32)
-    child_pid = spawnvp(compr[parm->method].argv[0],
+    child_pid = ap_spawnvp(compr[parm->method].argv[0],
 			new_argv);
-    return (child_pid);
-#else
-    execvp(compr[parm->method].argv[0], new_argv);
-    ap_log_rerror(APLOG_MARK, APLOG_ERR, parm->r,
+    if (child_pid == -1)
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, parm->r,
 		MODNAME ": could not execute `%s'.",
 		compr[parm->method].argv[0]);
-    return -1;
-#endif
+    return (child_pid);
 }