mirror of
https://github.com/apache/httpd.git
synced 2025-08-08 15:02:10 +03:00
Import the core parts of the DTrace patch. This is a modified and updated
version of what was submited by Theo before: <http://mail-archives.apache.org/mod_mbox/httpd-dev/200805.mbox/%3C6AFBCFE8-4CCA-4A02-8A43-F9170689695D@omniti.com%3E> Note, this does not hook it up into the build system at this time, because the original patch was a little too creative there. Submitted By: Theo Schlossnagle <jesus omniti.com> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723565 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -260,6 +260,7 @@ void ap_process_request_after_handler(request_rec *r)
|
||||
|
||||
c->cs->state = CONN_STATE_WRITE_COMPLETION;
|
||||
check_pipeline(c);
|
||||
AP_PROCESS_REQUEST_RETURN((uintptr_t)r, r->uri, r->status);
|
||||
if (ap_extended_status) {
|
||||
ap_time_process_request(c->sbh, STOP_PREQUEST);
|
||||
}
|
||||
@@ -284,6 +285,7 @@ void ap_process_async_request(request_rec *r)
|
||||
* Use this hook with extreme care and only if you know what you are
|
||||
* doing.
|
||||
*/
|
||||
AP_PROCESS_REQUEST_ENTRY((uintptr_t)r, r->uri);
|
||||
if (ap_extended_status) {
|
||||
ap_time_process_request(r->connection->sbh, START_PREQUEST);
|
||||
}
|
||||
@@ -299,6 +301,10 @@ void ap_process_async_request(request_rec *r)
|
||||
}
|
||||
|
||||
if (access_status == SUSPENDED) {
|
||||
/* TODO: Should move these steps into a generic function, so modules
|
||||
* working on a suspended request can also call _ENTRY again.
|
||||
*/
|
||||
AP_PROCESS_REQUEST_RETURN((uintptr_t)r, r->uri, access_status);
|
||||
if (ap_extended_status) {
|
||||
ap_time_process_request(c->sbh, STOP_PREQUEST);
|
||||
}
|
||||
@@ -536,6 +542,8 @@ AP_DECLARE(void) ap_internal_redirect(const char *new_uri, request_rec *r)
|
||||
request_rec *new = internal_internal_redirect(new_uri, r);
|
||||
int access_status;
|
||||
|
||||
AP_INTERNAL_REDIRECT(r->uri, new_uri);
|
||||
|
||||
/* ap_die was already called, if an error occured */
|
||||
if (!new) {
|
||||
return;
|
||||
|
Reference in New Issue
Block a user