Conversation
Submitted by: Christian Hesse <mail eworm.de> Github: closes apache#557 Merge r1928356 from trunk. (cherry picked from commit 9cd6c92)
* test/pyhttpd/env.py (HttpdTestEnv.set_httpd_env, _clean_path_env): Allow a suite to add variables to the environment httpd is started with. * test/pyhttpd/conf/stop.conf.template: Set DefaultRuntimeDir and PidFile to match httpd.conf, so that "apachectl -k stop" finds the running server. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> GitHub: PR apache#723 Merge r1937596 from trunk. (cherry picked from commit 4abdd20)
zero uptime, and report the idle and busy figures as percentages. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> GitHub: PR apache#723 Merge r1937597 from trunk. (cherry picked from commit f9ebab5)
ap_find_systemd_socket): Remember the number of sockets passed, so a
graceful restart of a socket-activated server works. Drop the
unchecked getenv("LISTEN_FDS").
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
GitHub: PR apache#723
Merge r1937598 from trunk.
(cherry picked from commit 3e26a67)
Send MONOTONIC_USEC with RELOADING=1. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> GitHub: PR apache#723 Merge r1937599 from trunk. (cherry picked from commit 651b6a9)
systemd_post_config): Notify STOPPING=1 on shutdown. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> GitHub: PR apache#723 Merge r1937600 from trunk. (cherry picked from commit 75d0e8c)
Generated HTML not rebuilt. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> GitHub: closes apache#723 Merge r1937601 from trunk. (cherry picked from commit 7bbc2b3)
Moved here from the mod_systemd tests, for use by other suites. [skip ci] Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> GitHub: PR apache#727 Merge r1937635 from trunk. (cherry picked from commit 31d91bb)
* modules/arch/unix/mod_systemd.c (watchdog_ping): New. (systemd_pre_config, systemd_post_config, systemd_monitor): Send the watchdog keep-alive, and warn (AH10621) if WatchdogSec is too short to be met. * docs/manual/mod/mod_systemd.xml: Document watchdog support. * test/modules/arch/linux/test_006_watchdog.py: New test suite. * test/modules/arch/linux/env.py (ForegroundServer): New, running httpd in the foreground so $WATCHDOG_PID can name it. (TransientService): Take extra unit properties. * test/modules/arch/linux/test_001_notify.py (test_systemd_001_09_watchdog): No longer xfail; use a WatchdogSec which does not draw AH10621. * test/modules/arch/linux/README: Describe the watchdog tests. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> GitHub: closes apache#728 Merge r1937644 from trunk. (cherry picked from commit 06c0a97)
ReloadSignal= and ExecReload=. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> GitHub: PR apache#729 Merge r1937646 from trunk. (cherry picked from commit 4a71f72)
Type=notify-reload. * test/modules/arch/linux/env.py (TransientService): Take the service type and whether to configure ExecReload=. (TransientService.systemctl): Take a timeout. (TransientService.reload, TransientService.rewrite_conf, error_log_size, error_log_since, systemd_version): New. * test/modules/arch/linux/README: Describe the new suite. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> GitHub: PR apache#729 Merge r1937647 from trunk. (cherry picked from commit be7efad)
PidFile. Merge the test/pyhttpd/conf/httpd.conf.template part of r1909769 from trunk. (cherry picked from commit bdd49d3)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge r1928356, r1937596, r1937597, r1937598, r1937599, r1937600, r1937601, r1937602, r1937635, r1937644, r1937646, r1937647 from trunk:
The
.github/workflows/linux.ymlchange from r1937596 is not included: 2.4.x CI has no reduced-exports job and no pytest target selection for it to hook into, so the newtest/modules/arch/linuxsuite is not run by CI here.🤖 Generated with Claude Code