Commit ddee98c5 authored by Eric Covener's avatar Eric Covener
Browse files

merge 1344666 from trunk manually, restore NVH resolutin detail 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1344672 13f79535-47bb-0310-9956-ffa450edef68
parent 38aec059

docs/manual/vhosts/details.html.en

+4 −0
Original line number Diff line number Diff line
@@ -279,6 +279,10 @@ 
    matches against the real port to which the client sent the

    request.</p>



    <p>The complete list of names in the <code>VirtualHost</code>

    directive are treated just like a (non wildcard) <code>ServerAlias</code>

    (but are not overridden by any <code>ServerAlias</code> statement).</p>



    <p>If the client submitted a HTTP/1.0 request without

    <code>Host:</code> header field we don't know to what server

    the client tried to connect and any existing

docs/manual/vhosts/details.xml

+4 −0
Original line number Diff line number Diff line
@@ -272,6 +272,10 @@ 
    matches against the real port to which the client sent the

    request.</p>



    <p>The complete list of names in the <code>VirtualHost</code>

    directive are treated just like a (non wildcard) <code>ServerAlias</code>

    (but are not overridden by any <code>ServerAlias</code> statement).</p>



    <p>If the client submitted a HTTP/1.0 request without

    <code>Host:</code> header field we don't know to what server

    the client tried to connect and any existing