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

Backports: r1352911 

Submitted by: sf
Make sure that a triggering LimitRequestFieldSize is always logged, even if the
first read already exeeds the limit and ap_rgetline does not return a header
name.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775710 13f79535-47bb-0310-9956-ffa450edef68
parent 94a24491

server/protocol.c

+17 −7
Original line number Diff line number Diff line
@@ -751,19 +751,29 @@ AP_DECLARE(void) ap_get_mime_headers_core(request_rec *r, apr_bucket_brigade *bb 
             * finding the end-of-line.  This is only going to happen if it

             * exceeds the configured limit for a field size.

             */

            if (rv == APR_ENOSPC && field) {

            if (rv == APR_ENOSPC) {

                const char *field_escaped;

                if (field) {

                    /* ensure ap_escape_html will terminate correctly */

                    field[len - 1] = '\0';

                    field_escaped = ap_escape_html(r->pool, field);

                }

                else {

                    field_escaped = field = "";

                }



                apr_table_setn(r->notes, "error-notes",

                               apr_psprintf(r->pool,

                                           "Size of a request header field "

                                           "exceeds server limit.<br />\n"

                                           "<pre>\n%.*s\n</pre>/n",

                                           field_name_len(field), 

                                           ap_escape_html(r->pool, field)));

                                           field_name_len(field_escaped),

                                           field_escaped));

                ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, 

                              "Request header exceeds LimitRequestFieldSize: "

                              "%.*s", field_name_len(field), field);

                              "Request header exceeds LimitRequestFieldSize%s"

                              "%.*s",

                              *field ? ": " : "",

                              field_name_len(field), field);

                ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,

                              "Request header exceeds LimitRequestFieldSize: "

                              "%.*s", field_name_len(field), field);