You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by ni...@apache.org on 2007/07/20 13:56:37 UTC

svn commit: r557972 - /httpd/httpd/trunk/modules/aaa/mod_authz_core.c

Author: niq
Date: Fri Jul 20 04:56:36 2007
New Revision: 557972

URL: http://svn.apache.org/viewvc?view=rev&rev=557972
Log:
Fix clash between r557837 and r427780

Modified:
    httpd/httpd/trunk/modules/aaa/mod_authz_core.c

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_core.c?view=diff&rev=557972&r1=557971&r2=557972
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_core.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_core.c Fri Jul 20 04:56:36 2007
@@ -132,7 +132,7 @@
     /* Create this conf by duplicating the base, replacing elements
     * (or creating copies for merging) where new-> values exist.
     */
-    conf = (authz_core_dir_conf *)apr_pmemdup(a, new, sizeof(authz_core_dir_conf));
+    conf = (authz_core_dir_conf *)apr_pmemdup(a, base, sizeof(authz_core_dir_conf));
 
     /* Wipe out the providers and rejects lists so that 
         they can be recreated by the merge process. */