fielding 99/08/09 02:41:41
Modified: src CHANGES
src/main http_protocol.c
Log:
Flush the output buffer immediately after sending an error or redirect
response, since the result will be needed by the client to abort a
long data transfer or restart a series of pipelined requests.
Submitted by: Tom Vaughan <[EMAIL PROTECTED]>, Roy Fielding
Revision Changes Path
1.1414 +5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1413
retrieving revision 1.1414
diff -u -r1.1413 -r1.1414
--- CHANGES 1999/08/09 07:38:36 1.1413
+++ CHANGES 1999/08/09 09:41:36 1.1414
@@ -1,5 +1,10 @@
Changes with Apache 1.3.8
+ *) Flush the output buffer immediately after sending an error or redirect
+ response, since the result may be needed by the client to abort a
+ long data transfer or restart a series of pipelined requests.
+ [Tom Vaughan <[EMAIL PROTECTED]>, Roy Fielding]
+
*) PORT: Improved compilation and DSO support on Sequent DYNIX/ptx.
[Ian Turner <[EMAIL PROTECTED]>] PR#4735
1.277 +3 -5 apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -r1.276 -r1.277
--- http_protocol.c 1999/08/08 11:45:18 1.276
+++ http_protocol.c 1999/08/09 09:41:39 1.277
@@ -949,7 +949,6 @@
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
"request failed: URI too long");
ap_send_error_response(r, 0);
- ap_rflush(r);
ap_log_transaction(r);
return r;
}
@@ -963,7 +962,6 @@
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
"request failed: error reading the headers");
ap_send_error_response(r, 0);
- ap_rflush(r);
ap_log_transaction(r);
return r;
}
@@ -983,7 +981,6 @@
r->header_only = 0;
r->status = HTTP_BAD_REQUEST;
ap_send_error_response(r, 0);
- ap_rflush(r);
ap_log_transaction(r);
return r;
}
@@ -1016,7 +1013,6 @@
"client sent HTTP/1.1 request without hostname "
"(see RFC2068 section 9, and 14.23): %s", r->uri);
ap_send_error_response(r, 0);
- ap_rflush(r);
ap_log_transaction(r);
return r;
}
@@ -1037,7 +1033,6 @@
"client sent an unrecognized expectation value of "
"Expect: %s", expect);
ap_send_error_response(r, 0);
- ap_rflush(r);
(void) ap_discard_request_body(r);
ap_log_transaction(r);
return r;
@@ -2487,6 +2482,7 @@
if (r->header_only) {
ap_finalize_request_protocol(r);
+ ap_rflush(r);
return;
}
}
@@ -2510,6 +2506,7 @@
ap_rputs(custom_response + 1, r);
ap_kill_timeout(r);
ap_finalize_request_protocol(r);
+ ap_rflush(r);
return;
}
/*
@@ -2773,4 +2770,5 @@
}
ap_kill_timeout(r);
ap_finalize_request_protocol(r);
+ ap_rflush(r);
}