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

Changeset 1872914 is being indexed.

Vote. [skip ci]
Notes/votes. [skip ci]

Reset mod_ssl PKCS#11 proposal with added r1836547. [skip ci]

Simplified mod_systemd backport proposal w/o IdleShutdown feature.

Note partial merge of some commits, socket activation changes are

excluded. mod_systemd.c as proposed is exactly as in trunk.

mod_setenvif: add "early mode"

Primarily to run before `RequestHeader ... ... early`

Merge r1822531, r1829676, r1847232, r1847234, r1861333, r1852442, r1866145, r1868295, r1868296 from trunk:

mod_proxy: fix proxy connection cleanup from an n+2 pool.

When connection_destructor() is called after pchild is gone, we can't

dereference worker->cp anymore. This happens is debug/one_process mode only,

if we exit by calling apr_terminate() or clearing the process pool directly.

Fix this by NULL-ing worker->cp in conn_pool_cleanup(), and by registering it

as a pre_cleanup.

Delay some memory allocation.

If this handler will not handle the request, no need to waste bytes in the request pool.

Add error messages and return bad request.

fix incorrect rv. Sorry.

Follow up to r1847232.

There is no point to use "old" numbers in recent commit.

Also avoid number duplication. The messages are the same but in different code path, so having different numbers makes sense.

This also avoids a warning when running:

make update-log-msg-tags

Make proxy modules compile if APR_HAS_THREADS is not defined.

restore use of global mutex under !APR_HAS_THREADS

followup to r1852442 which appears to have been too agressive in wrapping

blocks with #if APR_HAS_THREADS. With !APR_HAS_THREADS a global mutex

is a proc mutex.

* Add back logging goodness

Add back logging goodness added by covener in r1865938.

Fix pool concurrency problems

Create a subpool of the connection pool for worker scoped DNS resolutions.

This is needed to avoid race conditions in using the connection pool by multiple

threads during ramp up.

Recheck after obtaining the lock if we still need to do things or if they

were already done by another thread while we were waiting on the lock.

* modules/proxy/proxy_util.c: Create a subpool of the connection pool for worker

scoped DNS resolutions and use it.

* modules/proxy/mod_proxy.h: Define AP_VOLATILIZE_T and add dns_pool to

struct proxy_conn_pool.

* modules/proxy/mod_proxy_ftp.c: Use dns_pool and consider that

worker->cp->addr is volatile in this location of the code.

PR: 63503

Submitted by: ylavic, jailletc36, jfclere, jfclere, jailletc36, stsp, covener, rpluem, rpluem

Reviewed by: rpluem, covener, jim

Merge r1851332, r1861432, r1862202, r1864759, r1867254, r1867255, r1867569, r1869512 from trunk:

fix a misleading comment about s->defn_name

use the provided types via the macro

* modules/metadata/mod_mime_magic.c: Constify some constant

data, remove unused "suf_recursion" field. No functional


Axe some dead code + slighly improve a comment

Fix a typo

Fix a typo

* modules/ssl/ssl_engine_log.c (ssl_log_cert_error): Use string

length returned by apr_vsnprintf. No functional change.

mod_authz_core: follow up to r1864759.

We should at least log the unexpected provider_name == NULL condition.

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

Reviewed by: jailletc36, jim, ylavic


Proposal and votes

config: Speed up graceful restarts by using pre-hashed command table. PR 64066.

[Giovanni Bechis <giovanni>, Jim Jagielski]

* modules/loggers/config.m4: Don't override shared/static

selection for mod_journald, mod_syslog and mod_log_json.

Add Travis job with --enable-mods-static=reallyall.

* modules/loggers/config.m4, modules/md/config2.m4, acinclude.m4:

Correctly link mod_md and mod_log_json (and no other objects)

against -ljansson. Removes unnecessary deps on libjansson

from other linked objects, and fixes mod_md static build. (see

Transforms. [skip ci]
Fix link to ExtendedStatus. [skip ci]
Transforms. [skip ci]

  1. … 18 more files in changeset.
Remove IdleShutdown docs.

* modules/arch/unix/config5.m4: Don't override enable_systemd, fixing

--enable-systemd=static per covener's suggestion in


Also fix the APACHE_MODULE() usage; disable the module by default

for the "all" modules selection.

PR: 57632

* modules/arch/unix/mod_systemd.c: Remove IdleShutdown feature which

was buggy per sf's feedback in 2.4.x backport proposal, and would

probably be more appropriate outside this module anyway.

Merge r1870553, r1870555, r1871091, r1871095, r1871141, r1871815, r1871816, r1871907, r1871908, r1872045, r1872063, r1872073, r1872106, r1872124, r1872309, r1872372, r1872373, r1872389, r1872392, r1872519, r1872544, r1872588, r1872590 from trunk:

Skip "PCRE 1" job for 2.4.x since there's no PCRE 2 support.

Enable ppc64le builds, caching now seems to work in Travis for non-x86.

travis: enable email notifications on success as test

adding myself for debugging (happy 113th birthday to the inventor of that term\!)

does this work??

travis: send notification to httpd-dev@ only on failure

Due to a combination of Daniel's work and probably some fix

on Travis end, we are now finally getting Travis emails in

httpd-dev@. Since having notifications for successful builds

might become a little spammy, let's just alert when a build

fails (like we do with buildbot IIUC).

travis: sync trunk's notification config with 2.4.x

test/ add a simple bash retry to svn export

Sometimes a build is killed by Travis due to svn export taking

a long time to complete (> 10m). This change should be a test to see

if a simple workaround reduces the noise to the dev@ mailing list.

test/ remove bash -e flag

To allow a proper fail/retry, -e needs to be removed.

Ideally this shouldn't happen, so I'd consider this

a test to see if the bash for workaround is a viable

option or not.

test/ make for loop more resilient

This is a follow up to my last commit to this file, to make

the for loop more resilient with the following:

- use --force in svn export, otherwise the second attempt will

always fail due to the dest directory already present.

- exit 1 in case the 5 tries end up in a non zero exit code

(to fail fast the build).

travis: temporary disable notifications to dev@

There seem to be some issues to iron out, disabling

email notifications to avoid spamming dev@.

test/ move retry logic to function

Move the retry logic to a bash function and restore the -e

failure policy in the script (to have cleaner log traces

in base of build failures).

Work around a build failure when a cached APR branch install

is used but APR-util needs to be rebuilt; currently this fails

because the APR build directory is not available.


Disable caching for this combination for now.

travis: restore email notifications for dev@

The issue with ppcle64 seems to be fixed from [1],

and Joe fixed the APR 1.7.x issue as well. Builds are

back to normal.


test/ increase backoff time before executing svn export

Cache SVN checkout of test/framework across Travis builds. Should

improve reliability (the checkout fails frequently) and performance,

plus reduces load on ASF infra.

Github: closes #85

Add Travis job which runs tests in random order.

Github: closes #86

travis: add verbose config to perl test suite for Ubuntu Worker All Modules

For some reason we get sporadic failures only in Ubuntu Worker All Modules' test:

t/apache/rwrite.t ................... 53/? # Failed test 113 in /home/travis/build/apache/httpd/test/perl-framework/blib/lib/Apache/ at line 56 fail #113

t/apache/rwrite.t ................... Failed 1/114 subtests

Recent examples:

Add "-verbose" as test option to capture more data about the failure

when it happens.

travis: disable email notifications

There are still some spurious failures to iron out,

turn off email notification to avoid too many failure

emails to dev@.

Add arm64 support for Travis testing.

This support is experimental.

travis: remove verbose arg for Ubuntu Worker

Add Travis job running the litmus WebDAV test suite.

Enable verbose test output to debug failures on arm.

Submitted by: jorton, elukey, humbedoohy, mrumph

Github: closes #90

Non-x86 testing seems reasonably reliable; note some known failures


Try sleeping before reading the error_log to avoid the failures.

proxy: add local address to body-forwarding errors

Adds the local/ephemeral port for the backend connection

Use t_cmp for a test which keeps failing in CI.

Enable verbose test output to debug failures on arm.
Add Travis job running the litmus WebDAV test suite.

travis: remove verbose arg for Ubuntu Worker
Add arm64 support for Travis testing.

This support is experimental.

add a 2nd lua backport proposal

Use https instead of http when searching with Google.

PR 64058

Fixed by [stephane.blondon]

(r1872470 on trunk)