You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mt...@apache.org on 2006/08/02 14:03:43 UTC
svn commit: r427959 - in /httpd/httpd/trunk/modules/proxy: mod_proxy.h
mod_proxy_ajp.c mod_proxy_ftp.c mod_proxy_http.c proxy_util.c
Author: mturk
Date: Wed Aug 2 05:03:42 2006
New Revision: 427959
URL: http://svn.apache.org/viewvc?rev=427959&view=rev
Log:
Cleanup: Remove close_on_recycle from proxy_conn_rec.
It behaves the same as close.
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy.h
httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c
httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c
httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
httpd/httpd/trunk/modules/proxy/proxy_util.c
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.h?rev=427959&r1=427958&r2=427959&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.h (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.h Wed Aug 2 05:03:42 2006
@@ -228,7 +228,6 @@
apr_sockaddr_t *addr; /* Preparsed remote address info */
apr_uint32_t flags; /* Conection flags */
int close; /* Close 'this' connection */
- int close_on_recycle; /* Close the connection when returning to pool */
proxy_worker *worker; /* Connection pool this connection belogns to */
void *data; /* per scheme connection data */
#if APR_HAS_THREADS
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c?rev=427959&r1=427958&r2=427959&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c Wed Aug 2 05:03:42 2006
@@ -502,7 +502,7 @@
r->server);
if (status != OK) {
if (backend) {
- backend->close_on_recycle = 1;
+ backend->close = 1;
ap_proxy_release_connection(scheme, backend, r->server);
}
return status;
@@ -510,7 +510,7 @@
}
backend->is_ssl = 0;
- backend->close_on_recycle = 0;
+ backend->close = 0;
/* Step One: Determine Who To Connect To */
status = ap_proxy_determine_connection(p, r, conf, worker, backend,
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c?rev=427959&r1=427958&r2=427959&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c Wed Aug 2 05:03:42 2006
@@ -731,7 +731,7 @@
apr_status_t proxy_ftp_cleanup(request_rec *r, proxy_conn_rec *backend)
{
- backend->close_on_recycle = 1;
+ backend->close = 1;
ap_set_module_config(r->connection->conn_config, &proxy_ftp_module, NULL);
ap_proxy_release_connection("FTP", backend, r->server);
@@ -940,7 +940,7 @@
status = ap_proxy_acquire_connection("FTP", &backend, worker, r->server);
if (status != OK) {
if (backend) {
- backend->close_on_recycle = 1;
+ backend->close = 1;
ap_proxy_release_connection("FTP", backend, r->server);
}
return status;
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_http.c?rev=427959&r1=427958&r2=427959&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_http.c Wed Aug 2 05:03:42 2006
@@ -966,7 +966,7 @@
* otherwise sent Connection: Keep-Alive.
*/
if (!force10) {
- if (p_conn->close || p_conn->close_on_recycle) {
+ if (p_conn->close) {
buf = apr_pstrdup(p, "Connection: close" CRLF);
}
else {
@@ -1656,7 +1656,7 @@
* not work.
*/
if (is_ssl)
- backend->close_on_recycle = 1;
+ backend->close = 1;
/* Step One: Determine Who To Connect To */
if ((status = ap_proxy_determine_connection(p, r, conf, worker, backend,
Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=427959&r1=427958&r2=427959&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Wed Aug 2 05:03:42 2006
@@ -1553,7 +1553,7 @@
#endif
/* determine if the connection need to be closed */
- if (conn->close_on_recycle || conn->close) {
+ if (conn->close) {
apr_pool_t *p = conn->pool;
apr_pool_clear(conn->pool);
memset(conn, 0, sizeof(proxy_conn_rec));
@@ -1824,7 +1824,6 @@
(*conn)->worker = worker;
(*conn)->close = 0;
- (*conn)->close_on_recycle = 0;
#if APR_HAS_THREADS
(*conn)->inreslist = 0;
#endif