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

(-)java/org/apache/coyote/http11/AbstractInputBuffer.java (+5 lines)
Lines 53-58 Link Here
53
53
54
54
55
    /**
55
    /**
56
     * Associated processor.
57
     */
58
    protected AbstractHttp11Processor processor;
59
60
    /**
56
     * Associated Coyote request.
61
     * Associated Coyote request.
57
     */
62
     */
58
    protected Request request;
63
    protected Request request;
(-)java/org/apache/coyote/http11/Http11AprProcessor.java (-1 / +2 lines)
Lines 73-79 Link Here
73
        this.endpoint = endpoint;
73
        this.endpoint = endpoint;
74
        
74
        
75
        request = new Request();
75
        request = new Request();
76
        inputBuffer = new InternalAprInputBuffer(request, headerBufferSize);
76
        inputBuffer = new InternalAprInputBuffer(this,
77
                request, headerBufferSize);
77
        request.setInputBuffer(inputBuffer);
78
        request.setInputBuffer(inputBuffer);
78
79
79
        response = new Response();
80
        response = new Response();
(-)java/org/apache/coyote/http11/Http11NioProcessor.java (-1 / +2 lines)
Lines 77-83 Link Here
77
        this.endpoint = endpoint;
77
        this.endpoint = endpoint;
78
78
79
        request = new Request();
79
        request = new Request();
80
        inputBuffer = new InternalNioInputBuffer(request, maxHttpHeaderSize);
80
        inputBuffer = new InternalNioInputBuffer(this, request,
81
                maxHttpHeaderSize);
81
        request.setInputBuffer(inputBuffer);
82
        request.setInputBuffer(inputBuffer);
82
83
83
        response = new Response();
84
        response = new Response();
(-)java/org/apache/coyote/http11/Http11Processor.java (-1 / +1 lines)
Lines 67-73 Link Here
67
        this.endpoint = endpoint;
67
        this.endpoint = endpoint;
68
        
68
        
69
        request = new Request();
69
        request = new Request();
70
        inputBuffer = new InternalInputBuffer(request, headerBufferSize);
70
        inputBuffer = new InternalInputBuffer(this, request, headerBufferSize);
71
        request.setInputBuffer(inputBuffer);
71
        request.setInputBuffer(inputBuffer);
72
72
73
        response = new Response();
73
        response = new Response();
(-)java/org/apache/coyote/http11/InternalAprInputBuffer.java (-1 / +7 lines)
Lines 48-55 Link Here
48
    /**
48
    /**
49
     * Alternate constructor.
49
     * Alternate constructor.
50
     */
50
     */
51
    public InternalAprInputBuffer(Request request, int headerBufferSize) {
51
    public InternalAprInputBuffer(Http11AprProcessor processor,
52
            Request request, int headerBufferSize) {
52
53
54
        this.processor = processor;
53
        this.request = request;
55
        this.request = request;
54
        headers = request.getMimeHeaders();
56
        headers = request.getMimeHeaders();
55
57
Lines 596-601 Link Here
596
598
597
        }
599
        }
598
600
601
        if (!processor.getEndpoint().isRunning()) {
602
            throw new IOException(sm.getString("iib.endpointNotRunning"));
603
        }
604
599
        return (nRead > 0);
605
        return (nRead > 0);
600
606
601
    }
607
    }
(-)java/org/apache/coyote/http11/InternalInputBuffer.java (-1 / +6 lines)
Lines 37-44 Link Here
37
    /**
37
    /**
38
     * Default constructor.
38
     * Default constructor.
39
     */
39
     */
40
    public InternalInputBuffer(Request request, int headerBufferSize) {
40
    public InternalInputBuffer(Http11Processor processor, Request request,
41
            int headerBufferSize) {
41
42
43
        this.processor = processor;
42
        this.request = request;
44
        this.request = request;
43
        headers = request.getMimeHeaders();
45
        headers = request.getMimeHeaders();
44
46
Lines 465-470 Link Here
465
467
466
        }
468
        }
467
469
470
        if (!processor.getEndpoint().isRunning()) {
471
            throw new IOException(sm.getString("iib.endpointNotRunning"));
472
        }
468
        return (nRead > 0);
473
        return (nRead > 0);
469
474
470
    }
475
    }
(-)java/org/apache/coyote/http11/InternalNioInputBuffer.java (-1 / +8 lines)
Lines 55-62 Link Here
55
    /**
55
    /**
56
     * Alternate constructor.
56
     * Alternate constructor.
57
     */
57
     */
58
    public InternalNioInputBuffer(Request request, int headerBufferSize) {
58
    public InternalNioInputBuffer(Http11NioProcessor processor, Request request,
59
            int headerBufferSize) {
59
60
61
        this.processor = processor;
60
        this.request = request;
62
        this.request = request;
61
        headers = request.getMimeHeaders();
63
        headers = request.getMimeHeaders();
62
64
Lines 729-734 Link Here
729
            // Do a simple read with a short timeout
731
            // Do a simple read with a short timeout
730
            read = readSocket(timeout, block)>0;
732
            read = readSocket(timeout, block)>0;
731
        }
733
        }
734
        
735
        if (!processor.getEndpoint().isRunning()) {
736
            throw new IOException(sm.getString("iib.endpointNotRunning"));
737
        }
738
732
        return read;
739
        return read;
733
    }
740
    }
734
741
(-)java/org/apache/coyote/http11/LocalStrings.properties (+1 lines)
Lines 38-40 Link Here
38
iib.eof.error=Unexpected EOF read on the socket
38
iib.eof.error=Unexpected EOF read on the socket
39
iib.requestheadertoolarge.error=Request header is too large
39
iib.requestheadertoolarge.error=Request header is too large
40
iib.invalidmethod=Invalid character (CR or LF) found in method name
40
iib.invalidmethod=Invalid character (CR or LF) found in method name
41
iib.endpointNotRunning=The endpoint was stopped whilst waiting for data from the client

Return to bug 50903