Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 35897 invoked from network); 31 Dec 2007 05:01:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 31 Dec 2007 05:01:29 -0000 Received: (qmail 85856 invoked by uid 500); 31 Dec 2007 05:01:18 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 85658 invoked by uid 500); 31 Dec 2007 05:01:17 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 85647 invoked by uid 99); 31 Dec 2007 05:01:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 30 Dec 2007 21:01:17 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Dec 2007 05:01:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 224981A9844; Sun, 30 Dec 2007 21:01:06 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r607668 - /httpd/httpd/branches/2.0.x/server/log.c Date: Mon, 31 Dec 2007 05:01:05 -0000 To: cvs@httpd.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071231050106.224981A9844@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wrowe Date: Sun Dec 30 21:01:05 2007 New Revision: 607668 URL: http://svn.apache.org/viewvc?rev=607668&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.0.x/server/log.c Modified: httpd/httpd/branches/2.0.x/server/log.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/server/log.c?rev=607668&r1=607667&r2=607668&view=diff ============================================================================== --- httpd/httpd/branches/2.0.x/server/log.c (original) +++ httpd/httpd/branches/2.0.x/server/log.c Sun Dec 30 21:01:05 2007 @@ -165,15 +165,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)