Author: markt
Date: Mon Nov 23 13:59:37 2015
New Revision: 1715822
URL: http://svn.apache.org/viewvc?rev=1715822&view=rev
Log:
Fix an HTTP/2 TODO
Only include port in :authority header for HTTP/2 push if non-standard ports
are being used
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1715822&r1=1715821&r2=1715822&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Mon Nov 23 13:59:37
2015
@@ -388,9 +388,17 @@ public class Stream extends AbstractStre
request.getMimeHeaders().addValue(":scheme").duplicate(request.scheme());
// TODO: Query string
request.getMimeHeaders().addValue(":path").duplicate(request.decodedURI());
- // TODO: Handle default ports
- request.getMimeHeaders().addValue(":authority").setString(
- request.serverName().getString() + ":" +
request.getServerPort());
+
+ // Authority needs to include the port only if a non-standard port is
+ // being used.
+ if (!(request.scheme().equals("http") && request.getServerPort() ==
80) &&
+ !(request.scheme().equals("https") && request.getServerPort()
== 443)) {
+ request.getMimeHeaders().addValue(":authority").setString(
+ request.serverName().getString() + ":" +
request.getServerPort());
+ } else {
+
request.getMimeHeaders().addValue(":authority").duplicate(request.serverName());
+ }
+
push(handler, request, this);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
