httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r231501 - /httpd/httpd/trunk/modules/proxy/mod_proxy.c
Date Thu, 11 Aug 2005 18:52:19 GMT
Author: niq
Date: Thu Aug 11 11:52:16 2005
New Revision: 231501

URL: http://svn.apache.org/viewcvs?rev=231501&view=rev
Log:
Fix build error from cut&paste

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

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=231501&r1=231500&r2=231501&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Thu Aug 11 11:52:16 2005
@@ -871,17 +871,18 @@
 {
     proxy_dir_conf *new = (proxy_dir_conf *) apr_pcalloc(p, sizeof(proxy_dir_conf));
     proxy_dir_conf *add = (proxy_dir_conf *) addv;
+    proxy_dir_conf *base = (proxy_dir_conf *) basev;
 
     new->p = add->p;
     new->p_is_fnmatch = add->p_is_fnmatch;
     new->r = add->r;
 
     /* Put these in the dir config so they work inside <Location> */
-    new->raliases = apr_array_append(p, base->raliases, overrides->raliases);
+    new->raliases = apr_array_append(p, base->raliases, add->raliases);
     new->cookie_paths
-        = apr_array_append(p, base->cookie_paths, overrides->cookie_paths);
+        = apr_array_append(p, base->cookie_paths, add->cookie_paths);
     new->cookie_domains
-        = apr_array_append(p, base->cookie_domains, overrides->cookie_domains);
+        = apr_array_append(p, base->cookie_domains, add->cookie_domains);
     new->cookie_path_str = base->cookie_path_str;
     new->cookie_domain_str = base->cookie_domain_str;
     return new;



Mime
View raw message