Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 24 Apr 2001 02:17:22 -0000
Message-ID: <20010424021722.23151.qmail@apache.org>
From: dougm@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/server/mpm/perchild perchild.c

dougm       01/04/23 19:17:22

  Modified:    server/mpm/perchild perchild.c
  Log:
  adjust to ap_get_brigade() / input filter api changes
  
  Revision  Changes    Path
  1.63      +4 -3      httpd-2.0/server/mpm/perchild/perchild.c
  
  Index: perchild.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/perchild/perchild.c,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- perchild.c	2001/04/13 19:00:37	1.62
  +++ perchild.c	2001/04/24 02:17:21	1.63
  @@ -1362,6 +1362,7 @@
                                                    &mpm_perchild_module);
       char *foo;
       apr_size_t len;
  +    apr_size_t readbytes = 0;
   
       apr_pool_userdata_get((void **)&foo, "PERCHILD_BUFFER", r->connection->pool);
       len = strlen(foo);
  @@ -1397,7 +1398,7 @@
   
       write(sconf->sd2, foo, len);
      
  -    while (ap_get_brigade(r->input_filters, bb, AP_MODE_NONBLOCKING) == APR_SUCCESS) {
  +    while (ap_get_brigade(r->input_filters, bb, AP_MODE_NONBLOCKING, &readbytes) == APR_SUCCESS) {
           apr_bucket *e;
           APR_BRIGADE_FOREACH(e, bb) {
               const char *str;
  @@ -1491,7 +1492,7 @@
       return OK;
   }
   
  -static apr_status_t perchild_buffer(ap_filter_t *f, apr_bucket_brigade *b, ap_input_mode_t mode)
  +static apr_status_t perchild_buffer(ap_filter_t *f, apr_bucket_brigade *b, ap_input_mode_t mode, apr_size_t *readbytes)
   {
       apr_bucket *e;
       apr_status_t rv;
  @@ -1499,7 +1500,7 @@
       const char *str;
       apr_size_t len;
   
  -    if ((rv = ap_get_brigade(f->next, b, mode)) != APR_SUCCESS) {
  +    if ((rv = ap_get_brigade(f->next, b, mode, readbytes)) != APR_SUCCESS) {
           return rv;
       }