[NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
while x.{even}.z versions are Stable/GA releases.]
- 2.4.17 : In development.
+ 2.4.17 : In development. Proposed T&R week of Oct 5th. jim will RM.
2.4.16 : Tagged on July 9, 2015. Released July 15, 2015
2.4.15 : Tagged on June 19, 2015. Not released.
2.4.14 : Tagged on June 11, 2015. Not released.
then merge into branches/2.4.x, as applicable.
* Current exceptions for RTC for this branch:
+ . http/2 - mod_http2
. mod_lua
. documentation
. non-Unix build
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
+ *) mod_proxy: don't recyle backend announced "Connection: close" connections
+ to avoid reusing it should the close be effective after some new request
+ is ready to be sent.
+ trunk patch: http://svn.apache.org/r1678763
+ http://svn.apache.org/r1703807
+ http://svn.apache.org/r1703813
+ 2.4.x patch: trunk works (module CHANGES)
+ +1: ylavic, rjung, trawick
+ ylavic: while at it, I also included r1678763 which is only an
+ optimization, but allows to keep code in sync with 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.
- trunk patch: http://svn.apache.org/r1525597
- http://svn.apache.org/r1525664
- http://svn.apache.org/r1525845
- http://svn.apache.org/r1527003
- http://svn.apache.org/r1527005
- http://svn.apache.org/r1532344
- http://svn.apache.org/r1539988
- http://svn.apache.org/r1541029
- http://svn.apache.org/r1543979
- http://svn.apache.org/r1544156
- http://svn.apache.org/r1626978
- 2.4.x patch: http://people.apache.org/~jkaluza/patches/httpd-2.4.x-errorlog_provider.patch
- +1: jkaluza
- +1: covener w/ doc or code to fix syntax (providername:providerarg not supported like syslog or socacheproviders,
- 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)
-
* mod_journald: Add new module mod_journald to log error logs into journald.
This patch needs changes done in mod_systemd patch (already
proposed for 2.4.x).
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
-
- * MPMs: Support SO_REUSEPORT to create multiple duplicated listener
- records for scalability (full log in 2.4.x patch).
- trunk patch: http://svn.apache.org/r1599531
- http://svn.apache.org/r1599593
- http://svn.apache.org/r1599601
- http://svn.apache.org/r1599603
- http://svn.apache.org/r1601558
- http://svn.apache.org/r1629909
- http://svn.apache.org/r1629918
- http://svn.apache.org/r1629990
- http://svn.apache.org/r1635521
- http://svn.apache.org/r1635859
- http://svn.apache.org/r1640145
- http://svn.apache.org/r1640161
- http://svn.apache.org/r1640184
- http://svn.apache.org/r1640763
- http://svn.apache.org/r1643179
- http://svn.apache.org/r1656368
- http://svn.apache.org/r1679714
- 2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-ap_listeners_buckets-v3.patch
- +1: ylavic, jim
+ +1: jkaluza, jim
+ rjung, minfrin: Not understanding "This patch needs changes done in
+ mod_systemd patch", am I right in understanding this patch is
+ already committed?
*) http: Don't remove the Content-Length of zero from a HEAD response if
it comes from an origin server, module or script. Allow the previous
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.
-
- *) mod_substitute: Configure patterns merge order. PR 57641
- trunk patch: http://svn.apache.org/r1684900
- http://svn.apache.org/r1687539
- http://svn.apache.org/r1687680
- http://svn.apache.org/r1688331
- http://svn.apache.org/r1688339
- http://svn.apache.org/r1688340
- http://svn.apache.org/r1688343
- http://svn.apache.org/r1697013
- http://svn.apache.org/r1697015
- 2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-SubstituteInheritBefore-v5.patch
+ minfrin: Two new directives need to be documented.
+
+ *) mod_alias: Introduce expression parser support for Alias, ScriptAlias
+ and Redirect. Limit Redirect expressions to directory (Location) context
+ and redirect statuses (implicit or explicit).
+ trunk patch: http://svn.apache.org/r1653941
+ http://svn.apache.org/r1653978
+ http://svn.apache.org/r1656225
+ http://svn.apache.org/r1686853
+ http://svn.apache.org/r1686856
+ 2.4.x patch: https://people.apache.org/~minfrin/httpd-mod_alias-expr2.patch
+ +1: minfrin
+
+ * mod_ssl: Make the output filter more friendly with deferred write and
+ response pipelining.
+ trunk patch: http://svn.apache.org/r1705194
+ http://svn.apache.org/r1705823
+ http://svn.apache.org/r1705826
+ http://svn.apache.org/r1705828
+ http://svn.apache.org/r1705833
+ http://svn.apache.org/r1706275
+ http://svn.apache.org/r1707230
+ http://svn.apache.org/r1707231
+ 2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-mod_ssl-deferred_friendly-v3.patch
+1: ylavic
- ylavic: updated to v5 including r1697013 and r1697015, the diff to v4 is:
- http://people.apache.org/~ylavic/httpd-2.4.x-SubstituteInheritBefore-v4_vs_v5.diff
-
- *) mod_proxy: Fix a race condition that caused a failed worker to be retried
- before the retry period is over
- Trunk version of patch:
- http://svn.apache.org/r1664709
- http://svn.apache.org/r1697323
- Backport version for 2.4.x of patch:
- Trunk version of patch works modulo CHANGES
- +1: rpluem, ylavic
- 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
- differently hence part of the path I think it should be marked
- as TODO section. But this should be subject to another
- patch.
- 2. Re: error handline line 2930 - can PROXY_WORKER_IS_USABLE
- not be tested BEFORE opening connection?
- rpluem: We could, but we can catch more race cases with the current code
- as it also catches the case where a connection establishment
- took long and the worker went into error meanwhile.
-
- *) util_script: Make REDIRECT_URL a complete URL (where set).
- PR 57785
- trunk: http://svn.apache.org/viewvc?view=revision&revision=1677702
- 2.4.x: trunk patch applies.
- +1: niq, jim
-
- *) core/mod_ssl: add Protocols/ProtocolsHonorOrder directives and new
- protocols hooks to control Upgrade: and ALPN protocol switching.
- HTTP_MISDIRECTED_REQUEST addition and handling in mod_ssl
- trunk patch: http://svn.apache.org/r1697855
- http://svn.apache.org/r1697339
- http://svn.apache.org/r1696428
- http://svn.apache.org/r1696266
- http://svn.apache.org/r1696264
- http://svn.apache.org/r1695874
- http://svn.apache.org/r1695727
- http://svn.apache.org/r1692516
- http://svn.apache.org/r1692486
- http://svn.apache.org/r1610674
- http://svn.apache.org/r1685069
- http://svn.apache.org/r1693918
- http://svn.apache.org/r1698116
- http://svn.apache.org/r1698133
- http://svn.apache.org/r1694950
- http://svn.apache.org/r1700968
- http://svn.apache.org/r1701005
- http://svn.apache.org/r1701145
- http://svn.apache.org/r1701178
- All changes to files in modules/http2 need to be ignored.
- v2: added r1698116, r1693918 to patch
- v3: added changes to ap_array_index and ap_array_contains
- 2.4.x patch: https://raw.githubusercontent.com/icing/mod_h2/master/sandbox/httpd/patches/core-protocols-v4.patch
- +1: icing, jim
-
- *) mod_h2: add HTTP/2 support to httpd, depends on core/mod_ssl changes above
- 2.4.x branch for this and core/mod_ssl: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2
- See diff and merged changelists via:
- svn diff ^/httpd/httpd/branches/2.4.x ^/httpd/httpd/branches/2.4.17-protocols-http2
- +1: icing, jim
-
-
- *) mod_slotmem_shm: Fix slots/SHM files names on restart for systems that
- can't create new (clear) slots while previous children gracefully stopping
- still use the old ones (e.g. Windows, OS2). PR 58024.
- trunk patch: http://svn.apache.org/r1702450
- http://svn.apache.org/r1702473
- http://svn.apache.org/r1702501
- http://svn.apache.org/r1702955
- http://svn.apache.org/r1703149
- http://svn.apache.org/r1703157
- http://svn.apache.org/r1703169
- http://svn.apache.org/r1703200
- 2.4.x patch: trunk works (module CHANGES)
- merge patch: http://people.apache.org/~ylavic/httpd-2.4.x-mod_slotmem_shm-generation.patch
- +1: ylavic, jim
+
+ * mod_ssl: Extend expression parser registration to support ssl variables
+ in any expression using mod_rewrite syntax "%{SSL:VARNAME}" or function
+ syntax "ssl(VARIABLE)".
+ trunk patch: http://svn.apache.org/r1707002
+ 2.4.x patch: trunk works (modulo CHANGES)
+ +1: rjung, ylavic
+
PATCHES/ISSUES THAT ARE BEING WORKED
PATCHES/ISSUES THAT ARE STALLED
+ * 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.
+ trunk patch: http://svn.apache.org/r1525597
+ http://svn.apache.org/r1525664
+ http://svn.apache.org/r1525845
+ http://svn.apache.org/r1527003
+ http://svn.apache.org/r1527005
+ http://svn.apache.org/r1532344
+ http://svn.apache.org/r1539988
+ http://svn.apache.org/r1541029
+ http://svn.apache.org/r1543979
+ http://svn.apache.org/r1544156
+ http://svn.apache.org/r1626978
+ 2.4.x patch: http://people.apache.org/~jkaluza/patches/httpd-2.4.x-errorlog_provider.patch
+ +1: jkaluza
+ +1: covener w/ doc or code to fix syntax (providername:providerarg not supported like syslog or socacheproviders,
+ 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_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
projects / apache / blobdiff