From: Jeff Trawick <trawick@apache.org>
Date: Sun, 4 Jul 2004 11:34:36 +0000 (+0000)
Subject: Win32: Improve error reporting after a failed attempt to spawn a
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a5dbc15bad3067352b68b544fe909eff0def613;p=thirdparty%2Fapache%2Fhttpd.git

Win32: Improve error reporting after a failed attempt to spawn a
piped log process or rewrite map process.

Submitted by: trawick
Reviewed by:  stoddard, nd


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@104161 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/CHANGES b/src/CHANGES
index 048d214befa..916e3dc82a7 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 1.3.32
 
+  *) Win32: Improve error reporting after a failed attempt to spawn a 
+     piped log process or rewrite map process.  [Jeff Trawick]
+
   *) SECURITY: CAN-2004-0492 (cve.mitre.org)
      Reject responses from a remote server if sent an invalid (negative) 
      Content-Length.  [Mark Cox]
@@ -16,7 +19,7 @@ Changes with Apache 1.3.32
      It controls how UseCanonicalName Off determines the port value if
      the client doesn't provide one in the Host header. If defined during
      compilation, UseCanonicalName Off will use the physical port number to
-     generate the canonical name. If not defined, it trys the current Port
+     generate the canonical name. If not defined, it tries the current Port
      value followed by the default port for the current scheme.
      [Jim Jagielski]
 
diff --git a/src/main/alloc.c b/src/main/alloc.c
index f6a413e3961..71b20b82781 100644
--- a/src/main/alloc.c
+++ b/src/main/alloc.c
@@ -2318,9 +2318,11 @@ static pid_t spawn_child_core(pool *p, int (*func) (void *, child_info *),
 	(void) ap_release_mutex(spawn_mutex);
 	/*
 	 * go on to the end of the function, where you can
-	 * unblock alarms and return the pid
+	 * return the pid
 	 */
-
+        if (!pid) {
+            errno = save_errno;
+        }
     }
 #elif defined(NETWARE)
      /* NetWare currently has no pipes yet. This will