mirror of
https://github.com/apache/httpd.git
synced 2025-08-08 15:02:10 +03:00
Get rid of some warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@232311 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -1050,8 +1050,8 @@ PROXY_DECLARE(const char *) ap_proxy_cookie_reverse_map(request_rec *r,
|
|||||||
/* Find the match and replacement, but save replacing until we've done
|
/* Find the match and replacement, but save replacing until we've done
|
||||||
* both path and domain so we know the new strlen
|
* both path and domain so we know the new strlen
|
||||||
*/
|
*/
|
||||||
if (pathp = apr_strmatch(conf->cookie_path_str, str, len) ,pathp) {
|
if ((pathp = apr_strmatch(conf->cookie_path_str, str, len)) != NULL) {
|
||||||
pathp += 5 ;
|
pathp += 5;
|
||||||
poffs = pathp - str;
|
poffs = pathp - str;
|
||||||
pathe = ap_strchr_c(pathp, ';');
|
pathe = ap_strchr_c(pathp, ';');
|
||||||
l1 = pathe ? (pathe - pathp) : strlen(pathp);
|
l1 = pathe ? (pathe - pathp) : strlen(pathp);
|
||||||
@@ -1067,7 +1067,7 @@ PROXY_DECLARE(const char *) ap_proxy_cookie_reverse_map(request_rec *r,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (domainp = apr_strmatch(conf->cookie_domain_str, str, len), domainp) {
|
if ((domainp = apr_strmatch(conf->cookie_domain_str, str, len)) != NULL) {
|
||||||
domainp += 7;
|
domainp += 7;
|
||||||
doffs = domainp - str;
|
doffs = domainp - str;
|
||||||
domaine = ap_strchr_c(domainp, ';');
|
domaine = ap_strchr_c(domainp, ';');
|
||||||
@@ -1508,6 +1508,7 @@ static apr_status_t connection_constructor(void **resource, void *params,
|
|||||||
return APR_SUCCESS;
|
return APR_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if APR_HAS_THREADS /* only needed when threads are used */
|
||||||
/* reslist destructor */
|
/* reslist destructor */
|
||||||
static apr_status_t connection_destructor(void *resource, void *params,
|
static apr_status_t connection_destructor(void *resource, void *params,
|
||||||
apr_pool_t *pool)
|
apr_pool_t *pool)
|
||||||
@@ -1520,6 +1521,7 @@ static apr_status_t connection_destructor(void *resource, void *params,
|
|||||||
|
|
||||||
return APR_SUCCESS;
|
return APR_SUCCESS;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
PROXY_DECLARE(void) ap_proxy_initialize_worker_share(proxy_server_conf *conf,
|
PROXY_DECLARE(void) ap_proxy_initialize_worker_share(proxy_server_conf *conf,
|
||||||
proxy_worker *worker,
|
proxy_worker *worker,
|
||||||
|
Reference in New Issue
Block a user