public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Joe Orton <jorton@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/httpd] rawhide: mod_proxy_html: fix comment handling (#2496888)
Date: Tue, 14 Jul 2026 16:09:24 GMT [thread overview]
Message-ID: <178404536403.1.17334653162468568725.rpms-httpd-fa71834db324@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/httpd
Branch : rawhide
Commit : fa71834db324a44e7af1bb4c1f9cffe48ba09aa6
Author : Joe Orton <jorton@redhat.com>
Date : 2026-07-14T17:08:54+01:00
Stats : +24/-1 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/httpd/c/fa71834db324a44e7af1bb4c1f9cffe48ba09aa6?branch=rawhide
Log:
mod_proxy_html: fix comment handling (#2496888)
---
diff --git a/httpd-2.4.68-proxyhtml.patch b/httpd-2.4.68-proxyhtml.patch
new file mode 100644
index 0000000..84e1ba9
--- /dev/null
+++ b/httpd-2.4.68-proxyhtml.patch
@@ -0,0 +1,21 @@
+commit de4ab055040670a08feb587b0c525cffe60bb48c
+Author: Joe Orton <jorton@redhat.com>
+Date: Mon Jul 6 10:23:33 2026 +0100
+
+ * modules/filters/mod_proxy_html.c (pcomment): Don't dump content
+ when printing a comment. (regression in r1934975)
+
+ Fixes: 9dc00bf22922b805d780f403132d2e35a99ced93
+
+diff --git a/modules/filters/mod_proxy_html.c b/modules/filters/mod_proxy_html.c
+index 6e33eac46e..a8c29db862 100644
+--- a/modules/filters/mod_proxy_html.c
++++ b/modules/filters/mod_proxy_html.c
+@@ -337,7 +337,6 @@ static void pcomment(void *ctxt, const xmlChar *uchars)
+ ap_fputs(ctx->f->next, ctx->bb, "<!--");
+ AP_fwrite(ctx, chars, strlen(chars), 1);
+ ap_fputs(ctx->f->next, ctx->bb, "-->");
+- dump_content(ctx);
+ }
+ }
+ static void pendElement(void *ctxt, const xmlChar *uname)
diff --git a/httpd.spec b/httpd.spec
index 939ce64..4e0ffa8 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -101,6 +101,7 @@ 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.68-proxyhtml.patch
# Security fixes
# Patch200: ...
@@ -863,8 +864,9 @@ exit $rv
%{_rpmconfigdir}/macros.d/macros.httpd
%changelog
-* Wed Jul 01 2026 Joe Orton <jorton@redhat.com> - 2.4.68-3
+* Tue Jul 14 2026 Joe Orton <jorton@redhat.com> - 2.4.68-3
- for F45+ remove mod_proxy_wstunnel, deprecated upstream since 2.4.47
+- mod_proxy_html: fix comment handling (#2496888)
* Fri Jun 12 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 2.4.68-2
- Rebuilt for openssl 4.0
reply other threads:[~2026-07-14 16:09 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=178404536403.1.17334653162468568725.rpms-httpd-fa71834db324@fedoraproject.org \
--to=jorton@redhat.com \
--cc=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