- update for 2.2.8

Changed files:
    apache-bug-40970.patch -> 1.2

diff --git a/apache-bug-40970.patch b/apache-bug-40970.patch
index a1327e6f6ddc377b6913eb7b6b50b72112b51ce2..dd275fbff2073772aa8bda1ca1751ba53e27b32f 100644 (file)
--- a/apache-bug-40970.patch
+++ b/apache-bug-40970.patch
@@ -1,11 +1,12 @@
---- server/core.c.org  2006-11-22 12:37:15.991248750 +0100
-+++ server/core.c      2006-11-22 12:39:30.535657250 +0100
-@@ -1129,7 +1129,7 @@
-     /* XXX Shouldn't this be relative to ServerRoot ??? */
+--- apache/server/core.c~      2008-06-06 11:05:04.956063837 +0200
++++ apache/server/core.c       2008-06-06 11:11:35.201986198 +0200
+@@ -1176,8 +1176,7 @@
+ 
+     /* TODO: ap_configtestonly && ap_docrootcheck && */
      if (apr_filepath_merge((char**)&conf->ap_document_root, NULL, arg,
-                            APR_FILEPATH_TRUENAME, cmd->pool) != APR_SUCCESS
+-                           APR_FILEPATH_TRUENAME, cmd->pool) != APR_SUCCESS
 -        || !ap_is_directory(cmd->pool, arg)) {
-+        ) {
++                           APR_FILEPATH_TRUENAME, cmd->pool) != APR_SUCCESS) {
          if (cmd->server->is_virtual) {
              ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0,
                            cmd->pool,