1 https://issues.apache.org/bugzilla/show_bug.cgi?id=48357 |
|
2 |
|
3 --- server/protocol.c Tue Jan 24 12:02:19 2012 |
|
4 +++ server/protocol.c Mon Oct 1 04:53:41 2012 |
|
5 @@ -871,7 +871,7 @@ |
|
6 request_rec *r; |
|
7 apr_pool_t *p; |
|
8 const char *expect; |
|
9 - int access_status; |
|
10 + int access_status = HTTP_OK; |
|
11 apr_bucket_brigade *tmp_bb; |
|
12 apr_socket_t *csd; |
|
13 apr_interval_time_t cur_timeout; |
|
14 @@ -1049,7 +1049,7 @@ |
|
15 * HTTP/1.1 mentions twice (S9, S14.23) that a request MUST contain |
|
16 * a Host: header, and the server MUST respond with 400 if it doesn't. |
|
17 */ |
|
18 - r->status = HTTP_BAD_REQUEST; |
|
19 + access_status = HTTP_BAD_REQUEST; |
|
20 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, |
|
21 "client sent HTTP/1.1 request without hostname " |
|
22 "(see RFC2616 section 14.23): %s", r->uri); |
|
23 @@ -1065,14 +1065,8 @@ |
|
24 ap_add_input_filter_handle(ap_http_input_filter_handle, |
|
25 NULL, r, r->connection); |
|
26 |
|
27 - if (r->status != HTTP_OK) { |
|
28 - ap_send_error_response(r, 0); |
|
29 - ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, r); |
|
30 - ap_run_log_transaction(r); |
|
31 - return r; |
|
32 - } |
|
33 - |
|
34 - if ((access_status = ap_run_post_read_request(r))) { |
|
35 + if (access_status != HTTP_OK |
|
36 + || (access_status = ap_run_post_read_request(r))) { |
|
37 ap_die(access_status, r); |
|
38 ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, r); |
|
39 ap_run_log_transaction(r); |
|