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

Use worker as a parameter for connection_constructor.

Browse Source 
When min connections is greater then zero connstructor is
called when the reslist is created.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105073 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mladen Turk
2004-09-11 10:50:05 +00:00
parent 7114158e9f
commit 5a5f85aad4
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/proxy/proxy_util.c
View File

@@ -1345,7 +1345,7 @@ static apr_status_t connection_constructor(void **resource, void *params,
{
apr_pool_t *ctx;
proxy_conn_rec *conn;
server_rec *s = (server_rec *)params;
proxy_worker *worker = (proxy_worker *)params;
/* Create the subpool for each connection
* This keeps the memory consumption constant
@@ -1354,12 +1354,10 @@ static apr_status_t connection_constructor(void **resource, void *params,
apr_pool_create(&ctx, pool);
conn = apr_pcalloc(ctx, sizeof(proxy_conn_rec));
conn->pool = ctx;
conn->pool = ctx;
conn->worker = worker;
*resource = conn;
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
"proxy: socket is constructed");
return APR_SUCCESS;
}
@@ -1404,7 +1402,7 @@ PROXY_DECLARE(apr_status_t) ap_proxy_initialize_worker(proxy_worker *worker, ser
worker->min, worker->smax,
worker->hmax, worker->ttl,
connection_constructor, connection_destructor,
s, worker->cp->pool);
worker, worker->cp->pool);
apr_pool_cleanup_register(worker->cp->pool, (void *)worker,
conn_pool_cleanup,
@@ -1424,7 +1422,7 @@ PROXY_DECLARE(apr_status_t) ap_proxy_initialize_worker(proxy_worker *worker, ser
#endif
{
rv = connection_constructor((void **)&(worker->cp->conn), s, worker->cp->pool);
rv = connection_constructor((void **)&(worker->cp->conn), worker, worker->cp->pool);
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
"proxy: initialized single connection worker for (%s)",
worker->hostname);
@@ -1489,7 +1487,7 @@ PROXY_DECLARE(int) ap_proxy_acquire_connection(const char *proxy_function,
{
/* create the new connection if the previous was destroyed */
if (!worker->cp->conn)
connection_constructor((void **)conn, s, worker->cp->pool);
connection_constructor((void **)conn, worker, worker->cp->pool);
else {
*conn = worker->cp->conn;
worker->cp->conn = NULL;