diff options
| author | sf <sf@13f79535-47bb-0310-9956-ffa450edef68> | 2011-10-15 21:04:36 +0000 |
|---|---|---|
| committer | sf <sf@13f79535-47bb-0310-9956-ffa450edef68> | 2011-10-15 21:04:36 +0000 |
| commit | c8d8b9c9cc202fc73944d7d3493c7ec9300ba72b (patch) | |
| tree | 75a47e91ae0133671a02f97b0b7892272bef3fb6 /threadproc | |
| parent | 274be99b4691ff5ec544ffc83b25a88ba6d53b34 (diff) | |
| download | libapr-c8d8b9c9cc202fc73944d7d3493c7ec9300ba72b.tar.gz | |
Backport r1183685:
Don't close any of the new stdin/stdout/stderr FDs in the child if it
already has the correct FD.
PR: 51995
Submitted by: Dan Ports <drkp csail mit edu>]
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1183706 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'threadproc')
| -rw-r--r-- | threadproc/unix/proc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/threadproc/unix/proc.c b/threadproc/unix/proc.c index b5e4dd47c..e5a3df9b4 100644 --- a/threadproc/unix/proc.c +++ b/threadproc/unix/proc.c @@ -432,7 +432,8 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new, if ((attr->child_in) && (attr->child_in->filedes == -1)) { close(STDIN_FILENO); } - else if (attr->child_in) { + else if (attr->child_in && + attr->child_in->filedes != STDIN_FILENO) { dup2(attr->child_in->filedes, STDIN_FILENO); apr_file_close(attr->child_in); } @@ -440,7 +441,8 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new, if ((attr->child_out) && (attr->child_out->filedes == -1)) { close(STDOUT_FILENO); } - else if (attr->child_out) { + else if (attr->child_out && + attr->child_out->filedes != STDOUT_FILENO) { dup2(attr->child_out->filedes, STDOUT_FILENO); apr_file_close(attr->child_out); } @@ -448,7 +450,8 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new, if ((attr->child_err) && (attr->child_err->filedes == -1)) { close(STDERR_FILENO); } - else if (attr->child_err) { + else if (attr->child_err && + attr->child_err->filedes != STDERR_FILENO) { dup2(attr->child_err->filedes, STDERR_FILENO); apr_file_close(attr->child_err); } |