From: Jeff Trawick <trawick@apache.org>
Date: Thu, 3 Mar 2011 13:07:48 +0000 (+0000)
Subject: suEXEC: Fix backport r1070639 which breaks compilation for platforms which do
X-Git-Tag: 2.2.18~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=374c0394c5eded407706390609bf1de3828fb4aa;p=thirdparty%2Fapache%2Fhttpd.git

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


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

diff --git a/STATUS b/STATUS
index 4620a9543c6..930c1e81bf5 100644
--- a/STATUS
+++ b/STATUS
@@ -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
diff --git a/include/httpd.h b/include/httpd.h
index 40351b79c66..500f38cb827 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -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