]> granicus.if.org Git - apache/commit
projects / apache / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 519b3d3) | patch
Merge r1301398, r1301399 from trunk:
authorEric Covener <covener@apache.org>
Fri, 16 Mar 2012 09:47:02 +0000 (09:47 +0000)
committerEric Covener <covener@apache.org>
Fri, 16 Mar 2012 09:47:02 +0000 (09:47 +0000)
commit19358c20eddeed3f3a90a80b002aa273049b562c
treea78bf3b3823036d97fa275fb61653ecd574b12d1tree | snapshot
parent519b3d3cae2f1dad7f2ce56cc52b9bf8313bc9eecommit | diff
Merge r1301398, r1301399 from trunk:

fix a misleading example that implies ServerName has precedence over a ServerAlias.

We stop when a vhost matches for any reason (not 2.4 specific).  Mention this explicitly.

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1301400 13f79535-47bb-0310-9956-ffa450edef68
docs/manual/mod/core.html.en diff | blob | history
docs/manual/mod/core.xml diff | blob | history
docs/manual/vhosts/name-based.html.en diff | blob | history
docs/manual/vhosts/name-based.xml diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.