httpd

Checkout Tools
  • last updated 3 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1864005 is being indexed.

Merge r1856829 from trunk:

*) mod_proxy: Load balancer byrequests required when bytraffic chosen

PR 62372

vote and promote

Add CHANGES for r1864000

(backport of r1853560 from trunk).

update after backport
Merging r1853560 from trunk:

*) mod_proxy_hcheck: Create the configure for mod_proxy_hcheck when used in BalancerMember.

PR 60757

vote and promote

update after backport
Merged /httpd/httpd/trunk:r1851621,1852128,1862075

*) mod_ssl/mod_md: reversing dependency by letting mod_ssl offer hooks for

adding certificates and keys to a virtual host. An additional hook allows

answering special TLS connections as used in ACME challenges.

Adding 2 new hooks for init/get of OCSP stapling status information when

other modules want to provide those. Falls back to own implementation with

same behaviour as before.

Backport proposal

Wrap get_ct_scts_nid() in preproc in order to avoid error: unused function 'get_ct_scts_nid' [-Werror,-Wunused-function] in maint mode

mod_proxy_hcheck: mod_proxy_hcheck: mute "run from watchdog" message.

This is way too verbose (every 100ms) to be logged at any LogLevel.

Backport of r1853992 from trunk.

Proposed by: rjung

Backported by: rjung

Reviewed by: rjung, jailletc36, jim

core: fix crash when running with apr lib build with APR_POOL_DEBUG.

Observed with huge config and mod_security using long config lines.

Backport of r1863179 from trunk.

Proposed by: rjung

Backported by: rjung

Reviewed by: rjung, icing, jim

and promote

Backport votes

fr doc - Adding new html file after rebuild.

Vote
fr doc rebuild.

fr doc - adding a new xml file.

fr doc rebuild.

    • ?
    /httpd/trunk/docs/manual/mod/overrides.html.fr.utf8
fr doc - adding a new xml file.

    • ?
    /httpd/trunk/docs/manual/mod/overrides.xml.fr
Propose.

Synch trunk and 2.4.x

Remove some useless spaces which have never been backported in 2.4.x.

This was part of r1724879 and was backported in r1744951

Synch 2.4 and trunk.

Remove an empty line that must have been missed in a backport.

Follow up to r1863315.

Update MODULE_MAGIC_NUMBER_MINOR

remove useless mail address for a comitter
vote

cleanup after backport of change
Merge of r1862014 from trunk:

*) mod_proxy_hcheck fix for BZ 60948

Merge of r1851146 from trunk:

*) cache_storage: be consistent when building a cache key value when CacheKeyBaseURL is used with

an URL that contains a :port.

PR 53915 [Rein Tollevik <rein basefarm.no>]

Merge of r1426802,1744460,1829799,1824716,1838318,1840678,1861294

*) easy patches to synch 2.4.x and trunk:

- core: extend description of r->hostname

- mod_proxy_http: Avoid memory allocation before making sure that this handler can handle the URL

- core: Save a few cycles in 'ap_parse_form_data()'

- mod_cache_socache: Save some cycles

- mod_proxy_ftp: Save some cycle

- vhost: move an assignment to the end of the loop to ease readability and please a compiler

- core: Be a little more verbose when an error in trigerred in 'ap_set_file_slot()'