From 4ceaede796358169d88ca3dc8bff265addd2982c Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Fri, 6 Jan 2017 14:57:33 +0000 Subject: [PATCH] Remove definition of ASCII_CRLF which is the same as CRLF_ASCII. Remove definition of ASCII_ZERO which is the same as ZERO_ASCII. Use ZERO_ASCII and CRLF_ASCII in chunk_filter git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777622 13f79535-47bb-0310-9956-ffa450edef68 --- modules/http/chunk_filter.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/http/chunk_filter.c b/modules/http/chunk_filter.c index e8d34743570..6f5f7c153e0 100644 --- a/modules/http/chunk_filter.c +++ b/modules/http/chunk_filter.c @@ -46,8 +46,6 @@ static char bad_gateway_seen; apr_status_t ap_http_chunk_filter(ap_filter_t *f, apr_bucket_brigade *b) { -#define ASCII_CRLF "\015\012" -#define ASCII_ZERO "\060" conn_rec *c = f->r->connection; apr_bucket_brigade *more, *tmp; apr_bucket *e; @@ -144,7 +142,7 @@ apr_status_t ap_http_chunk_filter(ap_filter_t *f, apr_bucket_brigade *b) * Insert the end-of-chunk CRLF before an EOS or * FLUSH bucket, or appended to the brigade */ - e = apr_bucket_immortal_create(ASCII_CRLF, 2, c->bucket_alloc); + e = apr_bucket_immortal_create(CRLF_ASCII, 2, c->bucket_alloc); if (eos != NULL) { APR_BUCKET_INSERT_BEFORE(eos, e); } @@ -178,9 +176,9 @@ apr_status_t ap_http_chunk_filter(ap_filter_t *f, apr_bucket_brigade *b) */ if (eos && !f->ctx) { /* XXX: (2) trailers ... does not yet exist */ - e = apr_bucket_immortal_create(ASCII_ZERO ASCII_CRLF + e = apr_bucket_immortal_create(ZERO_ASCII CRLF_ASCII /* */ - ASCII_CRLF, 5, c->bucket_alloc); + CRLF_ASCII, 5, c->bucket_alloc); APR_BUCKET_INSERT_BEFORE(eos, e); } -- 2.47.2