Attachment #34783 for bug #60784

View | Details | Raw Unified | Return to bug 60784
Collapse All | Expand All

Lines 109-115 Link Here

(-)catalina/connector/TestKeepAliveCount.java (-1 / +1 lines)
109		109
110	for (int i=0; i<5; i++) {	110	for (int i=0; i<5; i++) {
111	processRequest(false); // blocks until response has been read	111	processRequest(false); // blocks until response has been read
112	assertTrue(getResponseLine()!=null && getResponseLine().trim().startsWith("HTTP/1.1 200"));	112	assertTrue(getResponseLine()!=null && getResponseLine().startsWith("HTTP/1.1 200 "));
113	}	113	}
114	boolean passed = (this.readLine()==null);	114	boolean passed = (this.readLine()==null);
115	// Close the connection	115	// Close the connection




    public static final String LF = "\n";
    public static final String CRLF = CR + LF;

    public static final String INFO_100 = "HTTP/1.1 100 ";
    public static final String OK_200 = "HTTP/1.1 200 ";
    public static final String REDIRECT_302 = "HTTP/1.1 302 ";
    public static final String REDIRECT_303 = "HTTP/1.1 303 ";
    public static final String FAIL_400 = "HTTP/1.1 400 ";
    public static final String FAIL_404 = "HTTP/1.1 404 ";
    public static final String TIMEOUT_408 = "HTTP/1.1 408 ";
    public static final String FAIL_413 = "HTTP/1.1 413 ";
    public static final String FAIL_417 = "HTTP/1.1 417 ";
    public static final String FAIL_50X = "HTTP/1.1 50";
    public static final String FAIL_500 = "HTTP/1.1 500 ";
    public static final String FAIL_501 = "HTTP/1.1 501 ";

    private static final String CONTENT_LENGTH_HEADER_PREFIX =
            "Content-Length: ";

Lines 545-551 Link Here

(-)coyote/http2/Http2TestBase.java (-2 / +2 lines)
545	if (responseHeaders.length < 3) {	545	if (responseHeaders.length < 3) {
546	return false;	546	return false;
547	}	547	}
548	if (!responseHeaders[0].startsWith("HTTP/1.1 101")) {	548	if (!responseHeaders[0].startsWith("HTTP/1.1 101 ")) {
549	return false;	549	return false;
550	}	550	}
551		551
Lines 617-623 Link Here
617		617
618	void parseHttp11Response() throws IOException {	618	void parseHttp11Response() throws IOException {
619	String[] responseHeaders = readHttpResponseHeaders();	619	String[] responseHeaders = readHttpResponseHeaders();
620	Assert.assertTrue(responseHeaders[0], responseHeaders[0].startsWith("HTTP/1.1 200"));	620	Assert.assertTrue(responseHeaders[0], responseHeaders[0].startsWith("HTTP/1.1 200 "));
621		621
622	// Find the content length (chunked responses not handled)	622	// Find the content length (chunked responses not handled)
623	for (int i = 1; i < responseHeaders.length; i++) {	623	for (int i = 1; i < responseHeaders.length; i++) {

Return to bug 60784

Lines 46-63 Link Here

(-)catalina/startup/SimpleHttpClient.java (-11 / +11 lines)
46	public static final String LF = "\n";	46	public static final String LF = "\n";
47	public static final String CRLF = CR + LF;	47	public static final String CRLF = CR + LF;
48		48
49	public static final String INFO_100 = "HTTP/1.1 100";	49	public static final String INFO_100 = "HTTP/1.1 100 ";
50	public static final String OK_200 = "HTTP/1.1 200";	50	public static final String OK_200 = "HTTP/1.1 200 ";
51	public static final String REDIRECT_302 = "HTTP/1.1 302";	51	public static final String REDIRECT_302 = "HTTP/1.1 302 ";
52	public static final String REDIRECT_303 = "HTTP/1.1 303";	52	public static final String REDIRECT_303 = "HTTP/1.1 303 ";
53	public static final String FAIL_400 = "HTTP/1.1 400";	53	public static final String FAIL_400 = "HTTP/1.1 400 ";
54	public static final String FAIL_404 = "HTTP/1.1 404";	54	public static final String FAIL_404 = "HTTP/1.1 404 ";
55	public static final String TIMEOUT_408 = "HTTP/1.1 408";	55	public static final String TIMEOUT_408 = "HTTP/1.1 408 ";
56	public static final String FAIL_413 = "HTTP/1.1 413";	56	public static final String FAIL_413 = "HTTP/1.1 413 ";
57	public static final String FAIL_417 = "HTTP/1.1 417";	57	public static final String FAIL_417 = "HTTP/1.1 417 ";
58	public static final String FAIL_50X = "HTTP/1.1 50";	58	public static final String FAIL_50X = "HTTP/1.1 50";
59	public static final String FAIL_500 = "HTTP/1.1 500";	59	public static final String FAIL_500 = "HTTP/1.1 500 ";
60	public static final String FAIL_501 = "HTTP/1.1 501";	60	public static final String FAIL_501 = "HTTP/1.1 501 ";
61		61
62	private static final String CONTENT_LENGTH_HEADER_PREFIX =	62	private static final String CONTENT_LENGTH_HEADER_PREFIX =
63	"Content-Length: ";	63	"Content-Length: ";