You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/11/12 14:00:22 UTC
svn commit: r1714036 -
/tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
Author: markt
Date: Thu Nov 12 13:00:22 2015
New Revision: 1714036
URL: http://svn.apache.org/viewvc?rev=1714036&view=rev
Log:
Fix a TODO since tests are now failing because of it.
Modified:
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
Modified: tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java?rev=1714036&r1=1714035&r2=1714036&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java Thu Nov 12 13:00:22 2015
@@ -450,11 +450,11 @@ public abstract class Http2TestBase exte
if (!responseHeaders[0].startsWith("HTTP/1.1 101")) {
return false;
}
- // TODO: There may be other headers.
- if (!responseHeaders[1].equals("Connection: Upgrade")) {
+
+ if (!validateHeader(responseHeaders, "Connection: Upgrade")) {
return false;
}
- if (!responseHeaders[2].startsWith("Upgrade: h2c")) {
+ if (!validateHeader(responseHeaders, "Upgrade: h2c")) {
return false;
}
@@ -462,6 +462,18 @@ public abstract class Http2TestBase exte
}
+ private boolean validateHeader(String[] responseHeaders, String header) {
+ boolean found = false;
+ for (String responseHeader : responseHeaders) {
+ if (responseHeader.equalsIgnoreCase(header)) {
+ found = true;
+ break;
+ }
+ }
+ return found;
+ }
+
+
String[] readHttpResponseHeaders() throws IOException {
// Only used by test code so safe to keep this just a little larger than
// we are expecting.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org