You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2014/07/08 15:14:34 UTC
svn commit: r1608760 - in /httpd/httpd/branches/2.4.x: ./ STATUS
modules/proxy/mod_proxy_http.c modules/proxy/proxy_util.c
Author: jim
Date: Tue Jul 8 13:14:34 2014
New Revision: 1608760
URL: http://svn.apache.org/r1608760
Log:
Merge r1572561 from trunk:
Avoid useless functions calls.
Submitted by: ylavic
Reviewed/backported by: jim
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c
httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1572561
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1608760&r1=1608759&r2=1608760&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Jul 8 13:14:34 2014
@@ -100,11 +100,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_proxy_http: Avoid useless functions calls.
- trunk patch: http://svn.apache.org/r1572561
- 2.4.x patch: trunk works
- +1: ylavic, covener, jim
-
* mod_proxy: When ping/pong is configured for a worker, don't send or forward
"100 Continue" (interim) response to the client if it does not
expect one.
Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c?rev=1608760&r1=1608759&r2=1608760&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c Tue Jul 8 13:14:34 2014
@@ -1745,7 +1745,6 @@ apr_status_t ap_proxy_http_process_respo
#endif
/* sanity check */
if (APR_BRIGADE_EMPTY(bb)) {
- apr_brigade_cleanup(bb);
break;
}
Modified: httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c?rev=1608760&r1=1608759&r2=1608760&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c Tue Jul 8 13:14:34 2014
@@ -2285,6 +2285,7 @@ ap_proxy_determine_connection(apr_pool_t
conn->pool);
}
socket_cleanup(conn);
+ conn->close = 0;
}
if (will_reuse) {
/*