Checkout Tools
  • last updated 6 hours ago
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:











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.
mod_status: PR60647: ACC per connection not available w/ event MPM

trunk patch:

2.4.x patch: svn merge -c 1780280 ^/httpd/httpd/trunk .

(minus CHANGES and ap_mmn.h)

+1: jailletc36, jim, rjung

  1. … 6 more files in changeset.
Merge r1749402, r1656549, r1840776, r1800126, r1817131, r1834226 from trunk:

Style only

Be more consistent:

- add space between (if|while) and \(

- place of 'break ' statement

Fix cut and paste typo in error message + remove empty lines to be consistent

follow-up to r1656549.

Instead of logging a password (which is not a good practice), clarify the associated message

* Silence compiler warning

Be less tolerant when parsing the credencial for Basic authorization. Only spaces should be accepted after the authorization scheme. \t are also tolerated.

The current code accepts \v and \f as well.

The same behavior is already used in 'ap_get_basic_auth_pw()' which is mostly the same function as 'get_basic_auth()'.

Function used as 'apr_reslist_destructor' when calling 'apr_reslist_create()' should have the following prototype:

apr_status_t (*apr_reslist_destructor)(void *resource, void *params, apr_pool_t *pool);

Submitted by: jailletc36, rpluem, jailletc36, jailletc36

Reviewed by: jailletc36, minfrin, jim

  1. … 6 more files in changeset.
  1. … 30 more files in changeset.
Merge r1756038 from trunk:

Fix spelling in comments and text files.

No functional change.

PR 59990

Submitted by: rjung

Reviewed/backported by: jim

  1. … 72 more files in changeset.
merge of r1743699 fromn trunk:

http_core: Avoid truncating the_request line when there is no request to 'W'rite.

  1. … 1 more file in changeset.
Revert premature mis-commit of proposed patch (had only meant to test merging
Replace one backport proposal with another
  1. … 2 more files in changeset.
Merge r1664071, r1664299 from trunk:

core: If explicitly configured, use the KeepaliveTimeout value of the

virtual host which handled the latest request on the connection, or by

default the one of the first virtual host bound to the same IP:port.

For non-async MPMs, use either r->server's or c->base_server's value in

ap_process_http_sync_connection() depending on a new server_rec's flag

called keep_alive_timeout_set and determined at config time.

For event MPM, use a queue per timeout value, chaining the queues per

type (keepalive wrt KeepAliveTimeout, write completion wrt to Timeout)

so that maintenance can be done on all the queues from the head, and such

that insertions/maintenance remain in O(1).

A server config is created and pointing to the queue of each vhost at

post_config time, hence the config can be associated to the connection

state (cs) at post_read_request time (keep_alive_timeout_set is used to

determine r->server vs c->base_server here), and we can simply insert

with TO_QUEUE_INSERT(cs->sc->q, cs). PR56226.

While at it, since each queue now embeds it own timeout and hence the

expiration_time of the cs has changed to a queue_timestamp (the time it

was queued), we can detect clock skews and expire entries immediatly if

the system is set (eg. far) in the past during runtime and we want to

avoid waiting for (eg.) centuries before the current logic kills them.

Any entry which is registered above now + q->timeout is concerned, and

is now cleaned from the queue when encountered. PR57374.

core: Follow up to r1664071: comments on new keep_alive_timeout_set flag.

Submitted by: ylavic

Reviewed/backported by: jim

  1. … 8 more files in changeset.
Merge r1204104, 1204180:

Remove MPM-private stuff from conn_state_t.

This should make it easier to improve the event MPM in 2.4 without breaking

the API.

  1. … 7 more files in changeset.