]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
5 years agovotes
Jim Jagielski [Tue, 7 Jul 2020 16:52:17 +0000 (16:52 +0000)] 
votes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879595 13f79535-47bb-0310-9956-ffa450edef68

5 years agoUpdate proposal.
Graham Leggett [Mon, 6 Jul 2020 12:29:53 +0000 (12:29 +0000)] 
Update proposal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879550 13f79535-47bb-0310-9956-ffa450edef68

5 years agoUpdate proposal.
Graham Leggett [Mon, 6 Jul 2020 10:36:31 +0000 (10:36 +0000)] 
Update proposal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879543 13f79535-47bb-0310-9956-ffa450edef68

5 years agoSTATUS: move proposal from being worked to backport [skip ci]
Luca Toscano [Sun, 5 Jul 2020 17:31:56 +0000 (17:31 +0000)] 
STATUS: move proposal from being worked to backport [skip ci]

This change seems ready again for another round of
review/discussion, to see if it is ok to backport
or if it needs more work (or even a revert).

The goal is to reduce the amount of code in review,
to reduce the diff between trunk and 2.4.x.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879534 13f79535-47bb-0310-9956-ffa450edef68

5 years agoVote.
Graham Leggett [Sun, 5 Jul 2020 13:55:12 +0000 (13:55 +0000)] 
Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879532 13f79535-47bb-0310-9956-ffa450edef68

5 years agoVote, vote.
Graham Leggett [Sun, 5 Jul 2020 13:41:51 +0000 (13:41 +0000)] 
Vote, vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879531 13f79535-47bb-0310-9956-ffa450edef68

5 years agoVote.
Graham Leggett [Sun, 5 Jul 2020 13:33:13 +0000 (13:33 +0000)] 
Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879530 13f79535-47bb-0310-9956-ffa450edef68

5 years agoPropose.
Graham Leggett [Sun, 5 Jul 2020 13:25:01 +0000 (13:25 +0000)] 
Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879529 13f79535-47bb-0310-9956-ffa450edef68

5 years agoPropose [skip ci]
Christophe Jaillet [Sun, 5 Jul 2020 13:19:59 +0000 (13:19 +0000)] 
Propose [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879527 13f79535-47bb-0310-9956-ffa450edef68

5 years ago *) mod_proxy_fcgi: Don't unset when condition is false. PR64365
Graham Leggett [Sun, 5 Jul 2020 12:58:58 +0000 (12:58 +0000)] 
  *) mod_proxy_fcgi: Don't unset when condition is false. PR64365
     trunk patch:
        - http://svn.apache.org/r1877829
        - http://svn.apache.org/r1877830
     2.4.x patch: svn merge -c 1877829,1877830 ^/httpd/httpd/trunk .
    +1: covener, ylavic, rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879525 13f79535-47bb-0310-9956-ffa450edef68

5 years ago *) Replace apr_psprintf with apr_pstrcat where the format strings only
Graham Leggett [Sun, 5 Jul 2020 12:55:38 +0000 (12:55 +0000)] 
  *) Replace apr_psprintf with apr_pstrcat where the format strings only
     contain %s to improve efficiency. Leave out error messages as they
     are not on a crtical code path and error message become less readable
     when taking out the format specifiers.
     trunk patch: http://svn.apache.org/1862270
     2.4.x patch: svn merge -c 1862270 ^/httpd/httpd/trunk .
     +1: minfrin, rpluem, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879524 13f79535-47bb-0310-9956-ffa450edef68

5 years agoRemove backported entry [skip ci]
Christophe Jaillet [Fri, 3 Jul 2020 20:05:58 +0000 (20:05 +0000)] 
Remove backported entry [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879491 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMerge r1612945, r1734835, r1738875, r1833416, r1842898, r1867257, r1876745, r1876807...
Christophe Jaillet [Fri, 3 Jul 2020 19:53:37 +0000 (19:53 +0000)] 
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

5 years agotab [skip ci].
Yann Ylavic [Tue, 30 Jun 2020 16:16:19 +0000 (16:16 +0000)] 
tab [skip ci].

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879375 13f79535-47bb-0310-9956-ffa450edef68

5 years ago2.4.x patch Eric's proposal, with latest changes [skip ci].
Yann Ylavic [Tue, 30 Jun 2020 16:15:30 +0000 (16:15 +0000)] 
2.4.x patch Eric's proposal, with latest changes [skip ci].

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879374 13f79535-47bb-0310-9956-ffa450edef68

5 years agoadd rev
Eric Covener [Tue, 30 Jun 2020 14:27:44 +0000 (14:27 +0000)] 
add rev

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879371 13f79535-47bb-0310-9956-ffa450edef68

5 years agono time to resolve but wanted to get it here insted of just sending a mail
Eric Covener [Tue, 30 Jun 2020 13:10:27 +0000 (13:10 +0000)] 
no time to resolve but wanted to get it here insted of just sending a mail

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879367 13f79535-47bb-0310-9956-ffa450edef68

5 years agoVote + promote [skip ci].
Yann Ylavic [Tue, 30 Jun 2020 12:50:38 +0000 (12:50 +0000)] 
Vote + promote [skip ci].

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879365 13f79535-47bb-0310-9956-ffa450edef68

5 years agoUpdate proposal [skip ci].
Yann Ylavic [Tue, 30 Jun 2020 12:26:11 +0000 (12:26 +0000)] 
Update proposal [skip ci].

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879362 13f79535-47bb-0310-9956-ffa450edef68

5 years agoSTATUS: update proposal [skip ci]
Luca Toscano [Tue, 30 Jun 2020 06:24:08 +0000 (06:24 +0000)] 
STATUS: update proposal [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879353 13f79535-47bb-0310-9956-ffa450edef68

5 years ago* Vote [skip ci]
Ruediger Pluem [Mon, 29 Jun 2020 18:55:02 +0000 (18:55 +0000)] 
* Vote [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879347 13f79535-47bb-0310-9956-ffa450edef68

5 years agoPropose and vote.
Graham Leggett [Mon, 29 Jun 2020 15:51:34 +0000 (15:51 +0000)] 
Propose and vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879338 13f79535-47bb-0310-9956-ffa450edef68

5 years agoAdd a note
Christophe Jaillet [Sun, 28 Jun 2020 07:24:46 +0000 (07:24 +0000)] 
Add a note

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879294 13f79535-47bb-0310-9956-ffa450edef68

5 years agoSTATUS: Add a comment for systemd socket activation [skip ci]
Luca Toscano [Sat, 27 Jun 2020 12:21:14 +0000 (12:21 +0000)] 
STATUS: Add a comment for systemd socket activation [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879265 13f79535-47bb-0310-9956-ffa450edef68

5 years agoSTATUS: update Last-Modified header proposal after Joe's comments
Luca Toscano [Sat, 27 Jun 2020 12:07:53 +0000 (12:07 +0000)] 
STATUS: update Last-Modified header proposal after Joe's comments
        and recent commits.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879264 13f79535-47bb-0310-9956-ffa450edef68

5 years agoBackported [skip ci].
Yann Ylavic [Fri, 26 Jun 2020 10:22:05 +0000 (10:22 +0000)] 
Backported [skip ci].

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879227 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMerge r1878280 from trunk:
Yann Ylavic [Fri, 26 Jun 2020 10:21:19 +0000 (10:21 +0000)] 
Merge r1878280 from trunk:

mod_proxy_http: don't strip EOS when spooling request body to file.

To prevent stream_reqbody() from sending the FILE and FLUSH bucket in separate
brigades, and thus apr_file_setaside() to trigger if network congestion occurs
with the backend, restore the EOS in spool_reqbody_cl() which was stripped
when spooling the request body to a file.

Until APR r1878279 is released (and installed by users), apr_file_setaside()
on a temporary file (mktemp) will simply drop the file cleanup, leaking the
fd and inode..

This fixes BZ 64452.

Submitted by: ylavic
Reviewed by: ylavic, jorton, rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879226 13f79535-47bb-0310-9956-ffa450edef68

5 years agoBackported [skip ci].
Yann Ylavic [Fri, 26 Jun 2020 10:19:10 +0000 (10:19 +0000)] 
Backported [skip ci].

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879225 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMerge r1879179, r1879180 from trunk:
Yann Ylavic [Fri, 26 Jun 2020 10:18:16 +0000 (10:18 +0000)] 
Merge r1879179, r1879180 from trunk:

EVP_PKEY_up_ref(): fix ref count locking type for proxy EVP pkey

When enabling client authentication for proxy (SSLProxyMachineCertificateFile),
the client certificate callback function ssl_callback_proxy_cert uses another
reference count locking type then one that is used by the caller function when
trying to free the private key afterwards by using EVP_PKEY_free.

This can lead to a race-condition on pkey->references resulting in a double
free error.

On my system, the error occurs sporadically when threaded health checking
(mod_watchdog) forces two threads competing for the client's private key.

For example, see following two backtraces of a coredump where thread 1 and
thread 15 both run into CRYPTO_free(). Actually, the private key should never
be freed during run-time nor should two threads ever enter CRYPTO_free()
concurrently.

(gdb) t 1
[Switching to thread 1 (Thread 0xb2cfbb40 (LWP 16054))]
#0 0xf7f3f329 in __kernel_vsyscall ()
(gdb) bt
#0 0xf7f3f329 in __kernel_vsyscall ()
#1 0xf7cec9e7 in raise () from /lib32/libc.so.6
#2 0xf7cedfb9 in abort () from /lib32/libc.so.6
#3 0xf7d2a14d in ?? () from /lib32/libc.so.6
#4 0xf7d2fd27 in ?? () from /lib32/libc.so.6
#5 0xf7d3047d in ?? () from /lib32/libc.so.6
#6 0x08499c70 in CRYPTO_free (str=0x93376b0) at mem.c:434
#7 0x084cc063 in EVP_PKEY_free (x=0x93376b0) at p_lib.c:406
#8 0x08463917 in ssl3_send_client_certificate (s=0xad21f070) at s3_clnt.c:3475
#9 0x0845d62c in ssl3_connect (s=0xad21f070) at s3_clnt.c:426
#10 0x08484213 in SSL_connect (s=0xad21f070) at ssl_lib.c:1008
#11 0x0846f9c8 in ssl23_get_server_hello (s=0xad21f070) at s23_clnt.c:832
#12 0x0846ea45 in ssl23_connect (s=0xad21f070) at s23_clnt.c:231
#13 0x08484213 in SSL_connect (s=0xad21f070) at ssl_lib.c:1008
#14 0x08261e73 in ssl_io_filter_handshake (filter_ctx=0xb4d3f450) at ssl_engine_io.c:1245
#15 0x08263ba6 in ssl_io_filter_output (f=0xb4d3f480, bb=0xacc079a0) at ssl_engine_io.c:1760
#16 0x080ea2c9 in ap_pass_brigade (next=0xb4d3f480, bb=0xacc079a0) at util_filter.c:590
#17 0x08263b07 in ssl_io_filter_coalesce (f=0xb4d3f468, bb=0xacc079a0) at ssl_engine_io.c:1728
#18 0x080ea2c9 in ap_pass_brigade (next=0xb4d3f468, bb=0xacc079a0) at util_filter.c:590
#19 0x08251658 in hc_send (r=0xacc069b0, out=0x8c25ec8 "GET /hcheck HTTP/1.0\r\nHost: XXX\r\n\r\n", bb=0xacc079a0) at mod_proxy_hcheck.c:664
#20 0x08251eb3 in hc_check_http (baton=0xacc068d8) at mod_proxy_hcheck.c:806
#21 0x08252653 in hc_check (thread=0x8cc6b10, b=0xacc068d8) at mod_proxy_hcheck.c:870
#22 0x08383185 in thread_pool_func (t=0x8cc6b10, param=0x8c245e0) at misc/apr_thread_pool.c:266
#23 0x083baef6 in dummy_worker (opaque=0x8cc6b10) at threadproc/unix/thread.c:142
#24 0xf7ec615f in start_thread () from /lib32/libpthread.so.0
#25 0xf7da862e in clone () from /lib32/libc.so.6

(gdb) t 15
[Switching to thread 15 (Thread 0xb44feb40 (LWP 16049))]
#0 0xf7dd90a5 in _dl_addr () from /lib32/libc.so.6
(gdb) bt
#0 0xf7dd90a5 in _dl_addr () from /lib32/libc.so.6
#1 0xf7db610c in backtrace_symbols_fd () from /lib32/libc.so.6
#2 0xf7cd89ab in ?? () from /lib32/libc.so.6
#3 0xf7d2a148 in ?? () from /lib32/libc.so.6
#4 0xf7d2fd27 in ?? () from /lib32/libc.so.6
#5 0xf7d3047d in ?? () from /lib32/libc.so.6
#6 0x08499c70 in CRYPTO_free (str=0x93376b0) at mem.c:434
#7 0x084cc063 in EVP_PKEY_free (x=0x93376b0) at p_lib.c:406
#8 0x08463917 in ssl3_send_client_certificate (s=0xacf1baa0) at s3_clnt.c:3475
#9 0x0845d62c in ssl3_connect (s=0xacf1baa0) at s3_clnt.c:426
#10 0x08484213 in SSL_connect (s=0xacf1baa0) at ssl_lib.c:1008
#11 0x0846f9c8 in ssl23_get_server_hello (s=0xacf1baa0) at s23_clnt.c:832
#12 0x0846ea45 in ssl23_connect (s=0xacf1baa0) at s23_clnt.c:231
#13 0x08484213 in SSL_connect (s=0xacf1baa0) at ssl_lib.c:1008
#14 0x08261e73 in ssl_io_filter_handshake (filter_ctx=0xb4d37430) at ssl_engine_io.c:1245
#15 0x08263ba6 in ssl_io_filter_output (f=0xb4d37460, bb=0xad101588) at ssl_engine_io.c:1760
#16 0x080ea2c9 in ap_pass_brigade (next=0xb4d37460, bb=0xad101588) at util_filter.c:590
#17 0x08263b07 in ssl_io_filter_coalesce (f=0xb4d37448, bb=0xad101588) at ssl_engine_io.c:1728
#18 0x080ea2c9 in ap_pass_brigade (next=0xb4d37448, bb=0xad101588) at util_filter.c:590
#19 0x08251658 in hc_send (r=0xad100598, out=0x8c25898 "GET /hcheck HTTP/1.0\r\nHost: XXX\r\n\r\n", bb=0xad101588) at mod_proxy_hcheck.c:664
#20 0x08251eb3 in hc_check_http (baton=0xad1004c0) at mod_proxy_hcheck.c:806
#21 0x08252653 in hc_check (thread=0x8cc6ab0, b=0xad1004c0) at mod_proxy_hcheck.c:870
#22 0x08383185 in thread_pool_func (t=0x8cc6ab0, param=0x8c245e0) at misc/apr_thread_pool.c:266
#23 0x083baef6 in dummy_worker (opaque=0x8cc6ab0) at threadproc/unix/thread.c:142
#24 0xf7ec615f in start_thread () from /lib32/libpthread.so.0
#25 0xf7da862e in clone () from /lib32/libc.so.6

Many thanks to Armin for finding this.

Github: closes #129
Submitted by: Armin Abfalterer (arminabf)
Reviewed by: ylavic

Follow up to r1879179: CHANGES entry.

Reviewed by: ylavic, jorton, rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879224 13f79535-47bb-0310-9956-ffa450edef68

5 years ago* Vote and promote [skip ci]
Ruediger Pluem [Fri, 26 Jun 2020 07:38:09 +0000 (07:38 +0000)] 
* Vote and promote [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879216 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMerge r1878993, r1879103 from trunk:
Joe Orton [Thu, 25 Jun 2020 13:21:17 +0000 (13:21 +0000)] 
Merge r1878993, r1879103 from trunk:

For diagnosing weird non-x86 failures, dump /etc/hosts in future runs.

Add workaround for IPv6 configuration on non-x86 hosts which
appears to fix the connection failures.  Almost certainly a bug
here, not at all sure where.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879189 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMerge r1879108, r1879109, r1879113, r1879115, r1879184 from trunk:
Joe Orton [Thu, 25 Jun 2020 13:20:19 +0000 (13:20 +0000)] 
Merge r1879108, r1879109, r1879113, r1879115, r1879184 from trunk:

Test mod_cgid w/fdpassing.

Fix YAML syntax.

Disable mod_cgi to ensure mod_cgid is really being tested.

Mark fdpassing test as failing.

Add a plain mod_cgid build, explicitly without mod_cgi.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879188 13f79535-47bb-0310-9956-ffa450edef68

5 years agoVote*2. [skip ci]
Joe Orton [Thu, 25 Jun 2020 12:34:56 +0000 (12:34 +0000)] 
Vote*2. [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879185 13f79535-47bb-0310-9956-ffa450edef68

5 years agoPropose fix for gh #129 [skip ci].
Yann Ylavic [Thu, 25 Jun 2020 11:38:24 +0000 (11:38 +0000)] 
Propose fix for gh #129 [skip ci].

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879182 13f79535-47bb-0310-9956-ffa450edef68

5 years agofixing things
Stefan Eissing [Wed, 24 Jun 2020 14:43:20 +0000 (14:43 +0000)] 
fixing things

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879158 13f79535-47bb-0310-9956-ffa450edef68

5 years agoVote, promote.
Yann Ylavic [Wed, 24 Jun 2020 14:05:29 +0000 (14:05 +0000)] 
Vote, promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879155 13f79535-47bb-0310-9956-ffa450edef68

5 years agoVote.
Yann Ylavic [Wed, 24 Jun 2020 13:44:29 +0000 (13:44 +0000)] 
Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879154 13f79535-47bb-0310-9956-ffa450edef68

5 years agobackport proposal
Stefan Eissing [Wed, 24 Jun 2020 08:36:27 +0000 (08:36 +0000)] 
backport proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879142 13f79535-47bb-0310-9956-ffa450edef68

5 years agoreflow
Jim Jagielski [Sat, 20 Jun 2020 14:25:10 +0000 (14:25 +0000)] 
reflow

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879039 13f79535-47bb-0310-9956-ffa450edef68

5 years agoBackported
Jim Jagielski [Sat, 20 Jun 2020 14:22:30 +0000 (14:22 +0000)] 
Backported

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879037 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMerge r1876616 from trunk:
Jim Jagielski [Sat, 20 Jun 2020 14:22:18 +0000 (14:22 +0000)] 
Merge r1876616 from trunk:

  *) mod_http2: Fixed regression that no longer set H2_STREAM_ID and H2_STREAM_TAG.
     PR64330

Submitted by: icing
Reviewed by: steffenal, rpluem, gbechis, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879036 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMerge r1877783 from trunk:
Jim Jagielski [Sat, 20 Jun 2020 14:21:19 +0000 (14:21 +0000)] 
Merge r1877783 from trunk:

  *) mod_http2: Fixed regression that caused connections to close when mod_reqtimeout
     was configured with a handshake timeout. Fixes gitub issue #196.

Submitted by: icing
Reviewed by: icing, steffenal, rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879035 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMerge r1876548 from trunk:
Jim Jagielski [Sat, 20 Jun 2020 14:19:56 +0000 (14:19 +0000)] 
Merge r1876548 from trunk:

mod_ssl: Fix memory leak in stapling code. PR63687.

Free issuer's X509 in ssl_stapling_init_cert()'s early return paths.

Submitted by: icing

Submitted by: ylavic
Reviewed by: gbechis, jorton, icing

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879034 13f79535-47bb-0310-9956-ffa450edef68

5 years agoVotes
Jim Jagielski [Sat, 20 Jun 2020 14:18:05 +0000 (14:18 +0000)] 
Votes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879033 13f79535-47bb-0310-9956-ffa450edef68

5 years agoPropose
Christophe Jaillet [Fri, 19 Jun 2020 20:50:44 +0000 (20:50 +0000)] 
Propose

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879010 13f79535-47bb-0310-9956-ffa450edef68

5 years agoUpdate proposal [skip ci].
Yann Ylavic [Fri, 19 Jun 2020 18:02:39 +0000 (18:02 +0000)] 
Update proposal [skip ci].

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879003 13f79535-47bb-0310-9956-ffa450edef68

5 years agoRe-propose ap_proxy_define_match_worker() for backport.
Yann Ylavic [Fri, 19 Jun 2020 16:05:56 +0000 (16:05 +0000)] 
Re-propose ap_proxy_define_match_worker() for backport.

Re new BZ 64537 (and old 43513). There's the dns/connection reuse
compat issue spotted by covener still, to be discussed..

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878996 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMerge r1877250, r1878502, r1878654, r1878660, r1878663, r1878889 from trunk:
Joe Orton [Wed, 17 Jun 2020 11:18:59 +0000 (11:18 +0000)] 
Merge r1877250, r1878502, r1878654, r1878660, r1878663, r1878889 from trunk:

[under CTR for Travis integration]

Add gcc-10 job, drop gcc-9 config from allow_failures (seems stable again).
Use -O2 for all gcc -Werror jobs otherwise warnings triggered under e.g.
aggressive inlining are not found.

Build with LDAP support for APR 1.x.
Dump end of error_log for test run failures.

Tail more error_log for failed test suite runs in Travis.

Disable all Travis notifications for forks (hopefully).

Add Travis job which runs slapd in a container to allow testing
mod_authnz_ldap, per new test case added in r1878655.

* test/travis_Dockerfile_slapd: New dockerfile for running slapd.

Update Travis LDAP testing to use new container setup script
provided by test framework.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878917 13f79535-47bb-0310-9956-ffa450edef68

5 years agofr doc rebuild
Lucien Gentis [Sat, 13 Jun 2020 15:27:18 +0000 (15:27 +0000)] 
fr doc rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878811 13f79535-47bb-0310-9956-ffa450edef68

5 years agofr doc XML files updates.
Lucien Gentis [Sat, 13 Jun 2020 15:26:22 +0000 (15:26 +0000)] 
fr doc XML files updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878810 13f79535-47bb-0310-9956-ffa450edef68

5 years agoFix a typo
Christophe Jaillet [Sat, 13 Jun 2020 04:18:58 +0000 (04:18 +0000)] 
Fix a typo

Spotted and fixed by David Poole <sarkie gmail.com>

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878785 13f79535-47bb-0310-9956-ffa450edef68

5 years agoupdate
André Malo [Wed, 10 Jun 2020 21:25:03 +0000 (21:25 +0000)] 
update

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878727 13f79535-47bb-0310-9956-ffa450edef68

5 years agoFix an invalid link
Christophe Jaillet [Mon, 8 Jun 2020 19:35:05 +0000 (19:35 +0000)] 
Fix an invalid link
PR 64466

Thx to  Dr. Prőhle Péter  for spotting and reporting it.

(r1878627 on trunk)
[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878628 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMerge r1878433 from trunk:
Ruediger Pluem [Mon, 8 Jun 2020 07:30:49 +0000 (07:30 +0000)] 
Merge r1878433 from trunk:

  *) mod_proxy_http2: the "ping" proxy parameter
     (see <https://httpd.apache.org/docs/2.4/mod/mod_proxy.html>) is now used
     when checking the liveliness of a new or reused h2 connection to the backend.
     With short durations, this makes load-balancing more responsive. The module
     will hold back requests until ping conditions are met, using features of the
     HTTP/2 protocol alone. [Ruediger Pluem, Stefan Eissing]

Note: mod_proxy_http2 is currently CTR on 2.4.x.

Submitted by: icing
Reviewed by: rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878579 13f79535-47bb-0310-9956-ffa450edef68

5 years agoRemove the term blacklist from our documentation
Rich Bowen [Sat, 6 Jun 2020 18:52:53 +0000 (18:52 +0000)] 
Remove the term blacklist from our documentation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878552 13f79535-47bb-0310-9956-ffa450edef68

5 years agorebuild docs
Rich Bowen [Sat, 6 Jun 2020 18:21:08 +0000 (18:21 +0000)] 
rebuild docs

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878550 13f79535-47bb-0310-9956-ffa450edef68

5 years agoRemove 'blacklist' from our documentation, as per
Rich Bowen [Sat, 6 Jun 2020 18:19:26 +0000 (18:19 +0000)] 
Remove 'blacklist' from our documentation, as per
https://lethargy.org/~jesus/writes/a-guide-to-nomenclature-selection/
and other recommendations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878549 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMerge r1876679 from trunk:
Ruediger Pluem [Tue, 2 Jun 2020 12:11:39 +0000 (12:11 +0000)] 
Merge r1876679 from trunk:

gdbinit: print bucket fd when available. [skip ci]
Submitted by: ylavic
Reviewed by: rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878392 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMerge r1876678 from trunk:
Ruediger Pluem [Tue, 2 Jun 2020 11:14:36 +0000 (11:14 +0000)] 
Merge r1876678 from trunk:

gdbinit: more address colomn space for 64bit.
Submitted by: ylavic
Reviewed by: rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878391 13f79535-47bb-0310-9956-ffa450edef68

5 years agoPropose fix for BZ 64452. [skip ci]
Yann Ylavic [Mon, 1 Jun 2020 16:12:47 +0000 (16:12 +0000)] 
Propose fix for BZ 64452. [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878368 13f79535-47bb-0310-9956-ffa450edef68

5 years agoupdate transformations.
Nilgun Belma Buguner [Sat, 30 May 2020 07:50:36 +0000 (07:50 +0000)] 
update transformations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878304 13f79535-47bb-0310-9956-ffa450edef68

5 years agoupdate for sync with English docs.
Nilgun Belma Buguner [Sat, 30 May 2020 07:49:55 +0000 (07:49 +0000)] 
update for sync with English docs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878303 13f79535-47bb-0310-9956-ffa450edef68

5 years agoupdate for sync with English docs.
Nilgun Belma Buguner [Sat, 30 May 2020 05:56:50 +0000 (05:56 +0000)] 
update for sync with English docs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878302 13f79535-47bb-0310-9956-ffa450edef68

5 years agoupdate after backport
Stefan Eissing [Fri, 29 May 2020 10:24:36 +0000 (10:24 +0000)] 
update after backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878267 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMerged /httpd/httpd/trunk:r1878233,1878264
Stefan Eissing [Fri, 29 May 2020 10:24:13 +0000 (10:24 +0000)] 
Merged /httpd/httpd/trunk:r1878233,1878264

  *) mod_proxy_http2: respect ProxyTimeout settings on backend connections
     while waiting on incoming data. [Ruediger Pluem, Stefan Eissing]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878266 13f79535-47bb-0310-9956-ffa450edef68

5 years agovote and promote
Stefan Eissing [Thu, 28 May 2020 15:43:48 +0000 (15:43 +0000)] 
vote and promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878236 13f79535-47bb-0310-9956-ffa450edef68

5 years agoproposing backport of r1878233.
Stefan Eissing [Thu, 28 May 2020 15:41:55 +0000 (15:41 +0000)] 
proposing backport of r1878233.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878235 13f79535-47bb-0310-9956-ffa450edef68

5 years ago* Vote and promote [skip ci]
Ruediger Pluem [Mon, 25 May 2020 08:12:22 +0000 (08:12 +0000)] 
* Vote and promote [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878094 13f79535-47bb-0310-9956-ffa450edef68

5 years agoRemove some extra spaces in order to align on 4 spaces and synch with trunk.
Christophe Jaillet [Sat, 23 May 2020 13:20:09 +0000 (13:20 +0000)] 
Remove some extra spaces in order to align on 4 spaces and synch with trunk.

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878058 13f79535-47bb-0310-9956-ffa450edef68

5 years agoEasy proposals
Christophe Jaillet [Thu, 21 May 2020 19:16:35 +0000 (19:16 +0000)] 
Easy proposals

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878010 13f79535-47bb-0310-9956-ffa450edef68

5 years agopropose PR64365
Eric Covener [Sat, 16 May 2020 18:34:08 +0000 (18:34 +0000)] 
propose PR64365

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1877831 13f79535-47bb-0310-9956-ffa450edef68

5 years agofr doc rebuild.
Lucien Gentis [Sat, 16 May 2020 15:42:57 +0000 (15:42 +0000)] 
fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1877822 13f79535-47bb-0310-9956-ffa450edef68

5 years agofr doc XML file update.
Lucien Gentis [Sat, 16 May 2020 15:42:15 +0000 (15:42 +0000)] 
fr doc XML file update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1877821 13f79535-47bb-0310-9956-ffa450edef68

5 years agoVote mod_http2
Steffen Land [Sat, 16 May 2020 10:14:17 +0000 (10:14 +0000)] 
Vote mod_http2

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1877804 13f79535-47bb-0310-9956-ffa450edef68

5 years agoproposing backport of 1877783
Stefan Eissing [Fri, 15 May 2020 12:06:03 +0000 (12:06 +0000)] 
proposing backport of 1877783

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1877784 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMerge r1877708 from trunk:
Eric Covener [Wed, 13 May 2020 20:45:09 +0000 (20:45 +0000)] 
Merge r1877708 from trunk:

mention relative path behavior, offline question

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1877709 13f79535-47bb-0310-9956-ffa450edef68

5 years agofr doc rebuild.
Lucien Gentis [Sat, 9 May 2020 14:17:48 +0000 (14:17 +0000)] 
fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1877535 13f79535-47bb-0310-9956-ffa450edef68

5 years agofr doc XML file update.
Lucien Gentis [Sat, 9 May 2020 14:17:06 +0000 (14:17 +0000)] 
fr doc XML file update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1877534 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMerge r1877394 from trunk:
Eric Covener [Tue, 5 May 2020 11:45:20 +0000 (11:45 +0000)] 
Merge r1877394 from trunk:

clarify, context is still CGI only.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1877395 13f79535-47bb-0310-9956-ffa450edef68

5 years agofr doc rebuild.
Lucien Gentis [Sat, 2 May 2020 13:24:38 +0000 (13:24 +0000)] 
fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1877298 13f79535-47bb-0310-9956-ffa450edef68

5 years agofr doc XML file update.
Lucien Gentis [Sat, 2 May 2020 13:23:49 +0000 (13:23 +0000)] 
fr doc XML file update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1877297 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMerge r1877119 from trunk:
Ruediger Pluem [Tue, 28 Apr 2020 06:09:22 +0000 (06:09 +0000)] 
Merge r1877119 from trunk:

* We have five providers [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1877120 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMerged with apologies for making you go round twice rjung ;) [skip ci]
Joe Orton [Thu, 23 Apr 2020 13:40:44 +0000 (13:40 +0000)] 
Merged with apologies for making you go round twice rjung ;) [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1876893 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMerge r1876869 from trunk:
Joe Orton [Thu, 23 Apr 2020 13:39:49 +0000 (13:39 +0000)] 
Merge r1876869 from trunk:

systemd dependencies are only needed by mod_systemd.
They should currently not be needed by httpd directly
or any other binary. So no need to add them to
HTTPD_LIBS.

Submitted by: rjung
Reviewed by: rjung, jim, jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1876892 13f79535-47bb-0310-9956-ffa450edef68

5 years agoVotes. [skip ci]
Joe Orton [Thu, 23 Apr 2020 13:35:25 +0000 (13:35 +0000)] 
Votes. [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1876891 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMerge r1876540 from trunk:
Jim Jagielski [Thu, 23 Apr 2020 12:33:29 +0000 (12:33 +0000)] 
Merge r1876540 from trunk:

PR64295 cannot override default Virtualhost's mod_reqtimeout
of course only body=n can work the headers have to parsed to get the virtualhost.

Submitted by: jfclere
Reviewed by: jailletc36, rpluem, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1876888 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMerge r1876484, r1876493 from trunk:
Jim Jagielski [Thu, 23 Apr 2020 12:33:04 +0000 (12:33 +0000)] 
Merge r1876484, r1876493 from trunk:

PR64313  htcacheclean: Empty directories in CacheRoot are still present even after using "-t"

* Whitespace style fixes. No functional change.
Submitted by: jfclere, rpluem
Reviewed by: jailletc36, rpluem, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1876887 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMerge r1783041 from trunk:
Jim Jagielski [Thu, 23 Apr 2020 12:32:32 +0000 (12:32 +0000)] 
Merge r1783041 from trunk:

default_handler: cleanup outputed brigade before leaving.
Submitted by: ylavic
Reviewed by: jailletc36, rpluem, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1876886 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMerge r1534995, r1560482, r1728779, r1805491, r1861528, r1868016, r1874470, r1874602...
Jim Jagielski [Thu, 23 Apr 2020 12:32:02 +0000 (12:32 +0000)] 
Merge r1534995, r1560482, r1728779, r1805491, r1861528, r1868016, r1874470, r1874602, r1875769, r1875811 from trunk:

don't ignore some apr_procattr failures (clang scan-build)

doxygen improvements

Standardize order of "extern" and XXX_DECLARE_YYY.

Fix some compilation warning when MIME_MAGIC_DEBUG is defined.

warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument <n> has type ‘<something> *’ [-Wformat=]

style: cmd_rec at the bottom

no functional change

Fix a typo in a message.

Reported and fixed by Christian Bartolomäus (bartolin gmx.de)
PR 63806

malloc -> ap_malloc
bz #63967

Slighly simplify code.

No need to set to NULL or 0 fields that are apr_pcalloc'ed.
Axe 'set_cookie_enable' and use 'ap_set_flag_slot' instead.

(based on ideas taken from r1874389)

Parentheses around AP_BUCKET_IS_EOR argument.

Fix a typo
Submitted by: trawick, rjung, jailletc36, covener, jailletc36, gbechis, jailletc36, ylavic, jailletc36
Reviewed by: jailletc36, gbechis, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1876885 13f79535-47bb-0310-9956-ffa450edef68

5 years agoand promote
Jim Jagielski [Thu, 23 Apr 2020 12:31:15 +0000 (12:31 +0000)] 
and promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1876884 13f79535-47bb-0310-9956-ffa450edef68

5 years agovotes
Jim Jagielski [Thu, 23 Apr 2020 12:30:41 +0000 (12:30 +0000)] 
votes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1876883 13f79535-47bb-0310-9956-ffa450edef68

5 years agoPorpose. [skip ci]
Rainer Jung [Thu, 23 Apr 2020 10:29:46 +0000 (10:29 +0000)] 
Porpose.  [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1876875 13f79535-47bb-0310-9956-ffa450edef68

5 years agor1876870 isn't under CTR.
Rainer Jung [Thu, 23 Apr 2020 10:22:38 +0000 (10:22 +0000)] 
r1876870 isn't under CTR.
So undo for now.
Will add to STATUS.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1876874 13f79535-47bb-0310-9956-ffa450edef68

5 years agosystemd dependencies are only needed by mod_systemd.
Rainer Jung [Thu, 23 Apr 2020 08:56:23 +0000 (08:56 +0000)] 
systemd dependencies are only needed by mod_systemd.
They should currently not be needed by httpd directly
or any other binary. So no need to add them to
HTTPD_LIBS.

Should be CTR (build system).

Backport of r1876869 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1876870 13f79535-47bb-0310-9956-ffa450edef68

5 years agoPut post-release security entries underneath
Rainer Jung [Mon, 20 Apr 2020 19:05:49 +0000 (19:05 +0000)] 
Put post-release security entries underneath
2.4.43 instead of 2.4.44.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1876764 13f79535-47bb-0310-9956-ffa450edef68

5 years agovote and propose [skip ci]
Giovanni Bechis [Fri, 17 Apr 2020 15:03:50 +0000 (15:03 +0000)] 
vote and propose [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1876668 13f79535-47bb-0310-9956-ffa450edef68

5 years ago* Vote [skip ci]
Ruediger Pluem [Fri, 17 Apr 2020 09:14:56 +0000 (09:14 +0000)] 
* Vote [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1876660 13f79535-47bb-0310-9956-ffa450edef68

5 years agovote mod_http2 PR64330
Steffen Land [Fri, 17 Apr 2020 08:08:21 +0000 (08:08 +0000)] 
vote mod_http2 PR64330

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1876654 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMerge r1876623 from trunk:
Joe Orton [Thu, 16 Apr 2020 18:26:34 +0000 (18:26 +0000)] 
Merge r1876623 from trunk:

Allow failures for the gcc9 build since the repo seems to have broken deps.

[under CTR for Travis stuff]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1876627 13f79535-47bb-0310-9956-ffa450edef68

5 years agobackport proposal for PR64330
Stefan Eissing [Thu, 16 Apr 2020 17:20:18 +0000 (17:20 +0000)] 
backport proposal for PR64330

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1876617 13f79535-47bb-0310-9956-ffa450edef68