SOURCES: apache-bug-40970.patch - update for 2.2.8

[arekm]

Author: arekm                        Date: Fri Jun  6 09:16:48 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update for 2.2.8

---- Files affected:
SOURCES:
   apache-bug-40970.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/apache-bug-40970.patch
diff -u SOURCES/apache-bug-40970.patch:1.1 SOURCES/apache-bug-40970.patch:1.2
--- SOURCES/apache-bug-40970.patch:1.1	Wed Nov 22 11:50:48 2006
+++ SOURCES/apache-bug-40970.patch	Fri Jun  6 11:16:43 2008
@@ -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,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/apache-bug-40970.patch?r1=1.1&r2=1.2&f=u