]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Stefan Eissing [Fri, 2 Aug 2019 09:13:37 +0000 (09:13 +0000)]
Merge of r1863635 from trunk:
*) md_crypt: Wrap get_ct_scts_nid(void) definition to avoid unused function error
when building in maintainer mode. [jim]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864209 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 2 Aug 2019 09:12:18 +0000 (09:12 +0000)]
update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864208 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 2 Aug 2019 09:10:06 +0000 (09:10 +0000)]
Merge of r1864191 from trunk:
*) core, proxy: remove request URL and headers from error docs (CVE-2019-10092)
[Eric Covener]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864207 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 2 Aug 2019 09:08:43 +0000 (09:08 +0000)]
votenpromote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864206 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 2 Aug 2019 07:51:29 +0000 (07:51 +0000)]
* Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864203 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 2 Aug 2019 01:47:02 +0000 (01:47 +0000)]
propose recent trunk revs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864194 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 1 Aug 2019 14:13:31 +0000 (14:13 +0000)]
Merged /httpd/httpd/trunk:r1864153
Fix unnecessary redefinition of AP_ENABLE_EXCEPTION_HOOK. [Eric Covener]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864155 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Thu, 1 Aug 2019 08:42:58 +0000 (08:42 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864136 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Thu, 1 Aug 2019 08:40:30 +0000 (08:40 +0000)]
Fix properties
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864135 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 1 Aug 2019 08:24:02 +0000 (08:24 +0000)]
merge information from h2 backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864128 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 1 Aug 2019 08:18:03 +0000 (08:18 +0000)]
Merge of r1861338,
1862475 ,
1862583 ,
1862865 ,
1863221 ,
1863276 from trunk:
*) mod_http2: core setting "LimitRequestFieldSize" is not additionally checked on
merged header fields, just as HTTP/1.1 does. [Stefan Eissing, Michael Kaufmann]
*) mod_http2: fixed a bug that prevented proper stream cleanup when connection
throttling was in place. Stream resets by clients on streams initiated by them
are counted as possible trigger for throttling. [Stefan Eissing]
*) mod_http2/mpm_event: Fixes the behaviour when a HTTP/2 connection has nothing
more to write with streams ongoing (flow control block). The timeout waiting
for the client to send WINODW_UPDATE was incorrectly KeepAliveTimeout and not
Timeout as it should be. Fixes PR 63534. [Yann Ylavic, Stefan Eissing]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864126 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 1 Aug 2019 07:27:04 +0000 (07:27 +0000)]
* Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864119 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 31 Jul 2019 12:53:04 +0000 (12:53 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864055 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 30 Jul 2019 13:44:32 +0000 (13:44 +0000)]
Add CHANGES for r1864005
(backport of r1856829 from trunk).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864007 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Jul 2019 13:11:39 +0000 (13:11 +0000)]
Merge r1856829 from trunk:
*) mod_proxy: Load balancer byrequests required when bytraffic chosen
PR 62372
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864005 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Jul 2019 13:10:35 +0000 (13:10 +0000)]
vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864004 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 30 Jul 2019 13:06:20 +0000 (13:06 +0000)]
Add CHANGES for r1864000
(backport of r1853560 from trunk).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864002 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Jul 2019 13:01:54 +0000 (13:01 +0000)]
update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864001 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Jul 2019 13:01:21 +0000 (13:01 +0000)]
Merging r1853560 from trunk:
*) mod_proxy_hcheck: Create the configure for mod_proxy_hcheck when used in BalancerMember.
PR 60757
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864000 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Jul 2019 13:00:29 +0000 (13:00 +0000)]
vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863997 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Jul 2019 12:47:39 +0000 (12:47 +0000)]
update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863995 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Jul 2019 11:23:52 +0000 (11:23 +0000)]
Merged /httpd/httpd/trunk:r1851621,
1852128 ,
1862075
*) mod_ssl/mod_md: reversing dependency by letting mod_ssl offer hooks for
adding certificates and keys to a virtual host. An additional hook allows
answering special TLS connections as used in ACME challenges.
Adding 2 new hooks for init/get of OCSP stapling status information when
other modules want to provide those. Falls back to own implementation with
same behaviour as before.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863988 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 23 Jul 2019 12:52:51 +0000 (12:52 +0000)]
Backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863636 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 22 Jul 2019 19:31:12 +0000 (19:31 +0000)]
mod_proxy_hcheck: mod_proxy_hcheck: mute "run from watchdog" message.
This is way too verbose (every 100ms) to be logged at any LogLevel.
Backport of r1853992 from trunk.
Proposed by: rjung
Backported by: rjung
Reviewed by: rjung, jailletc36, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863597 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 22 Jul 2019 19:28:14 +0000 (19:28 +0000)]
core: fix crash when running with apr lib build with APR_POOL_DEBUG.
Observed with huge config and mod_security using long config lines.
Backport of r1863179 from trunk.
Proposed by: rjung
Backported by: rjung
Reviewed by: rjung, icing, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863596 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Jul 2019 12:47:51 +0000 (12:47 +0000)]
and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863546 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Jul 2019 12:47:06 +0000 (12:47 +0000)]
Backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863545 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 21 Jul 2019 11:40:51 +0000 (11:40 +0000)]
fr doc - Adding new html file after rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863519 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 20 Jul 2019 19:17:30 +0000 (19:17 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863508 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 20 Jul 2019 16:01:30 +0000 (16:01 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863484 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 20 Jul 2019 15:51:04 +0000 (15:51 +0000)]
fr doc - adding a new xml file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863483 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 20 Jul 2019 09:41:33 +0000 (09:41 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863463 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 19 Jul 2019 22:00:42 +0000 (22:00 +0000)]
Follow up to r1863315.
Update MODULE_MAGIC_NUMBER_MINOR
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863438 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 19 Jul 2019 21:09:17 +0000 (21:09 +0000)]
remove useless mail address for a comitter
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863435 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 18 Jul 2019 14:03:36 +0000 (14:03 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863320 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 18 Jul 2019 13:58:41 +0000 (13:58 +0000)]
cleanup after backport of change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863319 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 18 Jul 2019 13:58:11 +0000 (13:58 +0000)]
Merge of r1862014 from trunk:
*) mod_proxy_hcheck fix for BZ 60948
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863318 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 18 Jul 2019 13:57:04 +0000 (13:57 +0000)]
Merge of r1851146 from trunk:
*) cache_storage: be consistent when building a cache key value when CacheKeyBaseURL is used with
an URL that contains a :port.
PR 53915 [Rein Tollevik <rein basefarm.no>]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863317 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 18 Jul 2019 13:55:35 +0000 (13:55 +0000)]
Merge of r1426802,
1744460 ,
1829799 ,
1824716 ,
1838318 ,
1840678 ,
1861294
*) easy patches to synch 2.4.x and trunk:
- core: extend description of r->hostname
- mod_proxy_http: Avoid memory allocation before making sure that this handler can handle the URL
- core: Save a few cycles in 'ap_parse_form_data()'
- mod_cache_socache: Save some cycles
- mod_proxy_ftp: Save some cycle
- vhost: move an assignment to the end of the loop to ease readability and please a compiler
- core: Be a little more verbose when an error in trigerred in 'ap_set_file_slot()'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863316 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 18 Jul 2019 13:46:38 +0000 (13:46 +0000)]
Merge of r1847430,r1853302 from trunk:
*) core: Split out the ability to parse wildcard files and directories
from the Include/IncludeOptional directives into a generic set of
functions ap_dir_nofnmatch() and ap_dir_fnmatch().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863315 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 18 Jul 2019 13:44:28 +0000 (13:44 +0000)]
* vote+promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863314 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 18 Jul 2019 12:47:43 +0000 (12:47 +0000)]
update proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863281 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 16 Jul 2019 20:43:30 +0000 (20:43 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863180 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sun, 14 Jul 2019 20:41:00 +0000 (20:41 +0000)]
modules/md/mod_md.mak
update to mod_md 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863067 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 12 Jul 2019 08:17:58 +0000 (08:17 +0000)]
Done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862959 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 12 Jul 2019 08:17:39 +0000 (08:17 +0000)]
Merge r1857859 from trunk:
Fix a compilation error when GPROF is defined.
Submitted by: jailletc36
Reviewed by: jfclere, icing, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862958 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 12 Jul 2019 07:31:12 +0000 (07:31 +0000)]
1 done, 1 paused, 1 vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862956 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 12 Jul 2019 07:16:45 +0000 (07:16 +0000)]
Merge r1858565 from trunk:
* modules/cache/mod_socache_shmcb.c (socache_shmcb_init): Describe
error better for anon shm failure case, fixing gcc 9 warning on
passing NULL for '%s'.
Reviewed by: jorton, icing, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862952 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 11 Jul 2019 14:24:31 +0000 (14:24 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862930 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 11 Jul 2019 14:24:05 +0000 (14:24 +0000)]
backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862929 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 11 Jul 2019 11:06:48 +0000 (11:06 +0000)]
mod_md v2.0.8: synching wiht github release.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862914 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 10 Jul 2019 10:51:40 +0000 (10:51 +0000)]
updated http2 backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862871 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 9 Jul 2019 17:23:09 +0000 (17:23 +0000)]
mod_md: adapting to the latest mod_ssk hook changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862828 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 9 Jul 2019 10:56:58 +0000 (10:56 +0000)]
fixing a signedness conversion warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862802 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 9 Jul 2019 09:49:04 +0000 (09:49 +0000)]
propose backport of new mod_ssl hooks
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862795 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 9 Jul 2019 08:40:17 +0000 (08:40 +0000)]
Merged /httpd/httpd/trunk:r1861448,
1862013 ,
1862041 ,
1862052 ,
1862785
*) mod_md: new features
- supports the ACMEv2 protocol
- new challenge method 'tls-alpn-01' implemented, needs mod_ssl patch to become available
- supports command configuration to setup/teardown 'dns-01' challenges
- supports wildcard certificates when dns challenges are configured
- ACMEv2 is the new default and will be used on the next certificate renewal,
unless another MDCertificateAuthority is configured
- challenge type 'tls-sni-01' has been removed as CAs do not offer this any longer
- a domain exposes its status at https://<domain>/.httpd/certificate-status
- Managed Domains are now in Apache's 'server-status' page
- A new handler 'md-status' exposes verbose status information in JSON format
- new directives "MDCertificateFile" and "MDCertificateKeyFile" to configure a
Managed Domain that uses static files. Auto-renewal is turned off for those.
- new MDMessageCmd that is invoked on several events: 'renewed', 'expiring' and
'errored'. New 'MDWarnWindow' directive to configure when expiration warnings
shall be issued.
- ACMEv2 endpoints use the GET via empty POST way of accessing resources, see
announcement by Let's Encrypt:
https://community.letsencrypt.org/t/acme-v2-scheduled-deprecation-of-unauthenticated-resource-gets/74380
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862791 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 5 Jul 2019 14:50:40 +0000 (14:50 +0000)]
Minimal mod_ssl warning fix?
acked by jfc in <
b5c6265e -18cb-92e2-99df-
91ef439d622e @gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862619 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 5 Jul 2019 11:50:50 +0000 (11:50 +0000)]
Two done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862605 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 5 Jul 2019 11:26:12 +0000 (11:26 +0000)]
Merge r1491700, r1862200 from trunk:
According to comment in 'magic_rsl_add' and to the way 'magic_rsl_printf' manages its buffer, I think that this memory should be apr_pstrdup'ed.
This has been like that forever, but seems broken to me.
Untested.
* docs/conf/magic: Allow mod_mime_magic to return "audio/x-wav" for
WAV files, and omit returning "audio/unknown" for other RIFF
format files. Having a MIME type defined on a continuation line
*and* the preceding top-level match breaks mod_mime_magic, which
treats the second result "printed" as the MIME encoding. Neither
audio/x-wav nor audio/unknown are IANA registered, though Firefox
and Chrome both appear to recognize the former. Since the RIFF
format can contain non-audio media, returning audio/unknown as
a fallback for all RIFF files appears to be bogus anyway.
Submitted by: Àngel Ollé Blázquez <aollebla redhat.com>
Submitted by: jailletc36
Reviewed by: jorton, jim, icing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862604 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 5 Jul 2019 11:22:46 +0000 (11:22 +0000)]
Merge r1861690 from trunk:
* server/util.c: Make "nul" symbol private.
Reviewed by: jorton, jfclere, icing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862603 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 5 Jul 2019 07:27:41 +0000 (07:27 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862592 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 5 Jul 2019 07:26:09 +0000 (07:26 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862591 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 5 Jul 2019 07:25:19 +0000 (07:25 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862590 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 5 Jul 2019 07:21:48 +0000 (07:21 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862589 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 5 Jul 2019 07:20:07 +0000 (07:20 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862588 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 5 Jul 2019 07:17:52 +0000 (07:17 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862586 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 5 Jul 2019 07:16:23 +0000 (07:16 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862585 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 5 Jul 2019 07:14:34 +0000 (07:14 +0000)]
Proposing backport of h2 timeout/keepalive handling.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862584 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Wed, 3 Jul 2019 17:26:04 +0000 (17:26 +0000)]
proposal for https://bz.apache.org/bugzilla/show_bug.cgi?id=60948
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862500 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 2 Jul 2019 11:11:08 +0000 (11:11 +0000)]
*) mod_proxy_http2: fixing a potential NULL pointer use in logging.
[Christophe Jaillet <christophe.jaillet wanadoo.fr>, Dr Silvio Cesare InfoSect]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862418 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 2 Jul 2019 09:10:24 +0000 (09:10 +0000)]
* Only availabe since 2.4.40
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862412 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 2 Jul 2019 09:09:34 +0000 (09:09 +0000)]
* Fix flow
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862411 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 2 Jul 2019 09:08:30 +0000 (09:08 +0000)]
Merge r1842010, r1841225, r1862039, r1862040, r1862042 from trunk:
* dav_stream_response processes data that has been allocated from the propdb
pool. Hence close the propdb *after* dav_stream_response which clears thei
probdb pool.
* Doing a PROPFIND on a large collection e.g. 50.000 elements can easily
consume 1 GB of memory as the subrequests and propdb pools are not
destroyed and cleared after each element was handled.
Do this now. There is one case in dav_get_props where elem->priv
lives longer then the propdb pool. In this case allocate from r->pool.
Furthermore also recycle propdb's which allows to clear the propdb's
pools instead of destroying them and creating them again.
Simplify handling of short-lived pool for dav_propdb in mod_dav. No
functional change.
* modules/dav/main/props.c (dav_popen_propdb): Rename from
dav_open_propdb, take a pool argument.
(dav_open_propdb): Reimplement in terms of above, using
r->pool.
(dav_propfind_walker): Switch to using dav_open_propdb
with scratchpool.
* modules/dav/main/props.c (dav_do_prop_subreq): Allocate escaped URI
out of propdb pool, fixing small per-resource leak during a PROPFIND
walk.
Submitted by: jorton, rpluem
* modules/dav/main/mod_dav.c (dav_send_multistatus): Tag the pool.
Reviewed by: rpluem, jorton, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862410 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 1 Jul 2019 16:00:58 +0000 (16:00 +0000)]
Couple more small fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862391 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 1 Jul 2019 15:37:49 +0000 (15:37 +0000)]
And promote backport w/ at least 3 +1 votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862390 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 1 Jul 2019 15:37:12 +0000 (15:37 +0000)]
cast votes on tested patches
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862388 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 27 Jun 2019 15:17:35 +0000 (15:17 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862232 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 27 Jun 2019 14:29:56 +0000 (14:29 +0000)]
Memory corruption fixed speculatively in r1491700 has been seen in the wild.
Also fix WAV file matching.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862221 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 27 Jun 2019 08:39:50 +0000 (08:39 +0000)]
* Update proposal to incorporate the recent memory improvement patches from Joe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862199 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 24 Jun 2019 20:01:20 +0000 (20:01 +0000)]
* Leave a breadcrumb note for another backport proposal that needs to be done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1862023 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 22 Jun 2019 16:18:41 +0000 (16:18 +0000)]
French doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1861882 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 22 Jun 2019 16:17:19 +0000 (16:17 +0000)]
xml fr doc update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1861881 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 21 Jun 2019 08:29:59 +0000 (08:29 +0000)]
Note that rotatelogs -D was added in 2.4.34.
PR: 46669
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1861759 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 16 Jun 2019 14:06:07 +0000 (14:06 +0000)]
Fix:
- some missing syntax highlight
- a default value not refelcted in quickreference
- a missing link between
(r1861455 in trunk )
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1861456 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 16 Jun 2019 12:08:08 +0000 (12:08 +0000)]
Fix an example in doc
(
1861448 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1861451 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 16 Jun 2019 12:07:13 +0000 (12:07 +0000)]
Fix an example in doc
(
1861449 in trunk)
+ synch some small things (trailing spaces...)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1861450 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 16 Jun 2019 09:08:41 +0000 (09:08 +0000)]
'flags' are optional in SSLCARevocationCheck. Update the syntax accordingly.
(r1861442 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1861443 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 16 Jun 2019 08:50:50 +0000 (08:50 +0000)]
Fix missing description of 2 directives
(r1861439 on trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1861440 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 15 Jun 2019 16:13:49 +0000 (16:13 +0000)]
Proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1861409 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 14 Jun 2019 12:11:43 +0000 (12:11 +0000)]
Merge of r1861337 from trunk:
mod_proxy_http2: adding support for handling trailers in both directions. PR 63502.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1861339 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 14 Jun 2019 05:29:11 +0000 (05:29 +0000)]
Add a missing PR
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1861311 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Jun 2019 11:09:12 +0000 (11:09 +0000)]
Merge r1707084, r1707093, r1707159, r1707362 from trunk:
eor_bucket: don't destroy the request multiple times should any filter
do a copy (e.g. mod_bucketeer).
eor_bucket: follow up to r1707084: fix comment.
eor_bucket: follow up to r1707084: use an inner shared bucket.
eor_bucket: follow up to r1707159.
We need an apr_bucket_refcount, as spotted by Ruediger.
Submitted by: ylavic
Reviewed by: icing, covener, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1861248 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Jun 2019 11:08:29 +0000 (11:08 +0000)]
Merge r1860260 from trunk:
* modules/http2: more copying of data to disentangle worker processing from main connection
Submitted by: icing
Reviewed by: icing, covener, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1861247 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Jun 2019 11:06:29 +0000 (11:06 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1861246 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Jun 2019 11:06:09 +0000 (11:06 +0000)]
Backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1861245 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 13 Jun 2019 09:24:46 +0000 (09:24 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1861241 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 12 Jun 2019 10:07:51 +0000 (10:07 +0000)]
Only describe functional/user-visible changes in CHANGES, svn
logs are sufficient for describing code cleanups.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1861102 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Mon, 10 Jun 2019 23:16:24 +0000 (23:16 +0000)]
rebuild ES access.html.es
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1860992 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 8 Jun 2019 14:42:11 +0000 (14:42 +0000)]
french doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1860834 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 8 Jun 2019 14:40:58 +0000 (14:40 +0000)]
french doc xml file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1860833 13f79535 -47bb-0310-9956-
ffa450edef68