Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 81327 invoked from network); 23 Aug 2007 04:11:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Aug 2007 04:11:48 -0000 Received: (qmail 83713 invoked by uid 500); 23 Aug 2007 04:11:44 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 83667 invoked by uid 500); 23 Aug 2007 04:11:44 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 83656 invoked by uid 99); 23 Aug 2007 04:11:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Aug 2007 21:11:44 -0700 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; Thu, 23 Aug 2007 04:12:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 371C71A981D; Wed, 22 Aug 2007 21:11:25 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r568819 - /apr/apr/branches/1.2.x/threadproc/win32/proc.c Date: Thu, 23 Aug 2007 04:11:24 -0000 To: commits@apr.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070823041125.371C71A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wrowe Date: Wed Aug 22 21:11:24 2007 New Revision: 568819 URL: http://svn.apache.org/viewvc?rev=568819&view=rev Log: Make Win32 consistent with unix, in that we will inherit the default stdin/out/err if some of these handles are left unset, while one or two of them are set with apr_procattr_io_set() (with one or more APR_NO_PIPE's) and/or apr_procattr_child_XXX_set(). Backport: 568818 Modified: apr/apr/branches/1.2.x/threadproc/win32/proc.c Modified: apr/apr/branches/1.2.x/threadproc/win32/proc.c URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/threadproc/win32/proc.c?rev=568819&r1=568818&r2=568819&view=diff ============================================================================== --- apr/apr/branches/1.2.x/threadproc/win32/proc.c (original) +++ apr/apr/branches/1.2.x/threadproc/win32/proc.c Wed Aug 22 21:11:24 2007 @@ -728,15 +728,15 @@ si.hStdInput = (attr->child_in) ? attr->child_in->filehand - : INVALID_HANDLE_VALUE; + : GetStdHandle(STD_INPUT_HANDLE); si.hStdOutput = (attr->child_out) ? attr->child_out->filehand - : INVALID_HANDLE_VALUE; + : GetStdHandle(STD_OUTPUT_HANDLE); si.hStdError = (attr->child_err) ? attr->child_err->filehand - : INVALID_HANDLE_VALUE; + : GetStdHandle(STD_ERROR_HANDLE); } if (attr->user_token) { si.lpDesktop = L"Winsta0\\Default"; @@ -800,15 +800,15 @@ si.hStdInput = (attr->child_in) ? attr->child_in->filehand - : INVALID_HANDLE_VALUE; + : GetStdHandle(STD_INPUT_HANDLE); si.hStdOutput = (attr->child_out) ? attr->child_out->filehand - : INVALID_HANDLE_VALUE; + : GetStdHandle(STD_OUTPUT_HANDLE); si.hStdError = (attr->child_err) ? attr->child_err->filehand - : INVALID_HANDLE_VALUE; + : GetStdHandle(STD_ERROR_HANDLE); } rv = CreateProcessA(progname, cmdline, /* Command line */