auto-import httpd-2.0.47-10 from httpd-2.0.47-10.src.rpmhttpd-2_0_47-10

1 files changed, 137 insertions, 127 deletions

diff --git a/httpd.conf b/httpd.conf
index c6a4fd0..4dabb4a 100644
--- a/httpd.conf
+++ b/httpd.conf
@@ -129,22 +129,6 @@ ThreadsPerChild     25
 MaxRequestsPerChild  0
 </IfModule>
 
-# perchild MPM
-# NumServers: constant number of server processes
-# StartThreads: initial number of worker threads in each server process
-# MinSpareThreads: minimum number of worker threads which are kept spare
-# 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
-<IfModule perchild.c>
-NumServers           5
-StartThreads         5
-MinSpareThreads      5
-MaxSpareThreads     10
-MaxThreadsPerChild  20
-MaxRequestsPerChild  0
-</IfModule>
-
 #
 # Listen: Allows you to bind Apache to specific IP addresses and/or
 # ports, in addition to the default. See also the <VirtualHost>
@@ -157,11 +141,6 @@ MaxRequestsPerChild  0
 Listen 80
 
 #
-# Load config files from the config directory "/etc/httpd/conf.d".
-#
-Include conf.d/*.conf
-
-#
 # Dynamic Shared Object (DSO) Support
 #
 # To be able to use the functionality of a module which was built as a DSO you
@@ -178,12 +157,15 @@ LoadModule auth_module modules/mod_auth.so
 LoadModule auth_anon_module modules/mod_auth_anon.so
 LoadModule auth_dbm_module modules/mod_auth_dbm.so
 LoadModule auth_digest_module modules/mod_auth_digest.so
+LoadModule ldap_module modules/mod_ldap.so
+LoadModule auth_ldap_module modules/mod_auth_ldap.so
 LoadModule include_module modules/mod_include.so
 LoadModule log_config_module modules/mod_log_config.so
 LoadModule env_module modules/mod_env.so
 LoadModule mime_magic_module modules/mod_mime_magic.so
 LoadModule cern_meta_module modules/mod_cern_meta.so
 LoadModule expires_module modules/mod_expires.so
+LoadModule deflate_module modules/mod_deflate.so
 LoadModule headers_module modules/mod_headers.so
 LoadModule usertrack_module modules/mod_usertrack.so
 LoadModule unique_id_module modules/mod_unique_id.so
@@ -208,14 +190,17 @@ LoadModule proxy_module modules/mod_proxy.so
 LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
 LoadModule proxy_http_module modules/mod_proxy_http.so
 LoadModule proxy_connect_module modules/mod_proxy_connect.so
-
-<IfModule prefork.c>
+LoadModule cache_module modules/mod_cache.so
+LoadModule suexec_module modules/mod_suexec.so
+LoadModule disk_cache_module modules/mod_disk_cache.so
+LoadModule file_cache_module modules/mod_file_cache.so
+LoadModule mem_cache_module modules/mod_mem_cache.so
 LoadModule cgi_module modules/mod_cgi.so
-</IfModule>
 
-<IfModule worker.c>
-LoadModule cgid_module modules/mod_cgid.so
-</IfModule>
+#
+# Load config files from the config directory "/etc/httpd/conf.d".
+#
+Include conf.d/*.conf
 
 #
 # ExtendedStatus controls whether Apache will generate "full" status
@@ -316,7 +301,7 @@ DocumentRoot "/var/www/html"
 #
 # Possible values for the Options directive are "None", "All",
 # or any combination of:
-#   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI Multiviews
+#   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
 #
 # Note that "MultiViews" must be named *explicitly* --- "Options All"
 # doesn't give it to you.
@@ -342,15 +327,6 @@ DocumentRoot "/var/www/html"
 
 </Directory>
 
-# 
-# Disable autoindex for the root directory, and present a
-# default Welcome page if no other index page is present.
-#
-<LocationMatch "^/+$">
-    Options -Indexes
-    ErrorDocument 403 /error/noindex.html
-</LocationMatch>
-
 #
 # UserDir: The name of the directory that is appended onto a user's home
 # directory if a ~user request is received.
@@ -409,7 +385,8 @@ DirectoryIndex index.html index.html.var
 
 #
 # AccessFileName: The name of the file to look for in each directory
-# for access control information.  See also the AllowOverride directive.
+# for additional configuration directives.  See also the AllowOverride
+# directive.
 #
 AccessFileName .htaccess
 
@@ -460,6 +437,25 @@ DefaultType text/plain
 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.0/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.0/mod/core.html#enablesendfile
+#
+#EnableSendfile off
+
+#
 # ErrorLog: The location of the error log file.
 # If you do not specify an ErrorLog directive within a <VirtualHost>
 # container, error messages relating to that virtual host will be
@@ -509,8 +505,9 @@ CustomLog logs/access_log combined
 
 #
 # Optionally add a line containing the server version and virtual host
-# name to server-generated pages (error documents, FTP directory listings,
-# mod_status and mod_info output etc., but not CGI generated documents).
+# 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
 #
@@ -543,13 +540,25 @@ Alias /icons/ "/var/www/icons/"
 # the manual, even if you choose to move your DocumentRoot.  You may comment
 # this out if you do not care for the documentation.
 #
-Alias /manual "/var/www/manual"
+AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "/var/www/manual$1"
 
 <Directory "/var/www/manual">
-    Options Indexes FollowSymLinks MultiViews
+    Options Indexes
     AllowOverride None
     Order allow,deny
     Allow from all
+
+    <Files *.html>
+        SetHandler type-map
+    </Files>
+
+    SetEnvIf Request_URI ^/manual/de/ prefer-language=de
+    SetEnvIf Request_URI ^/manual/en/ prefer-language=en
+    SetEnvIf Request_URI ^/manual/fr/ prefer-language=fr
+    SetEnvIf Request_URI ^/manual/ja/ prefer-language=ja
+    SetEnvIf Request_URI ^/manual/ko/ prefer-language=ko
+    SetEnvIf Request_URI ^/manual/ru/ prefer-language=ru
+    RedirectMatch 301 ^/manual(?:/(de|en|fr|ja|ko|ru)){2,}(/.*)?$ /manual/$1$2
 </Directory>
 
 <IfModule mod_dav_fs.c>
@@ -567,14 +576,6 @@ Alias /manual "/var/www/manual"
 #
 ScriptAlias /cgi-bin/ "/var/www/cgi-bin/"
 
-<IfModule mod_cgid.c>
-#
-# Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path>
-# for setting UNIX socket for communicating with cgid.
-#
-Scriptsock            run/httpd.cgid
-</IfModule>
-
 #
 # "/var/www/cgi-bin" should be changed to whatever your ScriptAliased
 # CGI directory exists, if you have that configured.
@@ -598,10 +599,8 @@ Scriptsock            run/httpd.cgid
 #
 
 #
-# FancyIndexing is whether you want fancy directory indexing or standard.
-# VersionSort is whether files containing version numbers should be 
-# compared in the natural way, so that `apache-1.3.9.tar' is placed before
-# `apache-1.3.12.tar'.
+# IndexOptions: Controls the appearance of server-generated directory
+# listings.
 #
 IndexOptions FancyIndexing VersionSort NameWidth=*
 
@@ -671,15 +670,6 @@ HeaderName HEADER.html
 IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
 
 #
-# AddEncoding allows you to have certain browsers (Mosaic/X 2.1+) 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
-
-#
 # 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.
@@ -709,39 +699,40 @@ AddEncoding x-gzip gz tgz
 # specifier. There is 'work in progress' to fix this and get
 # the reference data for rfc1766 cleaned up.
 #
-# Danish (da) - Dutch (nl) - English (en) - Estonian (et)
-# French (fr) - German (de) - Greek-Modern (el)
-# Italian (it) - Norwegian (no) - Norwegian Nynorsk (nn) - Korean (kr) 
-# Portugese (pt) - Luxembourgeois* (ltz)
-# Spanish (es) - Swedish (sv) - Catalan (ca) - Czech(cz)
-# Polish (pl) - Brazilian Portuguese (pt-br) - Japanese (ja)
-# Russian (ru) - Croatian (hr)
+# 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 nl .nl
+AddLanguage de .de
+AddLanguage el .el
 AddLanguage en .en
+AddLanguage eo .eo
+AddLanguage es .es
 AddLanguage et .et
 AddLanguage fr .fr
-AddLanguage de .de
 AddLanguage he .he
-AddLanguage el .el
+AddLanguage hr .hr
 AddLanguage it .it
 AddLanguage ja .ja
-AddLanguage pl .po
-AddLanguage kr .kr
-AddLanguage pt .pt
+AddLanguage ko .ko
+AddLanguage ltz .ltz
+AddLanguage nl .nl
 AddLanguage nn .nn
 AddLanguage no .no
-AddLanguage pt-br .pt-br
-AddLanguage ltz .ltz
-AddLanguage ca .ca
-AddLanguage es .es
-AddLanguage sv .se
-AddLanguage cz .cz
+AddLanguage pl .po
+AddLanguage pt .pt
+AddLanguage pt-BR .pt-br
 AddLanguage ru .ru
-AddLanguage tw .tw
-AddLanguage zh-tw .tw
-AddLanguage hr .hr
+AddLanguage sv .sv
+AddLanguage zh-CN .zh-cn
+AddLanguage zh-TW .zh-tw
 
 #
 # LanguagePriority allows you to give precedence to some languages
@@ -750,7 +741,7 @@ AddLanguage hr .hr
 # 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 da nl et fr de el it ja kr no pl pt pt-br ltz ca es sv tw
+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
@@ -769,14 +760,14 @@ ForceLanguagePriority Prefer Fallback
 # reasons in browsers, related to javascript and URL parsing
 # which encourage you to always set a default char set.
 #
-AddDefaultCharset ISO-8859-1
+AddDefaultCharset UTF-8
 
 #
 # 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 ftp://ftp.isi.edu/in-notes/iana/assignments/character-sets for
-# the official list of charset names and their respective RFCs
+# 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
@@ -805,7 +796,7 @@ AddCharset UTF-8       .utf8
 # capitalization actually matters (it should not, but it
 # does for some browsers).
 #
-# See ftp://ftp.isi.edu/in-notes/iana/assignments/character-sets
+# See http://www.iana.org/assignments/character-sets
 # for a list of sorts. But browsers support few.
 #
 AddCharset GB2312      .gb2312 .gb 
@@ -821,7 +812,22 @@ AddCharset shift_jis   .sjis
 # AddType allows you to add to or override the MIME configuration
 # file mime.types for specific file types.
 #
-AddType application/x-tar .tgz
+#AddType application/x-tar .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
+
+# If the AddEncoding directives above are commented-out, then you
+# probably should define those extensions to indicate media types:
+#
+AddType application/x-compress .Z
+AddType application/x-gzip .gz .tgz
 
 #
 # AddHandler allows you to map certain file extensions to "handlers":
@@ -850,11 +856,13 @@ AddHandler imap-file map
 #
 AddHandler type-map var
 
+#
 # Filters allow you to process content before it is sent to the client.
 #
 # To parse .shtml files for server-side includes (SSI):
 # (You will also need to add "Includes" to the "Options" directive.)
 #
+AddType text/html .shtml
 AddOutputFilter INCLUDES .shtml
 
 #
@@ -877,14 +885,14 @@ AddOutputFilter INCLUDES .shtml
 #
 
 #
-# Putting this all together, we can Internationalize error responses.
+# Putting this all together, we can internationalize error responses.
 #
 # 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;
+# default HTTP_<error>.html.var files by adding the line:
 #
 #   Alias /error/include/ "/your/include/path/"
 #
@@ -908,23 +916,23 @@ Alias /error/ "/var/www/error/"
         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_SERVICE_UNAVAILABLE.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
+#    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>
 </IfModule>
@@ -944,31 +952,35 @@ BrowserMatch "JDK/1\.0" force-response-1.0
 # 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" redirect-carefully
 
 #
-# Allow server status reports, with the URL of http://servername/server-status
-# Change the ".your-domain.com" to match your domain to enable.
+# Allow server status reports generated by mod_status,
+# with the URL of http://servername/server-status
+# Change the ".example.com" to match your domain to enable.
 #
 #<Location /server-status>
 #    SetHandler server-status
 #    Order deny,allow
 #    Deny from all
-#    Allow from .your-domain.com
+#    Allow from .example.com
 #</Location>
 
 #
 # Allow remote server configuration reports, with the URL of
 #  http://servername/server-info (requires that mod_info.c be loaded).
-# Change the ".your-domain.com" to match your domain to enable.
+# Change the ".example.com" to match your domain to enable.
 #
 #<Location /server-info>
 #    SetHandler server-info
 #    Order deny,allow
 #    Deny from all
-#    Allow from .your-domain.com
+#    Allow from .example.com
 #</Location>
 
 #
@@ -981,7 +993,7 @@ BrowserMatch "^WebDrive" redirect-carefully
 #<Proxy *>
 #    Order deny,allow
 #    Deny from all
-#    Allow from .your-domain.com
+#    Allow from .example.com
 #</Proxy>
 
 #
@@ -992,16 +1004,14 @@ BrowserMatch "^WebDrive" redirect-carefully
 #ProxyVia On
 
 #
-# To enable the cache as well, edit and uncomment the following lines:
-# (no cacheing without CacheRoot)
+# To enable a cache of proxied content, uncomment the following lines.
+# See http://httpd.apache.org/docs-2.0/mod/mod_cache.html for more details.
+#
+#<IfModule mod_disk_cache.c>
+#   CacheEnable disk /
+#   CacheRoot "/var/cache/mod_proxy"
+#</IfModule>
 #
-#CacheRoot "/etc/httpd/proxy"
-#CacheSize 5
-#CacheGcInterval 4
-#CacheMaxExpire 24
-#CacheLastModifiedFactor 0.1
-#CacheDefaultExpire 1
-#NoCache a-domain.com another-domain.edu joes.garage-sale.com
 
 #</IfModule>
 # End of proxy directives.
@@ -1023,7 +1033,7 @@ BrowserMatch "^WebDrive" redirect-carefully
 #
 # Use name-based virtual hosting.
 #
-#NameVirtualHost *
+#NameVirtualHost *:80
 
 #
 # VirtualHost example:
@@ -1031,7 +1041,7 @@ BrowserMatch "^WebDrive" redirect-carefully
 # The first VirtualHost section is used for requests without a known
 # server name.
 #
-#<VirtualHost *>
+#<VirtualHost *:80>
 #    ServerAdmin webmaster@dummy-host.example.com
 #    DocumentRoot /www/docs/dummy-host.example.com
 #    ServerName dummy-host.example.com