You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sl...@apache.org on 2005/04/12 02:12:14 UTC
svn commit: r160989 - in httpd/httpd/trunk: Makefile.win
docs/conf/httpd-win.conf
Author: slive
Date: Mon Apr 11 17:12:14 2005
New Revision: 160989
URL: http://svn.apache.org/viewcvs?view=rev&rev=160989
Log:
Bring the windows config file in line with the simplifications
of the main httpd.conf.
Make a vain attempt to modify Makefile.win appropriately.
Modified:
httpd/httpd/trunk/Makefile.win
httpd/httpd/trunk/docs/conf/httpd-win.conf
Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/Makefile.win?view=diff&r1=160988&r2=160989
==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Mon Apr 11 17:12:14 2005
@@ -475,6 +475,9 @@
-mkdir "$(INSTDIR)\bin\iconv"
-mkdir "$(INSTDIR)\cgi-bin"
-mkdir "$(INSTDIR)\conf"
+ -mkdir "$(INSTDIR)\conf\extra"
+ -mkdir "$(INSTDIR)\conf\original"
+ -mkdir "$(INSTDIR)\conf\original\extra"
-mkdir "$(INSTDIR)\error"
-mkdir "$(INSTDIR)\htdocs"
-mkdir "$(INSTDIR)\manual"
@@ -634,14 +637,14 @@
copy $(LONG)\libhttpd.lib "$(INSTDIR)\lib" <.y
copy modules\dav\main\$(LONG)\mod_dav.exp "$(INSTDIR)\lib" <.y
copy modules\dav\main\$(LONG)\mod_dav.lib "$(INSTDIR)\lib" <.y
- copy docs\conf\magic "$(INSTDIR)\conf\magic.default" <.y
+ copy docs\conf\magic "$(INSTDIR)\conf\original\magic" <.y
if not exist "$(INSTDIR)\conf\magic" \
- copy "$(INSTDIR)\conf\magic.default" "$(INSTDIR)\conf\magic"
- copy docs\conf\mime.types "$(INSTDIR)\conf\mime.types.default" <.y
+ copy "$(INSTDIR)\conf\original\magic" "$(INSTDIR)\conf\magic"
+ copy docs\conf\mime.types "$(INSTDIR)\conf\original\mime.types" <.y
if not exist "$(INSTDIR)\conf\mime.types" \
- copy "$(INSTDIR)\conf\mime.types.default" "$(INSTDIR)\conf\mime.types"
- copy docs\conf\httpd-win.conf "$(INSTDIR)\conf\httpd.default.conf" <.y
- -awk -f <<script.awk "docs/conf/httpd-win.conf" "$(INSTDIR)" > "$(INSTDIR)\conf\httpd.default.conf"
+ copy "$(INSTDIR)\conf\original\mime.types" "$(INSTDIR)\conf\mime.types"
+ copy docs\conf\httpd-win.conf "$(INSTDIR)\conf\original\httpd.conf" <.y
+ -awk -f <<script.awk "docs/conf/httpd-win.conf" "$(INSTDIR)" > "$(INSTDIR)\conf\original\httpd.conf"
BEGIN {
serverroot = ARGV[2];
delete ARGV[2];
@@ -657,10 +660,73 @@
}
<<
if not exist "$(INSTDIR)\conf\httpd.conf" \
- copy "$(INSTDIR)\conf\httpd.default.conf" "$(INSTDIR)\conf\httpd.conf"
-!IF EXIST("srclib\openssl")
- copy docs\conf\ssl-std.conf.in "$(INSTDIR)\conf\ssl.default.conf" <.y
- -awk -f <<script.awk "docs/conf/ssl-std.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\ssl.default.conf"
+ copy "$(INSTDIR)\conf\original\httpd.conf" "$(INSTDIR)\conf\httpd.conf"
+ copy docs\conf\extra\httpd-autoindex.conf.in "$(INSTDIR)\conf\original\httpd-autoindex.conf" <.y
+ -awk -f <<script.awk "docs/conf/extra/httpd-autoindex.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-autoindex.conf"
+ BEGIN {
+ serverroot = ARGV[2];
+ delete ARGV[2];
+ gsub( /\\/, "/", serverroot );
+ "cd" | getline root;
+ gsub( /^\//, substr( root, 1, 2 ) "/", serverroot );
+ }
+ {
+ gsub( /@exp_iconsdir@/, serverroot "/icons" );
+ print $$0;
+ }
+<<
+ if not exist "$(INSTDIR)\conf\extra\httpd-dav.conf" \
+ copy "$(INSTDIR)\conf\original\extra\httpd-dav.conf" "$(INSTDIR)\conf\extra\httpd-dav.conf"
+ copy docs\conf\extra\httpd-dav.conf.in "$(INSTDIR)\conf\original\httpd-dav.conf" <.y
+ -awk -f <<script.awk "docs/conf/extra/httpd-dav.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-dav.conf"
+ BEGIN {
+ serverroot = ARGV[2];
+ delete ARGV[2];
+ gsub( /\\/, "/", serverroot );
+ "cd" | getline root;
+ gsub( /^\//, substr( root, 1, 2 ) "/", serverroot );
+ }
+ {
+ gsub( /@@ServerRoot@@/, serverroot );
+ print $$0;
+ }
+<<
+ if not exist "$(INSTDIR)\conf\extra\httpd-dav.conf" \
+ copy "$(INSTDIR)\conf\original\extra\httpd-dav.conf" "$(INSTDIR)\conf\extra\httpd-dav.conf"
+ copy docs\conf\extra\httpd-manual.conf.in "$(INSTDIR)\conf\original\httpd-manual.conf" <.y
+ -awk -f <<script.awk "docs/conf/extra/httpd-manual.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-manual.conf"
+ BEGIN {
+ serverroot = ARGV[2];
+ delete ARGV[2];
+ gsub( /\\/, "/", serverroot );
+ "cd" | getline root;
+ gsub( /^\//, substr( root, 1, 2 ) "/", serverroot );
+ }
+ {
+ gsub( /@exp_manualdir@/, serverroot "/manual" );
+ print $$0;
+ }
+<<
+ if not exist "$(INSTDIR)\conf\extra\httpd-manual.conf" \
+ copy "$(INSTDIR)\conf\original\extra\httpd-manual.conf" "$(INSTDIR)\conf\extra\httpd-manual.conf"
+ copy docs\conf\extra\httpd-multilang-errordoc.conf.in "$(INSTDIR)\conf\original\httpd-multilang-errordoc.conf" <.y
+ -awk -f <<script.awk "docs/conf/extra/httpd-multilang-errordoc.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-multilang-errordoc.conf"
+ BEGIN {
+ serverroot = ARGV[2];
+ delete ARGV[2];
+ gsub( /\\/, "/", serverroot );
+ "cd" | getline root;
+ gsub( /^\//, substr( root, 1, 2 ) "/", serverroot );
+ }
+ {
+ gsub( /@exp_errordir@/, serverroot "/error" );
+ print $$0;
+ }
+<<
+ if not exist "$(INSTDIR)\conf\extra\httpd-multilang-errordoc.conf" \
+ copy "$(INSTDIR)\conf\original\extra\httpd-multilang-errordoc.conf" "$(INSTDIR)\conf\extra\httpd-multilang-errordoc.conf"
+ copy docs\conf\extra\httpd-ssl.conf.in "$(INSTDIR)\conf\original\httpd-ssl.conf" <.y
+ -awk -f <<script.awk "docs/conf/extra/httpd-ssl.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-ssl.conf"
BEGIN {
serverroot = ARGV[2];
delete ARGV[2];
@@ -674,13 +740,58 @@
gsub( /@exp_htdocsdir@/, serverroot "/htdocs" );
gsub( /@exp_logfiledir@/, "logs" );
gsub( /@exp_sysconfdir@/, "conf" );
- gsub( /@exp_cgidir@/, serverroot "/cgi" );
+ gsub( /@exp_cgidir@/, serverroot "/cgi-bin" );
print $$0;
}
<<
- if not exist "$(INSTDIR)\conf\ssl.conf" \
- copy "$(INSTDIR)\conf\ssl.default.conf" "$(INSTDIR)\conf\ssl.conf"
-!ENDIF
+ if not exist "$(INSTDIR)\conf\extra\httpd-ssl.conf" \
+ copy "$(INSTDIR)\conf\original\extra\httpd-ssl.conf" "$(INSTDIR)\conf\extra\httpd-ssl.conf"
+ copy docs\conf\extra\httpd-userdir.conf.in "$(INSTDIR)\conf\original\httpd-userdir.conf" <.y
+ -awk -f <<script.awk "docs/conf/extra/httpd-userdir.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-userdir.conf"
+ BEGIN {
+ serverroot = ARGV[2];
+ delete ARGV[2];
+ gsub( /\\/, "/", serverroot );
+ "cd" | getline root;
+ gsub( /^\//, substr( root, 1, 2 ) "/", serverroot );
+ }
+ {
+ gsub( /public_html/, "\"My Documents/My Website\"" );
+ gsub( /\/home/, "C:/WinNT/profiles" );
+ print $$0;
+ }
+<<
+ if not exist "$(INSTDIR)\conf\extra\httpd-userdir.conf" \
+ copy "$(INSTDIR)\conf\original\extra\httpd-userdir.conf" "$(INSTDIR)\conf\extra\httpd-userdir.conf"
+ copy docs\conf\extra\httpd-mpm.conf.in "$(INSTDIR)\conf\original\httpd-mpm.conf" <.y
+ -awk -f <<script.awk "docs/conf/extra/httpd-mpm.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-mpm.conf"
+ BEGIN {
+ serverroot = ARGV[2];
+ delete ARGV[2];
+ gsub( /\\/, "/", serverroot );
+ "cd" | getline root;
+ gsub( /^\//, substr( root, 1, 2 ) "/", serverroot );
+ }
+ {
+ gsub( /@rel_runtimedir@/, "logs/" );
+ gsub( /\/home/, "C:/WinNT/profiles" );
+ print $$0;
+ }
+<<
+ if not exist "$(INSTDIR)\conf\extra\httpd-mpm.conf" \
+ copy "$(INSTDIR)\conf\original\extra\httpd-mpm.conf" "$(INSTDIR)\conf\extra\httpd-mpm.conf"
+ copy docs\conf\extra\httpd-default.conf.in "$(INSTDIR)\conf\original\httpd-default.conf" <.y
+ if not exist "$(INSTDIR)\conf\extra\httpd-default.conf" \
+ copy "$(INSTDIR)\conf\original\extra\httpd-default.conf" "$(INSTDIR)\conf\extra\httpd-default.conf"
+ copy docs\conf\extra\httpd-info.conf.in "$(INSTDIR)\conf\original\httpd-info.conf" <.y
+ if not exist "$(INSTDIR)\conf\extra\httpd-info.conf" \
+ copy "$(INSTDIR)\conf\original\extra\httpd-info.conf" "$(INSTDIR)\conf\extra\httpd-info.conf"
+ copy docs\conf\extra\httpd-languages.conf.in "$(INSTDIR)\conf\original\httpd-languages.conf" <.y
+ if not exist "$(INSTDIR)\conf\extra\httpd-languages.conf" \
+ copy "$(INSTDIR)\conf\original\extra\httpd-languages.conf" "$(INSTDIR)\conf\extra\httpd-languages.conf"
+ copy docs\conf\extra\httpd-vhosts.conf.in "$(INSTDIR)\conf\original\httpd-vhosts.conf" <.y
+ if not exist "$(INSTDIR)\conf\extra\httpd-vhosts.conf" \
+ copy "$(INSTDIR)\conf\original\extra\httpd-vhosts.conf" "$(INSTDIR)\conf\extra\httpd-vhosts.conf"
-awk -f <<script.awk "support/dbmmanage.in" >"$(INSTDIR)\bin\dbmmanage.pl"
{ if ( $$0 ~ /^BEGIN \{ @AnyDBM_File::/ ) {
sub( /ISA = qw\(.*\)/, "ISA = qw(SDBM_File)" );
Modified: httpd/httpd/trunk/docs/conf/httpd-win.conf
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/conf/httpd-win.conf?view=diff&r1=160988&r2=160989
==============================================================================
--- httpd/httpd/trunk/docs/conf/httpd-win.conf (original)
+++ httpd/httpd/trunk/docs/conf/httpd-win.conf Mon Apr 11 17:12:14 2005
@@ -1,26 +1,15 @@
#
-# Based upon the NCSA server configuration files originally by Rob McCool.
-#
-# This is the main Apache server configuration file. It contains the
+# This is the main Apache HTTP server configuration file. It contains the
# configuration directives that give the server its instructions.
-# See <URL:http://httpd.apache.org/docs-2.1/> for detailed information about
-# the directives.
+# See <URL:http://httpd.apache.org/docs-2.1/> for detailed information.
+# In particular, see
+# <URL:http://httpd.apache.org/docs-2.1/mod/directives.html>
+# for a discussion of each configuration directive.
#
# Do NOT simply read the instructions in here without understanding
# what they do. They're here only as hints or reminders. If you are unsure
# consult the online docs. You have been warned.
#
-# The configuration directives are grouped into three basic sections:
-# 1. Directives that control the operation of the Apache server process as a
-# whole (the 'global environment').
-# 2. Directives that define the parameters of the 'main' or 'default' server,
-# which responds to requests that aren't handled by a virtual host.
-# These directives also provide default values for the settings
-# of all virtual hosts.
-# 3. Settings for virtual hosts, which allow Web requests to be sent to
-# different IP addresses or hostnames and have them handled by the
-# same Apache server process.
-#
# 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
@@ -36,79 +25,23 @@
# confusion.
#
-### Section 1: Global Environment
-#
-# The directives in this section affect the overall operation of Apache,
-# such as the number of concurrent requests it can handle or where it
-# can find its configuration files.
-#
+# ThreadsPerChild: constant number of worker threads in the server process
+# MaxRequestsPerChild: maximum number of requests a server process serves
+ThreadsPerChild 250
+MaxRequestsPerChild 0
#
# ServerRoot: The top of the directory tree under which the server's
# configuration, error, and log files are kept.
#
-# NOTE! If you intend to place this on an NFS (or otherwise network)
-# mounted filesystem then please read the LockFile documentation (available
-# at <URL:http://httpd.apache.org/docs-2.1/mod/mpm_common.html#lockfile>);
-# you will save yourself a lot of trouble.
-#
-# Do NOT add a slash at the end of the directory path.
+# Do not add a slash at the end of the directory path. If you point
+# ServerRoot at a non-local disk, be sure to point the LockFile directive
+# at a local disk. If you wish to share the same ServerRoot for multiple
+# httpd daemons, you will need to change at least LockFile and PidFile.
#
ServerRoot "@@ServerRoot@@"
#
-# ScoreBoardFile: File used to store internal server process information.
-# If unspecified (the default), the scoreboard will be stored in an
-# anonymous shared memory segment, and will be unavailable to third-party
-# applications.
-# If specified, ensure that no two invocations of Apache share the same
-# scoreboard file. The scoreboard file MUST BE STORED ON A LOCAL DISK.
-#
-#ScoreBoardFile logs/apache_runtime_status
-
-#
-# 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.
-#
-Timeout 300
-
-#
-# KeepAlive: Whether or not to allow persistent connections (more than
-# one request per connection). Set to "Off" to deactivate.
-#
-KeepAlive On
-
-#
-# MaxKeepAliveRequests: The maximum number of requests to allow
-# during a persistent connection. Set to 0 to allow an unlimited amount.
-# We recommend you leave this number high, for maximum performance.
-#
-MaxKeepAliveRequests 100
-
-#
-# KeepAliveTimeout: Number of seconds to wait for the next request from the
-# same client on the same connection.
-#
-KeepAliveTimeout 15
-
-##
-## Server-Pool Size Regulation (MPM specific)
-##
-
-# WinNT MPM
-# ThreadsPerChild: constant number of worker threads in the server process
-# MaxRequestsPerChild: maximum number of requests a server process serves
-<IfModule mpm_winnt_module>
- ThreadsPerChild 250
- MaxRequestsPerChild 0
-</IfModule>
-
-#
# Listen: Allows you to bind Apache to specific IP addresses and/or
# ports, instead of the default. See also the <VirtualHost>
# directive.
@@ -180,14 +113,7 @@
#LoadModule vhost_alias_module modules/mod_vhost_alias.so
#LoadModule ssl_module modules/mod_ssl.so
-#
-# ExtendedStatus controls whether Apache will generate "full" status
-# information (ExtendedStatus On) or just basic information (ExtendedStatus
-# Off) when the "server-status" handler is called. The default is Off.
-#
-#ExtendedStatus On
-
-### Section 2: 'Main' server configuration
+# 'Main' server configuration
#
# The directives in this section set up the values used by the 'main'
# server, which responds to any requests that aren't handled by a
@@ -211,25 +137,11 @@
# This can often be determined automatically, but we recommend you specify
# it explicitly to prevent problems during startup.
#
-# If this is not set to valid DNS name for your host, server-generated
-# redirections will not work. See also the UseCanonicalName directive.
-#
# If your host doesn't have a registered DNS name, enter its IP address here.
-# You will have to access it by its address anyway, and this will make
-# redirections work in a sensible way.
#
ServerName @@ServerName@@:@@Port@@
#
-# UseCanonicalName: Determines how Apache constructs self-referencing
-# URLs and the SERVER_NAME and SERVER_PORT variables.
-# When set "Off", Apache will use the Hostname and Port supplied
-# by the client. When set "On", Apache will use the value of the
-# ServerName directive.
-#
-UseCanonicalName Off
-
-#
# DocumentRoot: The directory out of which you will serve your
# documents. By default, all requests are taken from this directory, but
# symbolic links and aliases may be used to point to other locations.
@@ -262,7 +174,6 @@
# This should be changed to whatever you set DocumentRoot to.
#
<Directory "@@ServerRoot@@/htdocs">
-
#
# Possible values for the Options directive are "None", "All",
# or any combination of:
@@ -293,122 +204,21 @@
</Directory>
#
-# UserDir: The name of the directory that is appended onto a user's home
-# directory if a ~user request is received. Be especially careful to use
-# proper, forward slashes here. On Windows NT, "Personal/My Website"
-# is a more appropriate choice. Note that you must also set the default
-# access control for these directories, as in the example below.
-#
-<IfModule userdir_module>
- UserDir "My Documents/My Website"
-</IfModule>
-
-#
-# Control access to UserDir directories. The following is an example
-# for a site where these directories are restricted to read-only.
-#
-# You must correct the path for the root to match your system's configured
-# user directory location, e.g. "C:/WinNT/profiles/*/My Documents/My Website"
-# or whichever, as appropriate.
-#
-#<Directory "C:/Documents and Settings/*/My Documents/My Website">
-# AllowOverride FileInfo AuthConfig Limit Indexes
-# Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
-# <Limit GET POST OPTIONS PROPFIND>
-# Order allow,deny
-# Allow from all
-# </Limit>
-# <LimitExcept GET POST OPTIONS PROPFIND>
-# Order deny,allow
-# Deny from all
-# </LimitExcept>
-#</Directory>
-
-#
# DirectoryIndex: sets the file that Apache will serve if a directory
# is requested.
#
-# The index.html.var file (a type-map) is used to deliver content-
-# negotiated documents. The MultiViews Option can be used for the
-# same purpose, but it is much slower.
-#
<IfModule dir_module>
- DirectoryIndex index.html index.html.var
+ DirectoryIndex index.html
</IfModule>
#
-# AccessFileName: The name of the file to look for in each directory
-# for additional configuration directives. See also the AllowOverride
-# directive.
-#
-AccessFileName .htaccess
-
-#
# The following lines prevent .htaccess and .htpasswd files from being
# viewed by Web clients.
#
-<Files ~ "^\.ht">
+<FilesMatch "^\.ht">
Order allow,deny
Deny from all
-</Files>
-
-<IfModule mime_module>
- #
- # TypesConfig describes where the mime.types file (or equivalent) is
- # to be found.
- #
- TypesConfig conf/mime.types
-
-</IfModule>
-
-#
-# DefaultType is the default MIME type the server will use for a document
-# if it cannot otherwise determine one, such as from filename extensions.
-# If your server contains mostly text or HTML documents, "text/plain" is
-# a good value. If most of your content is binary, such as applications
-# or images, you may want to use "application/octet-stream" instead to
-# keep browsers from trying to display binary files as though they are
-# text.
-#
-DefaultType text/plain
-
-#
-# The mod_mime_magic module allows the server to use various hints from the
-# contents of the file itself to determine its type. The MIMEMagicFile
-# directive tells the module where the hint definitions are located.
-#
-<IfModule mime_magic_module>
- MIMEMagicFile conf/magic
-</IfModule>
-
-#
-# HostnameLookups: Log the names of clients or just their IP addresses
-# e.g., www.apache.org (on) or 204.62.129.132 (off).
-# The default is off because it'd be overall better for the net if people
-# had to knowingly turn this feature on, since enabling it means that
-# each client request will result in AT LEAST one lookup request to the
-# nameserver.
-#
-HostnameLookups Off
-
-#
-# EnableMMAP: Control whether memory-mapping is used to deliver
-# files (assuming that the underlying OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. On some systems, turning it off (regardless of
-# filesystem) can improve performance; for details, please see
-# http://httpd.apache.org/docs-2.1/mod/core.html#enablemmap
-#
-#EnableMMAP off
-
-#
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs-2.1/mod/core.html#enablesendfile
-#
-#EnableSendfile off
+</FilesMatch>
#
# ErrorLog: The location of the error log file.
@@ -417,10 +227,10 @@
# 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 logs/error.log
+ErrorLog logs/error_log
#
-# LogLevel: Control the number of messages logged to the error.log.
+# LogLevel: Control the number of messages logged to the error_log.
# Possible values include: debug, info, notice, warn, error, crit,
# alert, emerg.
#
@@ -433,8 +243,6 @@
#
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
LogFormat "%h %l %u %t \"%r\" %>s %b" common
- LogFormat "%{Referer}i -> %U" referer
- LogFormat "%{User-agent}i" agent
<IfModule logio_module>
# You need to enable mod_logio.c to use %I and %O
@@ -448,129 +256,38 @@
# define per-<VirtualHost> access logfiles, transactions will be
# logged therein and *not* in this file.
#
- CustomLog logs/access.log common
+ CustomLog logs/access_log common
#
- # If you would like to have agent and referer logfiles, uncomment the
- # following directives.
- #
- #CustomLog logs/referer.log referer
- #CustomLog logs/agent.log agent
-
- #
- # If you prefer a single logfile with access, agent, and referer information
+ # If you prefer a logfile with access, agent, and referer information
# (Combined Logfile Format) you can use the following directive.
#
- #CustomLog logs/access.log combined
+ #CustomLog logs/access_log combined
</IfModule>
-#
-# ServerTokens
-# This directive configures what you return as the Server HTTP response
-# Header. The default is 'Full' which sends information about the OS-Type
-# and compiled in modules.
-# Set to one of: Full | OS | Minor | Minimal | Major | Prod
-# where Full conveys the most information, and Prod the least.
-#
-ServerTokens Full
-
-#
-# Optionally add a line containing the server version and virtual host
-# name to server-generated pages (internal error documents, FTP directory
-# listings, mod_status and mod_info output etc., but not CGI generated
-# documents or custom error documents).
-# Set to "EMail" to also include a mailto: link to the ServerAdmin.
-# Set to one of: On | Off | EMail
-#
-ServerSignature On
-
<IfModule alias_module>
- #
- # Apache parses all CGI scripts for the shebang line by default.
- # This comment line, the first line of the script, consists of the symbols
- # pound (#) and exclamation (!) followed by the path of the program that
- # can execute this specific script. For a perl script, with perl.exe in
- # the C:\Program Files\Perl directory, the shebang line should be:
-
- #!c:/program files/perl/perl
-
- # Note you _must_not_ indent the actual shebang line, and it must be the
- # first line of the file. Of course, CGI processing must be enabled by
- # the appropriate ScriptAlias or Options ExecCGI directives for the files
- # or directory in question.
- #
- # However, Apache on Windows allows either the Unix behavior above, or can
- # use the Registry to match files by extention. The command to execute
- # a file of this type is retrieved from the registry by the same method as
- # the Windows Explorer would use to handle double-clicking on a file.
- # These script actions can be configured from the Windows Explorer View menu,
- # 'Folder Options', and reviewing the 'File Types' tab. Clicking the Edit
- # button allows you to modify the Actions, of which Apache 1.3 attempts to
- # perform the 'Open' Action, and failing that it will try the shebang line.
- # This behavior is subject to change in Apache release 2.0.
- #
- # Each mechanism has it's own specific security weaknesses, from the means
- # to run a program you didn't intend the website owner to invoke, and the
- # best method is a matter of great debate.
- #
- # To enable the this Windows specific behavior (and therefore -disable- the
- # equivilant Unix behavior), uncomment the following directive:
- #
- #ScriptInterpreterSource registry
- #
- # The directive above can be placed in individual <Directory> blocks or the
- # .htaccess file, with either the 'registry' (Windows behavior) or 'script'
- # (Unix behavior) option, and will override this server default option.
- #
-
- #
- # Aliases: Add here as many aliases as you need (with no limit). The format is
- # Alias fakename realname
- #
- # Note that if you include a trailing / on fakename then the server will
- # require it to be present in the URL. So "/icons" isn't aliased in this
- # example, only "/icons/". If the fakename is slash-terminated, then the
- # realname must also be slash terminated, and if the fakename omits the
- # trailing slash, the realname must also omit it.
- #
- # We include the /icons/ alias for FancyIndexed directory listings. If
- # you do not use FancyIndexing, you may comment this out.
- #
- Alias /icons/ "@@ServerRoot@@/icons/"
-
- <Directory "@@ServerRoot@@/icons">
- Options Indexes MultiViews
- AllowOverride None
- Order allow,deny
- Allow from all
- </Directory>
-
- #
- # This should be changed to the ServerRoot/manual/. The alias provides
- # the manual, even if you choose to move your DocumentRoot. You may
- # comment this out if you do not care for the documentation.
- #
- AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$ \
- "@@ServerRoot@@/manual$1"
-
- <Directory "@@ServerRoot@@/manual">
- Options Indexes
- AllowOverride None
- Order allow,deny
- Allow from all
-
- <Files *.html>
- SetHandler type-map
- </Files>
-
- SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|pt-br|ru)/ prefer-language=$1
- RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|pt-br|ru)){2,}(/.*)?$ /manual/$1$2
- </Directory>
+ #
+ # Redirect: Allows you to tell clients about documents that used to
+ # exist in your server's namespace, but do not anymore. The client
+ # will make a new request for the document at its new location.
+ # Example:
+ # Redirect permanent /foo http://www.example.com/bar
+
+ #
+ # Alias: Maps web paths into filesystem paths and is used to
+ # access content that does not live under the DocumentRoot.
+ # Example:
+ # Alias /webpath /full/filesystem/path
+ #
+ # If you include a trailing / on /webpath then the server will
+ # require it to be present in the URL. You will also likely
+ # need to provide a <Directory> section to allow access to
+ # the filesystem path.
#
# ScriptAlias: This controls which directories contain server scripts.
# ScriptAliases are essentially the same as Aliases, except that
- # documents in the realname directory are treated as applications and
+ # documents in the target directory are treated as applications and
# run by the server when requested rather than as documents sent to the
# client. The same rules about trailing "/" apply to ScriptAlias
# directives as to Alias.
@@ -590,101 +307,70 @@
Allow from all
</Directory>
+#
+# Apache parses all CGI scripts for the shebang line by default.
+# This comment line, the first line of the script, consists of the symbols
+# pound (#) and exclamation (!) followed by the path of the program that
+# can execute this specific script. For a perl script, with perl.exe in
+# the C:\Program Files\Perl directory, the shebang line should be:
+
+ #!c:/program files/perl/perl
+
+# Note you _must_not_ indent the actual shebang line, and it must be the
+# first line of the file. Of course, CGI processing must be enabled by
+# the appropriate ScriptAlias or Options ExecCGI directives for the files
+# or directory in question.
+#
+# However, Apache on Windows allows either the Unix behavior above, or can
+# use the Registry to match files by extention. The command to execute
+# a file of this type is retrieved from the registry by the same method as
+# the Windows Explorer would use to handle double-clicking on a file.
+# These script actions can be configured from the Windows Explorer View menu,
+# 'Folder Options', and reviewing the 'File Types' tab. Clicking the Edit
+# button allows you to modify the Actions, of which Apache 1.3 attempts to
+# perform the 'Open' Action, and failing that it will try the shebang line.
+# This behavior is subject to change in Apache release 2.0.
+#
+# Each mechanism has it's own specific security weaknesses, from the means
+# to run a program you didn't intend the website owner to invoke, and the
+# best method is a matter of great debate.
+#
+# To enable the this Windows specific behavior (and therefore -disable- the
+# equivilant Unix behavior), uncomment the following directive:
+#
+#ScriptInterpreterSource registry
+#
+# The directive above can be placed in individual <Directory> blocks or the
+# .htaccess file, with either the 'registry' (Windows behavior) or 'script'
+# (Unix behavior) option, and will override this server default option.
#
-# Redirect allows you to tell clients about documents which used to exist in
-# your server's namespace, but do not anymore. This allows you to tell the
-# clients where to look for the relocated document.
-# Example:
-# Redirect permanent /foo http://www.example.com/bar
#
-# Directives controlling the display of server-generated directory listings.
+# DefaultType: the default MIME type the server will use for a document
+# if it cannot otherwise determine one, such as from filename extensions.
+# If your server contains mostly text or HTML documents, "text/plain" is
+# a good value. If most of your content is binary, such as applications
+# or images, you may want to use "application/octet-stream" instead to
+# keep browsers from trying to display binary files as though they are
+# text.
#
-<IfModule autoindex_module>
-
- #
- # IndexOptions: Controls the appearance of server-generated directory
- # listings.
- #
- IndexOptions FancyIndexing VersionSort
-
- #
- # AddIcon* directives tell the server which icon to show for different
- # files or filename extensions. These are only displayed for
- # FancyIndexed directories.
- #
- AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip
-
- AddIconByType (TXT,/icons/text.gif) text/*
- AddIconByType (IMG,/icons/image2.gif) image/*
- AddIconByType (SND,/icons/sound2.gif) audio/*
- AddIconByType (VID,/icons/movie.gif) video/*
-
- AddIcon /icons/binary.gif .bin .exe
- AddIcon /icons/binhex.gif .hqx
- AddIcon /icons/tar.gif .tar
- AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv
- AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip
- AddIcon /icons/a.gif .ps .ai .eps
- AddIcon /icons/layout.gif .html .shtml .htm .pdf
- AddIcon /icons/text.gif .txt
- AddIcon /icons/c.gif .c
- AddIcon /icons/p.gif .pl .py
- AddIcon /icons/f.gif .for
- AddIcon /icons/dvi.gif .dvi
- AddIcon /icons/uuencoded.gif .uu
- AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
- AddIcon /icons/tex.gif .tex
- AddIcon /icons/bomb.gif core
-
- AddIcon /icons/back.gif ..
- AddIcon /icons/hand.right.gif README
- AddIcon /icons/folder.gif ^^DIRECTORY^^
- AddIcon /icons/blank.gif ^^BLANKICON^^
-
- #
- # DefaultIcon is which icon to show for files which do not have an icon
- # explicitly set.
- #
- DefaultIcon /icons/unknown.gif
-
- #
- # AddDescription allows you to place a short description after a file in
- # server-generated indexes. These are only displayed for FancyIndexed
- # directories.
- # Format: AddDescription "description" filename
- #
- #AddDescription "GZIP compressed document" .gz
- #AddDescription "tar archive" .tar
- #AddDescription "GZIP compressed tar archive" .tgz
-
- #
- # ReadmeName is the name of the README file the server will look for by
- # default, and append to directory listings.
- #
- # HeaderName is the name of a file which should be prepended to
- # directory indexes.
- ReadmeName README.html
- HeaderName HEADER.html
+DefaultType text/plain
+<IfModule mime_module>
#
- # IndexIgnore is a set of filenames which directory indexing should ignore
- # and not include in the listing. Shell-style wildcarding is permitted.
+ # TypesConfig points to the file containing the list of mappings from
+ # filename extension to MIME-type.
#
- IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
-</IfModule>
+ TypesConfig conf/mime.types
-<IfModule mime_module>
#
# AddType allows you to add to or override the MIME configuration
- # file mime.types for specific file types.
+ # file specified in TypesConfig for specific file types.
#
#AddType application/x-gzip .tgz
#
# AddEncoding allows you to have certain browsers uncompress
# information on the fly. Note: Not all browsers support this.
- # Despite the name similarity, the following Add* directives have
- # nothing to do with the FancyIndexing customization directives above.
#
#AddEncoding x-compress .Z
#AddEncoding x-gzip .gz .tgz
@@ -696,138 +382,6 @@
AddType application/x-gzip .gz .tgz
#
- # DefaultLanguage and AddLanguage allows you to specify the language of
- # a document. You can then use content negotiation to give a browser a
- # file in a language the user can understand.
- #
- # Specify a default language. This means that all data
- # going out without a specific language tag (see below) will
- # be marked with this one. You probably do NOT want to set
- # this unless you are sure it is correct for all cases.
- #
- # * It is generally better to not mark a page as
- # * being a certain language than marking it with the wrong
- # * language!
- #
- # DefaultLanguage nl
- #
- # Note 1: The suffix does not have to be the same as the language
- # keyword --- those with documents in Polish (whose net-standard
- # language code is pl) may wish to use "AddLanguage pl .po" to
- # avoid the ambiguity with the common suffix for perl scripts.
- #
- # Note 2: The example entries below illustrate that in some cases
- # the two character 'Language' abbreviation is not identical to
- # the two character 'Country' code for its country,
- # E.g. 'Danmark/dk' versus 'Danish/da'.
- #
- # Note 3: In the case of 'ltz' we violate the RFC by using a three char
- # specifier. There is 'work in progress' to fix this and get
- # the reference data for rfc1766 cleaned up.
- #
- # Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl)
- # English (en) - Esperanto (eo) - Estonian (et) - French (fr) - German (de)
- # Greek-Modern (el) - Hebrew (he) - Italian (it) - Japanese (ja)
- # Korean (ko) - Luxembourgeois* (ltz) - Norwegian Nynorsk (nn)
- # Norwegian (no) - Polish (pl) - Portugese (pt)
- # Brazilian Portuguese (pt-BR) - Russian (ru) - Swedish (sv)
- # Simplified Chinese (zh-CN) - Spanish (es) - Traditional Chinese (zh-TW)
- #
- AddLanguage ca .ca
- AddLanguage cs .cz .cs
- AddLanguage da .dk
- AddLanguage de .de
- AddLanguage el .el
- AddLanguage en .en
- AddLanguage eo .eo
- AddLanguage es .es
- AddLanguage et .et
- AddLanguage fr .fr
- AddLanguage he .he
- AddLanguage hr .hr
- AddLanguage it .it
- AddLanguage ja .ja
- AddLanguage ko .ko
- AddLanguage ltz .ltz
- AddLanguage nl .nl
- AddLanguage nn .nn
- AddLanguage no .no
- AddLanguage pl .po
- AddLanguage pt .pt
- AddLanguage pt-BR .pt-br
- AddLanguage ru .ru
- AddLanguage sv .sv
- AddLanguage zh-CN .zh-cn
- AddLanguage zh-TW .zh-tw
-</IfModule>
-
-<IfModule negotiation_module>
- #
- # LanguagePriority allows you to give precedence to some languages
- # in case of a tie during content negotiation.
- #
- # Just list the languages in decreasing order of preference. We have
- # more or less alphabetized them here. You probably want to change this.
- #
- LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
-
- #
- # ForceLanguagePriority allows you to serve a result page rather than
- # MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback)
- # [in case no accepted languages matched the available variants]
- #
- ForceLanguagePriority Prefer Fallback
-
-</IfModule>
-
-<IfModule mime_module>
- #
- # Commonly used filename extensions to character sets. You probably
- # want to avoid clashes with the language extensions, unless you
- # are good at carefully testing your setup after each change.
- # See http://www.iana.org/assignments/character-sets for the
- # official list of charset names and their respective RFCs.
- #
- AddCharset ISO-8859-1 .iso8859-1 .latin1
- AddCharset ISO-8859-2 .iso8859-2 .latin2 .cen
- AddCharset ISO-8859-3 .iso8859-3 .latin3
- AddCharset ISO-8859-4 .iso8859-4 .latin4
- AddCharset ISO-8859-5 .iso8859-5 .latin5 .cyr .iso-ru
- AddCharset ISO-8859-6 .iso8859-6 .latin6 .arb
- AddCharset ISO-8859-7 .iso8859-7 .latin7 .grk
- AddCharset ISO-8859-8 .iso8859-8 .latin8 .heb
- AddCharset ISO-8859-9 .iso8859-9 .latin9 .trk
- AddCharset ISO-2022-JP .iso2022-jp .jis
- AddCharset ISO-2022-KR .iso2022-kr .kis
- AddCharset ISO-2022-CN .iso2022-cn .cis
- AddCharset Big5 .Big5 .big5
- # For russian, more than one charset is used (depends on client, mostly):
- AddCharset WINDOWS-1251 .cp-1251 .win-1251
- AddCharset CP866 .cp866
- AddCharset KOI8-r .koi8-r .koi8-ru
- AddCharset KOI8-ru .koi8-uk .ua
- AddCharset ISO-10646-UCS-2 .ucs2
- AddCharset ISO-10646-UCS-4 .ucs4
- AddCharset UTF-8 .utf8
-
- # The set below does not map to a specific (iso) standard
- # but works on a fairly wide range of browsers. Note that
- # capitalization actually matters (it should not, but it
- # does for some browsers).
- #
- # See http://www.iana.org/assignments/character-sets
- # for a list of sorts. But browsers support few.
- #
- AddCharset GB2312 .gb2312 .gb
- AddCharset utf-7 .utf7
- AddCharset utf-8 .utf8
- AddCharset big5 .big5 .b5
- AddCharset EUC-TW .euc-tw
- AddCharset EUC-JP .euc-jp
- AddCharset EUC-KR .euc-kr
- AddCharset shift_jis .sjis
-
- #
# AddHandler allows you to map certain file extensions to "handlers":
# actions unrelated to filetype. These can be either built into the server
# or added with the Action directive (see below)
@@ -837,22 +391,14 @@
#
#AddHandler cgi-script .cgi
- #
# For files that include their own HTTP headers:
- #
#AddHandler send-as-is asis
- #
# For server-parsed imagemap files:
- #
#AddHandler imap-file map
- #
# For type maps (negotiated resources):
- # (This is enabled by default to allow the Apache "It Worked" page
- # to be distributed in multiple languages.)
- #
- AddHandler type-map var
+ #AddHandler type-map var
#
# Filters allow you to process content before it is sent to the client.
@@ -865,12 +411,11 @@
</IfModule>
#
-# Action lets you define media types that will execute a script whenever
-# a matching file is called. This eliminates the need for repeated URL
-# pathnames for oft-used CGI file processors.
-# Format: Action media/type /cgi-script/location
-# Format: Action handler-name /cgi-script/location
+# The mod_mime_magic module allows the server to use various hints from the
+# contents of the file itself to determine its type. The MIMEMagicFile
+# directive tells the module where the hint definitions are located.
#
+#MIMEMagicFile conf/magic
#
# Customizable error responses come in three flavors:
@@ -884,147 +429,61 @@
#
#
-# Putting this all together, we can internationalize error responses.
+# EnableMMAP and EnableSendfile: On systems that support it,
+# memory-mapping or the sendfile syscall is used to deliver
+# files. This usually improves server performance, but must
+# be turned off when serving from networked-mounted
+# filesystems or if support for these functions is otherwise
+# broken on your system.
#
-# We use Alias to redirect any /error/HTTP_<error>.html.var response to
-# our collection of by-error message multi-language collections. We use
-# includes to substitute the appropriate text.
-#
-# You can modify the messages' appearance without changing any of the
-# default HTTP_<error>.html.var files by adding the line:
-#
-# Alias /error/include/ "/your/include/path/"
-#
-# which allows you to create your own set of files by starting with the
-# @exp_errordir@/include/ files and copying them to /your/include/path/,
-# even on a per-VirtualHost basis. The default include files will display
-# your Apache version number and your ServerAdmin email address regardless
-# of the setting of ServerSignature.
-#
-# The internationalized error documents require mod_alias, mod_include
-# and mod_negotiation. To activate them, uncomment the following 30 lines.
-
-# Alias /error/ "@exp_errordir@/"
-#
-# <Directory "@exp_errordir@">
-# AllowOverride None
-# Options IncludesNoExec
-# AddOutputFilter Includes html
-# AddHandler type-map var
-# Order allow,deny
-# Allow from all
-# LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr
-# ForceLanguagePriority Prefer Fallback
-# </Directory>
-#
-# ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
-# ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
-# ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
-# ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
-# ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
-# ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
-# ErrorDocument 410 /error/HTTP_GONE.html.var
-# ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
-# ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var
-# ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
-# ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var
-# ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
-# ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var
-# ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
-# ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var
-# ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
-# ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
-
-<IfModule setenvif_module>
- #
- # The following directives modify normal HTTP response behavior to
- # handle known problems with browser implementations.
- #
- BrowserMatch "Mozilla/2" nokeepalive
- BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
- BrowserMatch "RealPlayer 4\.0" force-response-1.0
- BrowserMatch "Java/1\.0" force-response-1.0
- BrowserMatch "JDK/1\.0" force-response-1.0
-
- #
- # The following directive disables redirects on non-GET requests for
- # a directory that does not include the trailing slash. This fixes a
- # problem with Microsoft WebFolders which does not appropriately handle
- # redirects for folders with DAV methods.
- # Same deal with Apple's DAV filesystem and Gnome VFS support for DAV.
- #
- BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
- BrowserMatch "^WebDrive" redirect-carefully
- BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
- BrowserMatch "^gnome-vfs/1.0" redirect-carefully
- BrowserMatch "^XML Spy" redirect-carefully
-</IfModule>
+#EnableMMAP off
+#EnableSendfile off
-<IfModule status_module>
- #
- # Allow server status reports generated by mod_status,
- # with the URL of http://servername/server-status
- # Change the ".@@DomainName@@" to match your domain to enable.
- #
- #<Location /server-status>
- # SetHandler server-status
- # Order deny,allow
- # Deny from all
- # Allow from .@@DomainName@@
- #</Location>
-</IfModule>
+# Supplemental configuration
+#
+# The configuration files in the conf/extra/ directory can be
+# included to add extra features or to modify the default configuration of
+# the server, or you may simply copy their contents here and change as
+# necessary.
-<IfModule info_module>
- #
- # Allow remote server configuration reports, with the URL of
- # http://servername/server-info (requires that mod_info.c be loaded).
- # Change the ".@@DomainName@@" to match your domain to enable.
- #
- #<Location /server-info>
- # SetHandler server-info
- # Order deny,allow
- # Deny from all
- # Allow from .@@DomainName@@
- #</Location>
-</IfModule>
+# Server-pool management (MPM specific)
+#Include conf/extra/httpd-mpm.conf
-#
-# Bring in additional module-specific configurations
-#
-<IfModule ssl_module>
- Include conf/ssl.conf
-</IfModule>
+# Multi-language error messages
+#Include conf/extra/httpd-multilang-errordoc.conf
+# Fancy directory listings
+#Include conf/extra/httpd-autoindex.conf
-### Section 3: Virtual Hosts
-#
-# VirtualHost: If you want to maintain multiple domains/hostnames on your
-# machine you can setup VirtualHost containers for them. Most configurations
-# use only name-based virtual hosts so the server doesn't need to worry about
-# IP addresses. This is indicated by the asterisks in the directives below.
-#
-# Please see the documentation at
-# <URL:http://httpd.apache.org/docs-2.1/vhosts/>
-# for further details before you try to setup virtual hosts.
-#
-# You may use the command line option '-S' to verify your virtual host
-# configuration.
+# Language settings
+#Include conf/extra/httpd-languages.conf
-#
-# Use name-based virtual hosting.
-#
-#NameVirtualHost *:80
+# User home directories
+#Include conf/extra/httpd-userdir.conf
+
+# Real-time info on requests and configuration
+#Include conf/extra/httpd-info.conf
+
+# Virtual hosts
+#Include conf/extra/httpd-vhosts.conf
+# Local access to the Apache HTTP Server Manual
+#Include conf/extra/httpd-manual.conf
+
+# Distributed authoring and versioning (WebDAV)
+#Include conf/extra/httpd-dav.conf
+
+# Various default settings
+#Include conf/extra/httpd-default.conf
+
+# Secure (SSL/TLS) connections
+#Include conf/extra/httpd-ssl.conf
#
-# VirtualHost example:
-# Almost any Apache directive may go into a VirtualHost container.
-# The first VirtualHost section is used for requests without a known
-# server name.
+# Note: The following must must be present to support
+# starting without SSL on platforms with no /dev/random equivalent
+# but a statically compiled-in mod_ssl.
#
-#<VirtualHost *:80>
-# ServerAdmin webmaster@dummy-host.example.com
-# DocumentRoot /www/docs/dummy-host.example.com
-# ServerName dummy-host.example.com
-# ErrorLog logs/dummy-host.example.com-error_log
-# CustomLog logs/dummy-host.example.com-access_log common
-#</VirtualHost>
+<IfModule ssl_module>
+SSLRandomSeed startup builtin
+SSLRandomSeed connect builtin
+</IfModule>
Re: svn commit: r160989 - in httpd/httpd/trunk: Makefile.win
docs/conf/httpd-win.conf
Posted by Joshua Slive <jo...@slive.ca>.
On Tue, 12 Apr 2005 slive@apache.org wrote:
> Author: slive
> Date: Mon Apr 11 17:12:14 2005
> New Revision: 160989
>
> URL: http://svn.apache.org/viewcvs?view=rev&rev=160989
> Log:
> Bring the windows config file in line with the simplifications
> of the main httpd.conf.
>
> Make a vain attempt to modify Makefile.win appropriately.
I virtually guarantee that I broke the windows build with this one. I
don't have a proper setup for testing this. But I think it should be
pretty close.
The idea was to make life easier for the windows hackers by getting this
most-of-the-way done. If you don't like it, feel free to back it out.
Joshua.