diff --git a/VERSION.txt b/VERSION.txt index 0652cd0f182..8dad3b3da30 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -13,6 +13,7 @@ jetty-7.0.1-SNAPSHOT + JETTY-1114 unsynchronised WebAppClassloader.getResource(String) + JETTY-1121 Merge Multipart query parameters + JETTY-1122 Handle multi-byte utf that causes buffer overflow + + JETTY-1125 TransparentProxy incorrectly configured for test webapp + JETTY-1129 Filter control characters out of StdErrLog + Continuations ISE rather than ignore bad transitions + Fixed XSS issue in CookieDump demo servlet. diff --git a/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml b/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml index b0e93477ada..d2abb3cb8e5 100644 --- a/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml +++ b/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml @@ -205,17 +205,17 @@ TransparentProxy org.eclipse.jetty.servlets.ProxyServlet$Transparent - Prefix/jetty + Prefix/google - ProxyTohttp://jetty.mortbay.org/test + ProxyTohttp://www.google.com 1 TransparentProxy - /jetty/* + /google/* diff --git a/test-jetty-webapp/src/main/webapp/index.html b/test-jetty-webapp/src/main/webapp/index.html index 77c0121eab6..3748b1a793c 100644 --- a/test-jetty-webapp/src/main/webapp/index.html +++ b/test-jetty-webapp/src/main/webapp/index.html @@ -30,7 +30,7 @@ This is a test context that serves:
  • a Cookie Dump Servlet
  • a Dispatcher Servlet
  • a Request Rewrite Servlet
  • -
  • a Transparent Proxy (to jetty.mortbay.org)
  • +
  • a Transparent Proxy (to www.google.com)
  • a CGI script (unix only)
  • a Authentication