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

Change the way the prefork connection is created.

Browse Source 
Use the same constructor as for theaded mpm's.
Added API's for destroying and closing connections

Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104593 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
William A. Rowe Jr
2004-08-11 22:32:22 +00:00
parent a603a36021
commit ae33d99379
1 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
modules/proxy/proxy_util.c
View File

@@ -1358,12 +1358,30 @@ static apr_status_t connection_destructor(void *resource, void *params,
server_rec *s = (server_rec *)params; server_rec *s = (server_rec *)params;
apr_pool_destroy(conn->pool); apr_pool_destroy(conn->pool);
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, if (s != NULL)
"proxy: socket is destructed"); ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
"proxy: socket is destructed");
return APR_SUCCESS; return APR_SUCCESS;
} }
/* Destroy the connection */
PROXY_DECLARE(apr_status_t) ap_proxy_destroy_connection(proxy_conn_rec *conn)
{
return connection_destructor(conn, NULL, NULL);
}
/* Destroy the connection */
PROXY_DECLARE(apr_status_t) ap_proxy_close_connection(proxy_conn_rec *conn)
{
apr_status_t rv = APR_EOF;
/* Close the socket */
if (conn->sock)
rv = apr_socket_close(conn->sock);
conn->sock = NULL;
return rv;
}
/* low level connection acquire/release functions /* low level connection acquire/release functions
* they are hiding apr_reslist for nothreaded or prefork servers. * they are hiding apr_reslist for nothreaded or prefork servers.
*/ */
@@ -1378,6 +1396,7 @@ static apr_status_t acquire_connection_low(proxy_conn_rec **conn, proxy_worker *
#endif #endif
{ {
*conn = worker->cp->conn; *conn = worker->cp->conn;
worker->cp->conn = NULL;
rv = APR_SUCCESS; rv = APR_SUCCESS;
} }
return rv; return rv;
@@ -1390,7 +1409,11 @@ static apr_status_t release_connection_low(proxy_conn_rec *conn, proxy_worker *w
if (worker->hmax) { if (worker->hmax) {
rv = apr_reslist_release(worker->cp->res, (void *)conn); rv = apr_reslist_release(worker->cp->res, (void *)conn);
} }
else
#endif #endif
{
worker->cp->conn = conn;
}
return rv; return rv;
} }
@@ -1414,18 +1437,8 @@ static apr_status_t init_conn_worker(proxy_worker *worker, server_rec *s)
else else
#endif #endif
{ {
worker->cp->conn = apr_pcalloc(worker->cp->pool, sizeof(proxy_conn_rec));
/* register the pool cleanup. connection_constructor((void **)&(worker->cp->conn), s, worker->cp->pool);
* The cleanup is registered on conn_pool pool, so that
* the same mechanism (apr_pool_cleanup) can be used
* for both nonthreaded and threaded servers when closing
* the entire worker.
*/
apr_pool_cleanup_register(worker->cp->pool, (void *)worker->cp->conn,
proxy_conn_cleanup, apr_pool_cleanup_null);
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
"proxy: socket is created");
rv = APR_SUCCESS; rv = APR_SUCCESS;
} }
return rv; return rv;
@@ -1515,3 +1528,24 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r,
} }
return OK; return OK;
} }
static int is_socket_connected(apr_socket_t *sock)
{
apr_size_t buffer_len = 1;
char test_buffer[1];
apr_status_t socket_status;
apr_interval_time_t current_timeout;
/* save timeout */
apr_socket_timeout_get(sock, &current_timeout);
/* set no timeout */
apr_socket_timeout_set(sock, 0);
socket_status = apr_socket_recv(sock, test_buffer, &buffer_len);
/* put back old timeout */
apr_socket_timeout_set(sock, current_timeout);
if (APR_STATUS_IS_EOF(socket_status))
return 0;
else
return 1;
}