Commit ece6daeb authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

Merge r892808 from trunk: 

Fix up r892678 as pointed out by rpluem.

Submitted by: niq
Reviewed by: covener, jchampion, ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1775232 13f79535-47bb-0310-9956-ffa450edef68
parent 6e85af64

STATUS

+0 −7
Original line number Diff line number Diff line
@@ -103,13 +103,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

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



  *) core: http://svn.apache.org/viewvc?rev=892808&view=rev is missing on 2.2.x after

           after this backport http://svn.apache.org/viewvc?rev=1758671&view=rev

           PR60403.

     2.4.x patch: https://svn.apache.org/r892808

     2.2.x patch: 2.4 works

     +1: covener, jchampion, ylavic





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

server/protocol.c

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ AP_DECLARE(apr_status_t) ap_rgetline_core(char **s, apr_size_t n, 
    *read = bytes_handled;



    /* PR#43039: We shouldn't accept NULL bytes within the line */

    if (strlen(*s) < bytes_handled - 1) {

    if (strlen(*s) < bytes_handled) {

        return APR_EINVAL;

    }