]>
granicus.if.org Git - apache/log
Yann Ylavic [Tue, 20 Feb 2018 13:23:54 +0000 (13:23 +0000)]
Revert r1824870, we need the branch to re-merge what was reverted in r1824874.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-mpm_fdqueue@
1824875 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 20 Feb 2018 12:43:16 +0000 (12:43 +0000)]
Follow up to r1821624: sync with latest 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-mpm_fdqueue@
1824864 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 20 Feb 2018 12:34:17 +0000 (12:34 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824863 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 20 Feb 2018 12:03:34 +0000 (12:03 +0000)]
Backport vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824858 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 20 Feb 2018 06:52:26 +0000 (06:52 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824833 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Mon, 19 Feb 2018 22:47:28 +0000 (22:47 +0000)]
mod_proxy_uwsgi Win32 builds
IDE Add project to workspace/solution.
Add the missing pieces for command line build and connect the dots
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824825 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Mon, 19 Feb 2018 22:10:01 +0000 (22:10 +0000)]
Follow up r1824709 for command line build which is not in trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824823 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 19 Feb 2018 21:33:01 +0000 (21:33 +0000)]
Suggest ways to install on common platforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824816 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 19 Feb 2018 20:57:10 +0000 (20:57 +0000)]
LDAP cache fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824812 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 19 Feb 2018 18:11:38 +0000 (18:11 +0000)]
Backport votes... not promoting those with 3 in case we
decide to do another T&R for 2.4.31 to correct some
process flaws/inconsistencies
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824799 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 19 Feb 2018 18:09:19 +0000 (18:09 +0000)]
And any changes will be in 2.4.31
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824798 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 19 Feb 2018 18:08:52 +0000 (18:08 +0000)]
Fluff from 2.4.30 tagging...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824797 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Mon, 19 Feb 2018 14:18:51 +0000 (14:18 +0000)]
Post 2.4.30 tag updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824751 13f79535 -47bb-0310-9956-
ffa450edef68
Steffen Land [Mon, 19 Feb 2018 11:18:12 +0000 (11:18 +0000)]
add mod_proxy_uwsgi.so to windows build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824737 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 19 Feb 2018 09:23:40 +0000 (09:23 +0000)]
reverting current backport proposal for SSLPolicy
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824725 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 18 Feb 2018 21:04:37 +0000 (21:04 +0000)]
backport r1821581 fixes to mod_remoteip.dsp
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824709 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 17 Feb 2018 14:36:39 +0000 (14:36 +0000)]
Update proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824597 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 17 Feb 2018 14:08:02 +0000 (14:08 +0000)]
apr-util v1.6 has been released.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824594 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 17 Feb 2018 14:06:20 +0000 (14:06 +0000)]
Update proposal with fix for rpluem/jorton.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824592 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 17 Feb 2018 13:17:59 +0000 (13:17 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824587 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 16 Feb 2018 16:47:26 +0000 (16:47 +0000)]
Update comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824533 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 16 Feb 2018 16:44:02 +0000 (16:44 +0000)]
More comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824531 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 16 Feb 2018 16:41:00 +0000 (16:41 +0000)]
Comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824530 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 16 Feb 2018 16:38:02 +0000 (16:38 +0000)]
Comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824529 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 16 Feb 2018 16:00:18 +0000 (16:00 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824518 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 16 Feb 2018 15:59:21 +0000 (15:59 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824517 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 16 Feb 2018 15:46:14 +0000 (15:46 +0000)]
fixed patch for sslpolicy
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824512 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 16 Feb 2018 15:09:20 +0000 (15:09 +0000)]
Clarification about MMN bump not needed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824506 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 16 Feb 2018 15:05:13 +0000 (15:05 +0000)]
Backported in r1824504.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824505 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 16 Feb 2018 15:04:41 +0000 (15:04 +0000)]
Merge r1824176, r1824460, r1824482 from trunk:
mod_proxy: Provide an RFC1035 compliant version of the hostname in the
proxy_worker_shared structure. PR62085
Tone down the message that worker hostname is too long noting it only
affects legacy modules not yet using hostname_ex.
Set the notice when hostname is too long for legacy proxy modules to info level.
Submitted by: minfrin
Reviewed by: minfrin, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824504 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 16 Feb 2018 14:56:15 +0000 (14:56 +0000)]
Follow up to r1821624: sync with 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-mpm_fdqueue@
1824502 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 16 Feb 2018 14:52:51 +0000 (14:52 +0000)]
Clarify merge note.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824501 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 16 Feb 2018 14:50:34 +0000 (14:50 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824500 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 16 Feb 2018 14:24:46 +0000 (14:24 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824496 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 16 Feb 2018 14:12:19 +0000 (14:12 +0000)]
Vote (and note)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824491 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 16 Feb 2018 14:01:27 +0000 (14:01 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824487 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 16 Feb 2018 13:59:04 +0000 (13:59 +0000)]
Update mergeinfo for r1463049,
1492395 ,
1493257 ,
1494532 merged in r1824481.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824485 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 16 Feb 2018 13:57:59 +0000 (13:57 +0000)]
Update proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824484 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 16 Feb 2018 13:48:28 +0000 (13:48 +0000)]
*) mod_auth_digest: Fix nonce generation. PR 54637
trunk patch: http://svn.apache.org/r1463049
http://svn.apache.org/r1492395
http://svn.apache.org/r1493257
http://svn.apache.org/r1494532
2.4.x patch: http://people.apache.org/~jorton/mad_pr54637.diff
+1: jorton, ylavic, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824481 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 16 Feb 2018 13:46:54 +0000 (13:46 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824479 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 16 Feb 2018 13:41:31 +0000 (13:41 +0000)]
*) mod_session: Strip Session header when SessionEnv is on.
trunk patch: http://svn.apache.org/r1824390
2.4.x patch: trunk works (modulo CHANGES)
+1: ylavic, rpluem, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824477 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 16 Feb 2018 13:39:47 +0000 (13:39 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824476 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 16 Feb 2018 13:34:35 +0000 (13:34 +0000)]
*) mod_cache_socache: Fix caching of empty headers up to carriage return.
trunk patch: http://svn.apache.org/r1824343
2.4.x patch: trunk works (modulo CHANGES)
+1: ylavic, rpluem, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824475 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 16 Feb 2018 13:32:48 +0000 (13:32 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824474 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 16 Feb 2018 13:32:09 +0000 (13:32 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824473 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 16 Feb 2018 13:27:44 +0000 (13:27 +0000)]
*) regex: Allow to configure global/default options for regexes, like
caseless matching or extended format.
trunk patch: http://svn.apache.org/r1824339
http://svn.apache.org/r1824439
+1: ylavic, rpluem, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824472 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 16 Feb 2018 13:26:45 +0000 (13:26 +0000)]
Vote and promote (with mmn bump)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824471 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 16 Feb 2018 13:17:33 +0000 (13:17 +0000)]
core: For consistency, ensure that read lines are NUL terminated on any
error, not only on buffer full.
trunk patch: http://svn.apache.org/r1824303
+1: ylavic, rpluem, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824469 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 16 Feb 2018 13:16:24 +0000 (13:16 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824468 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 16 Feb 2018 13:10:08 +0000 (13:10 +0000)]
propose sslpolicy backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824467 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 16 Feb 2018 13:05:30 +0000 (13:05 +0000)]
Propose PR 54637 backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824466 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 16 Feb 2018 13:02:07 +0000 (13:02 +0000)]
Update proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824462 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 16 Feb 2018 12:37:30 +0000 (12:37 +0000)]
mod_authnz_ldap: Fix language long names detection as short name.
trunk patch: http://svn.apache.org/r1824336
+1: ylavic, elukey, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824456 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 16 Feb 2018 12:35:03 +0000 (12:35 +0000)]
proxy_util: Schemes and hostnames that are "too long" are
no longer automatically fatal errors but are instead logged
and truncated, at which point the admin can determine if that
is OK or not.
trunk patch: http://svn.apache.org/r1823482
+1: jim, minfrin, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824455 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 16 Feb 2018 11:13:17 +0000 (11:13 +0000)]
Update proposal with s/strcasecmp/ap_cstr_casecmp/ as suggested by Ruediger.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824448 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 16 Feb 2018 09:46:52 +0000 (09:46 +0000)]
* Vote, promote, comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824438 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 16 Feb 2018 07:38:57 +0000 (07:38 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824426 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 16 Feb 2018 00:31:27 +0000 (00:31 +0000)]
Fix duplicated proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824391 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 16 Feb 2018 00:10:06 +0000 (00:10 +0000)]
New proposals.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824387 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 16 Feb 2018 00:01:59 +0000 (00:01 +0000)]
Merge r1821624, r1821625, r1821626, r1821627, r1821629, r1821632, r1821635, r1821639, r1821644, r1821647, r1821648, r1821649, r1821650, r1821651, r1821659, r1821660, r1822366, r1822367, r1824381 from trunk:
Shared fdqueue code between MPMs event and worker into mpm_fdqueue.
This first step moves the files server/mpm/event/fdqueue.[ch] to
server/mpm_fdqueue.[ch] (untouched for now, simple svn move).
Will follow up with the necessary changes to mpm_unix.* for common code.
mpm_fdqueue: follow up to r1821624.
And now it's mpm_fdqueue, with minimal #includes.
mpm_fdqueue: follow up to r1821624.
Opacify fdqueue types.
mpm_fdqueue: follow up to r1821624.
Style, no functional change.
mpm_fdqueue: follow up to r1821624.
Rename ap_queue_info_get_idlers() to ap_queue_info_num_idlers().
mpm_fdqueue: follow up to r1821624.
Clear recycled_pools_count in ap_free_idle_pools().
mpm_fdqueue: follow up to r1821624.
Prepare mpm_worker to use common fdqueue.
mpm_worker: follow up to r1821624.
Use common [mpm_]fdqueue.
mpm_fdqueue: follow up to r1821624.
The implemention wants APR_HAS_THREADS too.
mpm_fdqueue: follow up to r1821624.
The code is not part of the API.
mpm_fdqueue: follow up to r1821624.
Fix typo in comment.
mpm_fdqueue: follow up to r1821624.
Cosmetics, 80 cols, no functional change.
mpm_worker: follow up to r1821624.
Free idle pools while stopping.
mpm_fdqueue: follow up to r1821624.
Be explicit in the naming about what's push/pop-ed.
mpm_fdqueue: follow up to r1821624.
Either error matters, simplify code.
mpm_fdqueue: follow up to r1821624.
Make the allocation and zero-ing in ap_queue_init() => ap_queue_create().
mpm_fdqueue: follow up to r1821624.
Export ap_queue_*() fonctions, so that they are accessible from MPMs, but
don't provide "mpm_fdqueue.h" in the API (include/).
mpm_fdqueue: follow up to r1821624.
80 colums.
Follow up to r1821624: CHANGES entry.
Submitted by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-mpm_fdqueue@
1824384 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Feb 2018 23:56:09 +0000 (23:56 +0000)]
Convenient branch to merge common fdqueue code for MPMs event/worker.
That is, r1821624 and follow ups.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-mpm_fdqueue@
1824383 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Feb 2018 21:31:24 +0000 (21:31 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824368 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Feb 2018 18:24:31 +0000 (18:24 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824342 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Feb 2018 18:11:19 +0000 (18:11 +0000)]
Backported in r1824333.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824341 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Feb 2018 17:27:31 +0000 (17:27 +0000)]
Merge r1667707, r1824332 from trunk:
* mod_proxy: Allow setting options to globally defined balancer from
ProxyPass used in VirtualHost. Balancers are now merged using the new
merge_balancers method which merges the balancers options.
mod_proxy: follow up to r1667707: MMN minor bump.
Submitted by: jkaluza, ylavic
Reviewed by: icing, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824333 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Feb 2018 14:00:57 +0000 (14:00 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824309 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 15 Feb 2018 13:43:58 +0000 (13:43 +0000)]
backport vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824308 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 15 Feb 2018 13:36:15 +0000 (13:36 +0000)]
propose backport of r1667707
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824307 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 14 Feb 2018 22:17:44 +0000 (22:17 +0000)]
Add CHANGES entry
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824271 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 14 Feb 2018 21:29:01 +0000 (21:29 +0000)]
Another comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824268 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 14 Feb 2018 21:19:45 +0000 (21:19 +0000)]
Comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824267 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 14 Feb 2018 15:33:51 +0000 (15:33 +0000)]
Backported in r1824248.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824250 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 14 Feb 2018 15:32:52 +0000 (15:32 +0000)]
Merge r1776575, r1776578, r1776624, r1776627, r1776674, r1776734, r1776740, r1778268, r1780725, r1781030, r1781031, r1781701, r1788674, r1789800, r1790169, r1790457, r1790691, r1806985, r1812332, r1818279 from trunk:
Merge new PROXY protocol code into mod_remoteip
Fix typo in mod_remoteip's doc
Shorten RemoteIPProxyProtocolEnable to RemoteIPProxyProtocol and correct references in docs
Move attribution for mod_remoteip RemoteIPProxyProtocol from file to CHANGES
On the trunk:
* mod_remoteip: added cast to fix clang compiler error
Reinsert attribution to mod_remoteip.c for PROXY protocol
* Silence compiler warning
Set all read buckets aside in case we need to restore all during optional header processing
* modules/metadata/mod_remoteip.c: Fix GCC strict-aliasing warning
by moving deference of header array via a different pointer type
("type-punning") out of line.
* modules/metadata/mod_remoteip.c (register_hooks,
remoteip_hook_pre_connection): Reference the filter by handle rather
than name (avoiding tree lookup by name on use).
Change tactic for PROXY processing in Optional case
Finally include feedback from Ruediger Pluem. Add slave "backoff" verified by Sander Hoentjen
Update PROXY handling by removing Optional processing
Rename RemoteIPProxyProtocolDisableHosts to RemoteIPProxyProtocolExceptions
Fix directive name in
(s/RemoteIPProxyProtocolDisableNetworks/RemoteIPProxyProtocolExceptions/)
Use cmd->cmd->name instead to be future proof.
XML update plus typo in mod_remoteip.xml.
PROXY protocol proposal corrections
Fix format pattern (%lu => %APR_SIZE_T_FMT).
Detected by maintainer mode compilation and GCC error:
.../modules/metadata/mod_remoteip.c:
In function 'remoteip_input_filter':
.../include/http_log.h:117:33:
error: format '%lu' expects argument of type
'long unsigned int', but argument 8 has type
'apr_size_t {aka unsigned int}' [-Werror=format=]
APR-ize uint types
Submitted by: druggeri, elukey, druggeri, druggeri, druggeri, icing, druggeri, rpluem, druggeri, jorton, jorton, druggeri, druggeri, druggeri, druggeri, jailletc36, lgentis, mrumph, rjung, jim
Reviewed by: druggeri, jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824248 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 14 Feb 2018 15:20:58 +0000 (15:20 +0000)]
Revert r1824221: wrong backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824246 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 14 Feb 2018 13:20:59 +0000 (13:20 +0000)]
propose T&R
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824240 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 14 Feb 2018 13:20:01 +0000 (13:20 +0000)]
Merge r1745863, r1745864 from trunk:
Fix segfault with logresolve -c and IPv6
Due to a logic error, there could be a NULL pointer dereference.
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823259
Fix comment typo
Submitted by: sf
Reviewed by: jailletc36, minfrin, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824239 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 14 Feb 2018 13:19:01 +0000 (13:19 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824238 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 14 Feb 2018 13:18:31 +0000 (13:18 +0000)]
Backport vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824237 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 14 Feb 2018 10:55:44 +0000 (10:55 +0000)]
mod_remoteip: Add PROXY protocol support
trunk patch: http://svn.apache.org/r1776575
http://svn.apache.org/r1776578 (doc fix)
http://svn.apache.org/r1776624
http://svn.apache.org/r1776627 (shortened name + doc fix)
http://svn.apache.org/r1776674 (attribution moved to CHANGES)
http://svn.apache.org/r1776734
http://svn.apache.org/r1776740 (attribution updated in mod_remotip.c)
http://svn.apache.org/r1778268 (fix compiler warning)
http://svn.apache.org/r1780725 (set buckets aside)
http://svn.apache.org/r1781030 (fix strict GCC warning)
http://svn.apache.org/r1781031 (reference the filter by handle)
http://svn.apache.org/r1781701 (rework optional processing case)
http://svn.apache.org/r1788674 (final edge cases/ignore slave conns)
http://svn.apache.org/r1789800 (remove optional processing)
http://svn.apache.org/r1790169 (rename "exception" directive)
http://svn.apache.org/r1790457 (Update directive name in err message)
http://svn.apache.org/r1790691
http://svn.apache.org/r1806985
http://svn.apache.org/r1818279
2.4 convenience patch (includes CHANGES):
http://home.apache.org/~ylavic/patches/RemoteIPProxyProtocol.2.4-v3.patch
+1: druggeri, jim, minfrin
[Reverted by r1824246]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824221 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 14 Feb 2018 10:52:17 +0000 (10:52 +0000)]
Make an explicit patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824220 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 14 Feb 2018 10:29:01 +0000 (10:29 +0000)]
Follow up to r1824187: record mergeinfo(s).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824214 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 14 Feb 2018 10:25:47 +0000 (10:25 +0000)]
Follow up to r1824180: record mergeinfo(s).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824212 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 14 Feb 2018 10:21:10 +0000 (10:21 +0000)]
v3 of RemoteIPProxyProtocol.2.4 accepted.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824211 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 14 Feb 2018 00:50:29 +0000 (00:50 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824191 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 14 Feb 2018 00:35:48 +0000 (00:35 +0000)]
Vote, and note we need an extra backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824190 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 13 Feb 2018 23:43:36 +0000 (23:43 +0000)]
mod_proxy, mod_ssl: Handle SSLProxy* directives in <Proxy> sections,
allowing per backend TLS configuration.
trunk patch: http://svn.apache.org/r1740928
http://svn.apache.org/r1740960
http://svn.apache.org/r1740967
http://svn.apache.org/r1740987
http://svn.apache.org/r1740998
http://svn.apache.org/r1742697
http://svn.apache.org/r1756976
http://svn.apache.org/r1781313
http://svn.apache.org/r1812193
2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4.x-r1740928_and_co-v6.patch
+1: ylavic, icing, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824187 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 13 Feb 2018 23:41:37 +0000 (23:41 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824186 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 13 Feb 2018 22:38:48 +0000 (22:38 +0000)]
mod_proxy_uwsgi: Add in UWSGI proxy (sub)module
trunk patch: http://svn.apache.org/r1810358
http://svn.apache.org/r1810362
http://svn.apache.org/r1810363
http://svn.apache.org/r1810365
http://svn.apache.org/r1810447
http://svn.apache.org/r1816919
http://svn.apache.org/r1816922
http://svn.apache.org/r1818013
http://svn.apache.org/r1818280
+1: jim, icing, minfrin
icing: tested on ubuntu 16.04 with a simple uwsgi python app.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824184 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 13 Feb 2018 22:37:18 +0000 (22:37 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824183 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 13 Feb 2018 22:12:17 +0000 (22:12 +0000)]
Backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824181 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 13 Feb 2018 22:11:47 +0000 (22:11 +0000)]
Merge r1822509, r1822511, r1823412, r1823415, r1823416, r1823564, r1823572, r1823575 from trunk:
mod_slotmem_shm: Rework SHM reuse/deletion.
To fix races with graceful restarts (PR 62044).
This commit does:
1/ use a constant file name for all systems (no generation suffix which
makes a new SHM to be created for each restart, losing previous data)
2/ maintain the list of the created SHMs accross restarts (ap_pglobal list)
3/ not unlink the files on restart anymore (otherwise we can't reuse them)
4/ not attach existing SHMs in slotmem_create() anymore (not suitable since
those are necessarily crash remainders)
5/ add type/sizes consistency check for persisted slots on restoration
6/ unlink the files only on stop/exit or before creating them (crash recovery)
We could possibly avoid 6/ (since we don't need to re-open files now) if we
remove the file just after the SHM is created. This would at least work for
systems with "unlink semantic" (i.e. unlink succeeds even if some descriptors
are opened, the "real" thing happening when the last one desciptor closed), but
this wouldn't work for other systems so I kept the code generic for now.
mod_slotmem_shm: follow up tp r1822509.
Please buildbot (and incidentally users of older APR) by using
apr_shm_remove() instead of the new(er) apr_shm_delete().
mod_slotmem_shm: follow up tp r1822509.
Check SHM sizes when reused, reload may have changed the needs.
mod_slotmem_shm: follow up tp r1822509.
Do not bind attached slotmems to the global list, they should be detached with
the given pool (pchild) is cleaned up, but not destroyed/removed (doubly) with
pglobal.
mod_slotmem_shm: follow up tp r1822509.
Complete layout of SHM and persited file (ascii art).
Simplify an "if" condition, no functional change.
mod_proxy_balancer: follow up tp r1822509.
Rework server_rec ID so that it doesn't change on restart (or stop/start)
unless it's Host(s)/IP(s):port(s), ServerName and/or ServerAlias(es) changed.
The goal being to reuse SHMs (and persisted files) names as much as possible,
with minimal bindings to configuration changes (as far as mod_proxy_balancer
is concerned). So if the ServerName and first Host/IP:port are unique we use
that first, otherwise the ServerAlias(es) and other Host(s)/IP(s):port(s) are
also taken into account, and finally if that's still not enough the server
index is also used (pathological case handled for correctness with regard to
the underlying mod_slotmem_shm's reuse code).
mod_slotmem_shm: follow up tp r1822509.
Fishy "unlink semantic" (description) does not apply anymore.
Follow up to r1822509: amend CHANGES entry.
Submitted by: ylavic
Reviewed by: ylavic, jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824180 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 13 Feb 2018 22:08:30 +0000 (22:08 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824179 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 13 Feb 2018 21:56:41 +0000 (21:56 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824178 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 13 Feb 2018 21:24:51 +0000 (21:24 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824177 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 13 Feb 2018 14:53:54 +0000 (14:53 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824145 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 13 Feb 2018 14:51:16 +0000 (14:51 +0000)]
Fixes quoting as per https://bz.apache.org/bugzilla/show_bug.cgi?id=62063
Credit: Hendrik Harms <hendrik.harms@gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824143 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 11 Feb 2018 11:11:31 +0000 (11:11 +0000)]
documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1823835 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 11 Feb 2018 11:10:41 +0000 (11:10 +0000)]
mod_proxy_fcgi.xml: add more context to the conn reuse note
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1823834 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 10 Feb 2018 16:33:38 +0000 (16:33 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1823785 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 10 Feb 2018 16:32:55 +0000 (16:32 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1823784 13f79535 -47bb-0310-9956-
ffa450edef68