]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1612945, r1734835, r1738875, r1833416, r1842898, r1867257, r1876745, r1876807...
authorChristophe Jaillet <jailletc36@apache.org>
Fri, 3 Jul 2020 19:53:37 +0000 (19:53 +0000)
committerChristophe Jaillet <jailletc36@apache.org>
Fri, 3 Jul 2020 19:53:37 +0000 (19:53 +0000)
commit7f1ce37f5f12989cc6de3be08f5de8210bc4bd3e
tree518cf932a4443bf4617a1e0751a3317d2c2f8916
parent1e35bd44f4d2a0a6f4887c0def0d6269859ecb3b
Merge r1612945, r1734835, r1738875, r1833416, r1842898, r1867257, r1876745, r1876807, r1876823, r1877642 from trunk

Easy patches: synch 2.4.x and trunk
        - core: Re-introduce check for sufficient PCRE version.
        - core: Fix doc string for QualifyRedirectURL
        - mod_proxy: really return an error message on invalid "flusher" value.
        - mod_http2: Remove extra and un-needed ""
        - mod_ldap: fix a (unlikely) memory leak
        - ab: fix a typo
        - suexec: Report error string after failure from setgid/initgroups or setuid
        - mod_session_crypto: be less specific and don't echo passphrase
        - mod_proxy_html: Fix proxy_html_conf.bufsz to have correct type, as
                          it is used with ap_set_int_slot.
        - mod_md: update duplicated APLOGNOs.

Submitted by: fuankg, trawick, ylavic, jailletc36, jorton, jailletc36, jorton, covener, jorton, ylavic
Reviewed by: jailletc36, jim, ylavic
Backported by: jailletc36

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879490 13f79535-47bb-0310-9956-ffa450edef68
modules/filters/mod_proxy_html.c
modules/http2/h2_session.c
modules/ldap/util_ldap_cache_mgr.c
modules/md/mod_md.c
modules/proxy/mod_proxy.c
modules/session/mod_session_crypto.c
server/core.c
server/util_pcre.c
support/ab.c
support/suexec.c