Commit c511928b authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

Partial Backport of r1746884, no-op changes that introduce patch conflicts. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-merge-http-strict@1769454 13f79535-47bb-0310-9956-ffa450edef68
parent d56fbe83

server/protocol.c

+5 −3
Original line number Diff line number Diff line
@@ -400,7 +400,8 @@ AP_DECLARE(apr_status_t) ap_rgetline_core(char **s, apr_size_t n, 
                     */

                    if (do_alloc) {

                        tmp = NULL;

                    } else {

                    }

                    else {

                        /* We're null terminated. */

                        tmp = last_char;

                    }
@@ -656,7 +657,8 @@ static int read_request_line(request_rec *r, apr_bucket_brigade *bb) 
        r->assbackwards = 0;

        pro = ll;

        len = strlen(ll);

    } else {

    }

    else {

        r->assbackwards = 1;

        pro = "HTTP/0.9";

        len = 8;