You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by rp...@apache.org on 2009/06/11 13:36:53 UTC

svn commit: r783723 - in /apr/apr/branches/1.3.x/threadproc: beos/proc.c netware/proc.c os2/proc.c

Author: rpluem
Date: Thu Jun 11 11:36:53 2009
New Revision: 783723

URL: http://svn.apache.org/viewvc?rev=783723&view=rev
Log:
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

Modified:
    apr/apr/branches/1.3.x/threadproc/beos/proc.c
    apr/apr/branches/1.3.x/threadproc/netware/proc.c
    apr/apr/branches/1.3.x/threadproc/os2/proc.c

Modified: apr/apr/branches/1.3.x/threadproc/beos/proc.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/threadproc/beos/proc.c?rev=783723&r1=783722&r2=783723&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/threadproc/beos/proc.c (original)
+++ apr/apr/branches/1.3.x/threadproc/beos/proc.c Thu Jun 11 11:36:53 2009
@@ -88,7 +88,7 @@
 
     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;

Modified: apr/apr/branches/1.3.x/threadproc/netware/proc.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/threadproc/netware/proc.c?rev=783723&r1=783722&r2=783723&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/threadproc/netware/proc.c (original)
+++ apr/apr/branches/1.3.x/threadproc/netware/proc.c Thu Jun 11 11:36:53 2009
@@ -95,7 +95,7 @@
 
     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;

Modified: apr/apr/branches/1.3.x/threadproc/os2/proc.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/threadproc/os2/proc.c?rev=783723&r1=783722&r2=783723&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/threadproc/os2/proc.c (original)
+++ apr/apr/branches/1.3.x/threadproc/os2/proc.c Thu Jun 11 11:36:53 2009
@@ -99,7 +99,7 @@
 
     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;