From 2a8cdcefdf4a87746ef5f140474e83f593faf04d Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Fri, 3 Sep 2021 17:07:37 +0000 Subject: [PATCH] Sync CHANGES [skip ci]. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1892879 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 15 +++++++++++++++ changes-entries/ap_proxy_tunnel_run.txt | 4 ---- changes-entries/fix_uds_filename.txt | 2 -- changes-entries/md_check_keys.txt | 4 ---- changes-entries/uwsgi_path_info.txt | 1 - 5 files changed, 15 insertions(+), 11 deletions(-) delete mode 100644 changes-entries/ap_proxy_tunnel_run.txt delete mode 100644 changes-entries/fix_uds_filename.txt delete mode 100644 changes-entries/md_check_keys.txt delete mode 100644 changes-entries/uwsgi_path_info.txt diff --git a/CHANGES b/CHANGES index d938c419175..4566202c887 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,21 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.1 + *) mod_proxy_uwsgi: Fix PATH_INFO setting for generic worker. [Yann Ylavic] + + *) mod_md: Certificate/keys pairs are verified as matching before a renewal is accepted + as successful or a staged renewal is replacing the existing certificates. + This avoid potential mess ups in the md store file system to render the active + certificates non-working. [@mkauf] + + *) mod_proxy: Fix a potential infinite loop when tunneling Upgrade(d) + protocols from mod_proxy_http, and a timeout triggering falsely when + using mod_proxy_wstunnel, mod_proxy_connect or mod_proxy_http with + upgrade= setting. PRs 65521 and 65519. [Yann Ylavic] + + *) mod_proxy: Faster unix socket path parsing in the "proxy:" URL. + [Yann Ylavic] + *) mpm_event: Fix graceful stop/restart of children processes if connections are in lingering close for too long. [Yann Ylavic] diff --git a/changes-entries/ap_proxy_tunnel_run.txt b/changes-entries/ap_proxy_tunnel_run.txt deleted file mode 100644 index c31cfcd3743..00000000000 --- a/changes-entries/ap_proxy_tunnel_run.txt +++ /dev/null @@ -1,4 +0,0 @@ - *) mod_proxy: Fix a potential infinite loop when tunneling Upgrade(d) - protocols from mod_proxy_http, and a timeout triggering falsely when - using mod_proxy_wstunnel, mod_proxy_connect or mod_proxy_http with - upgrade= setting. PRs 65521 and 65519. [Yann Ylavic] \ No newline at end of file diff --git a/changes-entries/fix_uds_filename.txt b/changes-entries/fix_uds_filename.txt deleted file mode 100644 index d6c3471c7fb..00000000000 --- a/changes-entries/fix_uds_filename.txt +++ /dev/null @@ -1,2 +0,0 @@ - *) mod_proxy: Faster unix socket path parsing in the "proxy:" URL. - [Yann Ylavic] diff --git a/changes-entries/md_check_keys.txt b/changes-entries/md_check_keys.txt deleted file mode 100644 index 259c96c8559..00000000000 --- a/changes-entries/md_check_keys.txt +++ /dev/null @@ -1,4 +0,0 @@ - * mod_md: Certificate/keys pairs are verified as matching before a renewal is accepted - as successful or a staged renewal is replacing the existing certificates. - This avoid potential mess ups in the md store file system to render the active - certificates non-working. [@mkauf] diff --git a/changes-entries/uwsgi_path_info.txt b/changes-entries/uwsgi_path_info.txt deleted file mode 100644 index 4591366cbe0..00000000000 --- a/changes-entries/uwsgi_path_info.txt +++ /dev/null @@ -1 +0,0 @@ - *) mod_proxy_uwsgi: Fix PATH_INFO setting for generic worker. [Yann Ylavic] -- 2.47.3