diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2007-12-21 09:40:11 +0100 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2007-12-21 09:40:11 +0100 |
| commit | c86828df9e137a382dff8e110feb90b9f4d42a69 (patch) | |
| tree | be99722939fb581282bc8e55f690f5d594b2a9ff /docs/conf | |
| parent | Unix illustrates a default of 150 max childs, so make (diff) | |
| download | apache2-c86828df9e137a382dff8e110feb90b9f4d42a69.tar.xz apache2-c86828df9e137a382dff8e110feb90b9f4d42a69.zip | |
Start preparing to use the general-case httpd.conf.in,
on Win32.
Note the quoted log *filenames*, which lets us figure
out the difference between fixing "access_log" to be
a windows friendly "access.log", and leaving the custom
log format name pretty_log alone.
Also, prefer the user specified port for example ServerName.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606135 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/conf')
| -rw-r--r-- | docs/conf/httpd.conf.in | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in index a165e57512..ef3f3adefe 100644 --- a/docs/conf/httpd.conf.in +++ b/docs/conf/httpd.conf.in @@ -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 @@ Listen @@Port@@ @@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 @@ Listen @@Port@@ # User daemon Group daemon + +</IfModule> </IfModule> # 'Main' server configuration @@ -92,7 +95,7 @@ ServerAdmin you@example.com # # 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 @@ -177,7 +180,7 @@ DocumentRoot "@exp_htdocsdir@" # 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. @@ -206,13 +209,13 @@ LogLevel warn # 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> |