You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2010/06/04 00:47:46 UTC
svn commit: r951189 - in /httpd/httpd/trunk/modules/proxy: mod_proxy.h
mod_proxy_connect.c proxy_util.c
Author: sf
Date: Thu Jun 3 22:47:46 2010
New Revision: 951189
URL: http://svn.apache.org/viewvc?rev=951189&view=rev
Log:
log issues with CONNECT at request scope instead of server scope
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy.h
httpd/httpd/trunk/modules/proxy/mod_proxy_connect.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=951189&r1=951188&r2=951189&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.h (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.h Thu Jun 3 22:47:46 2010
@@ -485,7 +485,7 @@ PROXY_DECLARE(int) ap_proxy_pre_http_req
PROXY_DECLARE(apr_status_t) ap_proxy_string_read(conn_rec *c, apr_bucket_brigade *bb, char *buff, size_t bufflen, int *eos);
PROXY_DECLARE(void) ap_proxy_table_unmerge(apr_pool_t *p, apr_table_t *t, char *key);
/* DEPRECATED (will be replaced with ap_proxy_connect_backend */
-PROXY_DECLARE(int) ap_proxy_connect_to_backend(apr_socket_t **, const char *, apr_sockaddr_t *, const char *, proxy_server_conf *, server_rec *, apr_pool_t *);
+PROXY_DECLARE(int) ap_proxy_connect_to_backend(apr_socket_t **, const char *, apr_sockaddr_t *, const char *, proxy_server_conf *, request_rec *);
PROXY_DECLARE(apr_status_t) ap_proxy_ssl_connection_cleanup(proxy_conn_rec *conn,
request_rec *r);
PROXY_DECLARE(int) ap_proxy_ssl_enable(conn_rec *c);
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c?rev=951189&r1=951188&r2=951189&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c Thu Jun 3 22:47:46 2010
@@ -313,8 +313,7 @@ static int proxy_connect_handler(request
* XXX FIXME
*/
failed = ap_proxy_connect_to_backend(&sock, "CONNECT", connect_addr,
- connectname, conf, r->server,
- r->pool);
+ connectname, conf, r);
/* handle a permanent error from the above loop */
if (failed) {
Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=951189&r1=951188&r2=951189&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Thu Jun 3 22:47:46 2010
@@ -1578,8 +1578,7 @@ PROXY_DECLARE(int) ap_proxy_connect_to_b
apr_sockaddr_t *backend_addr,
const char *backend_name,
proxy_server_conf *conf,
- server_rec *s,
- apr_pool_t *p)
+ request_rec *r)
{
apr_status_t rv;
int connected = 0;
@@ -1587,13 +1586,13 @@ PROXY_DECLARE(int) ap_proxy_connect_to_b
while (backend_addr && !connected) {
if ((rv = apr_socket_create(newsock, backend_addr->family,
- SOCK_STREAM, 0, p)) != APR_SUCCESS) {
+ SOCK_STREAM, 0, r->pool)) != APR_SUCCESS) {
loglevel = backend_addr->next ? APLOG_DEBUG : APLOG_ERR;
- ap_log_error(APLOG_MARK, loglevel, rv, s,
- "proxy: %s: error creating fam %d socket for target %s",
- proxy_function,
- backend_addr->family,
- backend_name);
+ ap_log_rerror(APLOG_MARK, loglevel, rv, r,
+ "proxy: %s: error creating fam %d socket for target %s",
+ proxy_function,
+ backend_addr->family,
+ backend_name);
/*
* this could be an IPv6 address from the DNS but the
* local machine won't give us an IPv6 socket; hopefully the
@@ -1606,16 +1605,16 @@ PROXY_DECLARE(int) ap_proxy_connect_to_b
if (conf->recv_buffer_size > 0 &&
(rv = apr_socket_opt_set(*newsock, APR_SO_RCVBUF,
conf->recv_buffer_size))) {
- ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
- "apr_socket_opt_set(SO_RCVBUF): Failed to set "
- "ProxyReceiveBufferSize, using default");
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+ "apr_socket_opt_set(SO_RCVBUF): Failed to set "
+ "ProxyReceiveBufferSize, using default");
}
rv = apr_socket_opt_set(*newsock, APR_TCP_NODELAY, 1);
if (rv != APR_SUCCESS && rv != APR_ENOTIMPL) {
- ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
- "apr_socket_opt_set(APR_TCP_NODELAY): "
- "Failed to set");
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+ "apr_socket_opt_set(APR_TCP_NODELAY): "
+ "Failed to set");
}
/* Set a timeout on the socket */
@@ -1623,12 +1622,12 @@ PROXY_DECLARE(int) ap_proxy_connect_to_b
apr_socket_timeout_set(*newsock, conf->timeout);
}
else {
- apr_socket_timeout_set(*newsock, s->timeout);
+ apr_socket_timeout_set(*newsock, r->server->timeout);
}
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
- "proxy: %s: fam %d socket created to connect to %s",
- proxy_function, backend_addr->family, backend_name);
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ "proxy: %s: fam %d socket created to connect to %s",
+ proxy_function, backend_addr->family, backend_name);
/* make the connection out of the socket */
rv = apr_socket_connect(*newsock, backend_addr);
@@ -1637,11 +1636,11 @@ PROXY_DECLARE(int) ap_proxy_connect_to_b
if (rv != APR_SUCCESS) {
apr_socket_close(*newsock);
loglevel = backend_addr->next ? APLOG_DEBUG : APLOG_ERR;
- ap_log_error(APLOG_MARK, loglevel, rv, s,
- "proxy: %s: attempt to connect to %pI (%s) failed",
- proxy_function,
- backend_addr,
- backend_name);
+ ap_log_rerror(APLOG_MARK, loglevel, rv, r,
+ "proxy: %s: attempt to connect to %pI (%s) failed",
+ proxy_function,
+ backend_addr,
+ backend_name);
backend_addr = backend_addr->next;
continue;
}