]>
granicus.if.org Git - apache/log
Christophe Jaillet [Fri, 10 Aug 2018 03:35:34 +0000 (03:35 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837769 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 8 Aug 2018 17:20:35 +0000 (17:20 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837663 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 8 Aug 2018 14:53:56 +0000 (14:53 +0000)]
quick fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837654 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 8 Aug 2018 11:48:15 +0000 (11:48 +0000)]
Merge r1836469, r1836154 from trunk:
* config.layout: Allow configure --localstatedir to over-ride /var/www
location in Fedora layout.
* Makefile.in (install-suexec*): Fix make -jN install.
Submitted by: Arkadiusz Miskiewicz <arekm maven.pl>
Submitted by: jorton
Reviewed by: jorton, covener, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837645 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 8 Aug 2018 11:46:52 +0000 (11:46 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837644 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 8 Aug 2018 11:46:19 +0000 (11:46 +0000)]
vote on some backports
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837643 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 7 Aug 2018 14:19:31 +0000 (14:19 +0000)]
Propose a few monitoring improvements.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837599 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 5 Aug 2018 14:15:25 +0000 (14:15 +0000)]
vote/comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837467 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 4 Aug 2018 08:09:54 +0000 (08:09 +0000)]
Fix comment in mod_lua and docs.
s/addoutputfilter/add_output_filter/
See PR 62359
(r1837404 on trunk)
Note: .c file is patch without any vote because it is only a comment in order to be consistent with the doc and the code, and mod_lua is marked as experimental.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837405 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 3 Aug 2018 13:17:28 +0000 (13:17 +0000)]
update backport prop
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837368 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 3 Aug 2018 10:54:47 +0000 (10:54 +0000)]
On the 2.4.x branch:
backport of r1837357 from trunk.
*) mod_md: When the last domain name from an MD is moved to another one,
that now empty MD gets moved to the store archive. PR 62572.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837358 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 1 Aug 2018 12:54:54 +0000 (12:54 +0000)]
Propose mod_socache_redis as backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837233 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 1 Aug 2018 11:58:52 +0000 (11:58 +0000)]
backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837226 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Wed, 1 Aug 2018 01:15:48 +0000 (01:15 +0000)]
rebuilt added misc index.html.es ES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837206 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Wed, 1 Aug 2018 00:56:32 +0000 (00:56 +0000)]
rebuilt added ES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837205 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Wed, 1 Aug 2018 00:44:00 +0000 (00:44 +0000)]
rebuilt added ES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837204 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Wed, 1 Aug 2018 00:29:33 +0000 (00:29 +0000)]
rebuilt added ES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837203 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Wed, 1 Aug 2018 00:20:07 +0000 (00:20 +0000)]
forgot to commit html
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837202 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Wed, 1 Aug 2018 00:17:49 +0000 (00:17 +0000)]
rebuilt spanish docs to match eng rev of ssi
translated adding ssi spanish doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837201 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Wed, 1 Aug 2018 00:08:43 +0000 (00:08 +0000)]
built and update file http2.html.es
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837200 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Wed, 1 Aug 2018 00:01:15 +0000 (00:01 +0000)]
rebuilt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837199 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Wed, 1 Aug 2018 00:00:43 +0000 (00:00 +0000)]
rebuilt spanish docs access.html.es
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837198 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 31 Jul 2018 23:38:04 +0000 (23:38 +0000)]
rebuilt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837196 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 31 Jul 2018 23:23:20 +0000 (23:23 +0000)]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837195 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 31 Jul 2018 22:41:14 +0000 (22:41 +0000)]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837193 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 31 Jul 2018 22:39:29 +0000 (22:39 +0000)]
fixed miss spells and rebuilt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837191 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 31 Jul 2018 22:38:15 +0000 (22:38 +0000)]
rebuilt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837190 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 31 Jul 2018 22:03:00 +0000 (22:03 +0000)]
fixed miss spells and rebuilt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837183 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 31 Jul 2018 21:59:31 +0000 (21:59 +0000)]
spelling
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837182 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 31 Jul 2018 21:58:33 +0000 (21:58 +0000)]
fixed miss spells and rebuilt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837180 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 31 Jul 2018 21:37:28 +0000 (21:37 +0000)]
mached ENG rev
1824187
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837179 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 31 Jul 2018 21:29:11 +0000 (21:29 +0000)]
updated spanish revision to match English Revision:
1807765 index file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837178 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 31 Jul 2018 16:22:29 +0000 (16:22 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837167 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 31 Jul 2018 16:21:26 +0000 (16:21 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837166 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 31 Jul 2018 16:12:49 +0000 (16:12 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837165 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 31 Jul 2018 16:11:48 +0000 (16:11 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837164 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 26 Jul 2018 19:51:52 +0000 (19:51 +0000)]
xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836761 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 26 Jul 2018 19:50:41 +0000 (19:50 +0000)]
Merge r1836758 from trunk:
replace mystery smart-quotes copy/pasted from httpd.conf + vi.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836760 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 25 Jul 2018 14:47:11 +0000 (14:47 +0000)]
Merge r1836638 from trunk:
add 2 conditional logging examples
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836640 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2018 09:04:08 +0000 (09:04 +0000)]
Propose 2x buildsystem tweaks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836476 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2018 08:54:55 +0000 (08:54 +0000)]
Merged x2.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836473 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2018 08:54:29 +0000 (08:54 +0000)]
Merge r1555631 from trunk:
Fix config merging of SSLOCSPEnable and SSLOCSPOverrideResponder.
Submitted by: trawick, Frank Meier <frank.meier ergon.ch>
Reviewed by: rpluem, ylavic, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836472 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2018 08:47:59 +0000 (08:47 +0000)]
* modules/proxy/mod_proxy_balancer.c (make_server_id):
Fix APR 1.4 compatibility by avoiding use of apr_escape.h.
Submitted by: jorton
Reviewed by: jorton, rpluem, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836471 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 20 Jul 2018 09:37:13 +0000 (09:37 +0000)]
Typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836338 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 20 Jul 2018 09:34:45 +0000 (09:34 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836337 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 20 Jul 2018 09:05:15 +0000 (09:05 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836335 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 20 Jul 2018 08:57:46 +0000 (08:57 +0000)]
* Propose patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836334 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 20 Jul 2018 02:30:36 +0000 (02:30 +0000)]
xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836315 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 19 Jul 2018 18:01:31 +0000 (18:01 +0000)]
Unclear why half of r1743512 was previously merged, but here's the remainder.
PR62190
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836289 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 19 Jul 2018 17:58:55 +0000 (17:58 +0000)]
Correct see also comment, backports r1836287
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836288 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 19 Jul 2018 16:34:17 +0000 (16:34 +0000)]
I think we need a buildbot for 2.4.x-on-APR-1.4.x...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836277 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 18 Jul 2018 11:51:43 +0000 (11:51 +0000)]
Note CVEs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836159 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 17 Jul 2018 12:57:33 +0000 (12:57 +0000)]
Rebuild after adding new files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836111 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 17 Jul 2018 12:47:37 +0000 (12:47 +0000)]
French translated file - First version.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836110 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 17 Jul 2018 11:48:05 +0000 (11:48 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836106 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 17 Jul 2018 11:46:30 +0000 (11:46 +0000)]
Forgotten update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836105 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 17 Jul 2018 09:39:38 +0000 (09:39 +0000)]
On the 2.4.x branch:
merge r1836095 from trunk:
* using the, hopefully correct, ever elusive libressl version numbering check for the new openssl API calls, fixes PR 62548.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836096 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 17 Jul 2018 09:11:25 +0000 (09:11 +0000)]
Adding new file manual/platform/rpm.html.fr after french doc rebuilding
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836089 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 17 Jul 2018 09:04:58 +0000 (09:04 +0000)]
First version of french translation of manual/platform/rpm.xml.fr
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836088 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 16 Jul 2018 19:47:16 +0000 (19:47 +0000)]
paraphrase slightly better
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836061 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 16 Jul 2018 12:09:08 +0000 (12:09 +0000)]
Rebuild after style/lang/fr.xml update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836025 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 16 Jul 2018 12:06:02 +0000 (12:06 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836024 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Thu, 12 Jul 2018 12:52:43 +0000 (12:52 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835730 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Thu, 12 Jul 2018 12:51:11 +0000 (12:51 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835729 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Thu, 12 Jul 2018 12:42:48 +0000 (12:42 +0000)]
Rebuild (with 8 bits characters replaced by their HTML entities because -Xbootclasspath/p option disabled in build.sh script because it is no more supported in openjdk 10)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835727 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 10 Jul 2018 13:48:27 +0000 (13:48 +0000)]
Post 2.4.34 tag updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835553 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 10 Jul 2018 13:48:23 +0000 (13:48 +0000)]
Get ready to tag httpd 2.4.34
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835551 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 10 Jul 2018 12:21:25 +0000 (12:21 +0000)]
Xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835546 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 Jul 2018 14:49:14 +0000 (14:49 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835314 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 6 Jul 2018 22:06:17 +0000 (22:06 +0000)]
Backport: r1835287
Review by popcorner with further edits for clarity by both CodeingBoy
and popcorner, their discussion at https://github.com/popcorner/chect/pull/1
Added CONTENT_LANGUAGE variable for both translations.
Note user-visible update in CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835289 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 6 Jul 2018 13:18:58 +0000 (13:18 +0000)]
Typo correction.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835249 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 6 Jul 2018 08:44:47 +0000 (08:44 +0000)]
Transforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835220 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 6 Jul 2018 08:43:37 +0000 (08:43 +0000)]
Merge r1834470 from trunk:
Render <code> in bold in man pages, matching commonly used style in
both help2man and the standard DocBook XSL stylesheets for man output.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835219 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 5 Jul 2018 20:52:46 +0000 (20:52 +0000)]
zap my name, I just noticed the accepted proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835189 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 5 Jul 2018 19:47:51 +0000 (19:47 +0000)]
Follow up to r1835179: CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835180 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 5 Jul 2018 19:45:14 +0000 (19:45 +0000)]
Merge r1588806 from trunk:
r1494157 from eventopt for event, per sf's review comments.
use a subpool of pchild since skiplist allocations will
happen across threads and are only protected from
other skiplist operations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835179 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 5 Jul 2018 19:39:12 +0000 (19:39 +0000)]
* Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835177 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 5 Jul 2018 19:27:26 +0000 (19:27 +0000)]
Backported in r1835175.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835176 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 5 Jul 2018 19:26:56 +0000 (19:26 +0000)]
Merge r1835094 from trunk (follow up to 2.4.x's r1834321):
global ap_server_conf must be reset when process->pconf is cleared
Submitted by: covener
Reviewed by: covener, rpluem, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835175 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 5 Jul 2018 19:24:39 +0000 (19:24 +0000)]
Backported in r1835173.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835174 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 5 Jul 2018 19:24:07 +0000 (19:24 +0000)]
mod_ssl: follow up to 2.4.x's r1666363.
Add missing bits from previous backport of r1666363.
Reviewed by: jailletc36, ylavic, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835173 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 5 Jul 2018 19:20:52 +0000 (19:20 +0000)]
Backported in r1835171.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835172 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 5 Jul 2018 19:20:20 +0000 (19:20 +0000)]
Merge r1832280 from trunk:
In 'ap_proxy_cookie_reverse_map', iterate over each token of the 'Set-Cookie' header field in order to avoid updating the wrong one.
This could happen if the header field has something like 'fakepath=foo;path=bar". In this case fakepath would be updated instead of path.
We don't need regex anymore in order to parse the field values and 'ap_proxy_strmatch_domain' and 'ap_proxy_strmatch_path' are now useless. (and should be axed IMHO)
PR 61560
Submitted by: jailletc36
Reviewed by: jailletc36, rpluem, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835171 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 5 Jul 2018 19:17:39 +0000 (19:17 +0000)]
Backported in r1835168.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835170 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 5 Jul 2018 19:16:37 +0000 (19:16 +0000)]
CHANGES: trim trailing spaces.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835169 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 5 Jul 2018 19:15:40 +0000 (19:15 +0000)]
Merge r1833875 from trunk:
mod_ratelimit: fix behavior with proxied content
mod_ratelimit works by splitting data in "chunks"
to send to the client, sleeping a predefined amount
of time between them (200ms). So for example,
a rate-limit 40 value would correspond to a chunk size
of 8192 bytes, flushed to the client every 200ms.
The idea works fine when httpd directly serves the
content, since the filter will be called once with
a single bucket brigade. In the context of a proxied
content though the filter is likely to be called multiple
times, with a bucket brigade size that corresponds to
the maximum allowed buffer size. If this value is lower
or higher than the chunk size, the filter will not
properly rate limit the data going to the client.
This patch solves the problem with two fix:
1) do_sleep is now stored in the ctx context struct,
so if the filter is invoked multiple times it
will still sleep when needed. For example, say
that the chunk_size is 8192 and the bucket brigate
len is 10240: the filter will flush 8192 bytes
on the first invocation, sleep 200ms, flush the
remaining bytes and then finish. The next invocation
will do the same, clearly not leading to the
correct "sleeping pattern".
2) The example above highlights also another issue:
mod_ratelimit should flush only chunk_size bytes
at the time (I am now excluding the burst calculation
from the picture), and buffer between invocations
unless the brigade contains EOS.
The change has been tested with various scenarios and
it looks working as expected, but of course more
feedback/testing is welcome.
The original patch was written by me and then Yann
refactored the code to be more precise and efficient,
basically transforming an axe in a wonderful Japanese
katana sword, so credits to him for this work.
PR: 62362
Submitted by: elukey
Reviewed by: elukey, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835168 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Thu, 5 Jul 2018 15:26:06 +0000 (15:26 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835146 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 5 Jul 2018 07:56:06 +0000 (07:56 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835102 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 5 Jul 2018 06:34:52 +0000 (06:34 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835099 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 5 Jul 2018 02:37:59 +0000 (02:37 +0000)]
vi for dummies
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835096 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 5 Jul 2018 02:36:01 +0000 (02:36 +0000)]
unset ap_server_conf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835095 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 3 Jul 2018 09:23:35 +0000 (09:23 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1834939 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 3 Jul 2018 09:22:45 +0000 (09:22 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1834938 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 3 Jul 2018 06:58:55 +0000 (06:58 +0000)]
* Comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1834924 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 3 Jul 2018 06:53:39 +0000 (06:53 +0000)]
* Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1834923 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 2 Jul 2018 21:05:50 +0000 (21:05 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1834899 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Mon, 2 Jul 2018 20:51:11 +0000 (20:51 +0000)]
Add another vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1834898 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 2 Jul 2018 20:49:02 +0000 (20:49 +0000)]
backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1834896 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 2 Jul 2018 20:47:00 +0000 (20:47 +0000)]
Merge r1834318 from trunk:
Re-allow '_' (underscore) in hostnames.
'_' was not permitted in hostnames since 2.4.25's "HTTP Strict"
changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1834895 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 2 Jul 2018 20:38:01 +0000 (20:38 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1834891 13f79535 -47bb-0310-9956-
ffa450edef68
projects / apache / log