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 13:58:03 UTC
svn commit: r1777611 - in /httpd/httpd/trunk: include/httpd.h
modules/proxy/mod_proxy_http.c
Author: jailletc36
Date: Fri Jan 6 13:58:03 2017
New Revision: 1777611
URL: http://svn.apache.org/viewvc?rev=1777611&view=rev
Log:
Move definition of ASCII_ZERO to httpd.h and rename it ZERO_ASCII for consistancy reason.
Remove definition of ASCII_CRLF which is the same as CRLF_ASCII.
Use ZERO_ASCII and CRLF_ASCII in mod_proxy_http
Modified:
httpd/httpd/trunk/include/httpd.h
httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
Modified: httpd/httpd/trunk/include/httpd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/httpd.h?rev=1777611&r1=1777610&r2=1777611&view=diff
==============================================================================
--- httpd/httpd/trunk/include/httpd.h (original)
+++ httpd/httpd/trunk/include/httpd.h Fri Jan 6 13:58:03 2017
@@ -690,6 +690,7 @@ struct ap_method_list_t {
#endif /* APR_CHARSET_EBCDIC */
/** Useful for common code with either platform charset. */
#define CRLF_ASCII "\015\012"
+#define ZERO_ASCII "\060"
/**
* @defgroup values_request_rec_body Possible values for request_rec.read_body
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_http.c?rev=1777611&r1=1777610&r2=1777611&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_http.c Fri Jan 6 13:58:03 2017
@@ -213,16 +213,13 @@ static void add_cl(apr_pool_t *p,
APR_BRIGADE_INSERT_TAIL(header_brigade, e);
}
-#define ASCII_CRLF "\015\012"
-#define ASCII_ZERO "\060"
-
static void terminate_headers(apr_bucket_alloc_t *bucket_alloc,
apr_bucket_brigade *header_brigade)
{
apr_bucket *e;
/* add empty line at the end of the headers */
- e = apr_bucket_immortal_create(ASCII_CRLF, 2, bucket_alloc);
+ e = apr_bucket_immortal_create(CRLF_ASCII, 2, bucket_alloc);
APR_BRIGADE_INSERT_TAIL(header_brigade, e);
}
@@ -281,7 +278,7 @@ static int stream_reqbody_chunked(apr_po
/*
* Append the end-of-chunk CRLF
*/
- e = apr_bucket_immortal_create(ASCII_CRLF, 2, bucket_alloc);
+ e = apr_bucket_immortal_create(CRLF_ASCII, 2, bucket_alloc);
APR_BRIGADE_INSERT_TAIL(input_brigade, e);
}
@@ -357,14 +354,14 @@ static int stream_reqbody_chunked(apr_po
bb = input_brigade;
}
- e = apr_bucket_immortal_create(ASCII_ZERO ASCII_CRLF
+ e = apr_bucket_immortal_create(ZERO_ASCII CRLF_ASCII
/* <trailers> */
- ASCII_CRLF,
+ CRLF_ASCII,
5, bucket_alloc);
APR_BRIGADE_INSERT_TAIL(bb, e);
if (apr_table_get(r->subprocess_env, "proxy-sendextracrlf")) {
- e = apr_bucket_immortal_create(ASCII_CRLF, 2, bucket_alloc);
+ e = apr_bucket_immortal_create(CRLF_ASCII, 2, bucket_alloc);
APR_BRIGADE_INSERT_TAIL(bb, e);
}
@@ -426,7 +423,7 @@ static int stream_reqbody_cl(apr_pool_t
apr_bucket_delete(e);
if (apr_table_get(r->subprocess_env, "proxy-sendextracrlf")) {
- e = apr_bucket_immortal_create(ASCII_CRLF, 2,
+ e = apr_bucket_immortal_create(CRLF_ASCII, 2,
bucket_alloc);
APR_BRIGADE_INSERT_TAIL(input_brigade, e);
}
@@ -665,7 +662,7 @@ static int spool_reqbody_cl(apr_pool_t *
apr_brigade_insert_file(header_brigade, tmpfile, 0, fsize, p);
}
if (apr_table_get(r->subprocess_env, "proxy-sendextracrlf")) {
- e = apr_bucket_immortal_create(ASCII_CRLF, 2, bucket_alloc);
+ e = apr_bucket_immortal_create(CRLF_ASCII, 2, bucket_alloc);
APR_BRIGADE_INSERT_TAIL(header_brigade, e);
}
return OK;