Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #1785 If only connector in vhost and not connector in request then fail to match 

Signed-off-by: Steve Bolton <steve@boltn.com>
This commit is contained in:
Steve Bolton 2018-04-07 17:22:37 -04:00
parent c79b0f4e2a
commit 6abf026440
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
View File

@ -980,9 +980,19 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
int connectorPos = contextVhost.indexOf('@') + 1;
if (connectorPos > 0)
{
// If there is no connector name and we have a match for connector only
// we fail to match. If we have connector and host we can continue
// to check for other host only matches.
if (connectorName == null || connectorName.length() == 0 )
{
if (connectorPos > 1)
continue;
else
return false;
}
// If connector specifier in vhost entry and no match then continue to next entry
// no need to check host
if (connectorName == null || !contextVhost.regionMatches(true,connectorPos,connectorName,0,connectorName.length()))
if (!contextVhost.regionMatches(true,connectorPos,connectorName,0,connectorName.length()))
continue;
// If we matched connector and no host portion was specified we match
if (connectorPos == 1)