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

Rename ap_casecmpstr[n]() to ap_cstr_casecmp[n](), update with APR doxygen

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1747469 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
William A. Rowe Jr
2016-06-09 00:06:42 +00:00
parent a3142bb870
commit f4cc76ee71
50 changed files with 374 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
modules/proxy/proxy_util.c
View File

@@ -1056,7 +1056,7 @@ PROXY_DECLARE(int) ap_proxy_valid_balancer_name(char *name, int i)
{
if (!i)
i = sizeof(BALANCER_PREFIX)-1;
return (!ap_casecmpstrn(name, BALANCER_PREFIX, i));
return (!ap_cstr_casecmpn(name, BALANCER_PREFIX, i));
}
@@ -1659,7 +1659,7 @@ PROXY_DECLARE(char *) ap_proxy_define_worker(apr_pool_t *p,
if (ptr) {
*ptr = '\0';
rv = apr_uri_parse(p, url, &urisock);
if (rv == APR_SUCCESS && !ap_casecmpstr(urisock.scheme, "unix")) {
if (rv == APR_SUCCESS && !ap_cstr_casecmp(urisock.scheme, "unix")) {
sockpath = ap_runtime_dir_relative(p, urisock.path);;
url = ptr+1; /* so we get the scheme for the uds */
}
@@ -3356,7 +3356,7 @@ static int ap_proxy_clear_connection(request_rec *r, apr_table_t *headers)
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02807)
"Removing header '%s' listed in Connection header",
name);
if (!ap_casecmpstr(name, "close")) {
if (!ap_cstr_casecmp(name, "close")) {
closed = 1;
}
apr_table_unset(headers, name);
@@ -3516,7 +3516,7 @@ PROXY_DECLARE(int) ap_proxy_create_hdrbrgd(apr_pool_t *p,
/* Add the Expect header if not already there. */
if (((val = apr_table_get(r->headers_in, "Expect")) == NULL)
|| (ap_casecmpstr(val, "100-Continue") != 0 /* fast path */
|| (ap_cstr_casecmp(val, "100-Continue") != 0 /* fast path */
&& !ap_find_token(r->pool, val, "100-Continue"))) {
apr_table_mergen(r->headers_in, "Expect", "100-Continue");
}
@@ -3581,15 +3581,15 @@ PROXY_DECLARE(int) ap_proxy_create_hdrbrgd(apr_pool_t *p,
|| headers_in[counter].val == NULL
/* Already sent */
|| !ap_casecmpstr(headers_in[counter].key, "Host")
|| !ap_cstr_casecmp(headers_in[counter].key, "Host")
/* Clear out hop-by-hop request headers not to send
* RFC2616 13.5.1 says we should strip these headers
*/
|| !ap_casecmpstr(headers_in[counter].key, "Keep-Alive")
|| !ap_casecmpstr(headers_in[counter].key, "TE")
|| !ap_casecmpstr(headers_in[counter].key, "Trailer")
|| !ap_casecmpstr(headers_in[counter].key, "Upgrade")
|| !ap_cstr_casecmp(headers_in[counter].key, "Keep-Alive")
|| !ap_cstr_casecmp(headers_in[counter].key, "TE")
|| !ap_cstr_casecmp(headers_in[counter].key, "Trailer")
|| !ap_cstr_casecmp(headers_in[counter].key, "Upgrade")
) {
continue;
@@ -3599,7 +3599,7 @@ PROXY_DECLARE(int) ap_proxy_create_hdrbrgd(apr_pool_t *p,
* If we have used it then MAYBE: RFC2616 says we MAY propagate it.
* So let's make it configurable by env.
*/
if (!ap_casecmpstr(headers_in[counter].key,"Proxy-Authorization")) {
if (!ap_cstr_casecmp(headers_in[counter].key,"Proxy-Authorization")) {
if (r->user != NULL) { /* we've authenticated */
if (!apr_table_get(r->subprocess_env, "Proxy-Chain-Auth")) {
continue;
@@ -3609,22 +3609,22 @@ PROXY_DECLARE(int) ap_proxy_create_hdrbrgd(apr_pool_t *p,
/* Skip Transfer-Encoding and Content-Length for now.
*/
if (!ap_casecmpstr(headers_in[counter].key, "Transfer-Encoding")) {
if (!ap_cstr_casecmp(headers_in[counter].key, "Transfer-Encoding")) {
*old_te_val = headers_in[counter].val;
continue;
}
if (!ap_casecmpstr(headers_in[counter].key, "Content-Length")) {
if (!ap_cstr_casecmp(headers_in[counter].key, "Content-Length")) {
*old_cl_val = headers_in[counter].val;
continue;
}
/* for sub-requests, ignore freshness/expiry headers */
if (r->main) {
if ( !ap_casecmpstr(headers_in[counter].key, "If-Match")
|| !ap_casecmpstr(headers_in[counter].key, "If-Modified-Since")
|| !ap_casecmpstr(headers_in[counter].key, "If-Range")
|| !ap_casecmpstr(headers_in[counter].key, "If-Unmodified-Since")
|| !ap_casecmpstr(headers_in[counter].key, "If-None-Match")) {
if ( !ap_cstr_casecmp(headers_in[counter].key, "If-Match")
|| !ap_cstr_casecmp(headers_in[counter].key, "If-Modified-Since")
|| !ap_cstr_casecmp(headers_in[counter].key, "If-Range")
|| !ap_cstr_casecmp(headers_in[counter].key, "If-Unmodified-Since")
|| !ap_cstr_casecmp(headers_in[counter].key, "If-None-Match")) {
continue;
}
}
@@ -3711,7 +3711,7 @@ PROXY_DECLARE(apr_port_t) ap_proxy_port_of_scheme(const char *scheme)
} else {
proxy_schemes_t *pscheme;
for (pscheme = pschemes; pscheme->name != NULL; ++pscheme) {
if (ap_casecmpstr(scheme, pscheme->name) == 0) {
if (ap_cstr_casecmp(scheme, pscheme->name) == 0) {
return pscheme->default_port;
}
}