cvs commit: apache-2.0/mpm/src/main http_protocol.c

[dgaudet]

dgaudet     99/06/24 18:17:01

  Modified:    mpm/src/main http_protocol.c
  Log:
  random futzing around
  
  Revision  Changes    Path
  1.7       +9 -9      apache-2.0/mpm/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/main/http_protocol.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- http_protocol.c   1999/06/24 07:29:31     1.6
  +++ http_protocol.c   1999/06/25 01:16:57     1.7
  @@ -1364,15 +1364,15 @@
    * It is more expensive to check the User-Agent than it is to just add the
    * bytes, so we haven't used the BrowserMatch feature here.
    */
  -static void terminate_header(BUFF *client)
  +static void terminate_header(request_rec *r)
   {
       long int bs;
   
  -    ap_bgetopt(client, BO_BYTECT, &bs);
  +    ap_bgetopt(r->connection->client, BO_BYTECT, &bs);
       if (bs >= 255 && bs <= 257)
  -        ap_bputs("X-Pad: avoid browser bug\015\012", client);
  +        ap_rputs("X-Pad: avoid browser bug\015\012", r);
   
  -    ap_bputs("\015\012", client);  /* Send the terminating empty line */
  +    ap_rputs("\015\012", r);  /* Send the terminating empty line */
   }
   
   /* Build the Allow field-value from the request handler method mask.
  @@ -1440,7 +1440,7 @@
       ap_table_do((int (*) (void *, const char *, const char *)) 
ap_send_header_field,
                (void *) r, r->headers_out, NULL);
   
  -    terminate_header(r->connection->client);
  +    terminate_header(r);
   
       ap_bsetopt(r->connection->client, BO_BYTECT, &zero);
   
  @@ -1544,7 +1544,7 @@
       ap_table_do((int (*) (void *, const char *, const char *)) 
ap_send_header_field,
                (void *) r, r->headers_out, NULL);
   
  -    terminate_header(r->connection->client);
  +    terminate_header(r);
   
   
       ap_bsetopt(r->connection->client, BO_BYTECT, &zero);
  @@ -2186,7 +2186,7 @@
       int n;
   
       if (r->connection->aborted)
  -        return -1;
  +        return EOF;
   
       n = ap_bwrite(r->connection->client, buf, nbyte);
       if (n < 0) {
  @@ -2196,7 +2196,7 @@
               ap_bsetflag(r->connection->client, B_EOUT, 1);
               r->connection->aborted = 1;
           }
  -        return -1;
  +        return EOF;
       }
       SET_BYTES_SENT(r);
       return n;
  @@ -2344,7 +2344,7 @@
                       "Proxy-Authenticate",
                       NULL);
   
  -        terminate_header(r->connection->client);
  +        terminate_header(r);
   
           return;
       }