From: Mladen Turk Date: Tue, 24 Aug 2004 08:24:18 +0000 (+0000) Subject: Use ap_str_tolower for lowercasing the scheme. X-Git-Tag: STRIKER_2_1_0_RC1~50 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f2b824bc8412d87fcbe294750c3d865910df68f;p=thirdparty%2Fapache%2Fhttpd.git Use ap_str_tolower for lowercasing the scheme. That was the original intention (not apr_tolower). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104783 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c index 351c328f883..ed1268d396b 100644 --- a/modules/proxy/proxy_http.c +++ b/modules/proxy/proxy_http.c @@ -849,7 +849,7 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r, apr_table_do(addit_dammit, save_table, r->headers_out, "Set-Cookie", NULL); - /* shove the headers direct into r->headers_out */ + /* shove the headers direct into r->headers_out */ ap_proxy_read_headers(r, rp, buffer, sizeof(buffer), origin); if (r->headers_out == NULL) { @@ -873,7 +873,7 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r, /* Now, add in the just read cookies */ apr_table_do(addit_dammit, save_table, r->headers_out, - "Set-Cookie", NULL); + "Set-Cookie", NULL); /* and now load 'em all in */ if (!apr_is_empty_table(save_table)) { @@ -1115,7 +1115,6 @@ int ap_proxy_http_handler(request_rec *r, proxy_worker *worker, int status; char server_portstr[32]; char *scheme; - char *ch; const char *proxy_function; const char *u; proxy_conn_rec *backend = NULL; @@ -1146,11 +1145,7 @@ int ap_proxy_http_handler(request_rec *r, proxy_worker *worker, return HTTP_BAD_REQUEST; scheme = apr_pstrndup(c->pool, url, u - url); /* scheme is lowercase */ - ch = scheme; - while (*ch) { - *ch = apr_tolower(*ch); - ++ch; - } + ap_str_tolower(scheme); /* is it for us? */ if (strcmp(scheme, "https") == 0) { if (!ap_proxy_ssl_enable(NULL)) {