Commit 637b93a0 authored by Brian Pane's avatar Brian Pane
Browse files

Avoid setting r->the_request to NULL if the client sends too many blank lines. 

Also, remove a bit of debug code.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@366996 13f79535-47bb-0310-9956-ffa450edef68
parent 3a3cbc8f

server/protocol.c

+6 −2
Original line number Diff line number Diff line
@@ -587,7 +587,6 @@ static apr_status_t getline_nonblocking(char **s, apr_size_t n, 
    }

    *last_char = '\0';

    bytes_handled = last_char - *s;

    fprintf(stderr, "read line '%s'\n", *s);



    *read = bytes_handled;

    return APR_SUCCESS;
@@ -791,9 +790,14 @@ static apr_status_t process_request_line(request_rec *r, char *line, 
            if (r->num_blank_lines < max_blank_lines) {

                return APR_SUCCESS;

            }

            else {

                set_the_request(r, "");

            }

        }

        else {

            set_the_request(r, line);

        }

    }

    else {

        /* We've already read the first line of the request.  This is either

         * a header field or the blank line terminating the header