diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2002-06-23 06:06:25 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2002-06-23 06:06:25 +0000 |
| commit | f8511d81d82f1981f1ad10529eb4fc7f64253e46 (patch) | |
| tree | ba19f2fd03b9ed0cf25172eb061fba7b247a17c4 /modules/proxy/proxy_http.c | |
| parent | 7f1ed02c5e270706e2ae2f09918baf271c8a2aaa (diff) | |
| download | httpd-f8511d81d82f1981f1ad10529eb4fc7f64253e46.tar.gz | |
No crutches, people!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95854 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/proxy/proxy_http.c')
| -rw-r--r-- | modules/proxy/proxy_http.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c index b460028dd1..7de23e75ef 100644 --- a/modules/proxy/proxy_http.c +++ b/modules/proxy/proxy_http.c @@ -779,19 +779,19 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r, /* handle Via header in response */ if (conf->viaopt != via_off && conf->viaopt != via_block) { /* create a "Via:" response header entry and merge it */ - ap_table_mergen(r->headers_out, "Via", - (conf->viaopt == via_full) - ? apr_psprintf(p, "%d.%d %s%s (%s)", - HTTP_VERSION_MAJOR(r->proto_num), - HTTP_VERSION_MINOR(r->proto_num), - ap_get_server_name(r), - server_portstr, - AP_SERVER_BASEVERSION) - : apr_psprintf(p, "%d.%d %s%s", - HTTP_VERSION_MAJOR(r->proto_num), - HTTP_VERSION_MINOR(r->proto_num), - ap_get_server_name(r), - server_portstr) + apr_table_mergen(r->headers_out, "Via", + (conf->viaopt == via_full) + ? apr_psprintf(p, "%d.%d %s%s (%s)", + HTTP_VERSION_MAJOR(r->proto_num), + HTTP_VERSION_MINOR(r->proto_num), + ap_get_server_name(r), + server_portstr, + AP_SERVER_BASEVERSION) + : apr_psprintf(p, "%d.%d %s%s", + HTTP_VERSION_MAJOR(r->proto_num), + HTTP_VERSION_MINOR(r->proto_num), + ap_get_server_name(r), + server_portstr) ); } @@ -1050,7 +1050,7 @@ int ap_proxy_http_handler(request_rec *r, proxy_server_conf *conf, } /* create space for state information */ if (!backend) { - backend = ap_pcalloc(c->pool, sizeof(proxy_conn_rec)); + backend = apr_pcalloc(c->pool, sizeof(proxy_conn_rec)); backend->connection = NULL; backend->hostname = NULL; backend->port = 0; |