not needed at all since behaviour is now configurable:

"New piped log syntax: Use "||process args" to launch the given process
     without invoking the shell/command interpreter.  Use "|$command line"
     (the default behavior of "|command line" in 2.2) to invoke using shell,
     consuming an additional shell process for the lifetime of the logging
     pipe program but granting additional process invocation flexibility."

Changed files:
    apache-bug-40970.patch -> 1.3
    apache.spec -> 1.568

diff --git a/apache-bug-40970.patch b/apache-bug-40970.patch
deleted file mode 100644 (file)
index dd275fb..0000000
--- a/apache-bug-40970.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
--        || !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,

diff --git a/apache.spec b/apache.spec
index 880eff23bce8611167e1934c0b63ebd4e75a335b..32dbbe294978eb3e4deeb9664e26cae44c728797 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -71,7 +71,6 @@ Patch18:      %{name}-v6only-ENOPROTOOPT.patch
 Patch19:       %{name}-conffile-path.patch
 Patch20:       %{name}-apxs.patch
 Patch23:       %{name}-suexec_fcgi.patch
-Patch24:       %{name}-revert-bug-40463.patch
 URL:           http://httpd.apache.org/
 BuildRequires: apr-devel >= 1:1.2
 BuildRequires: apr-util-devel >= 1:1.3
@@ -1723,8 +1722,6 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch19 -p1
 %patch20 -p1
 %patch23 -p1
-# disable for now, we'll see how things are handled now
-#%patch24 -p1
 
 # using system apr, apr-util and pcre
 rm -rf srclib/{apr,apr-util,pcre}