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/18 18:54:39 UTC
svn commit: r1808761 - in /tomcat/trunk/test/org/apache: catalina/connector/
catalina/core/ coyote/http11/
Author: markt
Date: Mon Sep 18 18:54:39 2017
New Revision: 1808761
URL: http://svn.apache.org/viewvc?rev=1808761&view=rev
Log:
Fix various tests that break when stricter Host header validation (comming soon) is applied.
Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
tomcat/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
tomcat/trunk/test/org/apache/coyote/http11/TestHttp11InputBuffer.java
tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java?rev=1808761&r1=1808760&r2=1808761&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java Mon Sep 18 18:54:39 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 +
@@ -594,7 +596,7 @@ public class TestRequest extends TomcatB
method + " http://localhost:" + getPort() + "/echo"
+ (null == queryString ? "" : ("?" + queryString))
+ " HTTP/1.1" + CRLF
- + "Host: localhost" + CRLF
+ + "Host: localhost:" + getPort() + CRLF
+ (null == contentType ? ""
: ("Content-Type: " + contentType + CRLF))
+ "Connection: close" + CRLF
Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java?rev=1808761&r1=1808760&r2=1808761&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java (original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java Mon Sep 18 18:54:39 2017
@@ -771,7 +771,7 @@ public class TestStandardContext extends
request = new String[] {
"POST http://localhost:" + getPort() + uri + " HTTP/1.1" + CRLF
- + "Host: localhost" + CRLF
+ + "Host: localhost:" + getPort() + CRLF
+ "Connection: close" + CRLF
+ "Content-Type: multipart/form-data; boundary=" + boundary + CRLF
+ "Content-Length: " + content.length() + CRLF
@@ -779,12 +779,10 @@ public class TestStandardContext extends
+ content
+ CRLF
};
- }
- else
- {
+ } else {
request = new String[] {
"GET http://localhost:" + getPort() + uri + " HTTP/1.1" + CRLF
- + "Host: localhost" + CRLF
+ + "Host: localhost:" + getPort() + CRLF
+ "Connection: close" + CRLF
+ CRLF
};
Modified: tomcat/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java?rev=1808761&r1=1808760&r2=1808761&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java (original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java Mon Sep 18 18:54:39 2017
@@ -293,7 +293,7 @@ public class TestSwallowAbortedUploads e
"ASCII");
request = new String[] { "POST http://localhost:" + getPort() + URI + " HTTP/1.1" + CRLF
- + "Host: localhost" + CRLF
+ + "Host: localhost:" + getPort() + CRLF
+ "Connection: close" + CRLF
+ "Content-Type: multipart/form-data; boundary=" + boundary + CRLF
+ "Content-Length: " + content.length() + CRLF
@@ -384,7 +384,7 @@ public class TestSwallowAbortedUploads e
String content = new String(body);
request = new String[] { "POST http://localhost:" + getPort() + URI + " HTTP/1.1" + CRLF
- + "Host: localhost" + CRLF
+ + "Host: localhost:" + getPort() + CRLF
+ "Connection: close" + CRLF
+ "Content-Length: " + content.length() + CRLF
+ CRLF
Modified: tomcat/trunk/test/org/apache/coyote/http11/TestHttp11InputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestHttp11InputBuffer.java?rev=1808761&r1=1808760&r2=1808761&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http11/TestHttp11InputBuffer.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http11/TestHttp11InputBuffer.java Mon Sep 18 18:54:39 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/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java?rev=1808761&r1=1808760&r2=1808761&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java Mon Sep 18 18:54:39 2017
@@ -808,6 +808,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 +
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org