summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * Propose PR 54637 backport.Joe Orton2018-02-161-0/+7
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824466 13f79535-47bb-0310-9956-ffa450edef68
| * Update proposal.Graham Leggett2018-02-161-4/+3
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824462 13f79535-47bb-0310-9956-ffa450edef68
| * mod_authnz_ldap: Fix language long names detection as short name.Graham Leggett2018-02-163-8/+10
| | | | | | | | | | | | | | | | 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
| * proxy_util: Schemes and hostnames that are "too long" areGraham Leggett2018-02-163-10/+8
| | | | | | | | | | | | | | | | | | | | | | 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
| * Update proposal with s/strcasecmp/ap_cstr_casecmp/ as suggested by Ruediger.Yann Ylavic2018-02-161-1/+2
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824448 13f79535-47bb-0310-9956-ffa450edef68
| * * Vote, promote, commentRuediger Pluem2018-02-161-14/+17
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824438 13f79535-47bb-0310-9956-ffa450edef68
| * voteLuca Toscano2018-02-161-1/+1
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824426 13f79535-47bb-0310-9956-ffa450edef68
| * Fix duplicated proposal.Yann Ylavic2018-02-161-2/+2
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824391 13f79535-47bb-0310-9956-ffa450edef68
| * New proposals.Yann Ylavic2018-02-161-0/+32
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824387 13f79535-47bb-0310-9956-ffa450edef68
* | Merge r1821624, r1821625, r1821626, r1821627, r1821629, r1821632, r1821635, ↵Yann Ylavic2018-02-1611-726/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Convenient branch to merge common fdqueue code for MPMs event/worker.Yann Ylavic2018-02-150-0/+0
|/ | | | | | | | 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
* Propose.Yann Ylavic2018-02-151-0/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824368 13f79535-47bb-0310-9956-ffa450edef68
* Propose.Yann Ylavic2018-02-151-1/+18
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824342 13f79535-47bb-0310-9956-ffa450edef68
* Backported in r1824333.Yann Ylavic2018-02-151-6/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824341 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1667707, r1824332 from trunk:Yann Ylavic2018-02-154-2/+117
| | | | | | | | | | | | | | | | * 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
* Vote, promote.Yann Ylavic2018-02-151-6/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824309 13f79535-47bb-0310-9956-ffa450edef68
* backport voteJim Jagielski2018-02-151-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824308 13f79535-47bb-0310-9956-ffa450edef68
* propose backport of r1667707Stefan Eissing2018-02-151-0/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824307 13f79535-47bb-0310-9956-ffa450edef68
* Add CHANGES entryChristophe Jaillet2018-02-141-0/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824271 13f79535-47bb-0310-9956-ffa450edef68
* Another commentChristophe Jaillet2018-02-141-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824268 13f79535-47bb-0310-9956-ffa450edef68
* CommentChristophe Jaillet2018-02-141-1/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824267 13f79535-47bb-0310-9956-ffa450edef68
* Backported in r1824248.Yann Ylavic2018-02-141-30/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824250 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1776575, r1776578, r1776624, r1776627, r1776674, r1776734, r1776740, ↵Yann Ylavic2018-02-143-3/+839
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Revert r1824221: wrong backport.Yann Ylavic2018-02-144-846/+31
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824246 13f79535-47bb-0310-9956-ffa450edef68
* propose T&RJim Jagielski2018-02-141-2/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824240 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1745863, r1745864 from trunk:Jim Jagielski2018-02-142-9/+2
| | | | | | | | | | | | | | | | | 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
* promoteJim Jagielski2018-02-141-8/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824238 13f79535-47bb-0310-9956-ffa450edef68
* Backport voteJim Jagielski2018-02-141-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824237 13f79535-47bb-0310-9956-ffa450edef68
* mod_remoteip: Add PROXY protocol supportGraham Leggett2018-02-144-31/+846
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Make an explicit patch.Graham Leggett2018-02-141-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824220 13f79535-47bb-0310-9956-ffa450edef68
* Follow up to r1824187: record mergeinfo(s).Yann Ylavic2018-02-140-0/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824214 13f79535-47bb-0310-9956-ffa450edef68
* Follow up to r1824180: record mergeinfo(s).Yann Ylavic2018-02-140-0/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824212 13f79535-47bb-0310-9956-ffa450edef68
* v3 of RemoteIPProxyProtocol.2.4 accepted.Yann Ylavic2018-02-141-9/+9
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824211 13f79535-47bb-0310-9956-ffa450edef68
* Propose.Graham Leggett2018-02-141-0/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824191 13f79535-47bb-0310-9956-ffa450edef68
* Vote, and note we need an extra backport.Graham Leggett2018-02-141-0/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824190 13f79535-47bb-0310-9956-ffa450edef68
* mod_proxy, mod_ssl: Handle SSLProxy* directives in <Proxy> sections,Graham Leggett2018-02-1331-351/+619
| | | | | | | | | | | | | | | | | | 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
* Vote, promote.Graham Leggett2018-02-131-15/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824186 13f79535-47bb-0310-9956-ffa450edef68
* mod_proxy_uwsgi: Add in UWSGI proxy (sub)moduleGraham Leggett2018-02-137-16/+770
| | | | | | | | | | | | | | | | | 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
* Vote, promote.Graham Leggett2018-02-131-16/+16
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824183 13f79535-47bb-0310-9956-ffa450edef68
* Backported.Graham Leggett2018-02-131-16/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824181 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1822509, r1822511, r1823412, r1823415, r1823416, r1823564, r1823572, ↵Graham Leggett2018-02-133-234/+381
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Vote and promote.Graham Leggett2018-02-131-16/+16
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824179 13f79535-47bb-0310-9956-ffa450edef68
* Vote.Graham Leggett2018-02-131-3/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824178 13f79535-47bb-0310-9956-ffa450edef68
* Vote.Graham Leggett2018-02-131-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824177 13f79535-47bb-0310-9956-ffa450edef68
* rebuildRich Bowen2018-02-1316-11/+30
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824145 13f79535-47bb-0310-9956-ffa450edef68
* Fixes quoting as per https://bz.apache.org/bugzilla/show_bug.cgi?id=62063Rich Bowen2018-02-131-1/+1
| | | | | | | 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
* documentation rebuildLuca Toscano2018-02-111-2/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1823835 13f79535-47bb-0310-9956-ffa450edef68
* mod_proxy_fcgi.xml: add more context to the conn reuse noteLuca Toscano2018-02-111-2/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1823834 13f79535-47bb-0310-9956-ffa450edef68
* Rebuild.Lucien Gentis2018-02-107-10/+33
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1823785 13f79535-47bb-0310-9956-ffa450edef68
* XML updates.Lucien Gentis2018-02-104-7/+35
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1823784 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status