From f8354dc77721bf33e827909af8f919f3cd938cae Mon Sep 17 00:00:00 2001 From: Sander Striker Date: Tue, 8 Feb 2005 22:31:56 +0000 Subject: [PATCH] Stop exposing source filenames in the configuration files. * docs\conf\httpd-win.conf * docs\conf\httpd-std.conf.in Replace all occurences of *.c with *_module within IfModule clauses, as pointed out by Paul Querna to be possible nowadays. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@152951 13f79535-47bb-0310-9956-ffa450edef68 --- docs/conf/httpd-std.conf.in | 58 ++++++++++++++++++------------------- docs/conf/httpd-win.conf | 6 ++-- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in index d20332a8be..39c7c08f9f 100644 --- a/docs/conf/httpd-std.conf.in +++ b/docs/conf/httpd-std.conf.in @@ -52,8 +52,8 @@ ServerRoot "@@ServerRoot@@" # # The accept serialization lock file MUST BE STORED ON A LOCAL DISK. # -# -# +# +# #LockFile @rel_logfiledir@/accept.lock # # @@ -66,8 +66,8 @@ ServerRoot "@@ServerRoot@@" # 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 @rel_logfiledir@/apache_runtime_status # # @@ -77,8 +77,8 @@ ServerRoot "@@ServerRoot@@" # PidFile: The file in which the server should record its process # identification number when it starts. # - -PidFile @rel_runtimedir@/httpd.pid + + PidFile @rel_runtimedir@/httpd.pid # @@ -115,7 +115,7 @@ KeepAliveTimeout 15 # MaxSpareServers: maximum number of server processes which are kept spare # MaxClients: maximum number of server processes allowed to start # MaxRequestsPerChild: maximum number of requests a server process serves - + StartServers 5 MinSpareServers 5 MaxSpareServers 10 @@ -130,7 +130,7 @@ KeepAliveTimeout 15 # MaxSpareThreads: maximum number of worker threads which are kept spare # ThreadsPerChild: constant number of worker threads in each server process # MaxRequestsPerChild: maximum number of requests a server process serves - + StartServers 2 MaxClients 150 MinSpareThreads 25 @@ -146,7 +146,7 @@ KeepAliveTimeout 15 # MaxSpareThreads: maximum number of worker threads which are kept spare # MaxThreadsPerChild: maximum number of worker threads in each server process # MaxRequestsPerChild: maximum number of connections per server process - + NumServers 5 StartThreads 5 MinSpareThreads 5 @@ -158,7 +158,7 @@ KeepAliveTimeout 15 # WinNT MPM # ThreadsPerChild: constant number of worker threads in the server process # MaxRequestsPerChild: maximum number of requests a server process serves - + ThreadsPerChild 250 MaxRequestsPerChild 0 @@ -167,7 +167,7 @@ KeepAliveTimeout 15 # StartThreads: how many threads do we initially spawn? # MaxClients: max number of threads we can have (1 thread == 1 client) # MaxRequestsPerThread: maximum number of requests each thread will process - + StartThreads 10 MaxClients 50 MaxRequestsPerThread 10000 @@ -183,7 +183,7 @@ KeepAliveTimeout 15 # recommended that the default value of 0 be set for this # directive on NetWare. This will allow the thread to # continue to service requests indefinitely. - + ThreadStackSize 65536 StartThreads 250 MinSpareThreads 25 @@ -199,7 +199,7 @@ KeepAliveTimeout 15 # to handle request spikes # MaxSpareThreads: Maximum number of idle threads per process # MaxRequestsPerChild: Maximum number of connections per server process - + StartServers 2 MinSpareThreads 5 MaxSpareThreads 10 @@ -250,8 +250,8 @@ Listen @@Port@@ # virtual host being defined. # - - + + # # If you wish httpd to run as a different user or group, you must run # httpd as root initially and it will switch. @@ -367,7 +367,7 @@ DocumentRoot "@exp_htdocsdir@" # directory if a ~user request is received. Note that you must also set # the default access control for these directories, as in the example below. # - + UserDir public_html @@ -396,7 +396,7 @@ DocumentRoot "@exp_htdocsdir@" # negotiated documents. The MultiViews Option can be used for the # same purpose, but it is much slower. # - + DirectoryIndex index.html index.html.var @@ -416,7 +416,7 @@ AccessFileName .htaccess Deny from all - + # # TypesConfig describes where the mime.types file (or equivalent) is # to be found. @@ -441,7 +441,7 @@ DefaultType text/plain # contents of the file itself to determine its type. The MIMEMagicFile # directive tells the module where the hint definitions are located. # - + MIMEMagicFile @rel_sysconfdir@/magic @@ -490,7 +490,7 @@ ErrorLog @rel_logfiledir@/error_log # LogLevel warn - + # # The following directives define some format nicknames for use with # a CustomLog directive (see below). @@ -546,7 +546,7 @@ ServerTokens Full # ServerSignature On - + # # Aliases: Add here as many aliases as you need (with no limit). The format is # Alias fakename realname @@ -603,7 +603,7 @@ ServerSignature On - + # # Additional to mod_cgid.c settings, mod_cgid has Scriptsock # for setting UNIX socket for communicating with cgid. @@ -632,7 +632,7 @@ ServerSignature On # # Directives controlling the display of server-generated directory listings. # - + # # IndexOptions: Controls the appearance of server-generated directory @@ -706,7 +706,7 @@ ServerSignature On IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t - + # # AddType allows you to add to or override the MIME configuration @@ -794,7 +794,7 @@ ServerSignature On AddLanguage zh-TW .zh-tw - + # # LanguagePriority allows you to give precedence to some languages # in case of a tie during content negotiation. @@ -813,7 +813,7 @@ ServerSignature On - + # # Commonly used filename extensions to character sets. You probably # want to avoid clashes with the language extensions, unless you @@ -978,7 +978,7 @@ ServerSignature On # ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var # ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var - + # # The following directives modify normal HTTP response behavior to # handle known problems with browser implementations. @@ -1003,7 +1003,7 @@ ServerSignature On BrowserMatch "^XML Spy" redirect-carefully - + # # Allow server status reports generated by mod_status, # with the URL of http://servername/server-status @@ -1034,7 +1034,7 @@ ServerSignature On # # Bring in additional module-specific configurations # - + Include @rel_sysconfdir@/ssl.conf diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf index f9893ce813..d2981d4f17 100644 --- a/docs/conf/httpd-win.conf +++ b/docs/conf/httpd-win.conf @@ -103,7 +103,7 @@ KeepAliveTimeout 15 # WinNT MPM # ThreadsPerChild: constant number of worker threads in the server process # MaxRequestsPerChild: maximum number of requests a server process serves - + ThreadsPerChild 250 MaxRequestsPerChild 0 @@ -370,7 +370,7 @@ DefaultType text/plain # contents of the file itself to determine its type. The MIMEMagicFile # directive tells the module where the hint definitions are located. # - + MIMEMagicFile conf/magic @@ -965,7 +965,7 @@ BrowserMatch "^XML Spy" redirect-carefully # # Bring in additional module-specific configurations # - + Include conf/ssl.conf -- 2.50.1