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_{http,ajp,fcgi}}: don't reuse backend connections with data available

Browse Source 
before the request is sent.  PR 57832.

ap_proxy_check_backend() can be used before ap_proxy_connect_backend() to try
to read available data (including from the filters), and is called by
ap_proxy_connect_backend() to check the socket state only (as before, still
relevant after ap_proxy_check_backend() due to filter data which may not have
triggered a real socket operation).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1750392 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2016-06-27 17:26:12 +00:00
parent 4ddbed1baf
commit d4aa6476b2
8 changed files with 96 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/proxy/mod_proxy.h
View File

@@ -271,6 +271,7 @@ typedef struct {
unsigned int inreslist:1; /* connection in apr_reslist? */
const char *uds_path; /* Unix domain socket path */
const char *ssl_hostname;/* Hostname (SNI) in use by SSL connection */
apr_bucket_brigade *tmp_bb;
} proxy_conn_rec;
typedef struct {
@@ -972,6 +973,20 @@ PROXY_DECLARE(int) ap_proxy_acquire_connection(const char *proxy_function,
PROXY_DECLARE(int) ap_proxy_release_connection(const char *proxy_function,
proxy_conn_rec *conn,
server_rec *s);
/**
* Check a connection to the backend
* @param proxy_function calling proxy scheme (http, ajp, ...)
* @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)
*/
PROXY_DECLARE(apr_status_t) ap_proxy_check_backend(const char *proxy_function,
proxy_conn_rec *conn,
server_rec *s,
int expect_empty);
/**
* Make a connection to the backend
* @param proxy_function calling proxy scheme (http, ajp, ...)