remm 02/02/26 19:32:29
Modified: webapp/java/org/apache/catalina/connector/warp
WarpEngine.java
Log:
- Apply patch submitted by Jeff Martin <jeff at custommonkey.org>
Currently warp redirects to the underlying server name rather than the
server name used when requesting a virtual host. This means that if you
select http://virtualhost/ you get redirected to
http://realhost/index.jsp
The patch fixes this.
Revision Changes Path
1.2 +12 -5
jakarta-tomcat-connectors/webapp/java/org/apache/catalina/connector/warp/WarpEngine.java
Index: WarpEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/webapp/java/org/apache/catalina/connector/warp/WarpEngine.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WarpEngine.java 23 Jan 2002 17:48:50 -0000 1.1
+++ WarpEngine.java 27 Feb 2002 03:32:29 -0000 1.2
@@ -69,12 +69,19 @@
public Container map(Request request, boolean update) {
this.log("Mapping request");
if (request instanceof WarpRequest) {
- WarpRequest wreq=(WarpRequest)request;
- Host host=wreq.getHost();
+ WarpRequest wreq = (WarpRequest)request;
+ Host host = wreq.getHost();
if (update) {
- request.setServerName(host.getName());
+ if (request.getRequest().getServerName() == null) {
+ request.setServerName(host.getName());
+ } else {
+ request.setServerName
+ (request.getRequest().getServerName());
+ }
}
- return(host);
- } else return(super.map(request,update));
+ return (host);
+ } else {
+ return (super.map(request,update));
+ }
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>