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 support for downstream keepalives in mod_proxy.

Browse Source 
*) Changed mod_proxy ap_proxy_http_handler() to support APR properly.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88648 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Graham Leggett
2001-04-02 17:04:19 +00:00
parent e27ddf4fac
commit d72c7d938e
5 changed files with 414 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/proxy/mod_proxy.c
View File

@@ -430,9 +430,8 @@ static void * create_proxy_config(apr_pool_t *p, server_rec *s)
ps->raliases = ap_make_array(p, 10, sizeof(struct proxy_alias)); ps->raliases = ap_make_array(p, 10, sizeof(struct proxy_alias));
ps->noproxies = ap_make_array(p, 10, sizeof(struct noproxy_entry)); ps->noproxies = ap_make_array(p, 10, sizeof(struct noproxy_entry));
ps->dirconn = ap_make_array(p, 10, sizeof(struct dirconn_entry)); ps->dirconn = ap_make_array(p, 10, sizeof(struct dirconn_entry));
ps->nocaches = ap_make_array(p, 10, sizeof(struct nocache_entry));
ps->allowed_connect_ports = ap_make_array(p, 10, sizeof(int)); ps->allowed_connect_ports = ap_make_array(p, 10, sizeof(int));
ps->cache_completion = DEFAULT_CACHE_COMPLETION; /* pc->origin = ap_make_array(p, 10, sizeof(struct origin_entry));*/
ps->domain = NULL; ps->domain = NULL;
ps->viaopt = via_off; /* initially backward compatible with 1.3.1 */ ps->viaopt = via_off; /* initially backward compatible with 1.3.1 */
ps->viaopt_set = 0; /* 0 means default */ ps->viaopt_set = 0; /* 0 means default */
@@ -455,8 +454,8 @@ static void * merge_proxy_config(apr_pool_t *p, void *basev, void *overridesv)
ps->raliases = ap_append_arrays(p, base->raliases, overrides->raliases); ps->raliases = ap_append_arrays(p, base->raliases, overrides->raliases);
ps->noproxies = ap_append_arrays(p, base->noproxies, overrides->noproxies); ps->noproxies = ap_append_arrays(p, base->noproxies, overrides->noproxies);
ps->dirconn = ap_append_arrays(p, base->dirconn, overrides->dirconn); ps->dirconn = ap_append_arrays(p, base->dirconn, overrides->dirconn);
ps->nocaches = ap_append_arrays(p, base->nocaches, overrides->nocaches);
ps->allowed_connect_ports = ap_append_arrays(p, base->allowed_connect_ports, overrides->allowed_connect_ports); ps->allowed_connect_ports = ap_append_arrays(p, base->allowed_connect_ports, overrides->allowed_connect_ports);
/* ps->origin = base->origin;*/
ps->domain = (overrides->domain == NULL) ? base->domain : overrides->domain; ps->domain = (overrides->domain == NULL) ? base->domain : overrides->domain;
ps->viaopt = (overrides->viaopt_set == 0) ? base->viaopt : overrides->viaopt; ps->viaopt = (overrides->viaopt_set == 0) ? base->viaopt : overrides->viaopt;
@@ -549,6 +548,7 @@ static const char *
struct noproxy_entry *new; struct noproxy_entry *new;
struct noproxy_entry *list = (struct noproxy_entry *) conf->noproxies->elts; struct noproxy_entry *list = (struct noproxy_entry *) conf->noproxies->elts;
struct hostent hp; struct hostent hp;
struct apr_sockaddr_t *addr;
int found = 0; int found = 0;
int i; int i;
@@ -563,11 +563,12 @@ static const char *
new->name = arg; new->name = arg;
/* Don't do name lookups on things that aren't dotted */ /* Don't do name lookups on things that aren't dotted */
if (ap_strchr_c(arg, '.') != NULL && if (ap_strchr_c(arg, '.') != NULL &&
ap_proxy_host2addr(new->name, &hp) == NULL) apr_sockaddr_info_get(&addr, new->name, APR_UNSPEC, 0, 0, parms->pool)) {
/*@@@FIXME: This copies only the first of (possibly many) IP addrs */ new->addr = addr;
memcpy(&new->addr, hp.h_addr, sizeof(struct in_addr)); }
else else {
new->addr.s_addr = 0; new->addr = NULL;
}
} }
return NULL; return NULL;
} }

16
modules/proxy/mod_proxy.h
View File

@@ -163,12 +163,12 @@ struct dirconn_entry {
struct noproxy_entry { struct noproxy_entry {
const char *name; const char *name;
struct in_addr addr; struct apr_sockaddr_t *addr;
}; };
struct nocache_entry { struct origin_entry {
const char *name; conn_rec *origin;
struct in_addr addr; struct origin_entry *next;
}; };
typedef struct { typedef struct {
@@ -177,12 +177,12 @@ typedef struct {
apr_array_header_t *raliases; apr_array_header_t *raliases;
apr_array_header_t *noproxies; apr_array_header_t *noproxies;
apr_array_header_t *dirconn; apr_array_header_t *dirconn;
apr_array_header_t *nocaches;
apr_array_header_t *allowed_connect_ports; apr_array_header_t *allowed_connect_ports;
/* apr_array_header_t *origin_array;*/
conn_rec *origin;
const char *domain; /* domain name to use in absence of a domain name in the request */ const char *domain; /* domain name to use in absence of a domain name in the request */
int req; /* true if proxy requests are enabled */ int req; /* true if proxy requests are enabled */
char req_set; char req_set;
float cache_completion; /* Force cache completion after this point */
enum { enum {
via_off, via_off,
via_on, via_on,
@@ -229,6 +229,7 @@ int ap_proxy_http_handler(request_rec *r, char *url,
/* proxy_util.c */ /* proxy_util.c */
request_rec *make_fake_req(conn_rec *c, request_rec *r);
int ap_proxy_hex2c(const char *x); int ap_proxy_hex2c(const char *x);
void ap_proxy_c2hex(int ch, char *x); void ap_proxy_c2hex(int ch, char *x);
char *ap_proxy_canonenc(apr_pool_t *p, const char *x, int len, enum enctype t, char *ap_proxy_canonenc(apr_pool_t *p, const char *x, int len, enum enctype t,
@@ -236,9 +237,10 @@ char *ap_proxy_canonenc(apr_pool_t *p, const char *x, int len, enum enctype t,
char *ap_proxy_canon_netloc(apr_pool_t *p, char **const urlp, char **userp, char *ap_proxy_canon_netloc(apr_pool_t *p, char **const urlp, char **userp,
char **passwordp, char **hostp, int *port); char **passwordp, char **hostp, int *port);
const char *ap_proxy_date_canon(apr_pool_t *p, const char *x); const char *ap_proxy_date_canon(apr_pool_t *p, const char *x);
apr_table_t *ap_proxy_read_headers(request_rec *r, char *buffer, int size, conn_rec *c); apr_table_t *ap_proxy_read_headers(request_rec *r, request_rec *rp, char *buffer, int size, conn_rec *c);
void ap_proxy_send_headers(request_rec *r, const char *respline, apr_table_t *hdrs); void ap_proxy_send_headers(request_rec *r, const char *respline, apr_table_t *hdrs);
int ap_proxy_liststr(const char *list, const char *val); int ap_proxy_liststr(const char *list, const char *val);
char *ap_proxy_removestr(apr_pool_t *pool, const char *list, const char *val);
void ap_proxy_hash(const char *it, char *val, int ndepth, int nlength); void ap_proxy_hash(const char *it, char *val, int ndepth, int nlength);
int ap_proxy_hex2sec(const char *x); int ap_proxy_hex2sec(const char *x);
void ap_proxy_sec2hex(int t, char *y); void ap_proxy_sec2hex(int t, char *y);

6
modules/proxy/proxy_connect.c
View File

@@ -143,10 +143,12 @@ int ap_proxy_connect_handler(request_rec *r, char *url,
} }
/* check if ProxyBlock directive on this host */ /* check if ProxyBlock directive on this host */
destaddr.s_addr = ap_inet_addr(host); /* XXX FIXME */
/* destaddr.s_addr = ap_inet_addr(host); */
for (i = 0; i < conf->noproxies->nelts; i++) { for (i = 0; i < conf->noproxies->nelts; i++) {
if ((npent[i].name != NULL && ap_strstr_c(host, npent[i].name) != NULL) if ((npent[i].name != NULL && ap_strstr_c(host, npent[i].name) != NULL)
|| destaddr.s_addr == npent[i].addr.s_addr || npent[i].name[0] == '*') /* || destaddr.s_addr == npent[i].addr.s_addr */
|| npent[i].name[0] == '*')
return ap_proxyerror(r, HTTP_FORBIDDEN, return ap_proxyerror(r, HTTP_FORBIDDEN,
"Connect to remote machine blocked"); "Connect to remote machine blocked");
} }

390
modules/proxy/proxy_http.c
View File

@@ -177,71 +177,67 @@ static void ap_proxy_clear_connection(apr_pool_t *p, apr_table_t *headers)
* route.) * route.)
*/ */
int ap_proxy_http_handler(request_rec *r, char *url, int ap_proxy_http_handler(request_rec *r, char *url,
const char *proxyhost, int proxyport) const char *proxyname, int proxyport)
{ {
apr_pool_t *p = r->pool; request_rec *rp;
char *desthost; apr_pool_t *p = r->connection->pool;
int destport = 0; struct hostent *connecthost;
char *destportstr = NULL; const char *connectname;
int connectport = 0;
apr_sockaddr_t *uri_addr;
apr_sockaddr_t *connect_addr;
char server_portstr[32]; char server_portstr[32];
const char *uri = NULL;
apr_socket_t *sock; apr_socket_t *sock;
int i, len, backasswards; int i, j, k, len, backasswards, close=0, failed=0, new=0;
apr_status_t err; apr_status_t err;
apr_array_header_t *headers_in_array; apr_array_header_t *headers_in_array;
apr_table_entry_t *headers_in; apr_table_entry_t *headers_in;
struct sockaddr_in server;
struct in_addr destaddr;
char buffer[HUGE_STRING_LEN]; char buffer[HUGE_STRING_LEN];
char *response; char *response;
char *buf; char *buf;
conn_rec *origin; conn_rec *origin;
apr_bucket *e; apr_bucket *e;
apr_bucket_brigade *bb = apr_brigade_create(p); apr_bucket_brigade *bb = apr_brigade_create(p);
uri_components uri;
void *sconf = r->server->module_config; void *sconf = r->server->module_config;
proxy_server_conf *conf = proxy_server_conf *conf =
(proxy_server_conf *) ap_get_module_config(sconf, &proxy_module); (proxy_server_conf *) ap_get_module_config(sconf, &proxy_module);
struct noproxy_entry *npent = (struct noproxy_entry *) conf->noproxies->elts;
memset(&server, '\0', sizeof(server));
server.sin_family = AF_INET;
/* We break the URL into host, port, uri */ /*
{ * Step One: Determine Who To Connect To
const char *buf; *
* Break up the URL to determine the host to connect to
*/
uri = strstr(url, "://"); /* we break the URL into host, port, uri */
if (uri == NULL) if (HTTP_OK != ap_parse_uri_components(p, url, &uri)) {
return HTTP_BAD_REQUEST; return ap_proxyerror(r, HTTP_BAD_REQUEST,
uri += 3; apr_pstrcat(p,"URI cannot be parsed: ", url, NULL));
destport = DEFAULT_HTTP_PORT; }
buf = ap_strchr_c(uri, '/');
if (buf == NULL) { ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
desthost = apr_pstrdup(p, uri); "proxy: connecting %s to %s:%d", url, uri.hostname, uri.port);
uri = "/";
/* do a DNS lookup for the destination host */
err = apr_sockaddr_info_get(&uri_addr, uri.hostname, APR_UNSPEC, uri.port, 0, p);
/* are we connecting directly, or via a proxy? */
if (proxyname) {
connectname = proxyname;
connectport = proxyport;
err = apr_sockaddr_info_get(&connect_addr, proxyname, APR_UNSPEC, proxyport, 0, p);
} }
else { else {
char *q = apr_palloc(p, buf - uri + 1); connectname = uri.hostname;
memcpy(q, uri, buf - uri); connectport = uri.port;
q[buf - uri] = '\0'; connect_addr = uri_addr;
uri = buf; url = apr_pstrcat(p, uri.path, uri.query ? "?" : "",
desthost = q; uri.query ? uri.query : "", uri.fragment ? "#" : "",
} uri.fragment ? uri.fragment : "", NULL);
} }
/* Get the port number - put it in destport and destportstr */
{
char *buf;
buf = ap_strchr(desthost, ':');
if (buf != NULL) {
*(buf++) = '\0';
if (apr_isdigit(*buf)) {
destport = atoi(buf);
destportstr = buf;
}
}
}
/* Get the server port for the Via headers */ /* Get the server port for the Via headers */
{ {
@@ -254,18 +250,89 @@ int ap_proxy_http_handler(request_rec *r, char *url,
} }
/* check if ProxyBlock directive on this host */ /* check if ProxyBlock directive on this host */
destaddr.s_addr = apr_inet_addr(desthost); /* XXX FIXME: conf->noproxies->elts is part of an opaque structure */
for (i = 0; i < conf->noproxies->nelts; i++) { for (j = 0; j < conf->noproxies->nelts; j++) {
if ((npent[i].name != NULL struct noproxy_entry *npent = (struct noproxy_entry *) conf->noproxies->elts;
&& ap_strstr_c(desthost, npent[i].name) != NULL) struct apr_sockaddr_t *conf_addr = npent[j].addr;
|| destaddr.s_addr == npent[i].addr.s_addr if ((npent[j].name && ap_strstr_c(uri.hostname, npent[j].name))
|| npent[i].name[0] == '*') || npent[j].name[0] == '*') {
return ap_proxyerror(r, HTTP_FORBIDDEN, return ap_proxyerror(r, HTTP_FORBIDDEN,
"Connect to remote machine blocked"); "Connect to remote machine blocked (by name)");
}
while (conf_addr) {
while (uri_addr) {
char *conf_ip;
char *uri_ip;
apr_sockaddr_ip_get(&conf_ip, conf_addr);
apr_sockaddr_ip_get(&uri_ip, uri_addr);
/* ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
"Testing %s and %s", conf_ip, uri_ip); */
if (!apr_strnatcasecmp(conf_ip, uri_ip)) {
return ap_proxyerror(r, HTTP_FORBIDDEN,
"Connect to remote machine blocked (by IP address)");
}
uri_addr = uri_addr->next;
}
conf_addr = conf_addr->next;
}
} }
/*
* Step Two: Make the Connection
*
* We have determined who to connect to. Now make the connection, supporting
* a KeepAlive connection.
*/
/* get all the possible IP addresses for the destname and loop through them
* until we get a successful connection
*/
if (APR_SUCCESS != err) {
return ap_proxyerror(r, HTTP_BAD_GATEWAY, apr_pstrcat(p,
"DNS lookup failure for: ",
connectname, NULL));
}
/* if a KeepAlive socket is already open, check whether it must stay
* open, or whether it should be closed and a new socket created.
*/
if (conf->origin) {
struct apr_sockaddr_t *remote_addr;
apr_port_t port;
if ((remote_addr = conf->origin->remote_addr) &&
(APR_SUCCESS == apr_sockaddr_port_get(&port, remote_addr)) &&
(port == connectport) &&
(!apr_strnatcasecmp(conf->origin->remote_addr->hostname,connectname))) {
ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
"proxy: keepalive address match (keep original socket)");
}
else {
ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
"proxy: keepalive address mismatch (close old socket (%s/%s, %d/%d))", connectname, conf->origin->remote_addr->hostname, connectport, port);
apr_socket_close(conf->origin->client_socket);
conf->origin = NULL;
}
}
/* get a socket - either a keepalive one, or a new one */
new = 1;
if (conf->origin) {
/* use previous keepalive socket */
origin = conf->origin;
sock = origin->client_socket;
origin->keepalives++;
new = 0;
/* XXX FIXME: If the socket has since closed, change new to 1 so
* a new socket is opened */
}
if (new) {
/* create a new socket */
if ((apr_socket_create(&sock, APR_INET, SOCK_STREAM, p)) != APR_SUCCESS) { if ((apr_socket_create(&sock, APR_INET, SOCK_STREAM, p)) != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
"proxy: error creating socket"); "proxy: error creating socket");
return HTTP_INTERNAL_SERVER_ERROR; return HTTP_INTERNAL_SERVER_ERROR;
} }
@@ -278,49 +345,100 @@ int ap_proxy_http_handler(request_rec *r, char *url,
} }
#endif #endif
if (proxyhost != NULL) { /*
err = ap_proxy_doconnect(sock, (char *)proxyhost, proxyport, r); * At this point we have a list of one or more IP addresses of
} * the machine to connect to. If configured, reorder this
else { * list so that the "best candidate" is first try. "best
err = ap_proxy_doconnect(sock, (char *)desthost, destport, r); * candidate" could mean the least loaded server, the fastest
} * responding server, whatever.
*
* For now we do nothing, ie we get DNS round robin.
* XXX FIXME
*/
/* try each IP address until we connect successfully */
failed = 1;
while (connect_addr) {
/* make the connection out of the socket */
err = apr_connect(sock, connect_addr);
/* if an error occurred, loop round and try again */
if (err != APR_SUCCESS) { if (err != APR_SUCCESS) {
if (proxyhost != NULL) ap_log_error(APLOG_MARK, APLOG_ERR, err, r->server,
return DECLINED; /* try again another way */ "proxy: attempt to connect to %pI (%s) failed", connect_addr, connectname);
else connect_addr = connect_addr->next;
return ap_proxyerror(r, HTTP_BAD_GATEWAY, apr_pstrcat(p, continue;
"Could not connect to remote machine: ",
desthost, NULL));
} }
/* the socket is now open, create a new connection */
origin = ap_new_connection(p, r->server, sock, 0); origin = ap_new_connection(p, r->server, sock, 0);
conf->origin = origin;
if (!origin) { if (!origin) {
/* the peer reset the connection already; ap_new_connection() /* the peer reset the connection already; ap_new_connection()
* closed the socket */ * closed the socket */
/* XXX somebody that knows what they're doing add an error path */ ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
/* XXX how's this? */ "proxy: an error occurred creating a new connection to %pI (%s)", connect_addr, connectname);
return ap_proxyerror(r, HTTP_BAD_GATEWAY, apr_pstrcat(p, connect_addr = connect_addr->next;
"Connection reset by peer: ", continue;
desthost, NULL));
} }
/* we use keepalives unless later specified */
origin->keepalive = 1;
origin->keepalives = 1;
/* set up the connection filters */
ap_add_output_filter("CORE", NULL, NULL, origin); ap_add_output_filter("CORE", NULL, NULL, origin);
ap_add_input_filter("HTTP_IN", NULL, NULL, origin);
ap_add_input_filter("CORE_IN", NULL, NULL, origin);
/* if we get here, all is well */
failed = 0;
break;
}
/* handle a permanent error from the above loop */
if (failed) {
if (proxyname) {
return DECLINED;
}
else {
return HTTP_BAD_GATEWAY;
}
}
}
/*
* Step Three: Send the Request
*
* Send the HTTP/1.1 request to the remote server
*/
/* strip connection listed hop-by-hop headers from the request */ /* strip connection listed hop-by-hop headers from the request */
/* even though in theory a connection: close coming from the client
* should not affect the connection to the server, it's unlikely
* that subsequent client requests will hit this thread/process, so
* we cancel server keepalive if the client does.
*/
close += ap_proxy_liststr(apr_table_get(r->headers_in, "Connection"), "close");
ap_proxy_clear_connection(p, r->headers_in); ap_proxy_clear_connection(p, r->headers_in);
if (close) {
apr_table_mergen(r->headers_in, "Connection", "close");
origin->keepalive = 0;
}
buf = apr_pstrcat(p, r->method, " ", proxyhost ? url : uri, buf = apr_pstrcat(p, r->method, " ", url, " HTTP/1.1" CRLF, NULL);
" HTTP/1.1" CRLF, NULL);
e = apr_bucket_pool_create(buf, strlen(buf), p); e = apr_bucket_pool_create(buf, strlen(buf), p);
APR_BRIGADE_INSERT_TAIL(bb, e); APR_BRIGADE_INSERT_TAIL(bb, e);
if (destportstr != NULL && destport != DEFAULT_HTTP_PORT) { if (uri.port_str && uri.port != DEFAULT_HTTP_PORT) {
buf = apr_pstrcat(p, "Host: ", desthost, ":", destportstr, CRLF, NULL); buf = apr_pstrcat(p, "Host: ", uri.hostname, ":", uri.port_str, CRLF, NULL);
e = apr_bucket_pool_create(buf, strlen(buf), p); e = apr_bucket_pool_create(buf, strlen(buf), p);
APR_BRIGADE_INSERT_TAIL(bb, e); APR_BRIGADE_INSERT_TAIL(bb, e);
} }
else { else {
buf = apr_pstrcat(p, "Host: ", desthost, CRLF, NULL); buf = apr_pstrcat(p, "Host: ", uri.hostname, CRLF, NULL);
e = apr_bucket_pool_create(buf, strlen(buf), p); e = apr_bucket_pool_create(buf, strlen(buf), p);
APR_BRIGADE_INSERT_TAIL(bb, e); APR_BRIGADE_INSERT_TAIL(bb, e);
} }
@@ -399,12 +517,12 @@ int ap_proxy_http_handler(request_rec *r, char *url,
/* Clear out hop-by-hop request headers not to send /* Clear out hop-by-hop request headers not to send
* RFC2616 13.5.1 says we should strip these headers * RFC2616 13.5.1 says we should strip these headers
*/ */
|| !strcasecmp(headers_in[i].key, "Host") /* Already sent */ || !apr_strnatcasecmp(headers_in[i].key, "Host") /* Already sent */
|| !strcasecmp(headers_in[i].key, "Keep-Alive") || !apr_strnatcasecmp(headers_in[i].key, "Keep-Alive")
|| !strcasecmp(headers_in[i].key, "TE") || !apr_strnatcasecmp(headers_in[i].key, "TE")
|| !strcasecmp(headers_in[i].key, "Trailer") || !apr_strnatcasecmp(headers_in[i].key, "Trailer")
|| !strcasecmp(headers_in[i].key, "Transfer-Encoding") || !apr_strnatcasecmp(headers_in[i].key, "Transfer-Encoding")
|| !strcasecmp(headers_in[i].key, "Upgrade") || !apr_strnatcasecmp(headers_in[i].key, "Upgrade")
/* XXX: @@@ FIXME: "Proxy-Authorization" should *only* be /* XXX: @@@ FIXME: "Proxy-Authorization" should *only* be
* suppressed if THIS server requested the authentication, * suppressed if THIS server requested the authentication,
@@ -415,8 +533,8 @@ int ap_proxy_http_handler(request_rec *r, char *url,
* code itself, not here. This saves us having to signal * code itself, not here. This saves us having to signal
* somehow whether this request was authenticated or not. * somehow whether this request was authenticated or not.
*/ */
|| !strcasecmp(headers_in[i].key, "Proxy-Authorization") || !apr_strnatcasecmp(headers_in[i].key, "Proxy-Authorization")
|| !strcasecmp(headers_in[i].key, "Proxy-Authenticate")) || !apr_strnatcasecmp(headers_in[i].key, "Proxy-Authenticate"))
continue; continue;
buf = apr_pstrcat(p, headers_in[i].key, ": ", headers_in[i].val, CRLF, NULL); buf = apr_pstrcat(p, headers_in[i].key, ": ", headers_in[i].val, CRLF, NULL);
@@ -425,11 +543,6 @@ int ap_proxy_http_handler(request_rec *r, char *url,
} }
/* we don't yet support keepalives - but we will soon, I promise! */
buf = apr_pstrcat(p, "Connection: close", CRLF, NULL);
e = apr_bucket_pool_create(buf, strlen(buf), p);
APR_BRIGADE_INSERT_TAIL(bb, e);
/* add empty line at the end of the headers */ /* add empty line at the end of the headers */
e = apr_bucket_pool_create(CRLF, strlen(CRLF), p); e = apr_bucket_pool_create(CRLF, strlen(CRLF), p);
APR_BRIGADE_INSERT_TAIL(bb, e); APR_BRIGADE_INSERT_TAIL(bb, e);
@@ -445,13 +558,21 @@ int ap_proxy_http_handler(request_rec *r, char *url,
APR_BRIGADE_INSERT_TAIL(bb, e); APR_BRIGADE_INSERT_TAIL(bb, e);
} }
} }
/* Flush the data to the origin server */ /* Flush the data to the origin server */
e = apr_bucket_flush_create(); e = apr_bucket_flush_create();
APR_BRIGADE_INSERT_TAIL(bb, e); APR_BRIGADE_INSERT_TAIL(bb, e);
ap_pass_brigade(origin->output_filters, bb); ap_pass_brigade(origin->output_filters, bb);
ap_add_input_filter("HTTP_IN", NULL, NULL, origin);
ap_add_input_filter("CORE_IN", NULL, NULL, origin); /*
* Step Four: Receive the Response
*
* Get response from the remote server, and pass it up the
* filter chain
*/
rp = make_fake_req(origin, r);
apr_brigade_destroy(bb); apr_brigade_destroy(bb);
bb = apr_brigade_create(p); bb = apr_brigade_create(p);
@@ -461,18 +582,28 @@ int ap_proxy_http_handler(request_rec *r, char *url,
ap_get_brigade(origin->input_filters, bb, AP_MODE_BLOCKING); ap_get_brigade(origin->input_filters, bb, AP_MODE_BLOCKING);
e = APR_BRIGADE_FIRST(bb); e = APR_BRIGADE_FIRST(bb);
/* XXX FIXME: a bug exists where apr_bucket_read() is returning
* len=0 when the response line is expected... we try it up to
* 5 times - this has not fixed the problem though.
*/
i = 5;
len = 0;
while (!len && i--) {
apr_bucket_read(e, (const char **)&response, &len, APR_BLOCK_READ); apr_bucket_read(e, (const char **)&response, &len, APR_BLOCK_READ);
}
if (len == -1) { if (len == -1) {
conf->origin = NULL;
apr_socket_close(sock); apr_socket_close(sock);
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
"ap_get_brigade() - proxy receive - Error reading from remote server %s (length %d)", "proxy: error reading from remote server %s (length %d) using ap_get_brigade()",
proxyhost ? proxyhost : desthost, len); connectname, len);
return ap_proxyerror(r, HTTP_BAD_GATEWAY, return ap_proxyerror(r, HTTP_BAD_GATEWAY,
"Error reading from remote server"); "Error reading from remote server");
} else if (len == 0) { } else if (len == 0) {
conf->origin = NULL;
apr_socket_close(sock); apr_socket_close(sock);
return ap_proxyerror(r, HTTP_BAD_GATEWAY, return ap_proxyerror(r, HTTP_BAD_GATEWAY,
"Document contains no data"); "No response data from server");
} }
APR_BUCKET_REMOVE(e); APR_BUCKET_REMOVE(e);
apr_bucket_destroy(e); apr_bucket_destroy(e);
@@ -488,7 +619,9 @@ int ap_proxy_http_handler(request_rec *r, char *url,
/* If not an HTTP/1 message or if the status line was > 8192 bytes */ /* If not an HTTP/1 message or if the status line was > 8192 bytes */
if (response[5] != '1' || response[len - 1] != '\n') { if (response[5] != '1' || response[len - 1] != '\n') {
apr_socket_close(sock); apr_socket_close(sock);
return HTTP_BAD_GATEWAY; conf->origin = NULL;
return ap_proxyerror(r, HTTP_BAD_GATEWAY,
apr_pstrcat(p, "Corrupt status line returned by remote server: ", response, NULL));
} }
backasswards = 0; backasswards = 0;
response[--len] = '\0'; response[--len] = '\0';
@@ -503,25 +636,27 @@ int ap_proxy_http_handler(request_rec *r, char *url,
/* N.B. for HTTP/1.0 clients, we have to fold line-wrapped headers */ /* N.B. for HTTP/1.0 clients, we have to fold line-wrapped headers */
/* Also, take care with headers with multiple occurences. */ /* Also, take care with headers with multiple occurences. */
r->headers_out = ap_proxy_read_headers(r, buffer, HUGE_STRING_LEN, origin); r->headers_out = ap_proxy_read_headers(r, rp, buffer, HUGE_STRING_LEN, origin);
if (r->headers_out == NULL) { if (r->headers_out == NULL) {
ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, r->server, ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, r->server,
"proxy: Bad HTTP/%d.%d header returned by %s (%s)", "proxy: bad HTTP/%d.%d header returned by %s (%s)",
major, minor, r->uri, r->method); major, minor, r->uri, r->method);
close += 1;
} }
else else
{ {
/* strip connection listed hop-by-hop headers from response */ /* strip connection listed hop-by-hop headers from response */
const char *buf; const char *buf;
close += ap_proxy_liststr(apr_table_get(r->headers_out, "Connection"), "close");
ap_proxy_clear_connection(p, r->headers_out); ap_proxy_clear_connection(p, r->headers_out);
if ((buf = apr_table_get(r->headers_out, "Content-type"))) { if ((buf = apr_table_get(r->headers_out, "Content-Type"))) {
r->content_type = apr_pstrdup(p, buf); r->content_type = apr_pstrdup(p, buf);
} }
} }
/* handle Via header in response */ /* handle Via header in response */
if (conf->viaopt != via_off && conf->viaopt != via_block) { if (conf->viaopt != via_off && conf->viaopt != via_block) {
/* Create a "Via:" response header entry and merge it */ /* create a "Via:" response header entry and merge it */
ap_table_mergen(r->headers_out, "Via", ap_table_mergen(r->headers_out, "Via",
(conf->viaopt == via_full) (conf->viaopt == via_full)
? apr_psprintf(p, "%d.%d %s%s (%s)", ? apr_psprintf(p, "%d.%d %s%s (%s)",
@@ -535,12 +670,19 @@ int ap_proxy_http_handler(request_rec *r, char *url,
ap_get_server_name(r), server_portstr) ap_get_server_name(r), server_portstr)
); );
} }
/* cancel keepalive if HTTP/1.0 or less */
if ((major < 1) || (minor < 1)) {
close += 1;
origin->keepalive = 0;
}
} }
else { else {
/* an http/0.9 response */ /* an http/0.9 response */
backasswards = 1; backasswards = 1;
r->status = 200; r->status = 200;
r->status_line = "200 OK"; r->status_line = "200 OK";
close += 1;
} }
/* munge the Location and URI response headers according to ProxyPassReverse */ /* munge the Location and URI response headers according to ProxyPassReverse */
@@ -563,11 +705,41 @@ int ap_proxy_http_handler(request_rec *r, char *url,
APR_BRIGADE_INSERT_TAIL(bb, e); APR_BRIGADE_INSERT_TAIL(bb, e);
} }
/* XXX FIXME - what about 304 et al responses that have no body and no content-length? */
/* send body */ /* send body */
/* HTTP/1.0 tells us to read to EOF, rather than content-length bytes */
if (!r->header_only) { if (!r->header_only) {
const char *buf;
/* if chunked - insert DECHUNK filter */
if (ap_proxy_liststr((buf = apr_table_get(r->headers_out, "Transfer-Encoding")), "chunked")) {
rp->read_chunked = 1;
apr_table_unset(r->headers_out, "Transfer-Encoding");
if (buf = ap_proxy_removestr(r->pool, buf, "chunked")) {
apr_table_set(r->headers_out, "Transfer-Encoding", buf);
}
ap_add_input_filter("DECHUNK", NULL, rp, origin);
}
/* if content length - set the length to read */
else if ((buf = apr_table_get(r->headers_out, "Content-Length"))) {
origin->remain = atol(buf);
}
/* no chunked / no length therefore read till EOF */
else {
origin->remain = -1; origin->remain = -1;
while (ap_get_brigade(origin->input_filters, bb, AP_MODE_BLOCKING) == APR_SUCCESS) { }
/* if keepalive cancelled, read to EOF */
if (close) {
origin->remain = -1;
}
ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
"proxy: start body send");
/* read the body, pass it to the output filters */
while (ap_get_brigade(rp->input_filters, bb, AP_MODE_BLOCKING) == APR_SUCCESS) {
if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(bb))) { if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(bb))) {
ap_pass_brigade(r->output_filters, bb); ap_pass_brigade(r->output_filters, bb);
break; break;
@@ -576,8 +748,32 @@ int ap_proxy_http_handler(request_rec *r, char *url,
apr_brigade_destroy(bb); apr_brigade_destroy(bb);
bb = apr_brigade_create(p); bb = apr_brigade_create(p);
} }
ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
"proxy: end body send");
}
else {
ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
"proxy: header only");
} }
/*
* Step Five: Clean Up
*
* If there are no KeepAlives, or if the connection has been signalled
* to close, close the socket and clean up
*/
/* if the connection is < HTTP/1.1, or Connection: close,
* we close the socket, otherwise we leave it open for KeepAlive support
*/
if (close) {
apr_socket_close(sock); apr_socket_close(sock);
conf->origin = NULL;
}
else {
origin->keptalive = 1;
}
return OK; return OK;
} }

91
modules/proxy/proxy_util.c
View File

@@ -369,31 +369,32 @@ const char *
return q; return q;
} }
static request_rec *make_fake_req(conn_rec *c) request_rec *make_fake_req(conn_rec *c, request_rec *r)
{ {
request_rec *r = apr_pcalloc(c->pool, sizeof(*r)); request_rec *rp = apr_pcalloc(c->pool, sizeof(*r));
core_request_config *req_cfg; core_request_config *req_cfg;
r->pool = c->pool; rp->pool = c->pool;
r->status = HTTP_OK; rp->status = HTTP_OK;
r->headers_in = apr_table_make(r->pool, 50); rp->headers_in = apr_table_make(r->pool, 50);
r->subprocess_env = apr_table_make(r->pool, 50); rp->subprocess_env = apr_table_make(r->pool, 50);
r->headers_out = apr_table_make(r->pool, 12); rp->headers_out = apr_table_make(r->pool, 12);
r->err_headers_out = apr_table_make(r->pool, 5); rp->err_headers_out = apr_table_make(r->pool, 5);
r->notes = apr_table_make(r->pool, 5); rp->notes = apr_table_make(r->pool, 5);
r->read_body = REQUEST_NO_BODY; rp->server = r->server;
r->connection = c; rp->request_time = r->request_time;
r->output_filters = c->output_filters; rp->connection = c;
r->input_filters = c->input_filters; rp->output_filters = c->output_filters;
rp->input_filters = c->input_filters;
r->request_config = ap_create_request_config(r->pool); rp->request_config = ap_create_request_config(rp->pool);
req_cfg = apr_pcalloc(r->pool, sizeof(core_request_config)); req_cfg = apr_pcalloc(rp->pool, sizeof(core_request_config));
req_cfg->bb = apr_brigade_create(r->pool); req_cfg->bb = apr_brigade_create(rp->pool);
ap_set_module_config(r->request_config, &core_module, req_cfg); ap_set_module_config(rp->request_config, &core_module, req_cfg);
return r; return rp;
} }
/* /*
@@ -403,15 +404,14 @@ static request_rec *make_fake_req(conn_rec *c)
* @@@: XXX: FIXME: currently the headers are passed thru un-merged. * @@@: XXX: FIXME: currently the headers are passed thru un-merged.
* Is that okay, or should they be collapsed where possible? * Is that okay, or should they be collapsed where possible?
*/ */
apr_table_t *ap_proxy_read_headers(request_rec *r, char *buffer, int size, conn_rec *c) apr_table_t *ap_proxy_read_headers(request_rec *r, request_rec *rr, char *buffer, int size, conn_rec *c)
{ {
apr_table_t *resp_hdrs; apr_table_t *headers_out;
int len; int len;
char *value, *end; char *value, *end;
char field[MAX_STRING_LEN]; char field[MAX_STRING_LEN];
request_rec *rr = make_fake_req(c);
resp_hdrs = ap_make_table(r->pool, 20); headers_out = ap_make_table(r->pool, 20);
/* /*
* Read header lines until we get the empty separator line, a read error, * Read header lines until we get the empty separator line, a read error,
@@ -450,11 +450,11 @@ apr_table_t *ap_proxy_read_headers(request_rec *r, char *buffer, int size, conn_
for (end = &value[strlen(value)-1]; end > value && apr_isspace(*end); --end) for (end = &value[strlen(value)-1]; end > value && apr_isspace(*end); --end)
*end = '\0'; *end = '\0';
apr_table_add(resp_hdrs, buffer, value); apr_table_add(headers_out, buffer, value);
/* the header was too long; at the least we should skip extra data */ /* the header was too long; at the least we should skip extra data */
if (len >= size - 1) { if (len >= size - 1) {
while ((len = ap_getline(field, MAX_STRING_LEN, r, 1)) while ((len = ap_getline(field, MAX_STRING_LEN, rr, 1))
>= MAX_STRING_LEN - 1) { >= MAX_STRING_LEN - 1) {
/* soak up the extra data */ /* soak up the extra data */
} }
@@ -462,7 +462,7 @@ apr_table_t *ap_proxy_read_headers(request_rec *r, char *buffer, int size, conn_
break; break;
} }
} }
return resp_hdrs; return headers_out;
} }
/* /*
@@ -528,6 +528,47 @@ int ap_proxy_liststr(const char *list, const char *val)
return 0; return 0;
} }
/*
* list is a comma-separated list of case-insensitive tokens, with
* optional whitespace around the tokens.
* The return returns 1 if the token val is found in the list, or 0
* otherwise.
*/
char *ap_proxy_removestr(apr_pool_t *pool, const char *list, const char *val)
{
int len, i;
const char *p;
char *new = NULL;
len = strlen(val);
while (list != NULL) {
p = ap_strchr_c(list, ',');
if (p != NULL) {
i = p - list;
do
p++;
while (apr_isspace(*p));
}
else
i = strlen(list);
while (i > 0 && apr_isspace(list[i - 1]))
i--;
if (i == len && strncasecmp(list, val, len) == 0) {
/* do nothing */
}
else {
if (new)
new = apr_pstrcat(pool, new, ",", apr_pstrndup(pool, list, i), NULL);
else
new = apr_pstrndup(pool, list, i);
}
list = p;
}
return new;
}
/* /*
* Converts 8 hex digits to a time integer * Converts 8 hex digits to a time integer
*/ */