From: Rich Bowen Date: Tue, 6 Apr 2010 12:57:41 +0000 (+0000) Subject: Remove a TODO item: Turns out mod_vhost_alias does not set DocumentRoot X-Git-Tag: 2.3.6~255 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=256136aaf87e7a14f43d588e3dcb0991ab31259a;p=thirdparty%2Fapache%2Fhttpd.git Remove a TODO item: Turns out mod_vhost_alias does not set DocumentRoot per request. Also several of the 'Apache' -> 'Apache HTTP Server' conversions. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@931133 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/vhosts/mass.html.en b/docs/manual/vhosts/mass.html.en index 16bbe94dc25..1687a211d5f 100644 --- a/docs/manual/vhosts/mass.html.en +++ b/docs/manual/vhosts/mass.html.en @@ -26,7 +26,7 @@

This document describes how to efficiently serve an - arbitrary number of virtual hosts with the Apache httpd webserver. A + arbitrary number of virtual hosts with the Apache HTTP Server. A separate document discusses using mod_rewrite to create dynamic mass virtual hosts.

@@ -108,17 +108,17 @@ NameVirtualHost 111.22.33.44 used here is based on automatically inserting this information into the pathname of the file that is used to satisfy the request. This can be most easily done by using mod_vhost_alias - with Apache 2.0. Alternatively, + with Apache httpd. Alternatively, mod_rewrite can be used.

Both of these modules are disabled by default; you must enable - one of them when configuring and building Apache if you want to + one of them when configuring and building Apache httpd if you want to use this technique.

A couple of things need to be determined from the request in order to make the dynamic virtual host look like a normal one. The most important is the - server name, which is used by Apache to generate + server name, which is used by the server to generate self-referential URLs etc. It is configured with the ServerName directive, and it is available to CGIs via the SERVER_NAME environment variable. The @@ -128,7 +128,7 @@ NameVirtualHost 111.22.33.44 request. With UseCanonicalName DNS, it is taken from a reverse DNS lookup of the virtual host's IP address. The former setting is used for name-based dynamic virtual hosting, and the - latter is used for IP-based hosting. If Apache cannot work out + latter is used for IP-based hosting. If httpd cannot work out the server name because there is no Host: header, or the DNS lookup fails, then the value configured with ServerName is used instead.

@@ -146,8 +146,6 @@ NameVirtualHost 111.22.33.44 if any CGIs or SSI documents make use of it, they will get a misleading value.

- -
top

Dynamic Virtual Hosts with @@ -211,7 +209,7 @@ ScriptAlias /cgi-bin/ /www/std-cgi/

Using Multiple Virtual Hosting Systems on the Same Server

-

With more complicated setups, you can use Apache's normal +

With more complicated setups, you can use httpd's normal <VirtualHost> directives to control the scope of the various virtual hosting configurations. For example, you could have one IP address for general customers' homepages, diff --git a/docs/manual/vhosts/mass.xml b/docs/manual/vhosts/mass.xml index 85767f164c3..41984cfa23b 100644 --- a/docs/manual/vhosts/mass.xml +++ b/docs/manual/vhosts/mass.xml @@ -27,7 +27,7 @@

This document describes how to efficiently serve an - arbitrary number of virtual hosts with the Apache httpd webserver. A + arbitrary number of virtual hosts with the Apache HTTP Server. A separate document discusses using mod_rewrite to create dynamic mass virtual hosts.

@@ -101,17 +101,17 @@ NameVirtualHost 111.22.33.44 used here is based on automatically inserting this information into the pathname of the file that is used to satisfy the request. This can be most easily done by using mod_vhost_alias - with Apache 2.0. Alternatively, + with Apache httpd. Alternatively, mod_rewrite can be used.

Both of these modules are disabled by default; you must enable - one of them when configuring and building Apache if you want to + one of them when configuring and building Apache httpd if you want to use this technique.

A couple of things need to be determined from the request in order to make the dynamic virtual host look like a normal one. The most important is the - server name, which is used by Apache to generate + server name, which is used by the server to generate self-referential URLs etc. It is configured with the ServerName directive, and it is available to CGIs via the SERVER_NAME environment variable. The @@ -122,7 +122,7 @@ NameVirtualHost 111.22.33.44 request. With UseCanonicalName DNS, it is taken from a reverse DNS lookup of the virtual host's IP address. The former setting is used for name-based dynamic virtual hosting, and the - latter is used for IP-based hosting. If Apache cannot work out + latter is used for IP-based hosting. If httpd cannot work out the server name because there is no Host: header, or the DNS lookup fails, then the value configured with ServerName is used instead.

@@ -140,9 +140,6 @@ NameVirtualHost 111.22.33.44 if any CGIs or SSI documents make use of it, they will get a misleading value.

- -
Dynamic Virtual Hosts with @@ -207,7 +204,7 @@ ScriptAlias /cgi-bin/ /www/std-cgi/<br /> <section id="combinations"><title>Using Multiple Virtual Hosting Systems on the Same Server -

With more complicated setups, you can use Apache's normal +

With more complicated setups, you can use httpd's normal <VirtualHost> directives to control the scope of the various virtual hosting configurations. For example, you could have one IP address for general customers' homepages,