Checkout Tools
  • last updated 8 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

  1. … 11 more files in changeset.
Merge r1729930, r1729931 from trunk:

hostname: Test and log useragent_host per-request across various modules,

including the scoreboard, expression and rewrite engines, setenvif,

authz_host, access_compat, custom logging, ssl and REMOTE_HOST variables.

PR55348 [William Rowe]

This is the complete change set which applies cleanly to 2.4.x as well,

the server/scoreboard.c will follow, which does not apply due to drift.

A rather ugly patch since the code was refactored recently to exclude

the simple patch for 2.4.x, illustrated below.

Completes the changeset r1729930 and resolves all 2.4.19-dev corrections,

but other 2.5.0-dev specific changes may still be needed on trunk.

--- server/scoreboard.c (revision 1729907)

+++ server/scoreboard.c (working copy)

@@ -491,9 +491,8 @@

ws->conn_bytes = 0;

}

if (r) {

- const char *client = ap_get_remote_host(c, r->per_dir_config,

- REMOTE_NOLOOKUP, NULL);

- if (!client || !strcmp(client, c->client_ip)) {

+ const char *client;

+ if (!(client = ap_get_useragent_host(r, REMOTE_NOLOOKUP, NULL))) {

apr_cpystrn(ws->client, r->useragent_ip, sizeof(ws->client));

}

else {

Submitted by: wrowe

Reviewed/backported by: jim

  1. … 12 more files in changeset.
Merge r1725485 from trunk:

Added many log numbers to log statements that

had none.

Those were not detected by the coccinelle script.

Submitted by: rjung

Reviewed/backported by: jim

  1. … 34 more files in changeset.
Merge r1700317, r1700318, r1700319, r1700320, r1700321, r1700322, r1700326, r1700328, r1700330, r1700331, r1700332, r1700334, r1700336, r1700338 from trunk:

Fix some spurious ident spotted by sparse

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting + some minor style issues

Remove useless line

Silence a sparse warning about inconsistent indenting + some minor style issues

Silence a sparse warning about inconsistent indenting + some minor style issues

Silence a sparse warning about inconsistent indenting + some minor style issues

Fix some spurious ident spotted by sparse

Silence a sparse warning about inconsistent indenting + some minor style issues

Silence a sparse warning about inconsistent indenting + some minor style issues

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 16 more files in changeset.
Merge r1661067 from trunk:

mod_proxy_ajp: Forward SSL protocol name (SSLv3, TLSv1.1 etc.) as a

request attribute to the backend. The name is taken from

the SSL_PROTOCOL env var. Recent Tomcat versions will extract

it and provide it as a servlet request attribute named

"org.apache.tomcat.util.net.secure_protocol_version".

The change is compatible with existing AJP13, because we forward

the protocol name as a normal named attribute, not with a new

byte abbreviated attribute name.

Submitted by: rjung

Reviewed by: rjung, ylavic, covener

Backported by: rjung

  1. … 5 more files in changeset.
Merge r1610207 from trunk:

Forward local IP address as a custom request attribute

like we already do for the remote port.

Both were forgotten in the original AJP 13 spec

but are needed by the Servlet spec. Until now,

Tomcat simply returns for getLocalAddr() the same as

for getLocalName().

The next round of Tomcat releases will look for the

optional new request attribute.

See also Tomcat BZ 56661.

Submitted by: rjung

Reviewed by: trawick, ylavic

  1. … 4 more files in changeset.
Merge r1435178 from trunk:

mod_proxy_ajp: Support unknown HTTP methods.

BZ 54416

Forward unknown methods as request attributes

using method id SC_M_JK_STORED=0xFF and

request attribute id SC_A_STORED_METHOD=13.

Code ported from mod_jk (which got it from mod_jk2).

Supported by Tomcat at least since TC 4.1.

Doesn't seem to be supported by Jetty though.

Submitted by: rjung

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Merge r1328339:

fix some comments

(no code change)

  1. … 2 more files in changeset.
Merge r1300766:

Fix some typos

No logic change. I think this is CTR, please correct me if I am wrong.

  1. … 4 more files in changeset.
Backport:

Further clarify the naming of the entity that originates the request by

calling that entity a useragent instead of a client.

Further clarify the naming of the entity that directly connects to us by

calling that entity a client instead of a peer.

  1. … 26 more files in changeset.
Backport r1209766, r1210252, r1210284:

Add lots of unique tags to error log messages

ssl_util.c: Downgrade some dynamic locking messages from level DEBUG

to TRACE1-3

  1. … 164 more files in changeset.
Backport:

Introduce a per request version of the remote IP address, which can be

optionally modified by a module when the effective IP of the client

is not the same as the real IP of the client (such as a load balancer).

Introduce a per connection "peer_ip" and a per request "client_ip" to

distinguish between the raw IP address of the connection and the effective

IP address of the request.

  1. … 31 more files in changeset.
Merge r1204556 from trunk:

check return status

Reviewed/backported by: jim

Backport r1203878:

More ap_log_rerror() usage and axe some more AJP: prefixes

  1. … 3 more files in changeset.