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

Added close_on_recycle flags for creatin connections.

Browse Source 
This flag enables to distinguish between connection types.
Also added a pool cleanup bound to connection pool that recycles
the connection when client disconnects from server.

Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104599 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
William A. Rowe Jr
2004-08-11 22:39:02 +00:00
parent 6cc26c2656
commit ae18ec32a1
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
modules/proxy/proxy_util.c
View File

@@ -1324,6 +1324,22 @@ static apr_status_t proxy_conn_cleanup(void *theconn)
return APR_SUCCESS;
}
static apr_status_t connection_cleanup(void *theconn)
{
proxy_conn_rec *conn = (proxy_conn_rec *)theconn;
/* deterimine if the connection need to be closed */
if (conn->close_on_recycle) {
if (conn->sock)
apr_socket_close(conn->sock);
conn->sock = NULL;
}
conn->connection = NULL;
ap_proxy_release_connection(NULL, conn, NULL);
/* Allways return the SUCCESS */
return APR_SUCCESS;
}
/* reslist constructor */
static apr_status_t connection_constructor(void **resource, void *params,
apr_pool_t *pool)
@@ -1446,6 +1462,17 @@ PROXY_DECLARE(int) ap_proxy_release_connection(const char *proxy_function,
* for now make a core dump.
*/
}
/* Need to close the connection */
if (conn->sock && conn->close) {
apr_socket_close(conn->sock);
conn->sock = NULL;
}
conn->close = 0;
/* If there is a connection kill it's cleanup */
if (conn->connection)
apr_pool_cleanup_kill(conn->connection->pool, conn, connection_cleanup);
#if APR_HAS_THREADS
if (worker->hmax) {
rv = apr_reslist_release(worker->cp->res, (void *)conn);
@@ -1455,7 +1482,7 @@ PROXY_DECLARE(int) ap_proxy_release_connection(const char *proxy_function,
{
worker->cp->conn = conn;
}
if (rv != APR_SUCCESS) {
if (rv != APR_SUCCESS && proxy_function) {
ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
"proxy: %s: failed to acquire connection for (%s)",
proxy_function, conn->hostname);
@@ -1664,6 +1691,7 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
PROXY_DECLARE(int) ap_proxy_connection_create(const char *proxy_function,
proxy_conn_rec *conn,
int close_on_recycle,
conn_rec *c,
server_rec *s)
{
@@ -1705,6 +1733,7 @@ PROXY_DECLARE(int) ap_proxy_connection_create(const char *proxy_function,
/* TODO: See if this will break FTP */
ap_proxy_ssl_disable(conn->connection);
}
conn->close_on_recycle = close_on_recycle;
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
"proxy: %s: connection complete to %pI (%s)",
@@ -1713,5 +1742,11 @@ PROXY_DECLARE(int) ap_proxy_connection_create(const char *proxy_function,
/* set up the connection filters */
ap_run_pre_connection(conn->connection, conn->sock);
/* register the connection cleanup to client connection
* so that the connection can be closed or reused
*/
apr_pool_cleanup_register(c->pool, (void *)conn, connection_cleanup,
apr_pool_cleanup_null);
return OK;
}