httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From f...@locus.apache.org
Subject cvs commit: apache-2.0/conf httpd.conf-dist httpd.conf-dist-win
Date Wed, 13 Sep 2000 18:19:23 GMT
fanf        00/09/13 11:19:20

  Modified:    conf     httpd.conf-dist httpd.conf-dist-win
  Log:
  Encourage people to use the simpler NameVirtualHost * syntax for new
  setups and use a syntactically valid hostname in the example.
  
  Revision  Changes    Path
  1.16      +15 -14    apache-2.0/conf/httpd.conf-dist
  
  Index: httpd.conf-dist
  ===================================================================
  RCS file: /home/cvs/apache-2.0/conf/httpd.conf-dist,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -u -r1.15 -r1.16
  --- httpd.conf-dist	2000/08/28 14:39:03	1.15
  +++ httpd.conf-dist	2000/09/13 18:19:16	1.16
  @@ -909,30 +909,31 @@
   ### Section 3: Virtual Hosts
   #
   # VirtualHost: If you want to maintain multiple domains/hostnames on your
  -# machine you can setup VirtualHost containers for them.
  +# 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://www.apache.org/docs/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.
   
   #
  -# If you want to use name-based virtual hosts you need to define at
  -# least one IP address (and port number) for them.
  +# Use name-based virtual hosting.
   #
  -#NameVirtualHost 12.34.56.78:80
  -#NameVirtualHost 12.34.56.78
  +#NameVirtualHost *
   
   #
   # 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.
   #
  -#<VirtualHost ip.address.of.host.some_domain.com>
  -#    ServerAdmin webmaster@host.some_domain.com
  -#    DocumentRoot /www/docs/host.some_domain.com
  -#    ServerName host.some_domain.com
  -#    ErrorLog logs/host.some_domain.com-error_log
  -#    CustomLog logs/host.some_domain.com-access_log common
  -#</VirtualHost>
  -
  -#<VirtualHost _default_:*>
  +#<VirtualHost *>
  +#    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>
  
  
  
  1.12      +15 -14    apache-2.0/conf/httpd.conf-dist-win
  
  Index: httpd.conf-dist-win
  ===================================================================
  RCS file: /home/cvs/apache-2.0/conf/httpd.conf-dist-win,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -u -r1.11 -r1.12
  --- httpd.conf-dist-win	2000/08/28 14:39:05	1.11
  +++ httpd.conf-dist-win	2000/09/13 18:19:17	1.12
  @@ -824,30 +824,31 @@
   ### Section 3: Virtual Hosts
   #
   # VirtualHost: If you want to maintain multiple domains/hostnames on your
  -# machine you can setup VirtualHost containers for them.
  +# 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://www.apache.org/docs/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.
   
   #
  -# If you want to use name-based virtual hosts you need to define at
  -# least one IP address (and port number) for them.
  +# Use name-based virtual hosting.
   #
  -#NameVirtualHost 12.34.56.78:80
  -#NameVirtualHost 12.34.56.78
  +#NameVirtualHost *
   
   #
   # 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.
   #
  -#<VirtualHost ip.address.of.host.some_domain.com>
  -#    ServerAdmin webmaster@host.some_domain.com
  -#    DocumentRoot /www/docs/host.some_domain.com
  -#    ServerName host.some_domain.com
  -#    ErrorLog logs/host.some_domain.com-error_log
  -#    CustomLog logs/host.some_domain.com-access_log common
  -#</VirtualHost>
  -
  -#<VirtualHost _default_:*>
  +#<VirtualHost *>
  +#    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>
  
  
  

Mime
View raw message