summaryrefslogtreecommitdiff
path: root/threadproc
diff options
context:
space:
mode:
authorrpluem <rpluem@13f79535-47bb-0310-9956-ffa450edef68>2009-06-11 11:38:10 +0000
committerrpluem <rpluem@13f79535-47bb-0310-9956-ffa450edef68>2009-06-11 11:38:10 +0000
commit0965fa98405483e5863c2aa6eefb1b1571313700 (patch)
tree36db0e49b6b3bf906bbdd46c7a6bd984cf736262 /threadproc
parentd52257c47c5e80d0fe9fd341c25dbfa6be59f0d3 (diff)
downloadlibapr-0965fa98405483e5863c2aa6eefb1b1571313700.tar.gz
Merge r783722 from trunk:
* We need to disable inheritance in the case of success like in the cases for stdout and stdin. Fixes the same issue fixed for unix in r783398 Submitted by: rpluem Reviewed by: rpluem git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@783725 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'threadproc')
-rw-r--r--threadproc/beos/proc.c2
-rw-r--r--threadproc/netware/proc.c2
-rw-r--r--threadproc/os2/proc.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/threadproc/beos/proc.c b/threadproc/beos/proc.c
index 2623b70d1..ee8afb8d1 100644
--- a/threadproc/beos/proc.c
+++ b/threadproc/beos/proc.c
@@ -88,7 +88,7 @@ APR_DECLARE(apr_status_t) apr_procattr_io_set(apr_procattr_t *attr,
if ((err != APR_NO_PIPE) && (err != APR_NO_FILE)) {
if ((rv = apr_file_pipe_create_ex(&attr->parent_err, &attr->child_err,
- err, attr->pool)) != APR_SUCCESS)
+ err, attr->pool)) == APR_SUCCESS)
rv = apr_file_inherit_unset(attr->parent_err);
if (rv != APR_SUCCESS)
return rv;
diff --git a/threadproc/netware/proc.c b/threadproc/netware/proc.c
index 5fb26913c..026ca6fd7 100644
--- a/threadproc/netware/proc.c
+++ b/threadproc/netware/proc.c
@@ -95,7 +95,7 @@ APR_DECLARE(apr_status_t) apr_procattr_io_set(apr_procattr_t *attr,
if ((err != APR_NO_PIPE) && (err != APR_NO_FILE)) {
if ((rv = apr_file_pipe_create_ex(&attr->parent_err, &attr->child_err,
- err, attr->pool)) != APR_SUCCESS)
+ err, attr->pool)) == APR_SUCCESS)
rv = apr_file_inherit_unset(attr->parent_err);
if (rv != APR_SUCCESS)
return rv;
diff --git a/threadproc/os2/proc.c b/threadproc/os2/proc.c
index 8e4a4a3b6..bae2785f0 100644
--- a/threadproc/os2/proc.c
+++ b/threadproc/os2/proc.c
@@ -99,7 +99,7 @@ APR_DECLARE(apr_status_t) apr_procattr_io_set(apr_procattr_t *attr,
if ((err != APR_NO_PIPE) && (err != APR_NO_FILE)) {
if ((rv = apr_file_pipe_create_ex(&attr->parent_err, &attr->child_err,
- err, attr->pool)) != APR_SUCCESS)
+ err, attr->pool)) == APR_SUCCESS)
rv = apr_file_inherit_unset(attr->parent_err);
if (rv != APR_SUCCESS)
return rv;