You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@locus.apache.org on 2000/10/18 19:24:38 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardEngineMapper.java
craigmcc 00/10/18 10:24:37
Modified: catalina/src/share/org/apache/catalina/core
StandardEngineMapper.java
Log:
When mapping requests to a particular host, the name comparison would fail
if the default host was not configured in lower case. The name comparison
is now correctly case insensitive in all circumstances.
Submitted by: Vivek Nagar <Vi...@eng.sun.com>
Revision Changes Path
1.2 +4 -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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StandardEngineMapper.java 2000/08/11 23:40:45 1.1
+++ StandardEngineMapper.java 2000/10/18 17:24:36 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardEngineMapper.java,v 1.1 2000/08/11 23:40:45 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/11 23:40:45 $
+ * $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 $
*
* ====================================================================
*
@@ -82,7 +82,7 @@
* <code>StandardEngine</code>, because it relies on internal APIs.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2000/08/11 23:40:45 $
+ * @version $Revision: 1.2 $ $Date: 2000/10/18 17:24:36 $
*/
public final class StandardEngineMapper
@@ -183,10 +183,9 @@
String server = request.getRequest().getServerName();
if (server == null)
server = engine.getDefaultHost();
- else
- server = server.toLowerCase();
if (server == null)
return (null);
+ server = server.toLowerCase();
if (debug >= 1)
engine.log("Mapping server name '" + server + "'");