You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2016/12/08 19:34:54 UTC
svn commit: r1773285 - /httpd/httpd/trunk/modules/http/http_filters.c
Author: covener
Date: Thu Dec 8 19:34:54 2016
New Revision: 1773285
URL: http://svn.apache.org/viewvc?rev=1773285&view=rev
Log:
change error handling for bad resp headers
- avoid looping between ap_die and the http filter
- remove the header that failed the check
- keep calling apr_table_do until our fn stops matching
This is still not great. We get the original body, a 500 status
code and status line.
Modified:
httpd/httpd/trunk/modules/http/http_filters.c
Modified: httpd/httpd/trunk/modules/http/http_filters.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_filters.c?rev=1773285&r1=1773284&r2=1773285&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_filters.c (original)
+++ httpd/httpd/trunk/modules/http/http_filters.c Thu Dec 8 19:34:54 2016
@@ -632,6 +632,7 @@ apr_status_t ap_http_filter(ap_filter_t
struct check_header_ctx {
request_rec *r;
int strict;
+ const char *badheader;
};
/* check a single header, to be used with apr_table_do() */
@@ -657,6 +658,7 @@ static int check_header(void *arg, const
"Response header name '%s' contains invalid "
"characters, aborting request",
name);
+ ctx->badheader = name;
return 0;
}
@@ -666,6 +668,7 @@ static int check_header(void *arg, const
"Response header '%s' value of '%s' contains invalid "
"characters, aborting request",
name, val);
+ ctx->badheader = name;
return 0;
}
return 1;
@@ -680,13 +683,21 @@ static APR_INLINE int check_headers(requ
struct check_header_ctx ctx;
core_server_config *conf =
ap_get_core_module_config(r->server->module_config);
+ int rv = 1;
ctx.r = r;
ctx.strict = (conf->http_conformance != AP_HTTP_CONFORMANCE_UNSAFE);
- if (!apr_table_do(check_header, &ctx, r->headers_out, NULL))
- return 0; /* problem has been logged by check_header() */
+ ctx.badheader = NULL;
- return 1;
+ while (!apr_table_do(check_header, &ctx, r->headers_out, NULL)){
+ if (ctx.badheader) {
+ apr_table_unset(r->headers_out, ctx.badheader);
+ apr_table_unset(r->err_headers_out, ctx.badheader);
+ }
+ rv = 0; /* problem has been logged by check_header() */
+ }
+
+ return rv;
}
typedef struct header_struct {
@@ -1249,8 +1260,7 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_
}
if (!check_headers(r)) {
- ap_die(HTTP_INTERNAL_SERVER_ERROR, r);
- return AP_FILTER_ERROR;
+ r->status = 500;
}
/*