mirror of
https://github.com/apache/httpd.git
synced 2025-08-07 04:02:58 +03:00
Now that stinks, sorry. In moving code - I didn't notice my code
now served out (r) info instead of the (rnew) info. Made for nasty cyclic loops in mod_dir :( It looks like this works once again. I'll post completed deltas to the list ASAP. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90838 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -438,14 +438,14 @@ AP_DECLARE(void) ap_internal_redirect(const char *new_uri, request_rec *r)
|
|||||||
request_rec *new = internal_internal_redirect(new_uri, r);
|
request_rec *new = internal_internal_redirect(new_uri, r);
|
||||||
int access_status = ap_process_request_internal(new);
|
int access_status = ap_process_request_internal(new);
|
||||||
if (access_status == OK) {
|
if (access_status == OK) {
|
||||||
if ((access_status = ap_invoke_handler(r)) != 0) {
|
if ((access_status = ap_invoke_handler(new)) != 0) {
|
||||||
ap_die(access_status, r);
|
ap_die(access_status, new);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ap_finalize_request_protocol(r);
|
ap_finalize_request_protocol(new);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
ap_die(access_status, r);
|
ap_die(access_status, new);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -461,14 +461,14 @@ AP_DECLARE(void) ap_internal_redirect_handler(const char *new_uri, request_rec *
|
|||||||
new->content_type = r->content_type;
|
new->content_type = r->content_type;
|
||||||
access_status = ap_process_request_internal(new);
|
access_status = ap_process_request_internal(new);
|
||||||
if (access_status == OK) {
|
if (access_status == OK) {
|
||||||
if ((access_status = ap_invoke_handler(r)) != 0) {
|
if ((access_status = ap_invoke_handler(new)) != 0) {
|
||||||
ap_die(access_status, r);
|
ap_die(access_status, new);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ap_finalize_request_protocol(r);
|
ap_finalize_request_protocol(new);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
ap_die(access_status, r);
|
ap_die(access_status, new);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user