public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/httpd] f43: new version 2.4.68
Date: Tue, 09 Jun 2026 13:16:13 GMT [thread overview]
Message-ID: <178101097332.1.8608678147875162228.rpms-httpd-33ab08a07025@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/httpd
Branch : f43
Commit : 33ab08a070251fcb3c8aea5f856ad6efc3941ce6
Author : Luboš Uhliarik <luhliari@redhat.com>
Date : 2026-06-09T15:15:59+02:00
Stats : +7/-70 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/httpd/c/33ab08a070251fcb3c8aea5f856ad6efc3941ce6?branch=f43
Log:
new version 2.4.68
---
diff --git a/.gitignore b/.gitignore
index 0fbc08a..1392a68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,4 @@ x86_64
/httpd-2.4.65.tar.bz2.asc
/httpd-2.4.66.tar.bz2.asc
/httpd-2.4.67.tar.bz2.asc
+/httpd-2.4.68.tar.bz2.asc
diff --git a/httpd-2.4.65-hcheck-stuck.patch b/httpd-2.4.65-hcheck-stuck.patch
deleted file mode 100644
index 315b9c2..0000000
--- a/httpd-2.4.65-hcheck-stuck.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/modules/proxy/mod_proxy_hcheck.c
-+++ b/modules/proxy/mod_proxy_hcheck.c
-@@ -989,12 +989,30 @@ static apr_status_t hc_watchdog_callback(int state
- sctx_t *ctx = (sctx_t *)data;
- server_rec *s = ctx->s;
- proxy_server_conf *conf;
-+ proxy_worker **workers;
-+ proxy_worker *worker;
-+ apr_time_t now;
-+ int i, n;
-
-+ conf = (proxy_server_conf *) ap_get_module_config(s->module_config, &proxy_module);
-+ balancer = (proxy_balancer *)conf->balancers->elts;
-+
- switch (state) {
- case AP_WATCHDOG_STATE_STARTING:
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(03258)
- "%s watchdog started.",
- HCHECK_WATHCHDOG_NAME);
-+ /* set last update time for all workers */
-+ now = apr_time_now();
-+ for (i = 0; i < conf->balancers->nelts; i++, balancer++) {
-+ workers = (proxy_worker **)balancer->workers->elts;
-+ for (n = 0; n < balancer->workers->nelts; n++, ++workers) {
-+ worker = *workers;
-+ if (worker->s->updated == 0) {
-+ worker->s->updated = now;
-+ }
-+ }
-+ }
- #if HC_USE_THREADS
- if (tpsize && hctp == NULL) {
- rv = apr_thread_pool_create(&hctp, tpsize,
-@@ -1020,21 +1038,13 @@ static apr_status_t hc_watchdog_callback(int state
-
- case AP_WATCHDOG_STATE_RUNNING:
- /* loop thru all workers */
-- if (s) {
-- int i;
-- conf = (proxy_server_conf *) ap_get_module_config(s->module_config, &proxy_module);
-- balancer = (proxy_balancer *)conf->balancers->elts;
-- ctx->s = s;
-+ {
-+ now = apr_time_now();
- for (i = 0; i < conf->balancers->nelts; i++, balancer++) {
-- int n;
-- apr_time_t now;
-- proxy_worker **workers;
-- proxy_worker *worker;
- /* Have any new balancers or workers been added dynamically? */
- ap_proxy_sync_balancer(balancer, s, conf);
- workers = (proxy_worker **)balancer->workers->elts;
-- now = apr_time_now();
-- for (n = 0; n < balancer->workers->nelts; n++) {
-+ for (n = 0; n < balancer->workers->nelts; n++, workers++) {
- worker = *workers;
- if (!PROXY_WORKER_IS(worker, PROXY_WORKER_STOPPED) &&
- (worker->s->method != NONE) &&
-@@ -1074,7 +1084,6 @@ static apr_status_t hc_watchdog_callback(int state
- hc_check(NULL, baton);
- }
- }
-- workers++;
- }
- }
- }
diff --git a/httpd.spec b/httpd.spec
index 887a940..b363498 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -30,7 +30,7 @@
Summary: Apache HTTP Server
Name: httpd
-Version: 2.4.67
+Version: 2.4.68
Release: 1%{?dist}
URL: https://httpd.apache.org/
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
@@ -103,7 +103,6 @@ Patch30: httpd-2.4.64-separate-systemd-fns.patch
# Bug fixes
# https://bugzilla.redhat.com/show_bug.cgi?id=1397243
Patch60: httpd-2.4.43-enable-sslv3.patch
-Patch61: httpd-2.4.65-hcheck-stuck.patch
# Security fixes
# Patch200: ...
@@ -846,6 +845,9 @@ exit $rv
%{_rpmconfigdir}/macros.d/macros.httpd
%changelog
+* Tue Jun 09 2026 Luboš Uhliarik <luhliari@redhat.com> - 2.4.68-1
+- new version 2.4.68
+
* Wed May 06 2026 Luboš Uhliarik <luhliari@redhat.com> - 2.4.67-1
- new version 2.4.67
diff --git a/sources b/sources
index 473192b..b4244b5 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (httpd-2.4.67.tar.bz2) = 5ae29fc8edb253453271613cb18754de0d943d1f82361059c81f8ebe1f057b894675506550bd1341bfa9416226b569a7bac08f497c53e8bb6dede87f4f41eae4
-SHA512 (httpd-2.4.67.tar.bz2.asc) = 1c91218b7811ec8c8f99960bdf607317fda3b7f8aab00115735345128990c5594839a003cf4672dcbb982eaa06beff7a322ba1435ec8145480ec1257c4336422
+SHA512 (httpd-2.4.68.tar.bz2) = 134a5bbd3ffe97523ac750490531bcb9441c532cedf0229aa006aa1368e9d25040507c6f519bed6754044f62c371f7c7f9a11b6a311f79b9680d478bf4373eb3
+SHA512 (httpd-2.4.68.tar.bz2.asc) = 87bf940f5041a9550726ca426162aaf5fb1c0433e4ecdb6777cd280751ac3938f40dc5ece44e2ed39642435039b4865fc2bbb5141df15fe4c3a16a748c8061a4
SHA512 (KEYS) = 88c848b7ab9e4915d6625dcad3e8328673b0448f2ce76f2c44eecc612cf6afbce3287a4ee7219a44c6fcc61d5ecb2a1a8545456a4a16b90400263d7249cbf192
reply other threads:[~2026-06-09 13:16 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178101097332.1.8608678147875162228.rpms-httpd-33ab08a07025@fedoraproject.org \
--to=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox