summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordgaudet <dgaudet@unknown>1997-08-05 06:49:32 +0000
committerdgaudet <dgaudet@unknown>1997-08-05 06:49:32 +0000
commita8dfb5063458bb604ef00a4a02e226c3744a89d2 (patch)
treeaac0368d8bb7e7d01baf6ae516111b79f372dafe
parent6379f750639c7c209c43fd549f6c142a8fe910b1 (diff)
downloadhttpd-a8dfb5063458bb604ef00a4a02e226c3744a89d2.tar.gz
Correct a few of my changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3@78897 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--APACHE_1_2_X/src/CHANGES12
1 files changed, 6 insertions, 6 deletions
diff --git a/APACHE_1_2_X/src/CHANGES b/APACHE_1_2_X/src/CHANGES
index 8deb421d23..f33591c563 100644
--- a/APACHE_1_2_X/src/CHANGES
+++ b/APACHE_1_2_X/src/CHANGES
@@ -1,14 +1,14 @@
Changes with Apache 1.2.2
- *) Fixed improper vhost merging of <Location> and <Directory>: changed the
- ordering of the arguments to append_arrays for the main server's before
- the vhost's.
- [Dean Gaudet]
+ *) When merging the main server's <Directory> and <Location> sections into
+ a vhost, put the main server's first and the vhost's second. Otherwise
+ the vhost can't override the main server. [Dean Gaudet] PR#717
- *) Bugfix for case where multiple <Directory>s match and all are applied.
+ *) The <Directory> code would merge and re-merge the same section after
+ a match was found, possibly causing problems with some modules.
[Dean Gaudet]
- *) Fixed an infinite loop in mod_imap for references above the server root
+ *) Fixed an infinite loop in mod_imap for references above the server root.
[Dean Gaudet] PR#748
*) mod_include cleanup showed that handle_else was being used to handle