remm 02/02/27 20:23:17
Modified: catalina/src/share/org/apache/catalina/connector/http
HttpProcessor.java
Log:
- Fix bug 6668.
- If no port is specified, the default port for the service is assumed. Note: This
can break broken clients, as it forces them to specify the port in the host header.
- Patch submitted by Craig Setera <craig.setera at kingland.com>
Revision Changes Path
1.44 +9 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java
Index: HttpProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- HttpProcessor.java 20 Feb 2002 22:56:05 -0000 1.43
+++ HttpProcessor.java 28 Feb 2002 04:23:17 -0000 1.44
@@ -1,6 +1,6 @@
-/* * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
1.43 2002/02/20 22:56:05 remm Exp $
- * $Revision: 1.43 $
- * $Date: 2002/02/20 22:56:05 $
+/* * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
1.44 2002/02/28 04:23:17 remm Exp $
+ * $Revision: 1.44 $
+ * $Date: 2002/02/28 04:23:17 $
*
* ====================================================================
*
@@ -108,7 +108,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.43 $ $Date: 2002/02/20 22:56:05 $
+ * @version $Revision: 1.44 $ $Date: 2002/02/28 04:23:17 $
*/
final class HttpProcessor
@@ -636,6 +636,11 @@
} else if (header.equals(DefaultHeaders.HOST_NAME)) {
int n = value.indexOf(':');
if (n < 0) {
+ if (connector.getScheme().equals("http")) {
+ request.setServerPort(80);
+ } else if (connector.getScheme().equals("https")) {
+ request.setServerPort(443);
+ }
if (proxyName != null)
request.setServerName(proxyName);
else
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
