Checkout Tools
  • last updated 5 hours ago
Constraints: committers
Constraints: files
Constraints: dates
* Propose
The mod_watchdog change is not user-visible (AFAIK) so should not be in CHANGES.

Merge r1879381, r1879382, r1879383, r1879384 from trunk:

* Let dump_brigade print the length of the brigade

* Create helper function isValidAddress to determine if an address is valid [skip ci]

* Use isValidAddress when dumping buckets [skip ci]

* Improve formating and aligning [skip ci]

Submitted by: rpluem

That was not me. Honors go to Joe.
Not obvious why the worker job is persistently failing in CPAN,

mark it as allowed_failure.


[skip ci]


*) mod_watchdog: Switch to simpler logic to avoid the thread cleanup running

before the thread has started, avoiding mutex operations with undefined

behaviour. [Christophe Jaillet]

Vote and promote.

*) mod_http2: connection terminology renamed to master/secondary.

trunk patch:

2.4.x patch:

+1: icing, ylavic, minfrin

ylavic: nitpicking, mixed "H2_secondary_IN" and "H2_secondary_OUT" case to

register the filters, but not for adding them. IIRC filters names

are case insentive so shouldn't matter, just popped at my eyes..

icing: updated patch and added r1879156 to fix the eye bleed.

jailletc36: CHANGES could also be looked at if it makes sense to update the terminology

also here

*) core: Drop an invalid Last-Modified header value coming

from a (F)CGI script instead of replacing it with Unix epoch.

Warn the users about Last-Modified header value replacements

and violations of the RFC.

trunk patch:

2.4.x: trunk patches work, final view:

svn merge -c 1748379,1750747,1750749,1750953,1751138,1751139,1751139,1757818,1879253,r1879348 ^/httpd/httpd/trunk .

The code has been tested with a simple PHP script returning different Last-Modified

headers (GMT now, GMT now Europe/Paris, GMT tomorrow, GMT yesterday, PST now).

+1: elukey, jorton, jim

jorton: +1 though I'd say log at WARN or INFO for the APR_BAD_DATE case

rather than "silently" (at normal log-level) dropping the parsed header?

[also nit: wrapping a lone ap_log_rerror(,APLOG_X) call in

if (APLOGrX(..) is unnecessary/redundant]

  1. … 4 more files in changeset.
Revert r1879627, the Travis job has now recovered. [skip ci]

Clear cache for the worker job which appears to be in a bad state.

[CTR under Travis exception]

Merge r1705539, r1877263, r1877291, r1879445 from trunk:

deduplicate the code handling the directory traversal for the

SSL[Proxy]CACertificatePath and SSLProxyMachineCertificatePath


* modules/ssl/ssl_engine_init.c (ssl_add_version_components,

ssl_init_Module): Use temporary pool for variable lookup results

which don't need to live in pconf.

mod_ssl: Factor out code to read a BIO into a palloc'ed string:

* modules/ssl/ssl_util_ssl.c (modssl_bio_free_read): New function.

(asn1_string_convert): Use it here.

* modules/ssl/ssl_engine_vars.c: Use it throughout.

* modules/ssl/ssl_scache.c (ssl_scache_init): Use <16 character

cname argument for socache ->init() per the API constraint.

Submitted by: kbrand, jorton, jorton, jorton

Reviewed by: jailletc36, minfrin, jim

Merge r1864868 from trunk:

Fix a signed/unsigned comparison that can never match.

-1 is a valid length value (for socket, pipe and cgi buckets for example)

All path I've checked cast the -1 to (apr_size_t) in order for the comparison to work. So do it as well here.

This has been like that in trunk since r708144, about 11 years ago, so I assume that it is not really an issue.

Spotted by gcc 9.1 and -Wextra

Submitted by: jailletc36

Reviewed by: jailletc36, minfrin, jim



Update proposal.

Update proposal.

STATUS: move proposal from being worked to backport [skip ci]

This change seems ready again for another round of

review/discussion, to see if it is ok to backport

or if it needs more work (or even a revert).

The goal is to reduce the amount of code in review,

to reduce the diff between trunk and 2.4.x.


Vote, vote.



Propose [skip ci]
*) mod_proxy_fcgi: Don't unset when condition is false. PR64365

trunk patch:



2.4.x patch: svn merge -c 1877829,1877830 ^/httpd/httpd/trunk .

+1: covener, ylavic, rpluem

*) Replace apr_psprintf with apr_pstrcat where the format strings only

contain %s to improve efficiency. Leave out error messages as they

are not on a crtical code path and error message become less readable

when taking out the format specifiers.

trunk patch:

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

+1: minfrin, rpluem, ylavic

Remove backported entry [skip ci]
Merge r1612945, r1734835, r1738875, r1833416, r1842898, r1867257, r1876745, r1876807, r1876823, r1877642 from trunk

Easy patches: synch 2.4.x and trunk

- core: Re-introduce check for sufficient PCRE version.

- core: Fix doc string for QualifyRedirectURL

- mod_proxy: really return an error message on invalid "flusher" value.

- mod_http2: Remove extra and un-needed ""

- mod_ldap: fix a (unlikely) memory leak

- ab: fix a typo

- suexec: Report error string after failure from setgid/initgroups or setuid

- mod_session_crypto: be less specific and don't echo passphrase

- mod_proxy_html: Fix proxy_html_conf.bufsz to have correct type, as

it is used with ap_set_int_slot.

- mod_md: update duplicated APLOGNOs.

Submitted by: fuankg, trawick, ylavic, jailletc36, jorton, jailletc36, jorton, covener, jorton, ylavic

Reviewed by: jailletc36, jim, ylavic

Backported by: jailletc36