httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/main http_protocol.c
Date Wed, 01 Nov 2000 15:44:45 GMT
trawick     00/11/01 07:44:44

  Modified:    src/main http_protocol.c
  Log:
  Get rid of a couple of buff calls by manipulating the APR socket
  timeout directly.
  
  Revision  Changes    Path
  1.217     +7 -7      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.216
  retrieving revision 1.217
  diff -u -r1.216 -r1.217
  --- http_protocol.c	2000/11/01 06:05:00	1.216
  +++ http_protocol.c	2000/11/01 15:44:42	1.217
  @@ -1396,11 +1396,11 @@
       r->output_filters  = conn->output_filters;
       r->input_filters   = conn->input_filters;
   
  -    ap_bsetopt(conn->client, BO_TIMEOUT,
  -               conn->keptalive
  -               ? &r->server->keep_alive_timeout
  -               : &r->server->timeout);
  -
  +    apr_setsocketopt(conn->client_socket, APR_SO_TIMEOUT, 
  +                     conn->keptalive
  +                     ? r->server->keep_alive_timeout * APR_USEC_PER_SEC
  +                     : r->server->timeout * APR_USEC_PER_SEC);
  +                     
       ap_add_output_filter("CONTENT_LENGTH", NULL, r, r->connection);
       ap_add_output_filter("HTTP_HEADER", NULL, r, r->connection);
   
  @@ -1416,8 +1416,8 @@
           return NULL;
       }
       if (r->connection->keptalive) {
  -        ap_bsetopt(r->connection->client, BO_TIMEOUT,
  -		   &r->server->timeout);
  +        apr_setsocketopt(r->connection->client_socket, APR_SO_TIMEOUT,
  +                         r->server->timeout * APR_USEC_PER_SEC);
       }
       if (!r->assbackwards) {
           get_mime_headers(r);
  
  
  

Mime
View raw message