www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

fix weird things that happen with canned error messages due to using two

Browse Source 
different request_recs after an ErrorDocument internal redirect failure.
examples: wrong Content-Type, garbled output from ebcdic servers due to
double charset translation


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96364 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Greg Ames
2002-08-13 14:27:39 +00:00
parent cdf30bf3e6
commit 65b5ceef11
3 changed files with 40 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/http/http_protocol.c
View File

@@ -2301,16 +2301,6 @@ AP_DECLARE(void) ap_send_error_response(request_rec *r, int recursive_error)
const char *title = status_lines[idx]; const char *title = status_lines[idx];
const char *h1; const char *h1;
/* XXX This is a major hack that should be fixed cleanly. The
* problem is that we have the information we need in a previous
* request, but the text of the page must be sent down the last
* request_rec's filter stack. rbb
*/
request_rec *rlast = r;
while (rlast->next) {
rlast = rlast->next;
}
/* Accept a status_line set by a module, but only if it begins /* Accept a status_line set by a module, but only if it begins
* with the 3 digit status code * with the 3 digit status code
*/ */
@@ -2331,24 +2321,24 @@ AP_DECLARE(void) ap_send_error_response(request_rec *r, int recursive_error)
* so do ebcdic->ascii translation explicitly (if needed) * so do ebcdic->ascii translation explicitly (if needed)
*/ */
ap_rvputs_proto_in_ascii(rlast, ap_rvputs_proto_in_ascii(r,
DOCTYPE_HTML_2_0 DOCTYPE_HTML_2_0
"<html><head>\n<title>", title, "<html><head>\n<title>", title,
"</title>\n</head><body>\n<h1>", h1, "</h1>\n", "</title>\n</head><body>\n<h1>", h1, "</h1>\n",
NULL); NULL);
ap_rvputs_proto_in_ascii(rlast, ap_rvputs_proto_in_ascii(r,
get_canned_error_string(status, r, location), get_canned_error_string(status, r, location),
NULL); NULL);
if (recursive_error) { if (recursive_error) {
ap_rvputs_proto_in_ascii(rlast, "<p>Additionally, a ", ap_rvputs_proto_in_ascii(r, "<p>Additionally, a ",
status_lines[ap_index_of_response(recursive_error)], status_lines[ap_index_of_response(recursive_error)],
"\nerror was encountered while trying to use an " "\nerror was encountered while trying to use an "
"ErrorDocument to handle the request.</p>\n", NULL); "ErrorDocument to handle the request.</p>\n", NULL);
} }
ap_rvputs_proto_in_ascii(rlast, ap_psignature("<hr />\n", r), NULL); ap_rvputs_proto_in_ascii(r, ap_psignature("<hr />\n", r), NULL);
ap_rvputs_proto_in_ascii(rlast, "</body></html>\n", NULL); ap_rvputs_proto_in_ascii(r, "</body></html>\n", NULL);
} }
ap_finalize_request_protocol(r); ap_finalize_request_protocol(r);
} }

67
modules/http/http_request.c
View File

@@ -96,6 +96,23 @@
* Mainline request processing... * Mainline request processing...
*/ */
/* XXX A cleaner and faster way to do this might be to pass the request_rec
* down the filter chain as a parameter. It would need to change for
* subrequest vs. main request filters; perhaps the subrequest filter could
* make the switch.
*/
static void update_r_in_filters(ap_filter_t *f,
request_rec *from,
request_rec *to)
{
while (f) {
if (f->r == from) {
f->r = to;
}
f = f->next;
}
}
AP_DECLARE(void) ap_die(int type, request_rec *r) AP_DECLARE(void) ap_die(int type, request_rec *r)
{ {
int error_index = ap_index_of_response(type); int error_index = ap_index_of_response(type);
@@ -124,6 +141,20 @@ AP_DECLARE(void) ap_die(int type, request_rec *r)
while (r_1st_err->prev && (r_1st_err->prev->status != HTTP_OK)) while (r_1st_err->prev && (r_1st_err->prev->status != HTTP_OK))
r_1st_err = r_1st_err->prev; /* Get back to original error */ r_1st_err = r_1st_err->prev; /* Get back to original error */
if (r_1st_err != r) {
/* The recursive error was caused by an ErrorDocument specifying
* an internal redirect to a bad URI. ap_internal_redirect has
* changed the filter chains to point to the ErrorDocument's
* request_rec. Back out those changes so we can safely use the
* original failing request_rec to send the canned error message.
*
* ap_send_error_response gets rid of existing resource filters
* on the output side, so we can skip those.
*/
update_r_in_filters(r_1st_err->proto_output_filters, r, r_1st_err);
update_r_in_filters(r_1st_err->input_filters, r, r_1st_err);
}
custom_response = NULL; /* Do NOT retry the custom thing! */ custom_response = NULL; /* Do NOT retry the custom thing! */
} }
@@ -301,7 +332,6 @@ static apr_table_t *rename_original_env(apr_pool_t *p, apr_table_t *t)
static request_rec *internal_internal_redirect(const char *new_uri, static request_rec *internal_internal_redirect(const char *new_uri,
request_rec *r) { request_rec *r) {
int access_status; int access_status;
ap_filter_t *f;
request_rec *new = (request_rec *) apr_pcalloc(r->pool, request_rec *new = (request_rec *) apr_pcalloc(r->pool,
sizeof(request_rec)); sizeof(request_rec));
@@ -367,21 +397,8 @@ static request_rec *internal_internal_redirect(const char *new_uri,
new->output_filters = new->proto_output_filters; new->output_filters = new->proto_output_filters;
new->input_filters = new->proto_input_filters; new->input_filters = new->proto_input_filters;
f = new->input_filters; update_r_in_filters(new->input_filters, r, new);
while (f) { update_r_in_filters(new->output_filters, r, new);
if (f->r == r) {
f->r = new;
}
f = f->next;
}
f = new->output_filters;
while (f) {
if (f->r == r) {
f->r = new;
}
f = f->next;
}
apr_table_setn(new->subprocess_env, "REDIRECT_STATUS", apr_table_setn(new->subprocess_env, "REDIRECT_STATUS",
apr_itoa(r->pool, r->status)); apr_itoa(r->pool, r->status));
@@ -402,8 +419,6 @@ static request_rec *internal_internal_redirect(const char *new_uri,
/* XXX: Is this function is so bogus and fragile that we deep-6 it? */ /* XXX: Is this function is so bogus and fragile that we deep-6 it? */
AP_DECLARE(void) ap_internal_fast_redirect(request_rec *rr, request_rec *r) AP_DECLARE(void) ap_internal_fast_redirect(request_rec *rr, request_rec *r)
{ {
ap_filter_t *filters;
/* We need to tell POOL_DEBUG that we're guaranteeing that rr->pool /* We need to tell POOL_DEBUG that we're guaranteeing that rr->pool
* will exist as long as r->pool. Otherwise we run into troubles because * will exist as long as r->pool. Otherwise we run into troubles because
* some values in this request will be allocated in r->pool, and others in * some values in this request will be allocated in r->pool, and others in
@@ -449,20 +464,8 @@ AP_DECLARE(void) ap_internal_fast_redirect(request_rec *rr, request_rec *r)
* their f->r structure when it is pointing to rr, the real request_rec * their f->r structure when it is pointing to rr, the real request_rec
* will not get updated. Fix that here. * will not get updated. Fix that here.
*/ */
filters = r->input_filters; update_r_in_filters(r->input_filters, rr, r);
while (filters) { update_r_in_filters(r->output_filters, rr, r);
if (filters->r == rr) {
filters->r = r;
}
filters = filters->next;
}
filters = r->output_filters;
while (filters) {
if (filters->r == rr) {
filters->r = r;
}
filters = filters->next;
}
} }
AP_DECLARE(void) ap_internal_redirect(const char *new_uri, request_rec *r) AP_DECLARE(void) ap_internal_redirect(const char *new_uri, request_rec *r)

4
server/protocol.c
View File

@@ -1101,10 +1101,6 @@ AP_DECLARE(void) ap_finalize_request_protocol(request_rec *r)
{ {
(void) ap_discard_request_body(r); (void) ap_discard_request_body(r);
while (r->next) {
r = r->next;
}
/* tell the filter chain there is no more content coming */ /* tell the filter chain there is no more content coming */
if (!r->eos_sent) { if (!r->eos_sent) {
end_output_stream(r); end_output_stream(r);