www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

mod_proxy: follow up to r1750392.

Browse Source 
Avoid double checking the connection in ap_proxy_connect_backend() when
ap_proxy_check_backend() says it is up and good to go.

This can be done by moving the PROXY_WORKER_IS_USABLE() check in
ap_proxy_check_backend(), since it is called by ap_proxy_connect_backend(),
and not calling the latter if the former succeeded (for the modules using it).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1750474 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2016-06-28 11:19:36 +00:00
parent be721db732
commit 26faec4940
5 changed files with 75 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/proxy/mod_proxy.h
View File

@@ -980,8 +980,11 @@ PROXY_DECLARE(int) ap_proxy_release_connection(const char *proxy_function,
* @param conn acquired connection
* @param s current server record
* @param expect_empty whether to check for empty (no data available) or not
* @return APR_SUCCESS or error status (APR_ENOTEMPTY if expect_empty
* is set but the connection is not empty)
* @return APR_SUCCESS or,
* APR_ENOTSOCK: not connected,
* APR_NOTFOUND: worker in error state (unusable),
* APR_ENOTEMPTY: expect_empty set but the connection has data,
* other: connection closed/aborted (remotely)
*/
PROXY_DECLARE(apr_status_t) ap_proxy_check_backend(const char *proxy_function,
proxy_conn_rec *conn,