Cleanup the config (somewhat) so that win32 -could- actually run from

  the httpd-std.conf - but there are still some discrepancies to take
  back to the conference committee :)

  LDAP was voted some time ago into it's own httpd-ldap repository, and
  never built on Win32; No ldap config directives are present, so I've
  pulled it from both .conf files.

  It would be really nice if the proxy team would come in and clean out
  the deprecated/unsupported directives here.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91294 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/conf/httpd-std.conf b/docs/conf/httpd-std.conf
index f3cd0ca90fa52c7f99a2e6ea8ff6f60e9f126dde..44213526aad7c9b3758ea9aa8cb19b896b7f736a 100644 (file)
--- a/docs/conf/httpd-std.conf
+++ b/docs/conf/httpd-std.conf
@@ -49,29 +49,30 @@
 #
 ServerRoot "@@ServerRoot@@"
 
+<IfModule !mpm_winnt.c>
 #
 # The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
 #
 #LockFile logs/accept.lock
 
-#
-# PidFile: The file in which the server should record its process
-# identification number when it starts.
-#
-PidFile logs/httpd.pid
-
 #
 # ScoreBoardFile: File used to store internal server process information.
 # Not all architectures require this.  But if yours does (you'll know because
 # this file will be  created when you run Apache) then you *must* ensure that
 # no two invocations of Apache share the same scoreboard file.
 #
-<IfModule !mpm_winnt.c>
 <IfModule !perchild.c>
 ScoreBoardFile logs/apache_runtime_status
 </IfModule>
+
 </IfModule>
 
+#
+# PidFile: The file in which the server should record its process
+# identification number when it starts.
+#
+PidFile logs/httpd.pid
+
 #
 # Timeout: The number of seconds before receives and sends time out.
 #
@@ -162,7 +163,7 @@ MaxThreadsPerChild  20
 MaxRequestsPerChild  0
 </IfModule>
 
-# Windows MPM
+# WinNT MPM
 # ThreadsPerChild: constant number of worker threads in the server process
 # MaxRequestsPerChild: maximum  number of requests a server process serves
 <IfModule mpm_winnt.c>
@@ -173,11 +174,13 @@ MaxRequestsPerChild  0
 #
 # Listen: Allows you to bind Apache to specific IP addresses and/or
 # ports, in addition to the default. See also the <VirtualHost>
-# directive.  If this directive is present, then the Port directive
-# above does not effect which port is bound.
+# directive.
+#
+# Change this to Listen on specific IP addresses as shown below to 
+# prevent Apache from glomming onto all bound IP addresses (0.0.0.0)
 #
-Listen @@Port@@
 #Listen 12.34.56.78:80
+Listen @@Port@@
 
 #
 # Dynamic Shared Object (DSO) Support
@@ -192,7 +195,6 @@ Listen @@Port@@
 #LoadModule auth_db_module modules/mod_auth_db.so
 #LoadModule auth_dbm_module modules/mod_auth_dbm.so
 #LoadModule auth_digest_module modules/mod_auth_digest.so
-#LoadModule auth_ldap_module modules/mod_auth_ldap.so
 #LoadModule cern_meta_module modules/mod_cern_meta.so
 #LoadModule dav_module modules/mod_dav.so
 #LoadModule dav_fs_module modules/mod_dav_fs.so
@@ -200,12 +202,15 @@ Listen @@Port@@
 #LoadModule file_cache_module modules/mod_file_cache.so
 #LoadModule headers_module modules/mod_headers.so
 #LoadModule info_module modules/mod_info.so
-#LoadModule ldap_module modules/mod_ldap.so
 #LoadModule mime_magic_module modules/mod_mime_magic.so
 #LoadModule proxy_module modules/mod_proxy.so
+#LoadModule proxy_connect_module modules/proxy_connect.so
+#LoadModule proxy_http_module modules/proxy_http.so
+#LoadModule proxy_ftp_module modules/proxy_ftp.so
 #LoadModule rewrite_module modules/mod_rewrite.so
-#LoadModule suexec_module modules/mod_suexec.so
+#LoadModule ssl_module modules/mod_ssl.so
 #LoadModule speling_module modules/mod_speling.so
+#LoadModule suexec_module modules/mod_suexec.so
 #LoadModule status_module modules/mod_status.so
 #LoadModule unique_id_module modules/mod_unique_id.so
 #LoadModule usertrack_module modules/mod_usertrack.so
@@ -230,6 +235,7 @@ Listen @@Port@@
 # virtual host being defined.
 #
 
+<IfModule !mpm_winnt.c>
 #
 # If you wish httpd to run as a different user or group, you must run
 # httpd as root initially and it will switch.  
@@ -244,6 +250,7 @@ Listen @@Port@@
 #
 User nobody
 Group #-1
+</IfModule>
 
 #
 # ServerAdmin: Your address, where problems with the server should be
@@ -378,9 +385,9 @@ AccessFileName .htaccess
 #
 # UseCanonicalName:  With this setting turned on, whenever Apache needs 
 # to construct a self-referencing URL (a URL that refers back to the 
-# server the response is coming from) it will use ServerName and Port 
-# to form a "canonical" name.  With this setting off, Apache will use 
-# the hostname:port that the client supplied, when possible.  This also 
+# server the response is coming from) it will use ServerName to form
+# a "canonical" name.  With this setting off, Apache will use the 
+# hostname:port that the client supplied, when possible.  This also 
 # affects SERVER_NAME and SERVER_PORT in CGI scripts.
 #
 UseCanonicalName On

diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index 87ee381974f091c981ec44775e3cf6d041d6fcea..3f47a3154fee02f8142d24d80e1fc3d0de518d1c 100644 (file)
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -86,8 +86,8 @@ KeepAliveTimeout 15
 ## 
 
 # WinNT MPM
-# ThreadsPerChild ...... constant number of worker threads in the server process
-# MaxRequestsPerChild .. maximum  number of requests a server process serves
+# ThreadsPerChild: constant number of worker threads in the server process
+# MaxRequestsPerChild: maximum  number of requests a server process serves
 <IfModule mpm_winnt.c>
 ThreadsPerChild 250
 MaxRequestsPerChild  0
@@ -98,8 +98,11 @@ MaxRequestsPerChild  0
 # ports, in addition to the default. See also the <VirtualHost>
 # directive.
 #
-#Listen 3000
+# Change this to Listen on specific IP addresses as shown below to 
+# prevent Apache from glomming onto all bound IP addresses (0.0.0.0)
+#
 #Listen 12.34.56.78:80
+Listen @@Port@@
 
 #
 # Dynamic Shared Object (DSO) Support
@@ -113,7 +116,6 @@ MaxRequestsPerChild  0
 #LoadModule auth_anon_module modules/mod_auth_anon.so
 #LoadModule auth_dbm_module modules/mod_auth_dbm.so
 #LoadModule auth_digest_module modules/mod_auth_digest.so
-#LoadModule auth_ldap_module modules/mod_auth_ldap.so
 #LoadModule cern_meta_module modules/mod_cern_meta.so
 #LoadModule dav_module modules/mod_dav.so
 #LoadModule dav_fs_module modules/mod_dav_fs.so
@@ -121,12 +123,18 @@ MaxRequestsPerChild  0
 #LoadModule file_cache_module modules/mod_file_cache.so
 #LoadModule headers_module modules/mod_headers.so
 #LoadModule info_module modules/mod_info.so
-#LoadModule ldap_module modules/mod_ldap.so
+#LoadModule mime_magic_module modules/mod_mime_magic.so
 #LoadModule proxy_module modules/mod_proxy.so
+#LoadModule proxy_connect_module modules/proxy_connect.so
+#LoadModule proxy_http_module modules/proxy_http.so
+#LoadModule proxy_ftp_module modules/proxy_ftp.so
 #LoadModule rewrite_module modules/mod_rewrite.so
 #LoadModule speling_module modules/mod_speling.so
+#LoadModule ssl_module modules/mod_ssl.so
 #LoadModule status_module modules/mod_status.so
+#LoadModule unique_id_module modules/mod_unique_id.so
 #LoadModule usertrack_module modules/mod_usertrack.so
+#LoadModule vhost_alias_module modules/mod_vhost_alias.so
 
 #
 # ExtendedStatus controls whether Apache will generate "full" status
@@ -147,11 +155,6 @@ MaxRequestsPerChild  0
 # virtual host being defined.
 #
 
-#
-# Port: The port to which the standalone server listens.
-#
-Port 80
-
 #
 # ServerAdmin: Your address, where problems with the server should be
 # e-mailed.  This address appears on some server-generated pages, such
@@ -294,9 +297,9 @@ AccessFileName .htaccess
 #
 # UseCanonicalName:  With this setting turned on, whenever Apache needs 
 # to construct a self-referencing URL (a URL that refers back to the 
-# server the response is coming from) it will use ServerName and Port 
-# to form a "canonical" name.  With this setting off, Apache will use 
-# the hostname:port that the client supplied, when possible.  This also 
+# server the response is coming from) it will use ServerName to form
+# a "canonical" name.  With this setting off, Apache will use the 
+# hostname:port that the client supplied, when possible.  This also 
 # affects SERVER_NAME and SERVER_PORT in CGI scripts.
 #
 UseCanonicalName On