httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Dean Gaudet <dgau...@hyperreal.com>
Subject cvs commit: apache/src http_protocol.c http_request.c httpd.h
Date Tue, 01 Jul 1997 06:50:33 GMT
dgaudet     97/06/30 23:50:32

  Modified:    src       Tag: APACHE_1_2_X  http_protocol.c http_request.c
                        httpd.h
  Log:
  We can use read_length instead of adding the new field begun_read_body.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.126.2.2 +1 -4      apache/src/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_protocol.c,v
  retrieving revision 1.126.2.1
  retrieving revision 1.126.2.2
  diff -C3 -r1.126.2.1 -r1.126.2.2
  *** http_protocol.c	1997/07/01 01:37:08	1.126.2.1
  --- http_protocol.c	1997/07/01 06:50:29	1.126.2.2
  ***************
  *** 868,874 ****
        
        rnew->read_length = r->read_length;
        rnew->read_body   = REQUEST_NO_BODY;
  -     rnew->begun_read_body = r->begun_read_body;
        
        rnew->main = (request_rec *)r;
    }
  --- 868,873 ----
  ***************
  *** 1346,1352 ****
    
    int should_client_block (request_rec *r)
    {
  !     if (r->begun_read_body || is_HTTP_ERROR(r->status))
            return 0;
    
        if (!r->read_chunked && (r->remaining <= 0))
  --- 1345,1351 ----
    
    int should_client_block (request_rec *r)
    {
  !     if (r->read_length || is_HTTP_ERROR(r->status))
            return 0;
    
        if (!r->read_chunked && (r->remaining <= 0))
  ***************
  *** 1397,1404 ****
        int c;
        long len_read, len_to_read;
        long chunk_start = 0;
  - 
  -     r->begun_read_body = 1;
    
        if (!r->read_chunked) {                 /* Content-length read */
            len_to_read = (r->remaining > bufsiz) ? bufsiz : r->remaining;
  --- 1396,1401 ----
  
  
  
  1.50.2.3  +1 -1      apache/src/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_request.c,v
  retrieving revision 1.50.2.2
  retrieving revision 1.50.2.3
  diff -C3 -r1.50.2.2 -r1.50.2.3
  *** http_request.c	1997/07/01 01:37:09	1.50.2.2
  --- http_request.c	1997/07/01 06:50:30	1.50.2.3
  ***************
  *** 1095,1101 ****
    				  */
        new->no_local_copy = r->no_local_copy;
    
  !     new->begun_read_body = r->begun_read_body;  /* We can only read it once */
    
        ap_snprintf (t, sizeof(t), "%d", r->status);
        table_set (new->subprocess_env, "REDIRECT_STATUS", pstrdup (r->pool, t));
  --- 1095,1101 ----
    				  */
        new->no_local_copy = r->no_local_copy;
    
  !     new->read_length = r->read_length;  /* We can only read it once */
    
        ap_snprintf (t, sizeof(t), "%d", r->status);
        table_set (new->subprocess_env, "REDIRECT_STATUS", pstrdup (r->pool, t));
  
  
  
  1.111.2.5 +0 -1      apache/src/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/httpd.h,v
  retrieving revision 1.111.2.4
  retrieving revision 1.111.2.5
  diff -C3 -r1.111.2.4 -r1.111.2.5
  *** httpd.h	1997/07/01 01:37:09	1.111.2.4
  --- httpd.h	1997/07/01 06:50:30	1.111.2.5
  ***************
  *** 472,478 ****
      long read_length;		/* bytes that have been read */
      int read_body;   		/* how the request body should be read */
      int read_chunked;		/* reading chunked transfer-coding */
  -   int begun_read_body;   	/* false (0) until first get_client_block */
    
      /* MIME header environments, in and out.  Also, an array containing
       * environment variables to be passed to subprocesses, so people can
  --- 472,477 ----
  
  
  

Mime
View raw message