svn commit: r606166 - /httpd/httpd/branches/2.2.x/docs/conf/httpd.conf.in

[wr...@apache.org]

Author: wrowe
Date: Fri Dec 21 03:43:00 2007
New Revision: 606166

URL: http://svn.apache.org/viewvc?rev=606166&view=rev
Log:
Prepare for win32 to share the common config file.

Note the quotes for "logs/access_log" which let us
toggle this to access.log, while leaving the custom
log format specifier pretty_log alone.

Also, prefer the user specified port for example
ServerName directive.

Backports: r606135

Modified:
    httpd/httpd/branches/2.2.x/docs/conf/httpd.conf.in

Modified: httpd/httpd/branches/2.2.x/docs/conf/httpd.conf.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/conf/httpd.conf.in?rev=606166&r1=606165&r2=606166&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/conf/httpd.conf.in (original)
+++ httpd/httpd/branches/2.2.x/docs/conf/httpd.conf.in Fri Dec 21 03:43:00 2007
@@ -13,9 +13,9 @@
 # Configuration and logfile names: If the filenames you specify for many
 # of the server's control files begin with "/" (or "drive:/" for Win32), the
 # server will use that explicit path.  If the filenames do *not* begin
-# with "/", the value of ServerRoot is prepended -- so "@rel_logfiledir@/foo.log"
+# with "/", the value of ServerRoot is prepended -- so "@rel_logfiledir@/foo_log"
 # with ServerRoot set to "@@ServerRoot@@" will be interpreted by the
-# server as "@@ServerRoot@@/@rel_logfiledir@/foo.log".
+# server as "@@ServerRoot@@/@rel_logfiledir@/foo_log".
 
 #
 # ServerRoot: The top of the directory tree under which the server's
@@ -54,6 +54,7 @@
 @@LoadModule@@
 
 <IfModule !mpm_netware_module>
+<IfModule !mpm_winnt_module>
 #
 # If you wish httpd to run as a different user or group, you must run
 # httpd as root initially and it will switch.  
@@ -64,6 +65,8 @@
 #
 User daemon
 Group daemon
+
+</IfModule>
 </IfModule>
 
 # 'Main' server configuration
@@ -92,7 +95,7 @@
 #
 # If your host doesn't have a registered DNS name, enter its IP address here.
 #
-#ServerName www.example.com:80
+#ServerName www.example.com:@@Port@@
 
 #
 # DocumentRoot: The directory out of which you will serve your
@@ -181,7 +184,7 @@
 # logged here.  If you *do* define an error logfile for a <VirtualHost>
 # container, that host's errors will be logged there and not here.
 #
-ErrorLog @rel_logfiledir@/error_log
+ErrorLog "@rel_logfiledir@/error_log"
 
 #
 # LogLevel: Control the number of messages logged to the error_log.
@@ -210,13 +213,13 @@
     # define per-<VirtualHost> access logfiles, transactions will be
     # logged therein and *not* in this file.
     #
-    CustomLog @rel_logfiledir@/access_log common
+    CustomLog "@rel_logfiledir@/access_log" common
 
     #
     # If you prefer a logfile with access, agent, and referer information
     # (Combined Logfile Format) you can use the following directive.
     #
-    #CustomLog @rel_logfiledir@/access_log combined
+    #CustomLog "@rel_logfiledir@/access_log" combined
 </IfModule>
 
 <IfModule alias_module>