craigmcc 00/11/08 11:30:31 Modified: catalina/src/share/org/apache/catalina/connector HttpResponseBase.java catalina/src/share/org/apache/catalina/core StandardEngineMapper.java Log: Work around a problem where the default hostname is not set when you access Tomcat 4.0 using a simple Telnet request. NOTE: It actually violates the HTTP spec to send a request like "GET / HTTP/1.0" without a "Host:" header, but this is way too handy for debugging to have the server name set from the default host you declare in server.xml. Revision Changes Path 1.16 +5 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java Index: HttpResponseBase.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- HttpResponseBase.java 2000/10/18 19:20:38 1.15 +++ HttpResponseBase.java 2000/11/08 19:30:14 1.16 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v 1.15 2000/10/18 19:20:38 craigmcc Exp $ - * $Revision: 1.15 $ - * $Date: 2000/10/18 19:20:38 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v 1.16 2000/11/08 19:30:14 craigmcc Exp $ + * $Revision: 1.16 $ + * $Date: 2000/11/08 19:30:14 $ * * ==================================================================== * @@ -96,7 +96,7 @@ * methods need to be implemented. * * @author Craig R. McClanahan - * @version $Revision: 1.15 $ $Date: 2000/10/18 19:20:38 $ + * @version $Revision: 1.16 $ $Date: 2000/11/08 19:30:14 $ */ public class HttpResponseBase @@ -1090,3 +1090,4 @@ } + 1.3 +8 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardEngineMapper.java Index: StandardEngineMapper.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardEngineMapper.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- StandardEngineMapper.java 2000/10/18 17:24:36 1.2 +++ StandardEngineMapper.java 2000/11/08 19:30:24 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardEngineMapper.java,v 1.2 2000/10/18 17:24:36 craigmcc Exp $ - * $Revision: 1.2 $ - * $Date: 2000/10/18 17:24:36 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardEngineMapper.java,v 1.3 2000/11/08 19:30:24 craigmcc Exp $ + * $Revision: 1.3 $ + * $Date: 2000/11/08 19:30:24 $ * * ==================================================================== * @@ -82,7 +82,7 @@ * <code>StandardEngine</code>, because it relies on internal APIs. * * @author Craig R. McClanahan - * @version $Revision: 1.2 $ $Date: 2000/10/18 17:24:36 $ + * @version $Revision: 1.3 $ $Date: 2000/11/08 19:30:24 $ */ public final class StandardEngineMapper @@ -181,8 +181,11 @@ // Extract the requested server name String server = request.getRequest().getServerName(); - if (server == null) + if (server == null) { server = engine.getDefaultHost(); + if (update) + request.setServerName(server); + } if (server == null) return (null); server = server.toLowerCase(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]