[patch] net-www/apache/files/patches/2.0.51-r1/00_satisfy_merge.patch

00_satisfy_merge.patch (text/plain), 742 bytes, created by Paul Querna on 2004-09-20 15:52:43 UTC

===================================================================
RCS file: /home/cvspublic/httpd-2.0/server/core.c,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- httpd-2.0/server/core.c	2004/09/13 13:19:10	1.285
+++ httpd-2.0/server/core.c	2004/09/20 20:12:20	1.286
@@ -353,9 +353,13 @@
     /* Otherwise we simply use the base->sec_file array
      */
 
+    /* use a separate ->satisfy[] array either way */
+    conf->satisfy = apr_palloc(a, sizeof(*conf->satisfy) * METHODS);
     for (i = 0; i < METHODS; ++i) {
         if (new->satisfy[i] != SATISFY_NOSPEC) {
             conf->satisfy[i] = new->satisfy[i];
+        } else {
+            conf->satisfy[i] = base->satisfy[i];
         }
     }