From fbcd4bd29abf8ed4ec97bcd696b6a7b182f998c4 Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Thu, 8 Jan 2009 21:40:59 +0000 Subject: [PATCH] Translate locally generated "100-Continue" message to ASCII on EBCDIC systems. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@732832 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ modules/http/http_filters.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 2186c26a7a..80ea7b1325 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,9 @@ Changes with Apache 2.3.2 [ When backported to 2.2.x, remove entry from this file ] + *) core: Translate locally generated "100-Continue" message to + ASCII on EBCDIC systems. [Eric Covener] + *) prefork: Fix child process hang during graceful restart/stop in configurations with multiple listening sockets. PR 42829. [Joe Orton, Jeff Trawick] diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c index b36fa563f2..b42b47fb69 100644 --- a/modules/http/http_filters.c +++ b/modules/http/http_filters.c @@ -328,11 +328,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); -- 2.40.0