Commit 4ff41a25 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1727544 from trunk: 

* Ensure that proto_num and protocol is set in another "error out early" edge
  case. This can happen with invalid CONNECT requests as described in the PR.

PR: 58929

Submitted by: rpluem
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1729875 13f79535-47bb-0310-9956-ffa450edef68
parent 55712da4

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 


Changes with Apache 2.4.19



  *) core: Prevent a server crash in case of an invalid CONNECT request with

     a custom error page for status code 400 that uses server side includes.

     PR 58929 [Ruediger Pluem]



  *) mod_ssl: handle TIMEOUT on empty SSL input as non-fatal, returning 

     APR_TIMEUP and preserving connection state for later retry.

     [Stefan Eissing]

STATUS

+0 −9
Original line number Diff line number Diff line
@@ -112,15 +112,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) core: Prevent a server crash in case of an invalid CONNECT request with

     a custom error page for status code 400 that uses server side includes.

     PR 58929

     Trunk version of patch:

         http://svn.apache.org/r1727544

     Backport version for 2.4.x of patch:

         Trunk version of patch works modulo CHANGES

     +1: rpluem, covener, ylavic



  *) core: Add expression support to SetHandler (someone wanted this in

     a well-articulated serverfault post).

     trunk patch:  http://svn.apache.org/r1725149

server/protocol.c

+2 −0
Original line number Diff line number Diff line
@@ -638,6 +638,8 @@ static int read_request_line(request_rec *r, apr_bucket_brigade *bb) 


    ap_parse_uri(r, uri);

    if (r->status != HTTP_OK) {

        r->proto_num = HTTP_VERSION(1,0);

        r->protocol  = apr_pstrdup(r->pool, "HTTP/1.0");

        return 0;

    }