Commit 23c960c1 authored by Chuck Murcko's avatar Chuck Murcko
Browse files

Reorganize ap_proxy_string_read() internally to not process eos buckets. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89473 13f79535-47bb-0310-9956-ffa450edef68
parent 06b50769

modules/proxy/CHANGES

+12 −3
Original line number Diff line number Diff line 


mod_proxy changes for httpd 2.0.18-dev



  *) Reorganize ap_proxy_string_read() internally to not process eos

     buckets.

     [Chuck Murcko <chuck@topsail.org>]

     [Victor Orlikowski <v.j.orlikowski@gte.net>]



  *) Remove result code check for FTP QUIT command. Some servers send

     nothing at all back in response to QUIT.

     [Chuck Murcko <chuck@topsail.org>]

     [Victor Orlikowski <v.j.orlikowski@gte.net>]



  *) Reverse previous patch since the core reverted.

     [Chuck Murcko <chuck@topsail.org>]
@@ -130,9 +136,12 @@ mod_proxy changes for httpd 2.0.18-dev 
mod_proxy changes for 2.0.14 alpha



  *) removed ProxyNoCache and ProxyCacheForceCompletion config directives,

     since we no longer directly cache from this module [Chuck Murcko]

     since we no longer directly cache from this module

     [Chuck Murcko <chuck@topsail.org>]



  *) removed cache [Chuck Murcko]

  *) removed cache

     [Chuck Murcko <chuck@topsail.org>]



  *) initial rerebuild for 2.0 [Chuck Murcko]

  *) initial rerebuild for 2.0

     [Chuck Murcko <chuck@topsail.org>]

modules/proxy/proxy_util.c

+15 −14
Original line number Diff line number Diff line
@@ -1110,8 +1110,8 @@ PROXY_DECLARE(apr_status_t) ap_proxy_string_read(conn_rec *c, apr_bucket_brigade 
	    e = APR_BRIGADE_FIRST(bb);

	    if (APR_BUCKET_IS_EOS(e)) {

		*eos = 1;

		continue;

            }

            else {

                if (APR_SUCCESS != apr_bucket_read(e, (const char **)&response, &len, APR_BLOCK_READ)) {

                    return rv;

                }
@@ -1126,6 +1126,7 @@ PROXY_DECLARE(apr_status_t) ap_proxy_string_read(conn_rec *c, apr_bucket_brigade 
                if (len > 0) {

                    pos = apr_cpystrn(pos, response, len);

                }

	    }

	    APR_BUCKET_REMOVE(e);

	    apr_bucket_destroy(e);

	}