summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorpgdad2012-03-21 08:44:02 (EDT)
committer pgdad2012-03-21 08:44:02 (EDT)
commitc81dbb86940bab2ce36a4538e9dda17efea49990 (patch)
tree6458eab28dcedb0d4c38af2758e3d745010f06e1
parent2a67ebca955a380e6ad1a25795e9ccfbfd811688 (diff)
downloadorg.eclipse.jetty.project-c81dbb86940bab2ce36a4538e9dda17efea49990.zip
org.eclipse.jetty.project-c81dbb86940bab2ce36a4538e9dda17efea49990.tar.gz
org.eclipse.jetty.project-c81dbb86940bab2ce36a4538e9dda17efea49990.tar.bz2
374891 - enhancement to how ProxyServlet determines the proxy targetrefs/changes/94/5394/1
-rw-r--r--jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java7
1 files changed, 6 insertions, 1 deletions
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 445a1bf..afae2ab 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
@@ -414,7 +414,7 @@ public class ProxyServlet implements Servlet
if (request.getQueryString() != null)
uri += "?" + request.getQueryString();
- HttpURI url = proxyHttpURI(request.getScheme(),request.getServerName(),request.getServerPort(),uri);
+ HttpURI url = proxyHttpURI(request,uri);
if (debug != 0)
_log.debug(debug + " proxy " + uri + "-->" + url);
@@ -677,6 +677,11 @@ public class ProxyServlet implements Servlet
}
/* ------------------------------------------------------------ */
+ protected HttpURI proxyHttpURI(HttpServletRequest request, String uri) throws MalformedURLException
+ {
+ return proxyHttpURI(request.getScheme(), request.getServerName(), request.getServerPort(), uri);
+ }
+
protected HttpURI proxyHttpURI(String scheme, String serverName, int serverPort, String uri) throws MalformedURLException
{
if (!validateDestination(serverName,uri))