Author: markt
Date: Thu Apr 26 21:35:09 2018
New Revision: 1830269
URL: http://svn.apache.org/viewvc?rev=1830269&view=rev
Log:
Fix test failures now 8.0.x enforces the requirement that a Host header MUST be
present
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestRequest.java
tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java?rev=1830269&r1=1830268&r2=1830269&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
(original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
Thu Apr 26 21:35:09 2018
@@ -68,9 +68,8 @@ public class TestCometProcessor extends
socket.setSoTimeout(5000);
final OutputStream os = socket.getOutputStream();
- String requestLine = "POST http://localhost:"; + getPort() +
- "/comet HTTP/1.1\r\n";
- os.write(requestLine.getBytes());
+ os.write("POST /comet HTTP/1.1\r\n".getBytes());
+ os.write(("host: localhost:" + getPort() + "\r\n").getBytes());
os.write("transfer-encoding: chunked\r\n".getBytes());
os.write("\r\n".getBytes());
@@ -90,9 +89,8 @@ public class TestCometProcessor extends
}
// Send a standard HTTP request on the same connection
- requestLine = "GET http://localhost:"; + getPort() +
- "/hello HTTP/1.1\r\n";
- os.write(requestLine.getBytes());
+ os.write("GET /hello HTTP/1.1\r\n".getBytes());
+ os.write(("host: localhost:" + getPort() + "\r\n").getBytes());
os.write("\r\n".getBytes());
// Check for the expected response
@@ -134,9 +132,8 @@ public class TestCometProcessor extends
socket.setSoTimeout(5000);
final OutputStream os = socket.getOutputStream();
- String requestLine = "POST http://localhost:"; + getPort() +
- "/comet HTTP/1.1\r\n";
- os.write(requestLine.getBytes());
+ os.write("POST /comet HTTP/1.1\r\n".getBytes());
+ os.write(("host: localhost:" + getPort() + "\r\n").getBytes());
os.write("transfer-encoding: chunked\r\n".getBytes());
os.write("\r\n".getBytes());
// Don't send any data
@@ -160,9 +157,8 @@ public class TestCometProcessor extends
}
// Send a standard HTTP request on the same connection
- requestLine = "GET http://localhost:"; + getPort() +
- "/hello HTTP/1.1\r\n";
- os.write(requestLine.getBytes());
+ os.write("GET /hello HTTP/1.1\r\n".getBytes());
+ os.write(("host: localhost:" + getPort() + "\r\n").getBytes());
os.write("connection: close\r\n".getBytes());
os.write("\r\n".getBytes());
@@ -205,9 +201,8 @@ public class TestCometProcessor extends
socket.setSoTimeout(5000);
final OutputStream os = socket.getOutputStream();
- String requestLine = "POST http://localhost:"; + getPort() +
- "/comet HTTP/1.1\r\n";
- os.write(requestLine.getBytes());
+ os.write("POST /comet HTTP/1.1\r\n".getBytes());
+ os.write(("host: localhost:" + getPort() + "\r\n").getBytes());
os.write("transfer-encoding: chunked\r\n".getBytes());
os.write("\r\n".getBytes());
// Don't send any data
@@ -282,9 +277,8 @@ public class TestCometProcessor extends
socket.setSoTimeout(60000);
final OutputStream os = socket.getOutputStream();
- String requestLine = "POST http://localhost:"; + getPort() +
- "/ HTTP/1.1\r\n";
- os.write(requestLine.getBytes());
+ os.write("POST / HTTP/1.1\r\n".getBytes());
+ os.write(("host: localhost:" + getPort() + "\r\n").getBytes());
os.write("transfer-encoding: chunked\r\n".getBytes());
os.write("\r\n".getBytes());
@@ -370,9 +364,8 @@ public class TestCometProcessor extends
socket.setSoTimeout(10000);
final OutputStream os = socket.getOutputStream();
- String requestLine = "POST http://localhost:"; + getPort() +
- "/ HTTP/1.1\r\n";
- os.write(requestLine.getBytes());
+ os.write("POST / HTTP/1.1\r\n".getBytes());
+ os.write(("host: localhost:" + getPort() + "\r\n").getBytes());
os.write("transfer-encoding: chunked\r\n".getBytes());
os.write("\r\n".getBytes());
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestRequest.java?rev=1830269&r1=1830268&r2=1830269&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestRequest.java
(original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestRequest.java
Thu Apr 26 21:35:09 2018
@@ -207,7 +207,8 @@ public class TestRequest extends TomcatB
String[] request = new String[2];
if (ucChunkedHead) {
request[0] =
- "POST http://localhost:8080/test HTTP/1.1" + CRLF +
+ "POST /test HTTP/1.1" + CRLF +
+ "Host: localhost:8080" + CRLF +
"content-type: application/x-www-form-urlencoded" +
CRLF +
"Transfer-Encoding: CHUNKED" + CRLF +
"Connection: close" + CRLF +
@@ -216,7 +217,8 @@ public class TestRequest extends TomcatB
"a=1" + CRLF;
} else {
request[0] =
- "POST http://localhost:8080/test HTTP/1.1" + CRLF +
+ "POST /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.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java?rev=1830269&r1=1830268&r2=1830269&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
Thu Apr 26 21:35:09 2018
@@ -775,7 +775,8 @@ public class TestAbstractHttp11Processor
try {
String[] request = new String[2];
request[0] =
- "PUT http://localhost:8080/test HTTP/1.1" + CRLF +
+ "PUT /test HTTP/1.1" + CRLF +
+ "host: localhost:8080" + CRLF +
"Transfer-encoding: chunked" + CRLF +
CRLF +
"2" + CRLF +
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java?rev=1830269&r1=1830268&r2=1830269&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java
Thu Apr 26 21:35:09 2018
@@ -74,7 +74,8 @@ public class TestInternalInputBuffer ext
String[] request = new String[1];
request[0] =
- "GET http://localhost:8080/test HTTP/1.1" + CRLF +
+ "GET /test HTTP/1.1" + CRLF +
+ "host: localhost:8080" + CRLF +
"X-Bug48839: abcd" + CRLF +
"\tefgh" + CRLF +
"Connection: close" + CRLF +
@@ -282,7 +283,8 @@ public class TestInternalInputBuffer ext
String[] request = new String[1];
request[0] =
- "GET http://localhost:8080/test HTTP/1.1" + CRLF +
+ "GET /test HTTP/1.1" + CRLF +
+ "host: localhost:8080" + CRLF +
headerLine + CRLF +
"X-Bug51557: abcd" + CRLF +
"Connection: close" + CRLF +
@@ -415,7 +417,8 @@ public class TestInternalInputBuffer ext
String[] request = new String[1];
request[0] =
newLines +
- "GET http://localhost:8080/test HTTP/1.1" + CRLF +
+ "GET /test HTTP/1.1" + CRLF +
+ "host: localhost:8080" + CRLF +
"X-Bug48839: abcd" + CRLF +
"\tefgh" + CRLF +
"Connection: close" + CRLF +
@@ -481,8 +484,9 @@ public class TestInternalInputBuffer ext
connect();
String[] request = new String[2];
- request[0] = "GET http://localhost:8080/test HTTP/1.1" + CR;
+ request[0] = "GET /test HTTP/1.1" + CR;
request[1] = LF +
+ "host: localhost:8080" + CRLF +
"Connection: close" + CRLF +
CRLF;
@@ -548,7 +552,8 @@ public class TestInternalInputBuffer ext
connect();
String[] request = new String[1];
- request[0] = "GET http://localhost:8080/test HTTP/1.1" + CRLF +
+ request[0] = "GET /test HTTP/1.1" + CRLF +
+ "host: localhost:8080" + CRLF +
"X-Header: Ignore" + CRLF +
"X-Header" + (char) 130 + ": Broken" + CRLF + CRLF;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
