httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r1305822 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/filters/libsed.h
Date Tue, 27 Mar 2012 12:32:13 GMT
Author: minfrin
Date: Tue Mar 27 12:32:12 2012
New Revision: 1305822

URL: http://svn.apache.org/viewvc?rev=1305822&view=rev
Log:
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

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/filters/libsed.h

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1304087

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1305822&r1=1305821&r2=1305822&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Tue Mar 27 12:32:12 2012
@@ -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]
 

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1305822&r1=1305821&r2=1305822&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Mar 27 12:32:12 2012
@@ -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:

Modified: httpd/httpd/branches/2.4.x/modules/filters/libsed.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/libsed.h?rev=1305822&r1=1305821&r2=1305822&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/libsed.h (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/libsed.h Tue Mar 27 12:32:12 2012
@@ -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



Mime
View raw message