From 0a59f40f599adbf4106a87b9ed59b0d1ff540208 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Wed, 23 Sep 2015 12:33:31 +0000 Subject: [PATCH] vote and demote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1704833 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/STATUS b/STATUS index b333ccee09..7ac1e03e4b 100644 --- a/STATUS +++ b/STATUS @@ -113,22 +113,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] - * mod_proxy: Add ap_proxy_define_match_worker() and use it for ProxyPassMatch - and ProxyMatch section to distinguish between normal workers and workers - with regex substitutions in the name. Implement handling of such workers - in ap_proxy_get_worker(). Fixes the bug when regex workers were not - matched and used for request. PR 43513. - trunk patch: http://svn.apache.org/r1609680 - http://svn.apache.org/r1609688 - http://svn.apache.org/r1641381 - ylavic: Merge patch provided (reusing new->real to avoid double de_socketfy() call). - Also added missing r1609688 to the patchset. - 2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-ap_proxy_define_match_worker.patch - +1: ylavic - -0: covener tried to review this one in Austin with Jeff. Does the added match function - really cover a very narrow set of parameters with the way it skips over backreferences? - Also, why a new API vs. just setting the field inline? - * core: Add ap_errorlog_provider to make ErrorLog logging modular. This backport keeps syslog logging as part of httpd core and only adds API to allow other modules to be used for error logging. @@ -149,6 +133,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: needs 2 args which is not valid in ErrorLog manual) trawick: nit: fix "writing" in "/* NULL if we are writting to syslog */" (sorry, haven't finished reviewing completely) + jim: What is the status of this?? * mod_journald: Add new module mod_journald to log error logs into journald. This patch needs changes done in mod_systemd patch (already @@ -156,7 +141,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: trunk patch: http://svn.apache.org/r1610339 http://svn.apache.org/r1621806 2.4.x patch: http://people.apache.org/~jkaluza/patches/httpd-2.4.x-mod_journald.patch - +1: jkaluza + +1: jkaluza, jim * MPMs: Support SO_REUSEPORT to create multiple duplicated listener records for scalability (full log in 2.4.x patch). @@ -188,7 +173,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: trunk patch: http://svn.apache.org/r1554303 http://svn.apache.org/r1678215 2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-preserve_head_cl_zero.patch - +1: ylavic + +1: ylavic, jim ylavic: r1554303 issued a major MMN bump, but since the ABI change is two ints added at the end of core_server_config, the proposed merge does a minor bump only. @@ -215,7 +200,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: http://svn.apache.org/r1697323 Backport version for 2.4.x of patch: Trunk version of patch works modulo CHANGES - +1: rpluem, ylavic + +1: rpluem, ylavic, jim niq: 1. the if(worker->s->retries) {} and comment at line 2917 don't seem to make any sense. rpluem: This is just taken over from existing code. It is just indented @@ -339,6 +324,22 @@ PATCHES/ISSUES THAT ARE BEING WORKED PATCHES/ISSUES THAT ARE STALLED + * mod_proxy: Add ap_proxy_define_match_worker() and use it for ProxyPassMatch + and ProxyMatch section to distinguish between normal workers and workers + with regex substitutions in the name. Implement handling of such workers + in ap_proxy_get_worker(). Fixes the bug when regex workers were not + matched and used for request. PR 43513. + trunk patch: http://svn.apache.org/r1609680 + http://svn.apache.org/r1609688 + http://svn.apache.org/r1641381 + ylavic: Merge patch provided (reusing new->real to avoid double de_socketfy() call). + Also added missing r1609688 to the patchset. + 2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-ap_proxy_define_match_worker.patch + +1: ylavic + -0: covener tried to review this one in Austin with Jeff. Does the added match function + really cover a very narrow set of parameters with the way it skips over backreferences? + Also, why a new API vs. just setting the field inline? + * mod_systemd: New module, for integration with systemd on Linux. trunk patch: http://svn.apache.org/r1393976 http://svn.apache.org/r1393997 -- 2.50.1