Apache 1.3.23+mod_ssl-2.8.6-1.3.23 merge

1 files changed, 56 insertions, 27 deletions

diff --git a/usr.sbin/httpd/conf/httpd.conf-dist b/usr.sbin/httpd/conf/httpd.conf-dist
index c30e1511260..394017afaf9 100644
--- a/usr.sbin/httpd/conf/httpd.conf-dist
+++ b/usr.sbin/httpd/conf/httpd.conf-dist
@@ -188,7 +188,7 @@ MaxRequestsPerChild 0
 # To be able to use the functionality of a module which was built as a DSO you
 # have to place corresponding `LoadModule' lines at this location so the
 # directives contained in it are actually available _before_ they are used.
-# Please read the file README.DSO in the Apache 1.3 distribution for more
+# Please read the file http://httpd.apache.org/docs/dso.html for more
 # details about the DSO mechanism and run `httpd -l' for the list of already
 # built-in (statically linked and thus always available) modules in your httpd
 # binary.
@@ -252,10 +252,10 @@ Listen 443
 #    suggested workaround is to create a user www and use that user.
 #  NOTE that some kernels refuse to setgid(Group) or semctl(IPC_SET)
 #  when the value of (unsigned)Group is above 60000; 
-#  don't use Group #-1 on these systems!
+#  don't use Group "#-1" on these systems!
 #
 User nobody
-Group #-1
+Group "#-1"
 
 #
 # ServerAdmin: Your address, where problems with the server should be
@@ -390,6 +390,7 @@ AccessFileName .htaccess
 <Files ~ "^\.ht">
     Order allow,deny
     Deny from all
+    Satisfy All
 </Files>
 
 #
@@ -510,6 +511,29 @@ CustomLog logs/access_log common
 #
 ServerSignature On
 
+# EBCDIC configuration:
+# (only for mainframes using the EBCDIC codeset, currently one of:
+# Fujitsu-Siemens' BS2000/OSD, IBM's OS/390 and IBM's TPF)!!
+# The following default configuration assumes that "text files"
+# are stored in EBCDIC (so that you can operate on them using the
+# normal POSIX tools like grep and sort) while "binary files" are
+# stored with identical octets as on an ASCII machine.
+#
+# The directives are evaluated in configuration file order, with
+# the EBCDICConvert directives applied before EBCDICConvertByType.
+#
+# If you want to have ASCII HTML documents and EBCDIC HTML documents
+# at the same time, you can use the file extension to force
+# conversion off for the ASCII documents:
+# > AddType       text/html .ahtml
+# > EBCDICConvert Off=InOut .ahtml
+#
+# EBCDICConvertByType  On=InOut text/* message/* multipart/*
+# EBCDICConvertByType  On=In    application/x-www-form-urlencoded
+# EBCDICConvertByType  On=InOut application/postscript model/vrml
+# EBCDICConvertByType Off=InOut */*
+
+
 #
 # Aliases: Add here as many aliases as you need (with no limit). The format is 
 # Alias fakename realname
@@ -519,7 +543,9 @@ ServerSignature On
     #
     # 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/"..
+    # 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.
     #
     Alias /icons/ "@@ServerRoot@@/icons/"
 
@@ -530,6 +556,19 @@ ServerSignature On
         Allow from all
     </Directory>
 
+    # This Alias will project the on-line documentation tree under /manual/
+    # even if you change the DocumentRoot. Comment it if you don't want to 
+    # provide access to the on-line documentation.
+    #
+    Alias /manual/ "@@ServerRoot@@/htdocs/manual/"
+
+    <Directory "@@ServerRoot@@/htdocs/manual">
+        Options Indexes FollowSymlinks MultiViews
+        AllowOverride None
+        Order allow,deny
+        Allow from all
+    </Directory>
+
     #
     # ScriptAlias: This controls which directories contain server scripts.
     # ScriptAliases are essentially the same as Aliases, except that
@@ -680,7 +719,7 @@ ServerSignature On
     #
     # Danish (da) - Dutch (nl) - English (en) - Estonian (ee)
     # French (fr) - German (de) - Greek-Modern (el)
-    # Italian (it) - Korean (kr) - Norwegian (no)
+    # Italian (it) - Korean (kr) - Norwegian (no) - Norwegian Nynorsk (nn)
     # Portugese (pt) - Luxembourgeois* (ltz)
     # Spanish (es) - Swedish (sv) - Catalan (ca) - Czech(cz)
     # Polish (pl) - Brazilian Portuguese (pt-br) - Japanese (ja)
@@ -700,6 +739,7 @@ ServerSignature On
     AddCharset ISO-2022-JP .jis
     AddLanguage kr .kr
     AddCharset ISO-2022-KR .iso-kr
+    AddLanguage nn .nn
     AddLanguage no .no
     AddLanguage pl .po
     AddCharset ISO-8859-2 .iso-pl
@@ -736,17 +776,6 @@ ServerSignature On
     # AddType allows you to tweak mime.types without actually editing it, or to
     # make certain files to be certain types.
     #
-    # For example, the PHP 3.x module (not part of the Apache distribution - see
-    # http://www.php.net) will typically use:
-    #
-    #AddType application/x-httpd-php3 .php3
-    #AddType application/x-httpd-php3-source .phps
-    #
-    # And for PHP 4.x, use:
-    #
-    #AddType application/x-httpd-php .php
-    #AddType application/x-httpd-php-source .phps
-
     AddType application/x-tar .tgz
 
     #
@@ -822,7 +851,7 @@ ServerSignature On
 #  N.B.: You can redirect to a script or a document using server-side-includes.
 #
 #    3) external redirects
-#ErrorDocument 402 http://some.other_server.com/subscription_info.html
+#ErrorDocument 402 http://some.other-server.com/subscription_info.html
 #  N.B.: Many of the environment variables associated with the original
 #  request will *not* be available to such a script.
 
@@ -856,25 +885,25 @@ ServerSignature On
 
 #
 # Allow server status reports, with the URL of http://servername/server-status
-# Change the ".your_domain.com" to match your domain to enable.
+# Change the ".your-domain.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 .your-domain.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 ".your-domain.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 .your-domain.com
 #</Location>
 
 #
@@ -899,7 +928,7 @@ ServerSignature On
 #    <Directory proxy:*>
 #        Order deny,allow
 #        Deny from all
-#        Allow from .your_domain.com
+#        Allow from .your-domain.com
 #    </Directory>
 
     #
@@ -919,7 +948,7 @@ ServerSignature On
 #    CacheMaxExpire 24
 #    CacheLastModifiedFactor 0.1
 #    CacheDefaultExpire 1
-#    NoCache a_domain.com another_domain.edu joes.garage_sale.com
+#    NoCache a-domain.com another-domain.edu joes.garage-sale.com
 
 #</IfModule>
 # End of proxy directives.
@@ -982,12 +1011,12 @@ AddType application/x-pkcs7-crl    .crl
 #   terminal dialog) has to provide the pass phrase on stdout.
 SSLPassPhraseDialog  builtin
 
+#   Configure the SSL Session Cache: First the mechanism 
+#   to use and second the expiring timeout (in seconds).
 #   Inter-Process Session Cache:
-#   Configure the SSL Session Cache: First either `none'
-#   or `dbm:/path/to/file' for the mechanism to use and
-#   second the expiring timeout (in seconds).
 #SSLSessionCache        none
-#SSLSessionCache        shm:logs/ssl_scache(512000)
+#SSLSessionCache        shmht:logs/ssl_scache(512000)
+#SSLSessionCache        shmcb:logs/ssl_scache(512000)
 SSLSessionCache         dbm:logs/ssl_scache
 SSLSessionCacheTimeout  300