You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bn...@apache.org on 2001/10/18 00:48:14 UTC

cvs commit: httpd-2.0/docs/conf httpd-nw.conf

bnicholes    01/10/17 15:48:14

  Modified:    docs/conf httpd-nw.conf
  Log:
  Brought the conf file up to date with the latest source
  
  Revision  Changes    Path
  1.5       +38 -86    httpd-2.0/docs/conf/httpd-nw.conf
  
  Index: httpd-nw.conf
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-nw.conf,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- httpd-nw.conf	2001/10/17 15:37:19	1.4
  +++ httpd-nw.conf	2001/10/17 22:48:14	1.5
  @@ -107,8 +107,11 @@
   # ports, in addition to the default. See also the <VirtualHost>
   # directive.
   #
  -#Listen 3000
  +# Change this to Listen on specific IP addresses as shown below to 
  +# prevent Apache from glomming onto all bound IP addresses (0.0.0.0)
  +#
   #Listen 12.34.56.78:80
  +Listen @@Port@@
   
   #
   # Dynamic Shared Object (DSO) Support
  @@ -119,23 +122,28 @@
   # Statically compiled modules (those listed by `httpd -l') do not need
   # to be loaded here.
   #
  -#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 auth_ldap_module modules/mod_auth_ldap.so
  -#LoadModule cern_meta_module modules/mod_cern_meta.so
  -#LoadModule dav_module modules/mod_dav.so
  -#LoadModule dav_fs_module modules/mod_dav_fs.so
  -#LoadModule expires_module modules/mod_expires.so
  -#LoadModule file_cache_module modules/mod_file_cache.so
  -#LoadModule headers_module modules/mod_headers.so
  -#LoadModule info_module modules/mod_info.so
  -#LoadModule ldap_module modules/mod_ldap.so
  -#LoadModule proxy_module modules/mod_proxy.so
  -#LoadModule rewrite_module modules/mod_rewrite.so
  -#LoadModule speling_module modules/mod_speling.so
  -#LoadModule status_module modules/mod_status.so
  -#LoadModule usertrack_module modules/mod_usertrack.so
  +#LoadModule auth_anon_module modules/mod_auth_anon.nlm
  +#LoadModule auth_dbm_module modules/mod_auth_dbm.nlm
  +#LoadModule auth_digest_module modules/mod_auth_digest.nlm
  +#LoadModule cern_meta_module modules/mod_cern_meta.nlm
  +#LoadModule dav_module modules/mod_dav.nlm
  +#LoadModule dav_fs_module modules/mod_dav_fs.nlm
  +#LoadModule expires_module modules/mod_expires.nlm
  +#LoadModule file_cache_module modules/mod_file_cache.nlm
  +#LoadModule headers_module modules/mod_headers.nlm
  +#LoadModule info_module modules/mod_info.nlm
  +#LoadModule mime_magic_module modules/mod_mime_magic.nlm
  +#LoadModule proxy_module modules/mod_proxy.nlm
  +#LoadModule proxy_connect_module modules/proxy_connect.nlm
  +#LoadModule proxy_http_module modules/proxy_http.nlm
  +#LoadModule proxy_ftp_module modules/proxy_ftp.nlm
  +#LoadModule rewrite_module modules/mod_rewrite.nlm
  +#LoadModule speling_module modules/mod_speling.nlm
  +#LoadModule ssl_module modules/mod_ssl.nlm
  +#LoadModule status_module modules/mod_status.nlm
  +#LoadModule unique_id_module modules/mod_unique_id.nlm
  +#LoadModule usertrack_module modules/mod_usertrack.nlm
  +#LoadModule vhost_alias_module modules/mod_vhost_alias.nlm
   
   #
   # ExtendedStatus controls whether Apache will generate "full" status
  @@ -157,11 +165,6 @@
   #
   
   #
  -# Port: The port to which the standalone server listens.
  -#
  -Port 80
  -
  -#
   # ServerAdmin: Your address, where problems with the server should be
   # e-mailed.  This address appears on some server-generated pages, such
   # as error documents.  e.g. admin@your-domain.com
  @@ -303,9 +306,9 @@
   #
   # UseCanonicalName:  With this setting turned on, whenever Apache needs 
   # to construct a self-referencing URL (a URL that refers back to the 
  -# server the response is coming from) it will use ServerName and Port 
  -# to form a "canonical" name.  With this setting off, Apache will use 
  -# the hostname:port that the client supplied, when possible.  This also 
  +# server the response is coming from) it will use ServerName to form
  +# a "canonical" name.  With this setting off, Apache will use the 
  +# hostname:port that the client supplied, when possible.  This also 
   # affects SERVER_NAME and SERVER_PORT in CGI scripts.
   #
   UseCanonicalName On
  @@ -584,7 +587,7 @@
   #
   # Danish (da) - Dutch (nl) - English (en) - Estonian (et)
   # French (fr) - German (de) - Greek-Modern (el)
  -# Italian (it) - Norwegian (no) - Korean (kr)
  +# 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)
  @@ -602,6 +605,7 @@
   AddLanguage pl .po
   AddLanguage kr .kr
   AddLanguage pt .pt
  +AddLanguage nn .nn
   AddLanguage no .no
   AddLanguage pt-br .pt-br
   AddLanguage ltz .ltz
  @@ -853,68 +857,16 @@
   #    Allow from .@@DomainName@@
   #</Location>
   
  -#
  -# Enable the LDAP connection pool and shared memory cache. Enable the
  -# LDAP cache status handler. Requires that mod_ldap be loaded. Change
  -# the ".your_domain.com" to match your domain to enable.
  -#
  -#<IfModule util_ldap.c>
  -#
  -#    LDAPSharedCacheSize 200000
  -#    LDAPCacheEntries 1024
  -#    LDAPCacheTTL 600
  -#    LDAPOpCacheEntries 1024
  -#    LDAPOpCacheTTL 600
  -#
  -#    <Location /ldap-status>
  -#        SetHandler ldap-status
  -#        Order deny,allow
  -#        Deny from all
  -#        Allow from .your_domain.com
  -#        <IfModule mod_auth_ldap.c>
  -#            AuthLDAPEnabled on
  -#            AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one
  -#            AuthLDAPAuthoritative on
  -#            require valid-user
  -#        </IfModule>
  -#    </Location>
  -#
  -#</IfModule>
  -
  -#
  -# Proxy Server directives. Uncomment the following lines to
  -# enable the proxy server:
   #
  -#<IfModule mod_proxy.c>
  -#ProxyRequests On
  +# Bring in additional module-specific configurations
   #
  -#<Proxy *>
  -#    Order deny,allow
  -#    Deny from all
  -#    Allow from .your_domain.com
  -#</Proxy>
  -
  -#
  -# Enable/disable the handling of HTTP/1.1 "Via:" headers.
  -# ("Full" adds the server version; "Block" removes all outgoing Via: headers)
  -# Set to one of: Off | On | Full | Block
  -#
  -#ProxyVia On
  -
  -#
  -# To enable the cache as well, edit and uncomment the following lines:
  -# (no cacheing without CacheRoot)
  -#
  -#CacheRoot "@@ServerRoot@@/proxy"
  -#CacheSize 5
  -#CacheGcInterval 4
  -#CacheMaxExpire 24
  -#CacheLastModifiedFactor 0.1
  -#CacheDefaultExpire 1
  -#NoCache a_domain.com another_domain.edu joes.garage_sale.com
  +<IfModule mod_ssl.c>
  +    Include conf/ssl.conf
  +</IfModule>
   
  -#</IfModule>
  -# End of proxy directives.
  +<IfModule mod_proxy.c>
  +    Include conf/proxy.conf
  +</IfModule>
   
   ### Section 3: Virtual Hosts
   #