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

Clean up assorted merge-duplications and whitespace to sync at 2.4.24-dev.0 

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

server/protocol.c

+3 −25
Original line number Original line Diff line number Diff line
@@ -660,16 +660,6 @@ static int read_request_line(request_rec *r, apr_bucket_brigade *bb) 
    return 1;

    return 1;

}

}





/* get the length of the field name for logging, but no more than 80 bytes */

#define LOG_NAME_MAX_LEN 80

static int field_name_len(const char *field)

{

    const char *end = ap_strchr_c(field, ':');

    if (end == NULL || end - field > LOG_NAME_MAX_LEN)

        return LOG_NAME_MAX_LEN;

    return end - field;

}



static int table_do_fn_check_lengths(void *r_, const char *key,

static int table_do_fn_check_lengths(void *r_, const char *key,

                                     const char *value)

                                     const char *value)

{

{
@@ -751,7 +741,7 @@ AP_DECLARE(void) ap_get_mime_headers_core(request_rec *r, apr_bucket_brigade *bb 
                               apr_psprintf(r->pool,

                               apr_psprintf(r->pool,

                                           "Size of a request header field "

                                           "Size of a request header field "

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

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

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

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

                                           field_name_len(field_escaped),

                                           field_name_len(field_escaped),

                                           field_escaped));

                                           field_escaped));

                ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,

                ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
@@ -759,9 +749,6 @@ AP_DECLARE(void) ap_get_mime_headers_core(request_rec *r, apr_bucket_brigade *bb 
                              "%.*s",

                              "%.*s",

                              *field ? ": " : "",

                              *field ? ": " : "",

                              field_name_len(field), 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);

            }

            }

            return;

            return;

        }

        }
@@ -796,10 +783,6 @@ AP_DECLARE(void) ap_get_mime_headers_core(request_rec *r, apr_bucket_brigade *bb 
                                  "Request header exceeds LimitRequestFieldSize "

                                  "Request header exceeds LimitRequestFieldSize "

                                  "after folding: %.*s",

                                  "after folding: %.*s",

                                  field_name_len(last_field), last_field);

                                  field_name_len(last_field), last_field);

                    ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,

                                  "Request header exceeds LimitRequestFieldSize "

                                  "after folding: %.*s",

                                  field_name_len(last_field), last_field);

                    return;

                    return;

                }

                }
@@ -845,11 +828,6 @@ AP_DECLARE(void) ap_get_mime_headers_core(request_rec *r, apr_bucket_brigade *bb 
                                  "Request header field is missing ':' "

                                  "Request header field is missing ':' "

                                  "separator: %.*s", (int)LOG_NAME_MAX_LEN,

                                  "separator: %.*s", (int)LOG_NAME_MAX_LEN,

                                  last_field);

                                  last_field);



                    ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,

                                  "Request header field is missing ':' "

                                  "separator: %.*s", (int)LOG_NAME_MAX_LEN,

                                  last_field);

                    return;

                    return;

                }

                }