diff --git a/example-jetty-embedded/pom.xml b/example-jetty-embedded/pom.xml
index d502516fcab..a0c53ce5695 100644
--- a/example-jetty-embedded/pom.xml
+++ b/example-jetty-embedded/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
example-jetty-embedded
diff --git a/jetty-aggregate/jetty-all-server/pom.xml b/jetty-aggregate/jetty-all-server/pom.xml
index 79cca0d1ac5..31b79ddbfb1 100644
--- a/jetty-aggregate/jetty-all-server/pom.xml
+++ b/jetty-aggregate/jetty-all-server/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.aggregate
jetty-aggregate-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-all-server
diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml
index 1732fe91454..e4a0593e7f7 100644
--- a/jetty-aggregate/jetty-all/pom.xml
+++ b/jetty-aggregate/jetty-all/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.aggregate
jetty-aggregate-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-all
diff --git a/jetty-aggregate/jetty-client/pom.xml b/jetty-aggregate/jetty-client/pom.xml
index d9564cc6500..819cbe7174f 100644
--- a/jetty-aggregate/jetty-client/pom.xml
+++ b/jetty-aggregate/jetty-client/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.aggregate
jetty-aggregate-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-client
diff --git a/jetty-aggregate/jetty-plus/pom.xml b/jetty-aggregate/jetty-plus/pom.xml
index 7b9072035ec..40a65deac1c 100644
--- a/jetty-aggregate/jetty-plus/pom.xml
+++ b/jetty-aggregate/jetty-plus/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.aggregate
jetty-aggregate-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-plus
diff --git a/jetty-aggregate/jetty-server/pom.xml b/jetty-aggregate/jetty-server/pom.xml
index 9d40c3c2874..b853d76d92f 100644
--- a/jetty-aggregate/jetty-server/pom.xml
+++ b/jetty-aggregate/jetty-server/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.aggregate
jetty-aggregate-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-server
diff --git a/jetty-aggregate/jetty-servlet/pom.xml b/jetty-aggregate/jetty-servlet/pom.xml
index c07d0f0cb27..cd32b86e965 100644
--- a/jetty-aggregate/jetty-servlet/pom.xml
+++ b/jetty-aggregate/jetty-servlet/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.aggregate
jetty-aggregate-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-servlet
diff --git a/jetty-aggregate/jetty-webapp/pom.xml b/jetty-aggregate/jetty-webapp/pom.xml
index 601029b7fc4..fa250deeb72 100644
--- a/jetty-aggregate/jetty-webapp/pom.xml
+++ b/jetty-aggregate/jetty-webapp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.aggregate
jetty-aggregate-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-webapp
diff --git a/jetty-aggregate/jetty-websocket/pom.xml b/jetty-aggregate/jetty-websocket/pom.xml
index 64a63f6ce6c..a17a741d1d3 100644
--- a/jetty-aggregate/jetty-websocket/pom.xml
+++ b/jetty-aggregate/jetty-websocket/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.aggregate
jetty-aggregate-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-websocket
diff --git a/jetty-aggregate/pom.xml b/jetty-aggregate/pom.xml
index e14e64cfe8f..472419aaa38 100644
--- a/jetty-aggregate/pom.xml
+++ b/jetty-aggregate/pom.xml
@@ -4,7 +4,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
org.eclipse.jetty.aggregate
jetty-aggregate-project
diff --git a/jetty-ajp/pom.xml b/jetty-ajp/pom.xml
index fd5738a61a1..8fe8f311d52 100644
--- a/jetty-ajp/pom.xml
+++ b/jetty-ajp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-ajp
diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml
index 0d70342a924..5a8051c2c4d 100644
--- a/jetty-annotations/pom.xml
+++ b/jetty-annotations/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-annotations
diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml
index cc1680f72db..f98e281b61f 100644
--- a/jetty-client/pom.xml
+++ b/jetty-client/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml
index 8fbbb06a52d..2cfa65e7005 100644
--- a/jetty-continuation/pom.xml
+++ b/jetty-continuation/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-continuation
diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml
index 8c860d28e25..72cb042eebf 100644
--- a/jetty-deploy/pom.xml
+++ b/jetty-deploy/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-deploy
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index a76dbaa55d6..d588b06a85c 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
jetty-distribution
Jetty :: Distribution Assemblies
diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml
index 84c54ea3d23..87c81305902 100644
--- a/jetty-http-spi/pom.xml
+++ b/jetty-http-spi/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-http-spi
diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml
index 73619e5cdbe..66633339b18 100644
--- a/jetty-http/pom.xml
+++ b/jetty-http/pom.xml
@@ -3,7 +3,7 @@
jetty-project
org.eclipse.jetty
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-http
diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml
index b96a6037e19..f5c8dcab778 100644
--- a/jetty-io/pom.xml
+++ b/jetty-io/pom.xml
@@ -2,7 +2,7 @@
jetty-project
org.eclipse.jetty
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-io
diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml
index 891baa6e469..3f82b9ebedb 100644
--- a/jetty-jaspi/pom.xml
+++ b/jetty-jaspi/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-jaspi
diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml
index b6d1c526123..6cb2dbd152d 100644
--- a/jetty-jmx/pom.xml
+++ b/jetty-jmx/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-jmx
diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml
index 975d0354c4b..23b4ee3ccf7 100644
--- a/jetty-jndi/pom.xml
+++ b/jetty-jndi/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-jndi
diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml
index 9b7ffa4be2e..11dee5659ad 100644
--- a/jetty-jsp/pom.xml
+++ b/jetty-jsp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-jsp
diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml
index 9aaba66f66d..ec560bb978c 100644
--- a/jetty-monitor/pom.xml
+++ b/jetty-monitor/pom.xml
@@ -19,7 +19,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-monitor
diff --git a/jetty-nested/pom.xml b/jetty-nested/pom.xml
index 08c1c75622a..99eca0d7756 100644
--- a/jetty-nested/pom.xml
+++ b/jetty-nested/pom.xml
@@ -4,7 +4,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
jetty-nested
Jetty :: Nested
diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml
index d9a7d9d713a..09346853c9e 100644
--- a/jetty-nosql/pom.xml
+++ b/jetty-nosql/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-nosql
diff --git a/jetty-npn/pom.xml b/jetty-npn/pom.xml
index b4564b36a9f..b251398c1e3 100644
--- a/jetty-npn/pom.xml
+++ b/jetty-npn/pom.xml
@@ -5,7 +5,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
index 229510055df..4baa60ac316 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
../pom.xml
4.0.0
diff --git a/jetty-osgi/jetty-osgi-boot-logback/pom.xml b/jetty-osgi/jetty-osgi-boot-logback/pom.xml
index 4be355432a2..c1ff444ca70 100644
--- a/jetty-osgi/jetty-osgi-boot-logback/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-logback/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
../pom.xml
4.0.0
diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
index 54439743d41..12df3058e17 100644
--- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
../pom.xml
4.0.0
diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml
index 2af33ad6470..277eb9db3f1 100644
--- a/jetty-osgi/jetty-osgi-boot/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
../pom.xml
4.0.0
diff --git a/jetty-osgi/jetty-osgi-equinoxtools/pom.xml b/jetty-osgi/jetty-osgi-equinoxtools/pom.xml
index 8213e4ca137..6c22c0850fc 100644
--- a/jetty-osgi/jetty-osgi-equinoxtools/pom.xml
+++ b/jetty-osgi/jetty-osgi-equinoxtools/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
../pom.xml
4.0.0
diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml
index 767042c2a42..9b20c736fa0 100644
--- a/jetty-osgi/jetty-osgi-httpservice/pom.xml
+++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
../pom.xml
4.0.0
diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
index d95a1b9e025..a6f22e17739 100644
--- a/jetty-osgi/pom.xml
+++ b/jetty-osgi/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
../pom.xml
org.eclipse.jetty.osgi
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index f0cfa42690b..a9fef116985 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
../pom.xml
4.0.0
diff --git a/jetty-overlay-deployer/pom.xml b/jetty-overlay-deployer/pom.xml
index ca9f243f9cc..3557aa19137 100644
--- a/jetty-overlay-deployer/pom.xml
+++ b/jetty-overlay-deployer/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-overlay-deployer
diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml
index 195dc9e3f5e..68f6c07a650 100644
--- a/jetty-plus/pom.xml
+++ b/jetty-plus/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-plus
diff --git a/jetty-policy/pom.xml b/jetty-policy/pom.xml
index e1a8b37e946..f7e7c616538 100644
--- a/jetty-policy/pom.xml
+++ b/jetty-policy/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
jetty-policy
Jetty :: Policy Tool
diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml
index f555c1e10de..58b9c36f24a 100644
--- a/jetty-rewrite/pom.xml
+++ b/jetty-rewrite/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-rewrite
diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml
index 51b25dc0d52..08c0ba2efb6 100644
--- a/jetty-security/pom.xml
+++ b/jetty-security/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-security
diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml
index cd446cab611..f9c73e17fe5 100644
--- a/jetty-server/pom.xml
+++ b/jetty-server/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-server
diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml
index 444a41fb492..abf9b924446 100644
--- a/jetty-servlet/pom.xml
+++ b/jetty-servlet/pom.xml
@@ -3,7 +3,7 @@
jetty-project
org.eclipse.jetty
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-servlet
diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml
index 47c149cb588..434ddf68e09 100644
--- a/jetty-servlets/pom.xml
+++ b/jetty-servlets/pom.xml
@@ -3,7 +3,7 @@
jetty-project
org.eclipse.jetty
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-servlets
diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
index 782d16765b1..445a1bf9150 100644
--- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
+++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
@@ -597,12 +597,14 @@ public class ProxyServlet implements Servlet
{
exchange.addRequestHeader("X-Forwarded-For",request.getRemoteAddr());
exchange.addRequestHeader("X-Forwarded-Proto",request.getScheme());
- exchange.addRequestHeader("X-Forwarded-Host",request.getServerName());
+ exchange.addRequestHeader("X-Forwarded-Host",request.getHeader("Host"));
exchange.addRequestHeader("X-Forwarded-Server",request.getLocalName());
}
if (hasContent)
+ {
exchange.setRequestContentSource(in);
+ }
customizeExchange(exchange, request);
diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java
index 68a3b97e49f..80e1fe396fa 100644
--- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java
+++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java
@@ -4,6 +4,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.PrintWriter;
import java.net.MalformedURLException;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
@@ -12,7 +13,6 @@ import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
import junit.framework.Assert;
import org.eclipse.jetty.client.ContentExchange;
import org.eclipse.jetty.client.HttpClient;
@@ -30,21 +30,24 @@ import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.junit.After;
import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.hamcrest.Matchers.*;
+
public class ProxyServletTest
{
- private Server server;
- private Connector connector;
- private HttpClient client;
+ private Server _server;
+ private Connector _connector;
+ private HttpClient _client;
public void init(HttpServlet servlet) throws Exception
{
- server = new Server();
+ _server = new Server();
- connector = new SelectChannelConnector();
- server.addConnector(connector);
+ _connector = new SelectChannelConnector();
+ _server.addConnector(_connector);
HandlerCollection handlers = new HandlerCollection();
- server.setHandler(handlers);
+ _server.setHandler(handlers);
ServletContextHandler proxyCtx = new ServletContextHandler(handlers, "/proxy", ServletContextHandler.NO_SESSIONS);
ServletHolder proxyServletHolder = new ServletHolder(new ProxyServlet()
@@ -66,25 +69,49 @@ public class ProxyServletTest
handlers.addHandler(proxyCtx);
handlers.addHandler(appCtx);
- server.start();
+ _server.start();
- client = new HttpClient();
- client.start();
+ _client = new HttpClient();
+ _client.start();
}
@After
public void destroy() throws Exception
{
- if (client != null)
- client.stop();
+ if (_client != null)
+ _client.stop();
- if (server != null)
+ if (_server != null)
{
- server.stop();
- server.join();
+ _server.stop();
+ _server.join();
}
}
+ @Test
+ public void testXForwardedHostHeader() throws Exception
+ {
+ init(new HttpServlet()
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+ {
+ PrintWriter writer = resp.getWriter();
+ writer.write(req.getHeader("X-Forwarded-Host"));
+ writer.flush();
+ }
+ });
+
+ String url = "http://localhost:" + _connector.getLocalPort() + "/proxy/test";
+ ContentExchange exchange = new ContentExchange();
+ exchange.setURL(url);
+ _client.send(exchange);
+ exchange.waitForDone();
+ assertThat("Response expected to contain content of X-Forwarded-Host Header from the request",exchange.getResponseContent(),equalTo("localhost:"
+ + _connector.getLocalPort()));
+ }
@Test
public void testBigDownloadWithSlowReader() throws Exception
@@ -101,6 +128,8 @@ public class ProxyServletTest
init(new HttpServlet()
{
+ private static final long serialVersionUID = 1L;
+
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
@@ -114,7 +143,7 @@ public class ProxyServletTest
}
});
- String url = "http://localhost:" + connector.getLocalPort() + "/proxy" + "/test";
+ String url = "http://localhost:" + _connector.getLocalPort() + "/proxy/test";
ContentExchange exchange = new ContentExchange(true)
{
@Override
@@ -134,7 +163,7 @@ public class ProxyServletTest
};
exchange.setURL(url);
long start = System.nanoTime();
- client.send(exchange);
+ _client.send(exchange);
Assert.assertEquals(HttpExchange.STATUS_COMPLETED, exchange.waitForDone());
long elapsed = System.nanoTime() - start;
Assert.assertEquals(HttpStatus.OK_200, exchange.getResponseStatus());
diff --git a/jetty-spdy/pom.xml b/jetty-spdy/pom.xml
index f179015fe32..02a657f9ef0 100644
--- a/jetty-spdy/pom.xml
+++ b/jetty-spdy/pom.xml
@@ -4,7 +4,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
diff --git a/jetty-spdy/spdy-core/pom.xml b/jetty-spdy/spdy-core/pom.xml
index 6af12e05689..e24895787fb 100644
--- a/jetty-spdy/spdy-core/pom.xml
+++ b/jetty-spdy/spdy-core/pom.xml
@@ -5,7 +5,7 @@
org.eclipse.jetty.spdy
spdy-parent
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
diff --git a/jetty-spdy/spdy-jetty-http-webapp/pom.xml b/jetty-spdy/spdy-jetty-http-webapp/pom.xml
index 76d47a636e1..b6ffdb82aee 100644
--- a/jetty-spdy/spdy-jetty-http-webapp/pom.xml
+++ b/jetty-spdy/spdy-jetty-http-webapp/pom.xml
@@ -5,7 +5,7 @@
org.eclipse.jetty.spdy
spdy-parent
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
diff --git a/jetty-spdy/spdy-jetty-http/pom.xml b/jetty-spdy/spdy-jetty-http/pom.xml
index b9e4eed45c5..3e2662c1b80 100644
--- a/jetty-spdy/spdy-jetty-http/pom.xml
+++ b/jetty-spdy/spdy-jetty-http/pom.xml
@@ -5,7 +5,7 @@
org.eclipse.jetty.spdy
spdy-parent
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
diff --git a/jetty-spdy/spdy-jetty/pom.xml b/jetty-spdy/spdy-jetty/pom.xml
index bdfe17c5bcc..d1db3388970 100644
--- a/jetty-spdy/spdy-jetty/pom.xml
+++ b/jetty-spdy/spdy-jetty/pom.xml
@@ -5,7 +5,7 @@
org.eclipse.jetty.spdy
spdy-parent
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml
index c227d7a7ed1..46b25d3821e 100644
--- a/jetty-start/pom.xml
+++ b/jetty-start/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-start
diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml
index c254b68dab1..f7cd942be52 100644
--- a/jetty-util/pom.xml
+++ b/jetty-util/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-util
diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml
index 1d799705ea4..093a4202cbc 100644
--- a/jetty-webapp/pom.xml
+++ b/jetty-webapp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-webapp
diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml
index d42c1bdf925..180d1e69548 100644
--- a/jetty-websocket/pom.xml
+++ b/jetty-websocket/pom.xml
@@ -3,7 +3,7 @@
jetty-project
org.eclipse.jetty
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml
index 86fecc83b55..ff4f04d1d84 100644
--- a/jetty-xml/pom.xml
+++ b/jetty-xml/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
jetty-xml
diff --git a/pom.xml b/pom.xml
index 8edf9e2e289..6e4d55f5deb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
19
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
Jetty :: Project
${jetty.url}
pom
diff --git a/test-continuation/pom.xml b/test-continuation/pom.xml
index 95f92bdc42f..263146b982b 100644
--- a/test-continuation/pom.xml
+++ b/test-continuation/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
test-continuation
diff --git a/test-jetty-nested/pom.xml b/test-jetty-nested/pom.xml
index 8a26d325607..2915d06fcf3 100644
--- a/test-jetty-nested/pom.xml
+++ b/test-jetty-nested/pom.xml
@@ -4,7 +4,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
test-jetty-nested
Jetty :: Nested Test
diff --git a/test-jetty-servlet/pom.xml b/test-jetty-servlet/pom.xml
index c4b5870f581..1d1c2c41892 100644
--- a/test-jetty-servlet/pom.xml
+++ b/test-jetty-servlet/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
test-jetty-servlet
diff --git a/test-jetty-webapp/pom.xml b/test-jetty-webapp/pom.xml
index a8deb0a2f67..cfd04177fb6 100644
--- a/test-jetty-webapp/pom.xml
+++ b/test-jetty-webapp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
test-jetty-webapp
diff --git a/tests/pom.xml b/tests/pom.xml
index fc08af9148b..566749bcd41 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty
jetty-project
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
org.eclipse.jetty.tests
tests-parent
diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml
index cd090026116..fab815f92c5 100644
--- a/tests/test-integration/pom.xml
+++ b/tests/test-integration/pom.xml
@@ -20,7 +20,7 @@
org.eclipse.jetty.tests
tests-parent
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
4.0.0
test-integration
diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml
index 0bd1190883e..504748b30d5 100644
--- a/tests/test-loginservice/pom.xml
+++ b/tests/test-loginservice/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
tests-parent
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
test-loginservice
Jetty Tests :: Login Service
diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml
index 91c77c3b91b..90cd048267b 100644
--- a/tests/test-sessions/pom.xml
+++ b/tests/test-sessions/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
tests-parent
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
test-sessions-parent
Jetty Tests :: Sessions :: Parent
diff --git a/tests/test-sessions/test-hash-sessions/pom.xml b/tests/test-sessions/test-hash-sessions/pom.xml
index 6cdd8f83eb9..ac985f66af4 100644
--- a/tests/test-sessions/test-hash-sessions/pom.xml
+++ b/tests/test-sessions/test-hash-sessions/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
test-sessions-parent
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
test-hash-sessions
Jetty Tests :: Sessions :: Hash
diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml
index 9f8b64da707..0676a6aae9b 100644
--- a/tests/test-sessions/test-jdbc-sessions/pom.xml
+++ b/tests/test-sessions/test-jdbc-sessions/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
test-sessions-parent
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
test-jdbc-sessions
Jetty Tests :: Sessions :: JDBC
diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml
index c4a2b231af8..3e7cda34db2 100644
--- a/tests/test-sessions/test-mongodb-sessions/pom.xml
+++ b/tests/test-sessions/test-mongodb-sessions/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
test-sessions-parent
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
test-mongodb-sessions
Jetty Tests :: Sessions :: Mongo
diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml
index 7eacd1a1268..d6f6cfabfd1 100644
--- a/tests/test-sessions/test-sessions-common/pom.xml
+++ b/tests/test-sessions/test-sessions-common/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
test-sessions-parent
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
test-sessions-common
Jetty Tests :: Sessions :: Common
diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml
index a97c0f7dd63..2b6000b55e3 100644
--- a/tests/test-webapps/pom.xml
+++ b/tests/test-webapps/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
tests-parent
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
test-webapps-parent
Jetty Tests :: WebApps :: Parent
diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml
index 4308f19d82b..9518b6e14ac 100644
--- a/tests/test-webapps/test-webapp-rfc2616/pom.xml
+++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
test-webapps-parent
- 7.6.3-SNAPSHOT
+ 7.6.2-SNAPSHOT
test-webapp-rfc2616
Jetty Tests :: WebApp :: RFC2616