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 2017/09/27 20:19:22 UTC
svn commit: r1809920 - in /tomcat/tc8.5.x/trunk/test/org/apache:
catalina/connector/TestRequest.java coyote/http11/TestHttp11InputBuffer.java
coyote/http11/TestHttp11Processor.java
Author: markt
Date: Wed Sep 27 20:19:22 2017
New Revision: 1809920
URL: http://svn.apache.org/viewvc?rev=1809920&view=rev
Log:
Fix unit tests that were not sending a Host header for a HTTP/1.1 request
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestRequest.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11InputBuffer.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
Modified: tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestRequest.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestRequest.java?rev=1809920&r1=1809919&r2=1809920&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestRequest.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestRequest.java Wed Sep 27 20:19:22 2017
@@ -216,6 +216,7 @@ public class TestRequest extends TomcatB
if (ucChunkedHead) {
request[0] =
"POST http://localhost:8080/test HTTP/1.1" + CRLF +
+ "Host: localhost:8080" + CRLF +
"content-type: application/x-www-form-urlencoded" + CRLF +
"Transfer-Encoding: CHUNKED" + CRLF +
"Connection: close" + CRLF +
@@ -225,6 +226,7 @@ public class TestRequest extends TomcatB
} else {
request[0] =
"POST http://localhost:8080/test HTTP/1.1" + CRLF +
+ "Host: localhost:8080" + CRLF +
"content-type: application/x-www-form-urlencoded" + CRLF +
"Transfer-Encoding: chunked" + CRLF +
"Connection: close" + CRLF +
Modified: tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11InputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11InputBuffer.java?rev=1809920&r1=1809919&r2=1809920&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11InputBuffer.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11InputBuffer.java Wed Sep 27 20:19:22 2017
@@ -78,6 +78,7 @@ public class TestHttp11InputBuffer exten
String[] request = new String[1];
request[0] =
"GET http://localhost:8080/test HTTP/1.1" + CRLF +
+ "Host: localhost:8080" + CRLF +
"X-Bug48839: abcd" + CRLF +
"\tefgh" + CRLF +
"Connection: close" + CRLF +
@@ -287,6 +288,7 @@ public class TestHttp11InputBuffer exten
String[] request = new String[1];
request[0] =
"GET http://localhost:8080/test HTTP/1.1" + CRLF +
+ "Host: localhost:8080" + CRLF +
headerLine + CRLF +
"X-Bug51557: abcd" + CRLF +
"Connection: close" + CRLF +
@@ -420,6 +422,7 @@ public class TestHttp11InputBuffer exten
request[0] =
newLines +
"GET http://localhost:8080/test HTTP/1.1" + CRLF +
+ "Host: localhost:8080" + CRLF +
"X-Bug48839: abcd" + CRLF +
"\tefgh" + CRLF +
"Connection: close" + CRLF +
@@ -487,6 +490,7 @@ public class TestHttp11InputBuffer exten
String[] request = new String[2];
request[0] = "GET http://localhost:8080/test HTTP/1.1" + CR;
request[1] = LF +
+ "Host: localhost:8080" + CRLF +
"Connection: close" + CRLF +
CRLF;
@@ -556,6 +560,7 @@ public class TestHttp11InputBuffer exten
String[] request = new String[1];
request[0] = "GET http://localhost:8080/test HTTP/1.1" + CRLF +
+ "Host: localhost:8080" + CRLF +
"X-Header: Ignore" + CRLF +
"X-Header" + (char) 130 + ": Broken" + CRLF + CRLF;
Modified: tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java?rev=1809920&r1=1809919&r2=1809920&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java Wed Sep 27 20:19:22 2017
@@ -812,6 +812,7 @@ public class TestHttp11Processor extends
String[] request = new String[2];
request[0] =
"PUT http://localhost:8080/test HTTP/1.1" + CRLF +
+ "Host: localhost:8080" + CRLF +
"Transfer-encoding: chunked" + CRLF +
CRLF +
"2" + CRLF +
@@ -1123,6 +1124,8 @@ public class TestHttp11Processor extends
// request
tomcat.getConnector().setAttribute("maxKeepAliveRequests", "1");
+ tomcat.getConnector().setAttribute("allowHostHeaderMismatch", "false");
+
// No file system docBase required
Context ctx = tomcat.addContext("", null);
@@ -1155,6 +1158,8 @@ public class TestHttp11Processor extends
// request
tomcat.getConnector().setAttribute("maxKeepAliveRequests", "1");
+ tomcat.getConnector().setAttribute("allowHostHeaderMismatch", "false");
+
// No file system docBase required
Context ctx = tomcat.addContext("", null);
@@ -1187,6 +1192,8 @@ public class TestHttp11Processor extends
// request
tomcat.getConnector().setAttribute("maxKeepAliveRequests", "1");
+ tomcat.getConnector().setAttribute("allowHostHeaderMismatch", "false");
+
// No file system docBase required
Context ctx = tomcat.addContext("", null);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org