httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1076611 - in /httpd/httpd/branches/2.2.x: STATUS include/httpd.h
Date Thu, 03 Mar 2011 13:07:49 GMT
Author: trawick
Date: Thu Mar  3 13:07:48 2011
New Revision: 1076611

URL: http://svn.apache.org/viewvc?rev=1076611&view=rev
Log:
suEXEC: Fix backport r1070639 which breaks compilation for platforms which do
not support suexec. The patch also avoids printing the useless suexec path.     

Submitted by: fuankg
Reviewed  by: rpluem, trawick

Modified:
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/include/httpd.h

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1076611&r1=1076610&r2=1076611&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Mar  3 13:07:48 2011
@@ -132,13 +132,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.2.x patch: Trunk version of patch works with offset  
      +1 fuankg
 
-  * suEXEC: Fix backport r1070639 which breaks compilation for platforms which do
-     not support suexec. The patch also avoids printing the useless suexec path.     
-     Trunk patch: n/a
-     2.2.x patch: http://people.apache.org/~fuankg/diffs/httpd_h.diff
-     +1 fuankg, rpluem
-
-
 PATCHES/ISSUES THAT ARE STALLED
 
   * mod_dav: If an unknown Content-* header is received for a PUT request, we

Modified: httpd/httpd/branches/2.2.x/include/httpd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/include/httpd.h?rev=1076611&r1=1076610&r2=1076611&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/include/httpd.h (original)
+++ httpd/httpd/branches/2.2.x/include/httpd.h Thu Mar  3 13:07:48 2011
@@ -154,9 +154,11 @@ extern "C" {
 #endif
 
 /** The path to the suExec wrapper, can be overridden in Configuration */
+#if !defined(NETWARE) && !defined(WIN32)
 #ifndef SUEXEC_BIN
 #define SUEXEC_BIN  HTTPD_ROOT "/bin/suexec"
 #endif
+#endif
 
 /** The timeout for waiting for messages */
 #ifndef DEFAULT_TIMEOUT



Mime
View raw message