]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Yann Ylavic [Wed, 13 Mar 2019 08:59:54 +0000 (08:59 +0000)]
Merge r1855306 from trunk:
MPMs unix: bind the bucket number of each child to its slot number
We need not remember each child's bucket number in SHM for restarts, for the
lifetime of the httpd main process the bucket number can be bound to the slot
number such that: bucket = slot % num_buckets.
This both simplifies the logic and helps children maintenance per bucket in
threaded MPMs, where previously perform_idle_server_maintenance() could create
or kill children processes for the buckets it was not in charge of.
Submitted by: ylavic
Reviewed by: ylavic, rpluem, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855378 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 13 Mar 2019 08:27:07 +0000 (08:27 +0000)]
Propose Yann's patch to fix a regression in mod_ratelimit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855376 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 13 Mar 2019 08:01:31 +0000 (08:01 +0000)]
Vote, promote x2.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855370 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 13 Mar 2019 07:15:09 +0000 (07:15 +0000)]
* Easy vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855368 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Wed, 13 Mar 2019 00:09:19 +0000 (00:09 +0000)]
fixing bugreport 63258 on the typo mapfile.map.pag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855357 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 12 Mar 2019 21:51:32 +0000 (21:51 +0000)]
Easy proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855350 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 12 Mar 2019 21:04:53 +0000 (21:04 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855346 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 12 Mar 2019 14:10:24 +0000 (14:10 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855328 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 12 Mar 2019 11:23:19 +0000 (11:23 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855308 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 12 Mar 2019 09:29:44 +0000 (09:29 +0000)]
Merged x2.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855301 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 12 Mar 2019 09:29:24 +0000 (09:29 +0000)]
Merge r1486027, r1828909, r1839249, r1842888, r1844343, r1846651 from trunk:
Clarify the existing behavior.
* modules/generators/mod_info.c: Constify fixed tables and mark
module-private global variables static. No functional change.
Axe an old and apparently out-dated comment.
There is a typo in the comment.
HN_UPDATE_SEC has been renamed HM_UPDATE_SEC.
The TODO seems to have been taken into account in r759862.
* modules/filters/mod_deflate.c
(deflate_out_filter): Fix typo setting output note. (Coverity warning)
(deflate_in_filter): Fix redundant assignment. (clang warning)
* modules/md/md_acme_authz.c (md_acme_authz_update): Fix typo in log
message.
* modules/dav/main/mod_dav.c (dav_method_propfind): Tag the scratchpool.
Submitted by: minfrin, jorton, jailletc36
Reviewed by: jailletc36, icing, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855300 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 12 Mar 2019 09:24:47 +0000 (09:24 +0000)]
adding the lastest h2 fix to the backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855299 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 12 Mar 2019 09:24:26 +0000 (09:24 +0000)]
Merge r1853190 from trunk:
Fix a race condition. Authentication with valid credentials could be
refused in case of concurrent accesses from different users.
PR: 63124
Submitted by: Simon Kappel <simon.kappel axis.com>
Reviewed by: jailletc36, icing, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855298 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 7 Mar 2019 10:40:13 +0000 (10:40 +0000)]
backport prposal h2 fixes and features
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1854966 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 27 Feb 2019 10:04:36 +0000 (10:04 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1854449 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 26 Feb 2019 17:36:34 +0000 (17:36 +0000)]
Simplify charset handling
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1854410 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Tue, 26 Feb 2019 14:03:24 +0000 (14:03 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1854384 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 26 Feb 2019 10:21:04 +0000 (10:21 +0000)]
backport proposal h2 slave keeapalives
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1854370 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 24 Feb 2019 13:36:12 +0000 (13:36 +0000)]
Update proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1854258 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 23 Feb 2019 15:53:09 +0000 (15:53 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1854225 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 23 Feb 2019 15:51:45 +0000 (15:51 +0000)]
XML fr doc files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1854224 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 22 Feb 2019 10:06:31 +0000 (10:06 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1854131 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 20 Feb 2019 16:17:57 +0000 (16:17 +0000)]
Update mod_reqtimeout proposal to fit mod_http2.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853970 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 20 Feb 2019 15:56:22 +0000 (15:56 +0000)]
proposal to include
1853967 in backport of mod_reqtimeout change, vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853968 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 20 Feb 2019 13:21:39 +0000 (13:21 +0000)]
Update proposal (and comment about it).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853958 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 20 Feb 2019 12:42:58 +0000 (12:42 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853955 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 20 Feb 2019 09:53:30 +0000 (09:53 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853939 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 15 Feb 2019 20:51:16 +0000 (20:51 +0000)]
- Be consistent with the case used for uniqueMember.
- Be consistent with the case used for AuthLDAPURL. Use uppercase URL, as in the code in order to fix syntax highlight issues.
- Fix the case of AuthLDAPSubGroupAttribute in <default>, so that quickreference.xsl works as expected
Fix some other small layout issues.
(r1853664 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853665 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 15 Feb 2019 16:32:21 +0000 (16:32 +0000)]
Remove backported proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853655 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 15 Feb 2019 16:06:24 +0000 (16:06 +0000)]
Merge r1850835, r1851552 from trunk
* mod_authn_dbm: clarify returned value (no fuctional change)
Submitted by: jorton, wrowe
Reviewed by: jailletc36, jim, ylavic
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853654 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 15 Feb 2019 15:57:51 +0000 (15:57 +0000)]
Merge r1851093 from trunk
* mod_proxy_wstunnel: Fix websocket proxy over UDS.
PR: 62932
Submitted by: <pavel dcmsys.com>
Reviewed by: jailletc36 (by inspection), jim, ylavic
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853653 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 15 Feb 2019 12:13:31 +0000 (12:13 +0000)]
Add directive name, so that quickreference.xsl can extract default value correctly.
Always align on the left code in <highlight> block in order to be consistent and fix a layout issue.
Add some links between directives.
(r1853637 in trunk)
+ remove some trailing spaces
+ improve an example to have it more simple (r1816989 in trunk)
to synch with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853640 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 15 Feb 2019 09:51:26 +0000 (09:51 +0000)]
Backport r1852478 to fix some typo in <syntax>
+ tweak mod_privilege to synch with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853628 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 15 Feb 2019 09:02:16 +0000 (09:02 +0000)]
Add directive name, so that quickreference.xsl can extract default value correctly.
Add a summary and explain at which loglevel the module operates. (related to PR 59088)
r1827780, r1853624 in trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853625 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 15 Feb 2019 08:28:00 +0000 (08:28 +0000)]
Fix case in directive name, so that quickreference.xsl can extract default value correctly.
Add a note in ThreadsPerChild about the relationship with ThreadsLimit
r1838958, r1853617 and r1853618 in trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853619 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 14 Feb 2019 12:01:41 +0000 (12:01 +0000)]
Don't pretend r1807318 is merged in 100-continue proposal.
This commit was merged to help with conflicts only, it's finally a noop
for the final result. Since it refences an unmerged issue, it rather be
merged/recorded in PR 59007's context.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853573 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 14 Feb 2019 08:52:53 +0000 (08:52 +0000)]
Update proposal (again).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853567 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 13 Feb 2019 17:15:08 +0000 (17:15 +0000)]
Update proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853519 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Tue, 12 Feb 2019 08:06:11 +0000 (08:06 +0000)]
mod_rewrite doc rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853418 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Tue, 12 Feb 2019 08:05:53 +0000 (08:05 +0000)]
mod_rewrite.xml: add an example about override behavior
A user in PR 63051 was confused about the default behavior
of mod_rewrite (override) when merging two sections in the
directory context at the same nesting level. I was confused
as well, but after a quick look at the code I figured out that
RewriteOptions Inherit seems to solve the issue (naming is,
in this case, a bit counter intuitive).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853417 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 11 Feb 2019 22:23:17 +0000 (22:23 +0000)]
Move proposal to the right section.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853409 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 11 Feb 2019 22:14:55 +0000 (22:14 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853408 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 11 Feb 2019 12:53:20 +0000 (12:53 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853361 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 11 Feb 2019 12:46:09 +0000 (12:46 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853359 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 11 Feb 2019 12:36:15 +0000 (12:36 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853356 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 10 Feb 2019 10:19:20 +0000 (10:19 +0000)]
Add comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853303 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 8 Feb 2019 20:16:04 +0000 (20:16 +0000)]
Add an easy proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853234 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 8 Feb 2019 20:06:09 +0000 (20:06 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853233 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 8 Feb 2019 10:05:48 +0000 (10:05 +0000)]
Restore "Changes with Apache 2.4.38" header.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853203 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 8 Feb 2019 09:02:13 +0000 (09:02 +0000)]
update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853198 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 8 Feb 2019 09:01:42 +0000 (09:01 +0000)]
Merge of r1853133,r1853166 from trunk:
mod_ssl: Don't unset FIPS mode on restart unless it's forced by
configuration (SSLFIPS on) and not active by default in OpenSSL. PR 63136.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853197 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 8 Feb 2019 09:00:25 +0000 (09:00 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853196 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 8 Feb 2019 07:18:00 +0000 (07:18 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853191 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 7 Feb 2019 22:27:11 +0000 (22:27 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853169 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Wed, 6 Feb 2019 12:18:23 +0000 (12:18 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853067 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Wed, 6 Feb 2019 12:17:51 +0000 (12:17 +0000)]
update for sync with English docs.
Translated by: NilgĂ¼n Belma BugĂ¼ner <nilgun belgeler.gen.tr>
Reviewed by: Orhan Berent <berent belgeler.gen.tr>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1853066 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 5 Feb 2019 11:52:28 +0000 (11:52 +0000)]
Merge of r1852986 from trunk:
mod_http2: disentangelment of stream and request method.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1852989 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 3 Feb 2019 04:46:37 +0000 (04:46 +0000)]
documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1852810 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 27 Jan 2019 14:17:36 +0000 (14:17 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1852293 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 27 Jan 2019 14:16:50 +0000 (14:16 +0000)]
fr doc XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1852292 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 27 Jan 2019 08:36:15 +0000 (08:36 +0000)]
Fix typo (s/ProxyExpressDBMFile/ProxyExpressDBMType/)
PR 63119.
Move compatibility note in the module synopsis instead of repeating it in all directives.
Fix the way <default> values are given, so that they can be reflected in quickreference.html.
Fix the style used in <syntax> to be consistent with the documentation.
Improve syntax highlight.
(r1852270 in trunk)
+ synch with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1852273 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 26 Jan 2019 13:04:15 +0000 (13:04 +0000)]
Remove a useless compatibility note.
It is already stated at the very begining of the page.
Add a missing ')' to ease reading
(r1852223 in trunk)
+ synch with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1852224 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 26 Jan 2019 07:31:33 +0000 (07:31 +0000)]
Promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1852202 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Tue, 22 Jan 2019 17:13:10 +0000 (17:13 +0000)]
Updates for announcement of 2.4.38
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851837 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 22 Jan 2019 10:09:58 +0000 (10:09 +0000)]
Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851800 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 22 Jan 2019 09:42:28 +0000 (09:42 +0000)]
Copy the "Note about /" note from the Location
explanation to the LocationMatch explanation.
Probably more people use LocationMatch than
Location with "~".
CTR: docs
Backport of r1851790 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851792 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 19 Jan 2019 14:56:59 +0000 (14:56 +0000)]
fr doc update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851675 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 19 Jan 2019 14:55:14 +0000 (14:55 +0000)]
XML fr doc update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851674 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 18 Jan 2019 20:55:42 +0000 (20:55 +0000)]
Add compatibility note missing in r1740967, backported in 2.4.x branch in r1824187.
(r1851643 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851644 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 18 Jan 2019 10:25:21 +0000 (10:25 +0000)]
No longer a binding vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851613 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Thu, 17 Jan 2019 18:44:51 +0000 (18:44 +0000)]
Post 2.4.38 tag updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851570 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Thu, 17 Jan 2019 18:44:41 +0000 (18:44 +0000)]
Get ready to tag httpd 2.4.38
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851568 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 17 Jan 2019 18:26:08 +0000 (18:26 +0000)]
Revert invalid 2.4.28/38 tagging.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851567 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Thu, 17 Jan 2019 17:50:58 +0000 (17:50 +0000)]
Fix errant lines added by script
[Reverted by r1851567]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851561 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Thu, 17 Jan 2019 17:48:48 +0000 (17:48 +0000)]
Post 2.4.38 tag updates
[Reverted by r1851567]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851559 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Thu, 17 Jan 2019 17:48:40 +0000 (17:48 +0000)]
Get ready to tag httpd 2.4.38
[Reverted by r1851567]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851557 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 17 Jan 2019 17:43:40 +0000 (17:43 +0000)]
Applied in r1851526
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851556 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 17 Jan 2019 17:37:31 +0000 (17:37 +0000)]
Carry ylavic's vote forward to mod_md fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851555 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 17 Jan 2019 17:35:02 +0000 (17:35 +0000)]
Per jorton's feedback, clarify in comments. Any objections?
Any clue why this alerted on valgrind and apr_authz_dbm did not?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851554 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Thu, 17 Jan 2019 17:08:28 +0000 (17:08 +0000)]
Post 2.4.28 tag updates
[Reverted by r1851567]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851550 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Thu, 17 Jan 2019 17:08:07 +0000 (17:08 +0000)]
Get ready to tag httpd 2.4.28
[Reverted by r1851567]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851548 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 17 Jan 2019 13:15:46 +0000 (13:15 +0000)]
Merge non-vetoed bit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851527 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 17 Jan 2019 13:15:03 +0000 (13:15 +0000)]
Merge r1850834 from trunk:
* modules/md/md_acme_drive.c (acme_driver_init):
Remove written-but-not-read variable (gcc 8.x warning).
Submitted by: jorton
Reviewed by: jailletc36, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851526 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 17 Jan 2019 11:18:15 +0000 (11:18 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851515 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 17 Jan 2019 11:16:48 +0000 (11:16 +0000)]
Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851514 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 17 Jan 2019 10:27:32 +0000 (10:27 +0000)]
Merge of r1830747 from trunk:
mod_md: Don't export all symbols on Unix (reduces .so size by ~8%) [jorton]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851511 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 17 Jan 2019 10:25:46 +0000 (10:25 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851510 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 16 Jan 2019 21:14:51 +0000 (21:14 +0000)]
Since jim insists upon a single proposal, nix it all.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851485 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Jan 2019 20:46:00 +0000 (20:46 +0000)]
this format has been used a crapton of times. Not sure why this time there's an issue.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851484 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 16 Jan 2019 17:58:14 +0000 (17:58 +0000)]
Ask for cleaner backport submissions, if you could?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851475 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 16 Jan 2019 17:06:07 +0000 (17:06 +0000)]
mod_ssl (ssl_engine_io.c: bio_filter_out_write, bio_filter_in_read)
Clear retry flags before aborting on client-initiated reneg.
PR: 63052
Backports: r1850946
Submitted by: Joe Orton
Reviewed by: wrowe, jorton, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851471 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 16 Jan 2019 16:37:41 +0000 (16:37 +0000)]
mod_negotiation: LanguagePriority tags must be treated case-insensitive,
per https://tools.ietf.org/html/rfc7231#section-3.1.3.1
PR: 39730
Backports: r1850989
Submitted by: jailletc36
Reviewed by: jailletc36, wrowe, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851468 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 16 Jan 2019 02:29:35 +0000 (02:29 +0000)]
Offer one more alternative
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851415 13f79535 -47bb-0310-9956-
ffa450edef68
Hank Ibell [Tue, 15 Jan 2019 19:54:41 +0000 (19:54 +0000)]
mod_session: Always decode session attributes early.
Backport r1850947 from trunk
Submitted by: hwibell
Reviewed by: hwibell, covener, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851409 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 15 Jan 2019 17:16:59 +0000 (17:16 +0000)]
Asked and answered. Appears correct to me, would appreciate Stefan's vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851401 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 15 Jan 2019 14:43:01 +0000 (14:43 +0000)]
backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851370 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 15 Jan 2019 13:58:29 +0000 (13:58 +0000)]
you take the good, you take the bad -- the facts of life.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851354 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 15 Jan 2019 12:59:44 +0000 (12:59 +0000)]
* Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851345 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 15 Jan 2019 12:49:00 +0000 (12:49 +0000)]
note mod_lua is now marked stable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851342 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 15 Jan 2019 12:45:53 +0000 (12:45 +0000)]
mod_lua moved to stable; https://s.apache.org/Xnh1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1851341 13f79535 -47bb-0310-9956-
ffa450edef68