diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2007-08-23 04:11:39 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2007-08-23 04:11:39 +0000 |
| commit | c1e94593a6c1a6f775db0cf8f19ddf25a94ab045 (patch) | |
| tree | c774e622c48d700acb970acf6941af6ddf663cef /threadproc | |
| parent | e2ed03cc5312e2e88e6b723cf940a4da7aa3a9f2 (diff) | |
| download | libapr-c1e94593a6c1a6f775db0cf8f19ddf25a94ab045.tar.gz | |
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
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/0.9.x@568820 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'threadproc')
| -rw-r--r-- | threadproc/win32/proc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/threadproc/win32/proc.c b/threadproc/win32/proc.c index cb33a0507..017840547 100644 --- a/threadproc/win32/proc.c +++ b/threadproc/win32/proc.c @@ -613,15 +613,15 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new, 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 = CreateProcessW(wprg, wcmd, /* Executable & Command line */ NULL, NULL, /* Proc & thread security attributes */ @@ -662,15 +662,15 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new, 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 */ |