aboutsummaryrefslogtreecommitdiff
path: root/threadproc/unix/proc.c
diff options
context:
space:
mode:
authorRyan Bloom <rbb@apache.org>2000-04-17 19:57:29 +0000
committerRyan Bloom <rbb@apache.org>2000-04-17 19:57:29 +0000
commita7589184b3180e632f7c78e83f00d0f8281de503 (patch)
treed569acd1be0fc0de15b34b3040bb04a9f9710450 /threadproc/unix/proc.c
parent8c092c78c05928717f0eb85ea1aa1c1d87774667 (diff)
downloadapr-a7589184b3180e632f7c78e83f00d0f8281de503.tar.gz
apr-a7589184b3180e632f7c78e83f00d0f8281de503.zip
Add a pool to dupfile. There is no reason that when we duplicate a file, we would want to use the same pool for the duplicated file as we used for
the original file. This should solve a problem we were having with dieing quietly on startup, because we are no longer closing stderr in the original process and then opening the config file as file descriptor 2. The original problem report can be found in the message <20000311232812.A1066@sanguine.linuxcare.com.au> git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@59873 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'threadproc/unix/proc.c')
-rw-r--r--threadproc/unix/proc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/threadproc/unix/proc.c b/threadproc/unix/proc.c
index ad5b7f9ce..177c8d984 100644
--- a/threadproc/unix/proc.c
+++ b/threadproc/unix/proc.c
@@ -136,10 +136,10 @@ ap_status_t ap_setprocattr_childin(ap_procattr_t *attr, ap_file_t *child_in,
ap_create_pipe(&attr->child_in, &attr->parent_in, attr->cntxt);
if (child_in != NULL)
- ap_dupfile(&attr->child_in, child_in);
+ ap_dupfile(&attr->child_in, child_in, attr->cntxt);
if (parent_in != NULL)
- ap_dupfile(&attr->parent_in, parent_in);
+ ap_dupfile(&attr->parent_in, parent_in, attr->cntxt);
return APR_SUCCESS;
}
@@ -152,10 +152,10 @@ ap_status_t ap_setprocattr_childout(ap_procattr_t *attr, ap_file_t *child_out,
ap_create_pipe(&attr->child_out, &attr->parent_out, attr->cntxt);
if (child_out != NULL)
- ap_dupfile(&attr->child_out, child_out);
+ ap_dupfile(&attr->child_out, child_out, attr->cntxt);
if (parent_out != NULL)
- ap_dupfile(&attr->parent_out, parent_out);
+ ap_dupfile(&attr->parent_out, parent_out, attr->cntxt);
return APR_SUCCESS;
}
@@ -168,10 +168,10 @@ ap_status_t ap_setprocattr_childerr(ap_procattr_t *attr, ap_file_t *child_err,
ap_create_pipe(&attr->child_err, &attr->parent_err, attr->cntxt);
if (child_err != NULL)
- ap_dupfile(&attr->child_err, child_err);
+ ap_dupfile(&attr->child_err, child_err, attr->cntxt);
if (parent_err != NULL)
- ap_dupfile(&attr->parent_err, parent_err);
+ ap_dupfile(&attr->parent_err, parent_err, attr->cntxt);
return APR_SUCCESS;
}