craigmcc 01/01/26 13:33:13
Modified: catalina/src/share/org/apache/catalina/connector
HttpResponseBase.java
Log:
Correct the isEncodeable() method to correctly assume a default port of
443 for https, rather than always assuming the default port is 80.
Submitted by: Mathias Bachner <[EMAIL PROTECTED]>
Revision Changes Path
1.25 +16 -8
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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- HttpResponseBase.java 2001/01/18 06:32:38 1.24
+++ HttpResponseBase.java 2001/01/26 21:33:12 1.25
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
1.24 2001/01/18 06:32:38 remm Exp $
- * $Revision: 1.24 $
- * $Date: 2001/01/18 06:32:38 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
1.25 2001/01/26 21:33:12 craigmcc Exp $
+ * $Revision: 1.25 $
+ * $Date: 2001/01/26 21:33:12 $
*
* ====================================================================
*
@@ -97,7 +97,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.24 $ $Date: 2001/01/18 06:32:38 $
+ * @version $Revision: 1.25 $ $Date: 2001/01/26 21:33:12 $
*/
public class HttpResponseBase
@@ -476,11 +476,19 @@
if (!hreq.getServerName().equalsIgnoreCase(url.getHost()))
return (false);
int serverPort = hreq.getServerPort();
- if (serverPort == -1) // Work around bug in java.net.URL.getHost()
- serverPort = 80;
+ if (serverPort == -1) {
+ if ("https".equals(hreq.getScheme()))
+ serverPort = 443;
+ else
+ serverPort = 80;
+ }
int urlPort = url.getPort();
- if (urlPort == -1)
- urlPort = 80;
+ if (urlPort == -1) {
+ if ("https".equals(url.getProtocol()))
+ urlPort = 443;
+ else
+ urlPort = 80;
+ }
if (serverPort != urlPort)
return (false);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
