Easy patches: synch 2.4.x and trunk (3b15204c) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

CHANGES

+13 −0

Original line number	Diff line number	Diff line
		-- coding: utf-8 --
		Changes with Apache 2.4.40

		*) Easy patches: synch 2.4.x and trunk
		- core: 80 chars
		- http_core: Clean-uo and style. No functional change overall
		- http_core: One more style fix in ap_process_http_async_connection()
		- mod_mime: Fix a cppcheck warning
		- mod_proxy_ajp: Fix a harmless clang warning
		- suexec: avoid a potential sprintf overflow
		- mod_headers: This is harmless, but this really should be an 'echo_do *'
		- core: Fix typo
		- core: Update a comment about the 'PATCH' HTTP command
		- mod_proxy_balancer: Fix some HTML syntax issues
		[Christophe Jaillet]

		*) When using mod_status with the Event MPM, report the number of requests
		associated with an active connection in the "ACC" field. Previously
		zero was always reported with this MPM. PR60647. [Eric Covener]

+0 −25

Original line number	Diff line number	Diff line
		@@ -127,31 +127,6 @@ RELEASE SHOWSTOPPERS:
		PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
		[ start all new proposals below, under PATCHES PROPOSED. ]

		*) Easy patches: synch 2.4.x and trunk
		- core: 80 chars
		- http_core: Clean-uo and style. No functional change overall
		- http_core: One more style fix in ap_process_http_async_connection()
		- mod_mime: Fix a cppcheck warning
		- mod_proxy_ajp: Fix a harmless clang warning
		- suexec: avoid a potential sprintf overflow
		- mod_headers: This is harmless, but this really should be an 'echo_do *'
		- core: Fix typo
		- core: Update a comment about the 'PATCH' HTTP command
		- mod_proxy_balancer: Fix some HTML syntax issues
		trunk patch:
		- http://svn.apache.org/r1780282
		- http://svn.apache.org/r1814659
		- http://svn.apache.org/r1814660
		- http://svn.apache.org/r1838285
		- http://svn.apache.org/r1842881
		- http://svn.apache.org/r1846253
		- http://svn.apache.org/r1853757
		- http://svn.apache.org/r1851702
		- http://svn.apache.org/r1853980
		- http://svn.apache.org/r1855614
		2.4.x patch: svn merge -c 1780282,1814659,1814660,1838285,1842881,1846253,1853757,1851702,1853980,1855614 ^/httpd/httpd/trunk .
		+1: jailletc36, jim, rjung
		jailletc36: this series relies on r1780280 backport (see above)

		PATCHES PROPOSED TO BACKPORT FROM TRUNK:
		[ New proposals should be added at the end of the list ]

+1 −1

Original line number	Diff line number	Diff line
		@@ -595,7 +595,7 @@ AP_DECLARE(const char *) ap_get_server_built(void);
		#define M_CONNECT 4
		#define M_OPTIONS 5
		#define M_TRACE 6 /** RFC 2616: HTTP */
		#define M_PATCH 7 /** no rfc(!) ### remove this one? */
		#define M_PATCH 7 /** RFC 5789: PATCH Method for HTTP */
		#define M_PROPFIND 8 /** RFC 2518: WebDAV */
		#define M_PROPPATCH 9 /* : */
		#define M_MKCOL 10

+7 −4

Original line number	Diff line number	Diff line
		@@ -140,17 +140,20 @@ static int ap_process_http_async_connection(conn_rec *c)
		AP_DEBUG_ASSERT(cs != NULL);
		AP_DEBUG_ASSERT(cs->state == CONN_STATE_READ_REQUEST_LINE);

		while (cs->state == CONN_STATE_READ_REQUEST_LINE) {
		if (cs->state == CONN_STATE_READ_REQUEST_LINE) {
		ap_update_child_status_from_conn(c->sbh, SERVER_BUSY_READ, c);
		if (ap_extended_status) ap_set_conn_count(c->sbh, r, c->keepalives);
		if (ap_extended_status) {
		ap_set_conn_count(c->sbh, r, c->keepalives);
		}
		if ((r = ap_read_request(c))) {

		c->keepalive = AP_CONN_UNKNOWN;
		/* process the request if it was read without error */

		if (r->status == HTTP_OK) {
		cs->state = CONN_STATE_HANDLER;
		if (ap_extended_status) ap_set_conn_count(c->sbh, r, c->keepalives+1);
		if (ap_extended_status) {
		ap_set_conn_count(c->sbh, r, c->keepalives + 1);
		}
		ap_update_child_status(c->sbh, SERVER_BUSY_WRITE, r);
		ap_process_async_request(r);
		/* After the call to ap_process_request, the

+1 −3

Original line number	Diff line number	Diff line
		@@ -989,9 +989,7 @@ static int find_ct(request_rec *r)
		if (!r->content_languages && conf->default_language) {
		const char **new;

		if (!r->content_languages) {
		r->content_languages = apr_array_make(r->pool, 2, sizeof(char *));
		}
		new = (const char **)apr_array_push(r->content_languages);
		*new = conf->default_language;
		}