You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2017/01/06 14:57:34 UTC
svn commit: r1777622 - /httpd/httpd/trunk/modules/http/chunk_filter.c
Author: jailletc36
Date: Fri Jan 6 14:57:33 2017
New Revision: 1777622
URL: http://svn.apache.org/viewvc?rev=1777622&view=rev
Log:
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
Modified:
httpd/httpd/trunk/modules/http/chunk_filter.c
Modified: httpd/httpd/trunk/modules/http/chunk_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/chunk_filter.c?rev=1777622&r1=1777621&r2=1777622&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/chunk_filter.c (original)
+++ httpd/httpd/trunk/modules/http/chunk_filter.c Fri Jan 6 14:57:33 2017
@@ -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_fil
* 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_fil
*/
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
/* <trailers> */
- ASCII_CRLF, 5, c->bucket_alloc);
+ CRLF_ASCII, 5, c->bucket_alloc);
APR_BUCKET_INSERT_BEFORE(eos, e);
}