Some windows tweaks to the default configuration, including providing

a default ServerName of 127.0.0.1, including the new auth digest and
file cache module LoadModuleDirectives, et. al.

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

diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index beb5e34d7653c2484a2daee2b7e2ea02959c70b4..6a9506f8417c783dadb3f1dcf667cf90defc7033 100644 (file)
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -68,7 +68,7 @@ PidFile logs/httpd.pid
 # this file will be  created when you run Apache) then you *must* ensure that
 # no two invocations of Apache share the same scoreboard file.
 #
-ScoreBoardFile logs/apache_status
+#ScoreBoardFile logs/apache_status
 
 #
 # In the standard configuration, the server will process httpd.conf,
@@ -130,7 +130,7 @@ MaxRequestsPerChild 0
 # requests active at once means they're all handled more slowly) and
 # the amount of system resources you'll allow the server to consume.
 #
-ThreadsPerChild 50
+ThreadsPerChild 250
 
 #
 # Listen: Allows you to bind Apache to specific IP addresses and/or
@@ -163,9 +163,10 @@ ThreadsPerChild 50
 # the order below without expert advice.
 #
 #LoadModule anon_auth_module modules/ApacheModuleAuthAnon.dll
+#LoadModule auth_digest_module modules/ApacheModuleAuthDigest.dll
 #LoadModule cern_meta_module modules/ApacheModuleCERNMeta.dll
-#LoadModule digest_module modules/ApacheModuleDigest.dll
 #LoadModule expires_module modules/ApacheModuleExpires.dll
+#LoadModule file_cache_module modules/ApacheModuleFileCache.dll
 #LoadModule headers_module modules/ApacheModuleHeaders.dll
 #LoadModule proxy_module modules/ApacheModuleProxy.dll
 #LoadModule rewrite_module modules/ApacheModuleRewrite.dll
@@ -216,6 +217,10 @@ ServerAdmin you@your.address
 # your server if it's different than the one the program would get (i.e., use
 # "www" instead of the host's real name).
 #
+# 127.0.0.1 is the TCP/IP local loop-back address. Your machine
+# always knows itself by this address. If you machine is connected to
+# a network, you should change this to be your machine's name
+#
 # Note: You cannot just invent host names and hope they work. The name you 
 # define here must be a valid DNS name for your host. If you don't understand
 # this, ask your network administrator.
@@ -223,7 +228,7 @@ ServerAdmin you@your.address
 # You will have to access it by its address (e.g., http://123.45.67.89/)
 # anyway, and this will make redirections work in a sensible way.
 #
-#ServerName new.host.name
+ServerName 127.0.0.1
 
 #
 # DocumentRoot: The directory out of which you will serve your