httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sl...@apache.org
Subject cvs commit: httpd-2.0/docs/conf httpd-nw.conf httpd-std.conf httpd-win.conf
Date Wed, 13 Feb 2002 19:58:21 GMT
slive       02/02/13 11:58:21

  Modified:    docs/conf httpd-nw.conf httpd-std.conf httpd-win.conf
  Log:
  Change httpd.conf default UseCanonicalName to off to make the server
  more idiot proof.
  
  Also, move UseCanonicalName to directly under ServerName to make the
  connection clearer, and clean up the comments.
  
  I removed the http://123.123.123.231/ example, because it just makes it
  too tempting for people to use
  ServerName http://123.23.23.23/
  
  Revision  Changes    Path
  1.15      +19 -24    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.14
  retrieving revision 1.15
  diff -u -d -b -u -r1.14 -r1.15
  --- httpd-nw.conf	25 Jan 2002 00:24:47 -0000	1.14
  +++ httpd-nw.conf	13 Feb 2002 19:58:21 -0000	1.15
  @@ -178,22 +178,27 @@
   ServerAdmin @@ServerAdmin@@
   
   #
  -# ServerName allows you to set a host name which is sent back to clients for
  -# your server if it's different than the one the program would get (i.e., use
  -# "www" instead of the host's real name).
  +# ServerName gives the name and port that the server uses to identify itself.
  +# This can often be determined automatically, but we recommend you specify
  +# it explicitly to prevent problems during startup.
   #
  -# 127.0.0.1 is the TCP/IP local loop-back address. Your machine
  -# always knows itself by this address. If you machine is connected to
  -# a network, you should change this to be your machine's name
  +# If this is not set to valid DNS name for your host, server-generated
  +# redirections will not work.  See also the UseCanonicalName directive.
   #
  -# Note: You cannot just invent host names and hope they work. The name you 
  -# define here must be a valid DNS name for your host. If you don't understand
  -# this, ask your network administrator.
   # If your host doesn't have a registered DNS name, enter its IP address here.
  -# You will have to access it by its address (e.g., http://123.45.67.89/)
  -# anyway, and this will make redirections work in a sensible way.
  +# You will have to access it by its address anyway, and this will make 
  +# redirections work in a sensible way.
   #
  -ServerName @@ServerName@@
  +#ServerName new.host.name:80
  +
  +#
  +# UseCanonicalName: Determines how Apache constructs self-referencing 
  +# URLs and the SERVER_NAME and SERVER_PORT variables.
  +# When set "Off", Apache will use the Hostname and Port supplied
  +# by the client.  When set "On", Apache will use the value of the
  +# ServerName directive.
  +#
  +UseCanonicalName Off
   
   #
   # DocumentRoot: The directory out of which you will serve your
  @@ -313,16 +318,6 @@
       Order allow,deny
       Deny from all
   </Files>
  -
  -#
  -# 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 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
   
   #
   # TypesConfig describes where the mime.types file (or equivalent) is
  
  
  
  1.80      +11 -12    httpd-2.0/docs/conf/httpd-std.conf
  
  Index: httpd-std.conf
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-std.conf,v
  retrieving revision 1.79
  retrieving revision 1.80
  diff -u -d -b -u -r1.79 -r1.80
  --- httpd-std.conf	25 Jan 2002 00:24:47 -0000	1.79
  +++ httpd-std.conf	13 Feb 2002 19:58:21 -0000	1.80
  @@ -269,12 +269,21 @@
   # redirections will not work.  See also the UseCanonicalName directive.
   #
   # If your host doesn't have a registered DNS name, enter its IP address here.
  -# You will have to access it by its address (e.g., http://123.45.67.89/)
  -# anyway, and this will make redirections work in a sensible way.
  +# You will have to access it by its address anyway, and this will make 
  +# redirections work in a sensible way.
   #
   #ServerName new.host.name:80
   
   #
  +# UseCanonicalName: Determines how Apache constructs self-referencing 
  +# URLs and the SERVER_NAME and SERVER_PORT variables.
  +# When set "Off", Apache will use the Hostname and Port supplied
  +# by the client.  When set "On", Apache will use the value of the
  +# ServerName directive.
  +#
  +UseCanonicalName Off
  +
  +#
   # DocumentRoot: The directory out of which you will serve your
   # documents. By default, all requests are taken from this directory, but
   # symbolic links and aliases may be used to point to other locations.
  @@ -382,16 +391,6 @@
       Order allow,deny
       Deny from all
   </Files>
  -
  -#
  -# 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 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
   
   #
   # TypesConfig describes where the mime.types file (or equivalent) is
  
  
  
  1.58      +11 -12    httpd-2.0/docs/conf/httpd-win.conf
  
  Index: httpd-win.conf
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-win.conf,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -d -b -u -r1.57 -r1.58
  --- httpd-win.conf	25 Jan 2002 00:24:47 -0000	1.57
  +++ httpd-win.conf	13 Feb 2002 19:58:21 -0000	1.58
  @@ -204,12 +204,21 @@
   # redirections will not work.  See also the UseCanonicalName directive.
   #
   # If your host doesn't have a registered DNS name, enter its IP address here.
  -# You will have to access it by its address (e.g., http://123.45.67.89/)
  -# anyway, and this will make redirections work in a sensible way.
  +# You will have to access it by its address anyway, and this will make 
  +# redirections work in a sensible way.
   #
   ServerName @@ServerName@@:@@Port@@
   
   #
  +# UseCanonicalName: Determines how Apache constructs self-referencing 
  +# URLs and the SERVER_NAME and SERVER_PORT variables.
  +# When set "Off", Apache will use the Hostname and Port supplied
  +# by the client.  When set "On", Apache will use the value of the
  +# ServerName directive.
  +#
  +UseCanonicalName Off
  +
  +#
   # DocumentRoot: The directory out of which you will serve your
   # documents. By default, all requests are taken from this directory, but
   # symbolic links and aliases may be used to point to other locations.
  @@ -322,16 +331,6 @@
       Order allow,deny
       Deny from all
   </Files>
  -
  -#
  -# 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 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
   
   #
   # TypesConfig describes where the mime.types file (or equivalent) is
  
  
  

Mime
View raw message