Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 24 Oct 2000 16:28:55 -0000
Message-ID: <20001024162855.24647.qmail@locus.apache.org>
From: trawick@locus.apache.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/main http_protocol.c

trawick     00/10/24 09:28:54

  Modified:    src/main http_protocol.c
  Log:
  The request body should be read with the normal send/receive timeout
  instead of in non-blocking mode.
  
  Revision  Changes    Path
  1.206     +1 -6      apache-2.0/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
  retrieving revision 1.205
  retrieving revision 1.206
  diff -u -r1.205 -r1.206
  --- http_protocol.c	2000/10/23 10:44:34	1.205
  +++ http_protocol.c	2000/10/24 16:28:53	1.206
  @@ -2506,7 +2506,6 @@
   {
       apr_ssize_t len_read, total;
       apr_status_t rv;
  -    apr_int32_t timeout;
       ap_bucket *b, *old;
       const char *tempbuf;
       core_request_config *req_cfg =
  @@ -2516,18 +2515,14 @@
   
       do {
           if (AP_BRIGADE_EMPTY(bb)) {
  -            apr_getsocketopt(r->connection->client_socket, APR_SO_TIMEOUT, &timeout);
  -            apr_setsocketopt(r->connection->client_socket, APR_SO_TIMEOUT, 0);
  -            if (ap_get_brigade(r->input_filters, bb, 9999) != APR_SUCCESS) {
  +            if (ap_get_brigade(r->input_filters, bb, AP_MODE_BLOCKING) != APR_SUCCESS) {
                   /* if we actually fail here, we want to just return and
                    * stop trying to read data from the client.
                    */
  -                apr_setsocketopt(r->connection->client_socket, APR_SO_TIMEOUT, timeout);
                   r->connection->keepalive = -1;
                   ap_brigade_destroy(bb);
                   return -1;
               }
  -            apr_setsocketopt(r->connection->client_socket, APR_SO_TIMEOUT, timeout);
           }
           b = AP_BRIGADE_FIRST(bb);
       } while (AP_BRIGADE_EMPTY(bb));