httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rede...@apache.org
Subject cvs commit: httpd-2.0/server protocol.c
Date Tue, 15 Jul 2003 21:03:15 GMT
rederpj     2003/07/15 14:03:15

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               server   Tag: APACHE_2_0_BRANCH protocol.c
  Log:
  Eliminate creation of a temporary table in ap_get_mime_headers_core()
  Submitted by:	Joe Schaefer <joe+gmane@sunstarsys.com>
  Reviewed by:	Brian Pane
  Backported by:	Paul J. Reder
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.133 +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.132
  retrieving revision 1.988.2.133
  diff -u -r1.988.2.132 -r1.988.2.133
  --- CHANGES	12 Jul 2003 12:56:16 -0000	1.988.2.132
  +++ CHANGES	15 Jul 2003 21:03:12 -0000	1.988.2.133
  @@ -1,5 +1,10 @@
   Changes with Apache 2.0.48
   
  +  *) Eliminate creation of a temporary table in ap_get_mime_headers_core()
  +     Submitted by: Joe Schaefer <joe+gmane@sunstarsys.com>
  +     Reviewed by: Brian Pane
  +     Backported: Paul J. Reder
  +
     *) Added FreeBSD directory layout. PR 21100.
        [Sander Holthaus <info@orangexl.com>, André Malo]
   
  
  
  
  1.751.2.377 +8 -7      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.376
  retrieving revision 1.751.2.377
  diff -u -r1.751.2.376 -r1.751.2.377
  --- STATUS	15 Jul 2003 19:09:22 -0000	1.751.2.376
  +++ STATUS	15 Jul 2003 21:03:13 -0000	1.751.2.377
  @@ -69,22 +69,20 @@
         rewritten request using "proxy:". The code was adding multiple "proxy:"
         fields in the rewritten URI. PR: 13946.
         http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/mappers/mod_rewrite.c.diff?r1=1.153&r2=1.154
  +      http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/mappers/mod_rewrite.c.diff?r1=1.154&r2=1.155
  +      http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/mappers/mod_rewrite.c.diff?r1=1.156&r2=1.157
         +1: rederpj, nd (besides my further comments on dev@)
   
       * ap_get_mime_headers_core(): Remove LWS between header token and ':'
         delimeter. (2616 compliance)
         server/protocol.c: r1.133
         http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/protocol.c.diff?r1=1.132&r2=1.133
  +      http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/protocol.c.diff?r1=1.133&r2=1.134
  +      http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/protocol.c.diff?r1=1.134&r2=1.135
         +1: rederpj, nd (though I think it's actually a bad request, being lenient
             is probably the best here), trawick (prefer style changes in
             r1.135 to be committed at same time), jim
   
  -    * ap_get_mime_headers(): eliminate the temporary table used to
  -      combine duplicate headers (performance enhancement)
  -      server/protocol.c: r1.132
  -      http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/protocol.c.diff?r1=1.131&r2=1.132&diff_format=h
  -      +1: brianp, jerenkrantz, rederpj, nd
  -
       * Replace some of the mutex locking in the worker MPM with
         atomic operations for higher concurrency.
         server/mpm/worker/fdqueue.c 1.24, 1.25
  @@ -865,6 +863,9 @@
         including CacheGc*, CacheSize, and, CacheTimeMargin)
         (mod_mem_cache: MCacheMaxObjectCount) and
         (mod_cache: CacheForceCompletion). 
  +
  +    * Fix RFC 2616 compliance issues. Including PRs: 15852, 15866,
  +      15868, 15869, 15870, 16133, 16135, 16136, 16521, 19441.
   
       mod_auth_ldap/util_ldap:
       * General stabilization and testing
  
  
  
  No                   revision
  No                   revision
  1.121.2.6 +1 -6      httpd-2.0/server/protocol.c
  
  Index: protocol.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/protocol.c,v
  retrieving revision 1.121.2.5
  retrieving revision 1.121.2.6
  diff -u -r1.121.2.5 -r1.121.2.6
  --- protocol.c	18 Apr 2003 20:30:42 -0000	1.121.2.5
  +++ protocol.c	15 Jul 2003 21:03:14 -0000	1.121.2.6
  @@ -705,10 +705,6 @@
       char *value;
       apr_size_t len;
       int fields_read = 0;
  -    apr_table_t *tmp_headers;
  -
  -    /* We'll use apr_table_overlap later to merge these into r->headers_in. */
  -    tmp_headers = apr_table_make(r->pool, 50);
   
       /*
        * Read header lines until we get the empty separator line, a read error,
  @@ -798,7 +794,6 @@
                       ++value;            /* Skip to start of value   */
                   }
   
  -                apr_table_addn(tmp_headers, last_field, value);
   
                   /* reset the alloc_len so that we'll allocate a new
                    * buffer if we have to do any more folding: we can't
  @@ -825,7 +820,7 @@
           }
       }
   
  -    apr_table_overlap(r->headers_in, tmp_headers, APR_OVERLAP_TABLES_MERGE);
  +    apr_table_compress(r->headers_in, APR_OVERLAP_TABLES_MERGE);
   }
   
   AP_DECLARE(void) ap_get_mime_headers(request_rec *r)
  
  
  

Mime
View raw message