Commit c02b79b2 authored by Paul Querna's avatar Paul Querna
Browse files

Merge r394088 and r395180 from trunk. 

PR: 38793
Reviewed By: rpluem, jim, wrowe, trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@396049 13f79535-47bb-0310-9956-ffa450edef68
parent a2063763

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ Changes with Apache 2.2.2 
  *) mod_deflate: work correctly in an internal redirect

     [Brian J. France <list firehawksystems com>]









  *) mod_proxy: Do not release connections from connection pool twice.









     PR 38793. [Ruediger Pluem, matthias <mk-asf gigacodes.de>]

















  *) core: Prevent reading uninitialized memory while reading a line of









     protocol input.  PR 39282. [Davi Arnaut <davi haxent.com.br>]










































STATUS



+0
−11



























Changes for STATUS: 0 added lines, 11 removed lines.



Original line number
Diff line number
Diff line







@@ -75,17 +75,6 @@ RELEASE SHOWSTOPPERS:







PATCHES ACCEPTED TO BACKPORT FROM TRUNK:









  [ start all new proposals below, under PATCHES PROPOSED. ]



















    * mod_proxy: Do not release connections from connection pool twice as this









                 can cause different threads to use the same connection at the









                 same time. PR 38793.









        Trunk version of patch:









          http://svn.apache.org/viewcvs?rev=394088&view=rev









        2.2.x version of patch:









          Trunk version works









      +1: rpluem, jim, wrowe (with trawick's observation),









          trawick (with rev 395180)









      trawick: needs http://svn.apache.org/viewcvs?rev=395180&view=rev



















    * mod_proxy_balancer: Initialize local data structures for workers of a









                          balancer. PR 38227, PR 38267.









        Trunk version of patch:


































include/ap_mmn.h



+2
−1



























Changes for include/ap_mmn.h: 2 added lines, 1 removed line.



Original line number
Diff line number
Diff line







@@ -109,6 +109,7 @@







 * 20051115.0 (2.1.10-dev/2.2.0) add use_canonical_phys_port to core_dir_config









 * 20051115.1 (2.2.1)  flush_packets and flush_wait members added to









 *                         proxy_server (minor)









 * 20051115.2 (2.2.2)  added inreslist member to proxy_conn_rec (minor)









 */



















#define MODULE_MAGIC_COOKIE 0x41503232UL /* "AP22" */










@@ -116,7 +117,7 @@







#ifndef MODULE_MAGIC_NUMBER_MAJOR









#define MODULE_MAGIC_NUMBER_MAJOR 20051115









#endif









#define MODULE_MAGIC_NUMBER_MINOR 1                     /* 0...n */









#define MODULE_MAGIC_NUMBER_MINOR 2                     /* 0...n */



















/**









 * Determine if the server's current MODULE_MAGIC_NUMBER is at least a


































modules/proxy/mod_proxy.h



+3
−0



























Changes for modules/proxy/mod_proxy.h: 3 added lines, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -221,6 +221,9 @@ typedef struct {







    int          close_on_recycle; /* Close the connection when returning to pool */









    proxy_worker *worker;   /* Connection pool this connection belogns to */









    void         *data;     /* per scheme connection data */









#if APR_HAS_THREADS









    int          inreslist; /* connection in apr_reslist? */









#endif









} proxy_conn_rec;



















typedef struct {


































modules/proxy/mod_proxy_http.c



+0
−2



























Changes for modules/proxy/mod_proxy_http.c: 0 added lines, 2 removed lines.



Original line number
Diff line number
Diff line







@@ -1230,7 +1230,6 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,







            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,









                          "proxy: error reading status line from remote "









                          "server %s", backend->hostname);









            ap_proxy_http_cleanup(NULL, r, backend);









            return ap_proxyerror(r, HTTP_BAD_GATEWAY,









                                 "Error reading from remote server");









        }










@@ -1251,7 +1250,6 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,







             * if the status line was > 8192 bytes









             */









            else if ((buffer[5] != '1') || (len >= sizeof(buffer)-1)) {









                ap_proxy_http_cleanup(NULL, r, backend);









                return ap_proxyerror(r, HTTP_BAD_GATEWAY,









                apr_pstrcat(p, "Corrupt status line returned by remote "









                            "server: ", buffer, NULL));