From 69c1a5c854b89a80cf5ca08b7b38d9f0a88c2667 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Fri, 23 Sep 2011 13:36:39 +0000 Subject: Cleanup effort in prep for GA push: Trim trailing whitespace... no func change git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174747 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/vhosts/details.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'docs/manual/vhosts/details.xml') diff --git a/docs/manual/vhosts/details.xml b/docs/manual/vhosts/details.xml index 4036af603b..c84f4aba31 100644 --- a/docs/manual/vhosts/details.xml +++ b/docs/manual/vhosts/details.xml @@ -69,7 +69,7 @@

The address can be specified as *, which will match a request if no other vhost has the explicit address on which the request was - received.

+ received.

The address appearing in the VirtualHost directive can have an optional port. If the port is unspecified, @@ -83,9 +83,9 @@ Use the Listen directive to control the addresses and ports on which the server listens.)

- +

Collectively the - entire set of addresses (including multiple + entire set of addresses (including multiple results from DNS lookups) are called the vhost's address set.

@@ -94,7 +94,7 @@ whenever the most specific match for an IP address and port combination is listed in multiple virtual hosts.

-

The +

The ServerName directive may appear anywhere within the definition of a server. However, each appearance overrides the previous appearance (within that @@ -195,7 +195,7 @@

If there are multiple VirtualHost directives listing the IP address and port combination that was determined to be the - best match, the "list" in the remaining steps refers to the list of vhosts + best match, the "list" in the remaining steps refers to the list of vhosts that matched, in the order they were in the configuration file.

If the connection is using SSL, the server supports

  • If two vhosts have an address in common, those common addresses - act as name-based virtual hosts implicitly. This is new behavior as of + act as name-based virtual hosts implicitly. This is new behavior as of 2.3.11.
  • The main server is only used to serve a request if the IP - address and port number to which the client connected + address and port number to which the client connected does not match any vhost (including a * vhost). In other words, the main server only catches a request for an unspecified address/port -- cgit v1.2.3