httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/main http_protocol.c
Date Thu, 02 Nov 2000 21:10:40 GMT
rbb         00/11/02 13:10:34

  Modified:    src/main http_protocol.c
  Log:
  Remove some more BUFF code.  This makes the 100 continue code use buckets
  instead of BUFF.
  
  Revision  Changes    Path
  1.221     +12 -13    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.220
  retrieving revision 1.221
  diff -u -r1.220 -r1.221
  --- http_protocol.c	2000/11/02 15:42:56	1.220
  +++ http_protocol.c	2000/11/02 21:10:29	1.221
  @@ -141,17 +141,6 @@
       return n;
   }
   
  -static int checked_bflush(request_rec *r)
  -{
  -    apr_status_t rv;
  -
  -    if ((rv = ap_bflush(r->connection->client)) != APR_SUCCESS) {
  -        check_first_conn_error(r, "checked_bflush", rv);
  -        return EOF;
  -    }
  -    return 0;
  -}
  -
   /*
    * Builds the content-type that should be sent to the client from the
    * content-type specified.  The following rules are followed:
  @@ -2589,10 +2578,20 @@
           return 0;
   
       if (r->expecting_100 && r->proto_num >= HTTP_VERSION(1,1)) {
  +        char *tmp;
  +        ap_bucket *e;
  +        ap_bucket_brigade *bb;
  +
           /* sending 100 Continue interim response */
  -        (void) checked_bputstrs(r, AP_SERVER_PROTOCOL, " ", status_lines[0],
  +        tmp = apr_pstrcat(r->pool, AP_SERVER_PROTOCOL, " ", status_lines[0],
                                   CRLF CRLF, NULL);
  -        (void) checked_bflush(r);
  +        bb = ap_brigade_create(r->pool);
  +        e = ap_bucket_create_pool(tmp, strlen(tmp), r->pool);
  +        AP_BRIGADE_INSERT_HEAD(bb, e);
  +        e = ap_bucket_create_flush();
  +        AP_BRIGADE_INSERT_TAIL(bb, e);
  +
  +        ap_pass_brigade(r->connection->output_filters, bb);
       }
   
       return 1;
  
  
  

Mime
View raw message