Backport:

mod_sed: Don't define PATH_MAX to a potentially undefined value, causing
compile problems on GNU hurd.
Submitted by: sf
Reviewed by: minfrin, fuankg

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1305822 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index b64d956edabdb34683af0b99e4c7f5bf32a14f07..d85c757c89ac51d2bdb939eb799d9b28a70bf897 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@ Changes with Apache 2.4.2
      envvars: Fix insecure handling of LD_LIBRARY_PATH that could lead to the
      current working directory to be searched for DSOs. [Stefan Fritsch]
 
+  *) mod_sed: Don't define PATH_MAX to a potentially undefined value, causing
+     compile problems on GNU hurd. [Stefan Fritsch]
+
   *) core: Add ap_runtime_dir_relative() and DefaultRuntimeDir.
      [Jeff Trawick]
 

diff --git a/STATUS b/STATUS
index ab42f5ece402e24ab3a1bfb3487b0be34acdcff3..008dddd8d49d104be558089fc80a41874a9c93f6 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -88,12 +88,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_sed: Don't define PATH_MAX to a potentially undefined value, causing
-    compile problems on GNU hurd.
-    Trunk patch: http://svn.apache.org/viewvc?rev=1304087&view=rev
-    2.4.x patch: Trunk patch works
-    +1: sf, minfrin, fuankg (/me stupid, sorry - saw the removal as add ...)
-
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:

diff --git a/modules/filters/libsed.h b/modules/filters/libsed.h
index a889d50ab0512a972ed9aee24c1c392067effcb8..76cbc0ce8ad0c3407416f0692451c2cc8e6a3ec5 100644 (file)
--- a/modules/filters/libsed.h
+++ b/modules/filters/libsed.h
@@ -28,9 +28,6 @@ extern "C" {
 #include <limits.h>
 
 #include "apr_file_io.h"
-#ifndef PATH_MAX
-#define PATH_MAX MAX_PATH
-#endif
 
 #define SED_NLINES 256
 #define SED_DEPTH 20