httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject svn commit: r232311 - /httpd/httpd/trunk/modules/proxy/proxy_util.c
Date Fri, 12 Aug 2005 15:22:21 GMT
Author: martin
Date: Fri Aug 12 08:22:19 2005
New Revision: 232311

URL: http://svn.apache.org/viewcvs?rev=232311&view=rev
Log:
Get rid of some warnings

Modified:
    httpd/httpd/trunk/modules/proxy/proxy_util.c

Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=232311&r1=232310&r2=232311&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Fri Aug 12 08:22:19 2005
@@ -1050,8 +1050,8 @@
    /* Find the match and replacement, but save replacing until we've done
     * both path and domain so we know the new strlen
     */
-    if (pathp = apr_strmatch(conf->cookie_path_str, str, len) ,pathp) {
-        pathp += 5 ;
+    if ((pathp = apr_strmatch(conf->cookie_path_str, str, len)) != NULL) {
+        pathp += 5;
         poffs = pathp - str;
         pathe = ap_strchr_c(pathp, ';');
         l1 = pathe ? (pathe - pathp) : strlen(pathp);
@@ -1067,7 +1067,7 @@
         }
     }
     
-    if (domainp = apr_strmatch(conf->cookie_domain_str, str, len), domainp) {
+    if ((domainp = apr_strmatch(conf->cookie_domain_str, str, len)) != NULL) {
         domainp += 7;
         doffs = domainp - str;
         domaine = ap_strchr_c(domainp, ';');
@@ -1508,6 +1508,7 @@
     return APR_SUCCESS;
 }
 
+#if APR_HAS_THREADS /* only needed when threads are used */
 /* reslist destructor */
 static apr_status_t connection_destructor(void *resource, void *params,
                                           apr_pool_t *pool)
@@ -1520,6 +1521,7 @@
 
     return APR_SUCCESS;
 }
+#endif
 
 PROXY_DECLARE(void) ap_proxy_initialize_worker_share(proxy_server_conf *conf,
                                                      proxy_worker *worker,



Mime
View raw message