components/apache2/patches/bug48357.patch
author Rich Burridge <rich.burridge@oracle.com>
Mon, 07 Dec 2015 16:17:05 -0800
changeset 5166 29635ee48caa
parent 4696 96b9957387bf
permissions -rw-r--r--
17458457 Several ncurses man pages are delivered in the wrong location
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1008
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     1
https://issues.apache.org/bugzilla/show_bug.cgi?id=48357
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     2
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     3
--- server/protocol.c	Tue Jan 24 12:02:19 2012
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     4
+++ server/protocol.c	Mon Oct  1 04:53:41 2012
4696
96b9957387bf 21479636 Upgrade Apache Web Server to version 2.2.31
Petr Sumbera <petr.sumbera@oracle.com>
parents: 1008
diff changeset
     5
@@ -871,7 +871,7 @@
1008
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     6
     request_rec *r;
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     7
     apr_pool_t *p;
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     8
     const char *expect;
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     9
-    int access_status;
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    10
+    int access_status = HTTP_OK;
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    11
     apr_bucket_brigade *tmp_bb;
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    12
     apr_socket_t *csd;
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    13
     apr_interval_time_t cur_timeout;
4696
96b9957387bf 21479636 Upgrade Apache Web Server to version 2.2.31
Petr Sumbera <petr.sumbera@oracle.com>
parents: 1008
diff changeset
    14
@@ -1049,7 +1049,7 @@
1008
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    15
          * HTTP/1.1 mentions twice (S9, S14.23) that a request MUST contain
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    16
          * a Host: header, and the server MUST respond with 400 if it doesn't.
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    17
          */
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    18
-        r->status = HTTP_BAD_REQUEST;
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    19
+        access_status = HTTP_BAD_REQUEST;
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    20
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    21
                       "client sent HTTP/1.1 request without hostname "
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    22
                       "(see RFC2616 section 14.23): %s", r->uri);
4696
96b9957387bf 21479636 Upgrade Apache Web Server to version 2.2.31
Petr Sumbera <petr.sumbera@oracle.com>
parents: 1008
diff changeset
    23
@@ -1065,14 +1065,8 @@
1008
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    24
     ap_add_input_filter_handle(ap_http_input_filter_handle,
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    25
                                NULL, r, r->connection);
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    26
 
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    27
-    if (r->status != HTTP_OK) {
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    28
-        ap_send_error_response(r, 0);
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    29
-        ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, r);
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    30
-        ap_run_log_transaction(r);
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    31
-        return r;
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    32
-    }
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    33
-
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    34
-    if ((access_status = ap_run_post_read_request(r))) {
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    35
+    if (access_status != HTTP_OK
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    36
+        || (access_status = ap_run_post_read_request(r))) {
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    37
         ap_die(access_status, r);
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    38
         ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, r);
85cbcf3980ca 7202142 Upgrade Apache Web Server to version 2.2.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    39
         ap_run_log_transaction(r);