Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorGreg Wilkins2013-08-23 07:17:34 +0000
committerGreg Wilkins2013-08-23 07:17:34 +0000
commitd2ff4758345035299a3c39fa49aa99a4c0315e78 (patch)
tree8f99cf9e951d50a69d50cf8c623dced476490f8a /tests
parentc4583918a3febd3df66632545fce9fb0849be65d (diff)
parentb33b5f2f5d1d7d69b8fb3c3b0ef85c9fd94036a8 (diff)
downloadorg.eclipse.jetty.project-d2ff4758345035299a3c39fa49aa99a4c0315e78.tar.gz
org.eclipse.jetty.project-d2ff4758345035299a3c39fa49aa99a4c0315e78.tar.xz
org.eclipse.jetty.project-d2ff4758345035299a3c39fa49aa99a4c0315e78.zip
Merge remote-tracking branch 'origin/jetty-8'
Conflicts: jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java tests/test-webapps/test-jetty-webapp/src/main/config/webapps.demo/test.xml
Diffstat (limited to 'tests')
-rw-r--r--tests/test-webapps/test-jetty-webapp/src/main/config/webapps.demo/test.xml14
1 files changed, 1 insertions, 13 deletions
diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/webapps.demo/test.xml b/tests/test-webapps/test-jetty-webapp/src/main/config/webapps.demo/test.xml
index 44cbce55c3..423477a2d9 100644
--- a/tests/test-webapps/test-jetty-webapp/src/main/config/webapps.demo/test.xml
+++ b/tests/test-webapps/test-jetty-webapp/src/main/config/webapps.demo/test.xml
@@ -28,19 +28,7 @@ detected.
<Set name="copyWebDir">false</Set>
<Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>
<Set name="overrideDescriptor"><Property name="jetty.webapps" default="."/>/test.d/override-web.xml</Set>
-
- <!-- Allow directory symbolic links -->
- <Call name="addAliasCheck">
- <Arg>
- <New class="org.eclipse.jetty.server.handler.ContextHandler$ApprovePathPrefixAliases"/>
- </Arg>
- </Call>
- <!-- Allow file symbolic links -->
- <Call name="addAliasCheck">
- <Arg>
- <New class="org.eclipse.jetty.server.handler.ContextHandler$ApproveSameSuffixAliases"/>
- </Arg>
- </Call>
+
<!-- virtual hosts
<Set name="virtualHosts">

Back to the top