From: Jeff Trawick Date: Mon, 11 Jun 2001 18:23:21 +0000 (+0000) Subject: back out a change from last week that reversed the meaning of pod_in and X-Git-Tag: 2.0.19~84 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c50b9eaa6229c893468cbff7dc83567a3a299937;p=thirdparty%2Fapache%2Fhttpd.git back out a change from last week that reversed the meaning of pod_in and pod_out; after that change, all read and write syscalls on the handles failed because pod_in was only readable and pod_out was only writable we could instead reverse the order of the parameters to apr_pipe_create so that the descriptors returned by pipe() get put in the right place, but it seems better to stick with APR terminology for what is the input handle and what is the output handle git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89335 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/server/mpm_common.c b/server/mpm_common.c index fa389bea876..7cd94063c22 100644 --- a/server/mpm_common.c +++ b/server/mpm_common.c @@ -347,7 +347,7 @@ AP_DECLARE(apr_status_t) ap_mpm_pod_open(apr_pool_t *p, ap_pod_t **pod) *pod = apr_palloc(p, sizeof(**pod)); rv = apr_file_pipe_create(&((*pod)->pod_in), &((*pod)->pod_out), p); - apr_file_pipe_timeout_set((*pod)->pod_out, 0); + apr_file_pipe_timeout_set((*pod)->pod_in, 0); (*pod)->p = p; return rv; } @@ -358,7 +358,7 @@ AP_DECLARE(apr_status_t) ap_mpm_pod_check(ap_pod_t *pod) apr_size_t len = 1; apr_status_t rv; - rv = apr_file_read(pod->pod_out, &c, &len); + rv = apr_file_read(pod->pod_in, &c, &len); if ((rv == APR_SUCCESS) && (len == 1)) { return APR_SUCCESS; @@ -394,7 +394,7 @@ AP_DECLARE(apr_status_t) ap_mpm_pod_signal(ap_pod_t *pod) apr_size_t one = 1; do { - rv = apr_file_write(pod->pod_in, &char_of_death, &one); + rv = apr_file_write(pod->pod_out, &char_of_death, &one); } while (APR_STATUS_IS_EINTR(rv)); if (rv != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf,