Author: markt
Date: Thu Apr 26 20:54:59 2018
New Revision: 1830266
URL: http://svn.apache.org/viewvc?rev=1830266&view=rev
Log:
Back-port default port handling that updated validation depends on. (Should fix
failing CI build)
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1830266&r1=1830265&r2=1830266&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Thu Apr 26 20:54:59 2018
@@ -773,6 +773,13 @@ public class CoyoteAdapter implements Ad
int proxyPort = connector.getProxyPort();
if (proxyPort != 0) {
req.setServerPort(proxyPort);
+ } else if (req.getServerPort() == -1) {
+ // Not explicitly set. Use default ports based on the scheme
+ if (req.scheme().equals("https")) {
+ req.setServerPort(443);
+ } else {
+ req.setServerPort(80);
+ }
}
if (proxyName != null) {
req.serverName().setString(proxyName);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
