diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2011-12-27 19:42:33 +0100 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2011-12-27 19:42:33 +0100 |
| commit | ad14e19ad0400e289b06fb7728aea815e6ed49be (patch) | |
| tree | bd29489cafb04b303940169ae7b00c1171a5a34c /modules/http | |
| parent | 02a0e3b89d2ea1b984365e692c910668d75c6dcd (diff) | |
| download | apache2-ad14e19ad0400e289b06fb7728aea815e6ed49be.tar.gz | |
Upstream tarball 2.2.12upstream/2.2.12
Diffstat (limited to 'modules/http')
| -rw-r--r-- | modules/http/http_filters.c | 5 | ||||
| -rw-r--r-- | modules/http/http_protocol.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c index 89263d4d..f7f86df4 100644 --- a/modules/http/http_filters.c +++ b/modules/http/http_filters.c @@ -329,11 +329,14 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b, ctx->eos_sent = 1; } else { char *tmp; + int len; tmp = apr_pstrcat(f->r->pool, AP_SERVER_PROTOCOL, " ", ap_get_status_line(100), CRLF CRLF, NULL); + len = strlen(tmp); + ap_xlate_proto_to_ascii(tmp, len); apr_brigade_cleanup(bb); - e = apr_bucket_pool_create(tmp, strlen(tmp), f->r->pool, + e = apr_bucket_pool_create(tmp, len, f->r->pool, f->c->bucket_alloc); APR_BRIGADE_INSERT_HEAD(bb, e); e = apr_bucket_flush_create(f->c->bucket_alloc); diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c index 10e6514b..046e98bc 100644 --- a/modules/http/http_protocol.c +++ b/modules/http/http_protocol.c @@ -1044,8 +1044,8 @@ static const char *get_canned_error_string(int status, "request due to maintenance downtime or capacity\n" "problems. Please try again later.</p>\n"); case HTTP_GATEWAY_TIME_OUT: - return("<p>The proxy server did not receive a timely response\n" - "from the upstream server.</p>\n"); + return("<p>The gateway did not receive a timely response\n" + "from the upstream server or application.</p>\n"); case HTTP_NOT_EXTENDED: return("<p>A mandatory extension policy in the request is not\n" "accepted by the server for this resource.</p>\n"); |