]>
granicus.if.org Git - apache/log
Joe Orton [Fri, 9 Feb 2018 10:20:50 +0000 (10:20 +0000)]
Merge r1556473 from trunk:
* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLCompression): Fail if
enabled *and* if OpenSSL does not make any compression methods
available. Tweak wording for failure without SSL_OP_NO_COMPRESSION.
Submitted by: jorton
Reviewed by: jorton, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1823625 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 9 Feb 2018 10:17:30 +0000 (10:17 +0000)]
Merge r1816534 from trunk:
* support/Makefile.in, acinclude.m4: Add OpenSSL libraries at the end of the
ab link line, not the start.
[too boring for CHANGES]
Submitted by: jorton
Reviewed by: jorton, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1823624 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 9 Feb 2018 10:16:22 +0000 (10:16 +0000)]
Merge r1822305 from trunk:
* modules/lua/config.m4: Link mod_lua against -lcrypt if available,
since mk_password_hash() can use crypt().
[too boring for CHANGES]
Submitted by: jorton
Reviewed by: jorton, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1823623 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 8 Feb 2018 20:48:23 +0000 (20:48 +0000)]
Votes, comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1823600 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 8 Feb 2018 20:21:23 +0000 (20:21 +0000)]
votes on backprops
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1823599 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 8 Feb 2018 16:18:26 +0000 (16:18 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1823576 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 7 Feb 2018 16:51:15 +0000 (16:51 +0000)]
Backport request... long schemes and hostnames
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1823501 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 7 Feb 2018 15:07:17 +0000 (15:07 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1823474 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 7 Feb 2018 13:44:27 +0000 (13:44 +0000)]
Correct LDAP attribute quoting. Patch from hendrik.harms@gmail.com
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1823464 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 6 Feb 2018 09:28:34 +0000 (09:28 +0000)]
Merge r1723522 from trunk:
* mod_log_debug docs: Fix the IS_SUBREQ example
Submitted by: jkaluza
Reviewed by: jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1823289 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 6 Feb 2018 09:22:18 +0000 (09:22 +0000)]
mod_ssl tweak.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1823286 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 5 Feb 2018 14:26:14 +0000 (14:26 +0000)]
Trio of minor build system tweaks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1823181 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Jan 2018 10:20:50 +0000 (10:20 +0000)]
On the 2.4.x branch:
mod_md: merged copyright de-advertisements.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1822628 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Jan 2018 10:14:44 +0000 (10:14 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1822627 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Jan 2018 13:54:35 +0000 (13:54 +0000)]
maybe do a T&R soon??
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821864 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 20 Jan 2018 13:48:49 +0000 (13:48 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821742 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 20 Jan 2018 13:47:31 +0000 (13:47 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821741 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 08:36:25 +0000 (08:36 +0000)]
+ r1821595 to event patch 4/4.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821599 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 08:04:51 +0000 (08:04 +0000)]
Better event *merge* staging.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821594 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 01:11:00 +0000 (01:11 +0000)]
Propose event update (incremental).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821580 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 18 Jan 2018 16:08:10 +0000 (16:08 +0000)]
Follow up to r1821517: backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821518 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 18 Jan 2018 16:07:32 +0000 (16:07 +0000)]
Merge r1821504, r1821505 from trunk:
mpm_{event,worker}: Mask signals for threads created by modules in child init.
PR 62009, so that they don't receive (implicitely) the ones meant for the MPM.
Inspired by: Armin Abfalterer <a.abfalterer gmail.com>
Follow up to r1821504: same comment in event than in worker.
Proposed by: ylavic
Reviewed by: ylavic, icing, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821517 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 18 Jan 2018 15:44:02 +0000 (15:44 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821513 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 18 Jan 2018 15:36:16 +0000 (15:36 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821510 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 18 Jan 2018 15:02:28 +0000 (15:02 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821507 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Wed, 17 Jan 2018 01:47:04 +0000 (01:47 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821342 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Wed, 17 Jan 2018 01:46:30 +0000 (01:46 +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@
1821341 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 16 Jan 2018 11:27:53 +0000 (11:27 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821232 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Mon, 15 Jan 2018 19:33:49 +0000 (19:33 +0000)]
backport r1821195 from trunk and add util_debug.c to libhttpd.mak
http://mail-archives.apache.org/mod_mbox/httpd-dev/201801.mbox/%
3C4C412873 -869D-4A0C-89E6-
397706EFA1F7 @apachelounge.com%3E
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821196 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 15 Jan 2018 16:56:22 +0000 (16:56 +0000)]
question... is this a "blocker"?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821182 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 14 Jan 2018 22:12:47 +0000 (22:12 +0000)]
docs: update the prettify.js files with new directives
Procedure that I've used:
1) Copy https://httpd.apache.org/docs/2.4/mod/directives.html
to a text file.
2) Generate a csv with something like
cat /tmp/trunk_directives | sort | tr "\n" ","
3) Replace the content of CONFIG_KEYWORDS in prettify.js
with the list generated in 2)
4) Run the command the MINIFY command to generate prettify.min.js
This change should bring out highlight up to speed with the
recent docs (like mod_md's).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821119 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 14 Jan 2018 21:51:51 +0000 (21:51 +0000)]
Documentation rebuild: welcome mod_md to 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821117 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sun, 14 Jan 2018 11:48:22 +0000 (11:48 +0000)]
On the 2.4.x branch:
Merge of r1821095 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821096 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sun, 14 Jan 2018 11:27:25 +0000 (11:27 +0000)]
2.4.x STATUS update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821094 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sun, 14 Jan 2018 11:26:33 +0000 (11:26 +0000)]
On the 2.4.x branch:
Merged /httpd/httpd/branches/2.4.x-mod_md:r1816423-
1821089
Merged /httpd/httpd/trunk:r1804530-
1804531 ,
1804542 ,
1804545 ,
1804671 ,
1804759 ,
1804787 ,
1804975 ,
1805180 ,
1805192 ,
1805194 ,
1805256 ,
1805294 ,
1805373 ,
1806939 ,
1807228 ,
1807347 ,
1807577 ,
1807593 ,
1807774 ,
1807777 ,
1808005 ,
1808092 ,
1808100 ,
1808241 -
1808243 ,
1808249 ,
1808444 ,
1809719 ,
1809888 ,
1810723 ,
1811082 ,
1811812 ,
1812193 ,
1812517 -
1812518 ,
1812999 ,
1813642 ,
1814720 ,
1814939 ,
1815005 ,
1815078 ,
1815264 ,
1815370 ,
1815483 ,
1816055 ,
1816154 ,
1816156 ,
1816552 ,
1816558 ,
1816970 ,
1817023 ,
1817777 ,
1817785 ,
1818120 ,
1818122 ,
1818308 ,
1818725 ,
1818792 ,
1818849
Merged mod_md from trunk via 2.4.x-mod_md branch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821093 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 13 Jan 2018 16:42:04 +0000 (16:42 +0000)]
We track merges at the root only.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-mod_md@
1821077 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 13 Jan 2018 16:39:51 +0000 (16:39 +0000)]
We track merges at the root only.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821076 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 13 Jan 2018 15:58:17 +0000 (15:58 +0000)]
Follow up to r1821073: backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821074 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 13 Jan 2018 15:57:11 +0000 (15:57 +0000)]
Merge r1599012, r1601559, r1818624, r1819969, r1819970 from trunk:
mod_proxy_html: skip documents < 4 bytes
PR 56286
Micha Lenk
follow up r1599012:
C99 fix
Fix some style
mod_proxy_html: follow up to r1599012.
To determine whether or not HTML data are lower than 4 bytes, use a retain
buffer rather than assuming that all should be contained in a single bucket
with the next one being EOS (if any).
mod_proxy_html: don't depend on NUL terminated bucket data.
ap_regexec() wants NUL terminated strings, so use ap_regexec_len() instead.
Submitted by: niq, takashi, jailletc36, ylavic, ylavic
Reviewed by: jim, ylavic, icing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821073 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 13 Jan 2018 15:50:28 +0000 (15:50 +0000)]
Follow up to r1821071: backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821072 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 13 Jan 2018 15:49:17 +0000 (15:49 +0000)]
Merge r1809302, r1809303, r1809305, r1809311, r1809314, r1809713 from trunk:
config: allow to specify flags when registering modules.
First one is AP_MODULE_FLAG_ALWAYS_MERGE.
mod_ssl: follow up to r1809302.
Make use of AP_MODULE_FLAG_ALWAYS_MERGE.
config: follow up to r1809302.
We need to check that the module itself is at the right version.
config: follow up to r1809302.
Provide a convenient function to get module flags, and remove useless
AP_MODULE_HAS_FLAGS checks in the core, core's version is at current MMN.
config: follow up to r1809302.
Associate ap_get_module_flags() to MMN bump.
On the trunk:
mod_ssl: make the new module flag used.
Submitted by: ylavic, icing
Reviewed by: icing, ylavic, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821071 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 13 Jan 2018 15:37:59 +0000 (15:37 +0000)]
Follow up to r1821068 and r1821069: backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821070 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 13 Jan 2018 15:36:38 +0000 (15:36 +0000)]
Merge r1802618, r1820808 from trunk:
core, mpm_event: Add ap_update_sb_handle() to avoid a small memory leak of
sizeof(ap_sb_handle_t) when re-entering event's process_socket().
Follow up to r1802618: CHANGES entry.
Proposed by: ylavic
Reviewed by: ylavic, icing, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821069 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 13 Jan 2018 15:31:05 +0000 (15:31 +0000)]
Merge r1740910, r1741277, r1820809 from trunk:
event: update worker score keepalive status.
Correct regressions introduced in r1137358 and r1740910.
The conn_rec context may be passed only when setting up the
initial connection, otherwise the request info is trashed.
Follow up to r1740910: CHANGES entry.
Submitted by: ylavic, wrowe, ylavic
Reviewed by: ylavic, icing, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821068 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 13 Jan 2018 15:21:12 +0000 (15:21 +0000)]
Promote (my + Steffen's vote according to dev@).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821067 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 13 Jan 2018 15:18:15 +0000 (15:18 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821066 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 13 Jan 2018 15:17:37 +0000 (15:17 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821065 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 12 Jan 2018 15:34:42 +0000 (15:34 +0000)]
vote/promote modflags thing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1821000 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 12 Jan 2018 13:57:52 +0000 (13:57 +0000)]
promote "2" backports
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820986 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 12 Jan 2018 13:57:17 +0000 (13:57 +0000)]
vote...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820985 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 12 Jan 2018 13:56:58 +0000 (13:56 +0000)]
With these changes, looks like we have enuff votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820983 13f79535 -47bb-0310-9956-
ffa450edef68
Steffen Land [Fri, 12 Jan 2018 12:42:12 +0000 (12:42 +0000)]
Reset vote mod_md
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820977 13f79535 -47bb-0310-9956-
ffa450edef68
Steffen Land [Fri, 12 Jan 2018 12:21:59 +0000 (12:21 +0000)]
mod_md vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820972 13f79535 -47bb-0310-9956-
ffa450edef68
Steffen Land [Fri, 12 Jan 2018 11:41:59 +0000 (11:41 +0000)]
Vote mod_md SSL only hosts not usable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820969 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 11 Jan 2018 10:31:52 +0000 (10:31 +0000)]
2.4.x votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820860 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 11 Jan 2018 09:20:03 +0000 (09:20 +0000)]
Note about how to separate the two changes for the real backport(s).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820849 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 11 Jan 2018 01:07:37 +0000 (01:07 +0000)]
Fix revision nums.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820813 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 11 Jan 2018 01:03:16 +0000 (01:03 +0000)]
Follow up to r1820810.
Join the previous proposal with another one (leak fix), not really
related but code conflicts...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820812 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 11 Jan 2018 00:35:36 +0000 (00:35 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820810 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 10 Jan 2018 22:12:04 +0000 (22:12 +0000)]
Follow up to r1820802: backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820803 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 10 Jan 2018 22:11:37 +0000 (22:11 +0000)]
Merge r1818278 from trunk:
APR-ize uint types
Submitted by: jim
Reviewed by: covener, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820802 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 10 Jan 2018 22:05:53 +0000 (22:05 +0000)]
Follow up to r1820800: backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820801 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 10 Jan 2018 22:05:23 +0000 (22:05 +0000)]
Merge r1818040 from trunk:
PR61891: looping over mostly full LDAP cache
*) mod_ldap: Fix a case where a full LDAP cache would continually fail to
purge old entries and log AH01323. PR61891.
Submitted By: Hendrik Harms <hendrik.harms gmail.com>
Committed By: covener
Reviewed By: covener, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820800 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 10 Jan 2018 22:01:00 +0000 (22:01 +0000)]
Follow up to r1820798: backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820799 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 10 Jan 2018 22:00:18 +0000 (22:00 +0000)]
Merge r1813991 from trunk:
Save a few bytes in the conf pool when handling 'ProxyHTMLDoctype' directive with a user defined FPI
Submitted by: jailletc36
Reviewed by: jailletc36, niq, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820798 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 10 Jan 2018 21:56:07 +0000 (21:56 +0000)]
Follow up to r1820796: backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820797 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 10 Jan 2018 21:55:08 +0000 (21:55 +0000)]
Merge r1818804, r1818951, r1818958, r1818960, r1819027, r1819214, r1820035 from trunk:
mpm_event: close connections not reported as handled by any module.
This avoids losing track of them and leaking scoreboard entries.
PR 61551.
mpm_event: follow up to r1818804.
Address corner case where connection is aborted due to ap_run_pre_connection()
failure, and update comment about ap_run_process_connection() expected return
status and state.
mpm_event: follow up to r1818804 and r1818951.
Align comment and fix typos.
mpm_event: follow up to r1818804.
Allow DONE as a successful ap_run_process_connection() return value, for
instance h2_conn_run() and h2_task_process_conn() uses it, third-party
modules may too...
mpm_event: follow up to r1818804 and r1818951.
Be more correct in comment about CONN_STATE_WRITE_COMPLETION.
We currently have/need no state to simply wait for readability on a socket,
so the previous comment was misleading. Write completion can't be used for
a simple "wait for read event and come back to process_connection hooks".
mpm_event: follow up to r1818804 and r1818960.
Align mod_http2 with expected returned state from process_connection hooks in
async MPMs.
When the master connection is handled, enter CONN_STATE_LINGER in any case.
Add missing APLOGNO
Submitted by: ylavic, jailletc36
Reviewed by: ylavic, icing, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820796 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 10 Jan 2018 21:48:56 +0000 (21:48 +0000)]
Follow up to r1820794: backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820795 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 10 Jan 2018 21:48:04 +0000 (21:48 +0000)]
Merge r1809881, r1809973, r1809976, r1812075 from trunk:
core: deregister all hooks before leaving pconf, otherwise some late cleanup
or function call (e.g. ap_log) may use one while DSOs are unloaded.
See PR 61558 (double/second fault).
core, MPMs unix: follow up to r1809881.
Deregister all hooks first (in pre_cleanup), by doing it last we could still
have had them run when DSOs were unloaded.
Likewise, avoid double faults when handling fatal signals by restoring the
default handler before pconf is cleared (we can't ap_log_error there).
Finally, we need to ignore sig_term/restart (do nothing) when the main
process is exiting (i.e. ap_pglobal is destroyed), since retained_data are
freed.
Aimed to fix all faults in PR 61558.
MPMs unix: follow up to r1809881 and r1809973.
unset_signals() is called when ap_pglobal is destroyed too.
Follow up to r1809881: CHANGES entry.
Submitted by: ylavic
Reviewed by: ylavic, jim, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820794 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 10 Jan 2018 19:20:06 +0000 (19:20 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820773 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 8 Jan 2018 15:58:57 +0000 (15:58 +0000)]
mod_md is backported in this branch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-mod_md@
1820579 13f79535 -47bb-0310-9956-
ffa450edef68
Steffen Land [Mon, 8 Jan 2018 15:56:30 +0000 (15:56 +0000)]
mod_md maxsize was less than the resulting image size
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-mod_md@
1820578 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Mon, 8 Jan 2018 10:21:27 +0000 (10:21 +0000)]
documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820542 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Mon, 8 Jan 2018 10:20:37 +0000 (10:20 +0000)]
event.xml: follow up r1820466 with Yann's suggestions
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820541 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 7 Jan 2018 14:40:49 +0000 (14:40 +0000)]
mpm_event's doc rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820467 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 7 Jan 2018 14:39:47 +0000 (14:39 +0000)]
event.xml: add a note about lingering close
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820466 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 5 Jan 2018 22:04:52 +0000 (22:04 +0000)]
Sync with 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-mod_md@
1820360 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 5 Jan 2018 15:34:15 +0000 (15:34 +0000)]
On the 2.4.x-mod_md branch:
merged mod_md relevant parts of
1818030 ,
1818120 ,
1818308 ,
1818725 ,
1818792 ,
1818849 ,
1819799 ,
1819854 ,
1819943 ,
1820036 ,
1820310 ,
1820312 from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-mod_md@
1820314 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 4 Jan 2018 17:35:29 +0000 (17:35 +0000)]
Update proposal with correct APLOGNO (thanks Christophe!).
No need to reset Stefan\'s vote I guess...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820150 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Thu, 4 Jan 2018 16:52:13 +0000 (16:52 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820128 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Thu, 4 Jan 2018 16:51:04 +0000 (16:51 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820127 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Thu, 4 Jan 2018 15:34:05 +0000 (15:34 +0000)]
happy new year's documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820107 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 4 Jan 2018 15:17:13 +0000 (15:17 +0000)]
Happy New Year 2018
Backport of r1820101 from trunk plus year
update in docs/manual/style/xsl/common.xsl.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820103 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 4 Jan 2018 12:16:52 +0000 (12:16 +0000)]
update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820076 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 4 Jan 2018 12:15:42 +0000 (12:15 +0000)]
On the 2.4.x branch:
merge of
1804530 ,
1804531 ,
1805186 ,
1806939 ,
1807232 ,
1808122 from trunk.
Backport of mod_md support in mod_ssl.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820075 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 4 Jan 2018 06:19:34 +0000 (06:19 +0000)]
Small comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1820037 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 3 Jan 2018 13:54:15 +0000 (13:54 +0000)]
Comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1819973 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 3 Jan 2018 13:45:08 +0000 (13:45 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1819971 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 3 Jan 2018 10:26:01 +0000 (10:26 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1819944 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 2 Jan 2018 22:25:59 +0000 (22:25 +0000)]
Merge r1819907 from trunk:
Fix upgrading examples
- providers are case sensitive
- description didn't match example / 2.2 didn't match 2.4.
Submitted by: Hank Ibell
Committed by: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1819908 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sat, 30 Dec 2017 19:53:00 +0000 (19:53 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1819676 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 28 Dec 2017 11:49:50 +0000 (11:49 +0000)]
And promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1819420 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 28 Dec 2017 11:49:24 +0000 (11:49 +0000)]
backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1819419 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 24 Dec 2017 12:18:57 +0000 (12:18 +0000)]
Propose backport for PR 61551.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1819217 13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Fri, 22 Dec 2017 22:52:21 +0000 (22:52 +0000)]
Backport mod_proxy_html doctype fixes.
PR#56457 included.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1819098 13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Fri, 22 Dec 2017 22:34:06 +0000 (22:34 +0000)]
Votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1819097 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 22 Dec 2017 12:40:43 +0000 (12:40 +0000)]
vote + promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1819035 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 21 Dec 2017 18:52:00 +0000 (18:52 +0000)]
tiny formatting/readability tweak in example
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818967 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 21 Dec 2017 18:51:39 +0000 (18:51 +0000)]
backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818966 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 21 Dec 2017 18:50:57 +0000 (18:50 +0000)]
backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818965 13f79535 -47bb-0310-9956-
ffa450edef68
projects / apache / log