httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/server mpm_common.c
Date Mon, 11 Jun 2001 18:23:22 GMT
trawick     01/06/11 11:23:22

  Modified:    server   mpm_common.c
  Log:
  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
  
  Revision  Changes    Path
  1.54      +3 -3      httpd-2.0/server/mpm_common.c
  
  Index: mpm_common.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm_common.c,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- mpm_common.c	2001/06/09 02:57:46	1.53
  +++ mpm_common.c	2001/06/11 18:23:21	1.54
  @@ -347,7 +347,7 @@
   
       *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 @@
       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 @@
       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,
  
  
  

Mime
View raw message