]>
granicus.if.org Git - apache/log
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
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 [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
Jim Jagielski [Thu, 21 Dec 2017 18:50:38 +0000 (18:50 +0000)]
Merge r1814968 from trunk:
core: silently ignore a not existent file path when IncludeOptional
is used.
In https://bz.apache.org/bugzilla/show_bug.cgi?id=57585 some use cases
were reported in which IncludeOptional seems to be too strict in its
sanity checks.
This change is a proposal to relax IncludeOptional checks to silently
fail when a file path is not existent rather than returning SyntaxError.
Submitted by: elukey
Reviewed by: elukey, jim, niq
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818964 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 21 Dec 2017 18:49:24 +0000 (18:49 +0000)]
Merge r1809273, r1814719 from trunk:
event: better apr_pollset_add() failure handling to avoid an (very unlikely)
worker vs listener race condition.
Follow up to r1809273: 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@
1818963 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 21 Dec 2017 17:06:05 +0000 (17:06 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818956 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 21 Dec 2017 16:59:30 +0000 (16:59 +0000)]
Make this example actually work.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818953 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 20 Dec 2017 17:00:08 +0000 (17:00 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818829 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 20 Dec 2017 16:56:09 +0000 (16:56 +0000)]
Define delimiter, as per a complaint in the comments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818828 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 19 Dec 2017 19:11:18 +0000 (19:11 +0000)]
Merge r1818701 from trunk:
clarify/reword RegisterHTTPMethod and add some seealso's
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818702 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 Dec 2017 13:47:47 +0000 (13:47 +0000)]
uwsgi updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818669 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 18 Dec 2017 21:20:49 +0000 (21:20 +0000)]
Other proposals related to mod_proxy_html
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818627 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 18 Dec 2017 20:07:59 +0000 (20:07 +0000)]
Fix missing reference in 'svn merge ...' command line.
Suggest other commits for this backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818616 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 16 Dec 2017 19:33:16 +0000 (19:33 +0000)]
withdrawl proposal of blocking confusing non-global DEFINE
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818450 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 16 Dec 2017 19:31:20 +0000 (19:31 +0000)]
initial vote
:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818449 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 16 Dec 2017 19:30:31 +0000 (19:30 +0000)]
vote/promote the low hanging fruit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818448 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 16 Dec 2017 19:22:54 +0000 (19:22 +0000)]
systemd stalled too
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818447 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 16 Dec 2017 19:22:16 +0000 (19:22 +0000)]
journald looks stalled.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818446 13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sat, 16 Dec 2017 00:40:34 +0000 (00:40 +0000)]
httpd/2.4 STATUS: propose, review
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818360 13f79535 -47bb-0310-9956-
ffa450edef68
Steffen Land [Fri, 15 Dec 2017 18:11:13 +0000 (18:11 +0000)]
removed -1 vote mod_proxy_uwsgi, builds now. Cannot test.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818313 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 15 Dec 2017 17:08:45 +0000 (17:08 +0000)]
docco fix... correct license/copyright info
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818305 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 15 Dec 2017 12:25:49 +0000 (12:25 +0000)]
Handle uint*_t fields for some backports...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818281 13f79535 -47bb-0310-9956-
ffa450edef68
Steffen Land [Fri, 15 Dec 2017 10:36:44 +0000 (10:36 +0000)]
vote mod_proxy_uwsgi
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818264 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 14 Dec 2017 19:41:30 +0000 (19:41 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818204 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 14 Dec 2017 19:36:28 +0000 (19:36 +0000)]
add trailing slash to end of URL
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818200 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 14 Dec 2017 19:29:42 +0000 (19:29 +0000)]
Closing "|" on regex replace string
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818198 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 14 Dec 2017 19:01:18 +0000 (19:01 +0000)]
Backport vote for mod_md
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818189 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 13 Dec 2017 20:40:00 +0000 (20:40 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818062 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 13 Dec 2017 20:36:36 +0000 (20:36 +0000)]
Fix a link as spotted by Benoit Wery in the comment system. (backport of r1818059)
Synch with trunk doc:
- Add some quotes to improve syntax hightlight
- Remove some trailing spaces.
- Mention mod_macro (backport of r1436578)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818061 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 13 Dec 2017 16:59:07 +0000 (16:59 +0000)]
propose LDAP cache fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1818041 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 12 Dec 2017 19:30:14 +0000 (19:30 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1817953 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 12 Dec 2017 19:25:45 +0000 (19:25 +0000)]
Remove broken link to mod_sed tutorial
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1817952 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 11 Dec 2017 14:49:12 +0000 (14:49 +0000)]
On the 2.4.x branch:
Updated mod_md backport proposal and reset votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1817783 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 5 Dec 2017 14:46:13 +0000 (14:46 +0000)]
r1816969
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1817207 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 5 Dec 2017 14:42:05 +0000 (14:42 +0000)]
sufficient votes and self-contained.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1817206 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 3 Dec 2017 09:28:43 +0000 (09:28 +0000)]
CHANGES: fix missing attribution in r1812083
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1817020 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 2 Dec 2017 23:27:46 +0000 (23:27 +0000)]
Add missing CHANGE entry for r1748212 in 2.4.21
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1817005 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sat, 2 Dec 2017 18:23:31 +0000 (18:23 +0000)]
On the 2.4.x branch:
mod_http2: h2_workers.c now in sync with trunk again and backported as intended.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1816977 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sat, 2 Dec 2017 17:51:37 +0000 (17:51 +0000)]
On the 2.4.x branch:
Fixed backport of r1816619 (mod_http2) to have the desired changes and added the version inc as well.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1816969 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 2 Dec 2017 14:58:30 +0000 (14:58 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1816960 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 2 Dec 2017 14:56:48 +0000 (14:56 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1816959 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 29 Nov 2017 15:06:31 +0000 (15:06 +0000)]
Propose UWSGI proxy (sub)module backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1816634 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 29 Nov 2017 15:01:27 +0000 (15:01 +0000)]
Update votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1816633 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 29 Nov 2017 14:59:56 +0000 (14:59 +0000)]
The updated PROXY protocol support patchset
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1816632 13f79535 -47bb-0310-9956-
ffa450edef68
Steffen Land [Wed, 29 Nov 2017 12:01:25 +0000 (12:01 +0000)]
vote mod_http2 v1.10.14 and removed vote mod_md
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1816623 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 29 Nov 2017 09:52:45 +0000 (09:52 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1816620 13f79535 -47bb-0310-9956-
ffa450edef68
Steffen Land [Mon, 27 Nov 2017 12:38:10 +0000 (12:38 +0000)]
Vote mod_md
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1816442 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 27 Nov 2017 11:12:28 +0000 (11:12 +0000)]
On the 2.4.x branch:
Updated STATUS proposal for mod_md backporting. New branch for changes available.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1816432 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 26 Nov 2017 10:21:16 +0000 (10:21 +0000)]
docs: allow Directive and <Directive> names to co-exist in the same page.
This work was done in trunk to allow the new mod_md's directive
names <ManagedDomain> and ManagedDomain in the same doc page (without
triggering any validate-xml/xhtml error). Subsequently this also helped
for SSLPolicy and <SSLPolicy>. All the aforementioned Directives
have not been backported yet, but these commits are needed behorehand to
allow a smoother backport procedure.
I explicitly reverted the changes to sections.xml for this backport since
they mention the above directives, not yet available in 2.4.x and hence
probably confusing for users.
Building the documentation after these changes yield to a no-op as expected.
I also tried to copy mod_md's documentation from trunk and it renders nicely.
Merge r1805189, r1805193, r1805372, r1805376, r1805189, r1806443 from trunk:
synopsis.xsl: do not render two times the same
directive HTML if more than one
directive share the same name.
This has happened when mod_md.xml was introduced,
and the following directives shared the same name:
* ManagedDomain
* <ManagedDomain>
With the current code each time that a node needs
to be rendered it will emit a duplicate, ending up
in the above example with 4 sections rather than two.
Uniqueness of sections will be ensured by the HTML
elements ids, to avoid errors before committing for
example (accidental duplicates, etc..).
common|synopsis.xsl: rename directive type=sections id generation
This commits is a follow up of r1805189 and it is meant
to allow directives with the same name but different type
to coexist in the same document without triggering errors
while executing validate-xhtml.
For example: mod_md.xml recently introduced the following:
* ManagedDomain
* <ManagedDomain> (this one is type=section)
In my opinion this is a perfectly valid use case and it should
be allowed/handled correctly by the doc generation process/validation.
In order to avoid clashing the directive ids will get a suffix
called "section" if type=section will be present as param.
Quicklinks, <directive> links have been updated to the new
scheme to avoid dandling pointers in the doc.
Comments/reviews are welcome, if I left something behind
please let me know.
doc xsl/dtd: introduce idtype attribute for directivesynopsis
In r1805193 synopsis.xsl was changed to allow two directives
of different type (like <SSLPolicy> and SSLPolicy) to share
the same name but have different ids (and please validate-xml/xhtml).
The downside of this action was that all the quicklinks to
existing directive sections (like <If>, <VirtualHost>, etc..)
were changed, possibly breaking external clients already
referencing them.
This change introduces a new attribute in the directivesynopsis
DTD, namely 'idtype', that will be appended to 'name'
in the id generation by synopsis.xsl. This will rollback
link names to their previous values and will allow documentators
to fine tune directivesynopsis sections as they need
(for example we have recently introduced mod_md's
ManagedDomain/<ManagedDomain>, and modssl's SSLPolicy/<SSLPolicy>).
This approach seems more precise and less invasive to me.
Of course the name of the attribute can be changed later on
to whatever term would fit best, the main concern for me at
the moment is to restore the trunk documentation to its previous
state.
common.dtd: add idtype attribute to directive
This change completes r1805372 and also fixes
links generation for <ManageDomain> and <SSLPolicy>
in sections.xml
synopsis.xsl: do not render two times the same
directive HTML if more than one
directive share the same name.
This has happened when mod_md.xml was introduced,
and the following directives shared the same name:
* ManagedDomain
* <ManagedDomain>
With the current code each time that a node needs
to be rendered it will emit a duplicate, ending up
in the above example with 4 sections rather than two.
Uniqueness of sections will be ensured by the HTML
elements ids, to avoid errors before committing for
example (accidental duplicates, etc..).
synopsis.xsl: fix broken translation builds
This commit is a follow up of r1805189, in which
a new logic was added to allow to repeat a directive
name only if its type is different (like SSLPolicy
and <SSLPolicy>). The change broken french translations
since the $this variable, containing the translated
sections, was not used anymore.
The XPath code could surely be improved, but it seems
more pressing to allow our translators to get back
to their daily work without interference.
build.sh validate-* worked fine, as well as the build.sh fr
translation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1816378 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 26 Nov 2017 09:50:43 +0000 (09:50 +0000)]
Documentation rebuild - part 2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1816375 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 26 Nov 2017 00:15:03 +0000 (00:15 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1816357 13f79535 -47bb-0310-9956-
ffa450edef68