httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r607667 - /httpd/httpd/branches/2.2.x/server/log.c
Date Mon, 31 Dec 2007 05:00:53 GMT
Author: wrowe
Date: Sun Dec 30 21:00:52 2007
New Revision: 607667

URL: http://svn.apache.org/viewvc?rev=607667&view=rev
Log:
On win32, we must never, never close the parent's copy of the
child's read end for a reliable piped logger.  The child runs
and manages it's own logs, and even if the parent did instead, 
the mpm would be adjusted to pass down the child write ends 
without read ends to the pipes, so this forever makes no sense.

Backport: r607666

Modified:
    httpd/httpd/branches/2.2.x/server/log.c

Modified: httpd/httpd/branches/2.2.x/server/log.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/log.c?rev=607667&r1=607666&r2=607667&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/log.c (original)
+++ httpd/httpd/branches/2.2.x/server/log.c Sun Dec 30 21:00:52 2007
@@ -161,15 +161,26 @@
     return APR_SUCCESS;
 }
 
-/* remember to close this handle in the child process */
+/* remember to close this handle in the child process
+ *
+ * On Win32 this makes zero sense, because we don't
+ * take the parent process's child procs.
+ * If the win32 parent instead passed each and every
+ * logger write handle from itself down to the child,
+ * and the parent manages all aspects of keeping the 
+ * reliable pipe log children alive, this would still
+ * make no sense :)  Cripple it on Win32.
+ */
 static void close_handle_in_child(apr_pool_t *p, apr_file_t *f)
 {
+#ifndef WIN32
     read_handle_t *new_handle;
 
     new_handle = apr_pcalloc(p, sizeof(read_handle_t));
     new_handle->next = read_handles;
     new_handle->handle = f;
     read_handles = new_handle;
+#endif
 }
 
 void ap_logs_child_init(apr_pool_t *p, server_rec *s)



Mime
View raw message