Checkout Tools
  • last updated 4 hours ago
Constraints: committers
Constraints: files
Constraints: dates
Merge of r1861338,1862475,1862583,1862865,1863221,1863276 from trunk:

*) mod_http2: core setting "LimitRequestFieldSize" is not additionally checked on

merged header fields, just as HTTP/1.1 does. [Stefan Eissing, Michael Kaufmann]

*) mod_http2: fixed a bug that prevented proper stream cleanup when connection

throttling was in place. Stream resets by clients on streams initiated by them

are counted as possible trigger for throttling. [Stefan Eissing]

*) mod_http2/mpm_event: Fixes the behaviour when a HTTP/2 connection has nothing

more to write with streams ongoing (flow control block). The timeout waiting

for the client to send WINODW_UPDATE was incorrectly KeepAliveTimeout and not

Timeout as it should be. Fixes PR 63534. [Yann Ylavic, Stefan Eissing]

  1. … 12 more files in changeset.
Merge of 1849296,1852038,1852101,1852339,1853171,1853967,1854365,1854963,1854964,1855295,1855411 from trunk:

*) mod_http2: when SSL renegotiation is inhibited and a 403 ErrorDocument is

in play, the proper HTTP/2 stream reset did not trigger with H2_ERR_HTTP_1_1_REQUIRED.

Fixed. [Michael Kaufmann]

*) mod_http2: new configuration directive: `H2Padding numbits` to control

padding of HTTP/2 payload frames. 'numbits' is a number from 0-8,

controlling the range of padding bytes added to a frame. The actual number

added is chosen randomly per frame. This applies to HEADERS, DATA and PUSH_PROMISE

frames equally. The default continues to be 0, e.g. no padding. [Stefan Eissing]

*) mod_http2: ripping out all the h2_req_engine internal features now that mod_proxy_http2

has no more need for it. Optional functions are still declared but no longer implemented.

While previous mod_proxy_http2 will work with this, it is recommeneded to run the matching

versions of both modules. [Stefan Eissing]

*) mod_proxy_http2: changed mod_proxy_http2 implementation and fixed several bugs which

resolve PR63170. The proxy module does now a single h2 request on the (reused)

connection and returns. [Stefan Eissing]

*) mod_http2/mod_proxy_http2: proxy_http2 checks correct master connection aborted status

to trigger immediate shutdown of backend connections. This is now always signalled

by mod_http2 when the the session is being released.

proxy_http2 now only sends a PING frame to the backend when there is not already one

in flight. [Stefan Eissing]

*) mod_proxy_http2: fixed an issue where a proxy_http2 handler entered an infinite

loop when encountering certain errors on the backend connection.

See <>. [Stefan Eissing]

*) mod_http2: Configuration directives H2Push and H2Upgrade can now be specified per

Location/Directory, e.g. disabling PUSH for a specific set of resources. [Stefan Eissing]

*) mod_http2: HEAD requests to some module such as mod_cgid caused the stream to

terminate improperly and cause a HTTP/2 PROTOCOL_ERROR.

Fixes <>. [Michael Kaufmann]

  1. … 34 more files in changeset.
Merge r1853901, r1853906, r1853908, r1853929, r1853935, r1853967 from trunk:

mod_reqtimeout: factorize structs and code.

With a bit of macro magic, this is to avoid more code duplication when adding

new stages (next commit will add TLS/handshake timeouts handling in addition to

existing header and body ones).

No functional change here.

mod_reqtimeout: Allow to configure (TLS-)handshake timeouts.

The timeouts apply between the process_connection and pre_read_request hooks.

They are disabled by default for compatibily reasons.

mod_reqtimeout: follow up to r1853906: adjust hooks priorities comments.

mod_reqtimeout: follow up to r1853901: fix macro args.

mod_reqtimeout: follow up to r1853901: init stage name outside INIT_STAGE().

It helps both code readability where stages are initilized and potential

logging in the input filter (even if the stage is disabled).

mod_http2: fix for latest mod_reqtimeout change re handshake timeouts

Submitted by: ylavic, icing

Reviewed by: ylavic, icing, jim

  1. … 5 more files in changeset.
Merge r1852038, r1852101 from trunk:

mod_http2: enable re-use of slave connections again.

mod_http2: fixed slave connection keepalives counter.

Submitted by: icing

Reviewed by: icing, ylavic, jim

  1. … 5 more files in changeset.
Merge r1826687, r1827166, r1828210, r1828232, r1828687 from trunk:

Instrument 'bbout'

mod_http2: use proper ARP defined for formatting apr_off_t

On the trunk:

mod_http2: on level trace2, log any unsuccessful HTTP/2 direct connection upgrade

with base64 encoding to unify its appearance in possible bug reports.

On the trunk:

* mod_http2: calculate unencrypted connection sniffing base64 only when log level is at required height. [Ruediger Pluem]

On the trunk:

mod_http2: accurate reporting of h2 data input/output per request via mod_logio. Fixes

an issue where output sizes where counted n-times on reused slave connections. See

gituhub issue:

Submitted by: jailletc36, icing, icing, icing, icing

Reviewed by: icing, jim, ylavic

  1. … 17 more files in changeset.
On the 2.4.x branch:

Merged /httpd/httpd/trunk:r1821371,1822502-1822503,1822624

  1. … 54 more files in changeset.
docco fix... correct license/copyright info

  1. … 24 more files in changeset.
Merge r1804096, r1807238, r1809981, r1810088, r1810089 from trunk:

bumping version, removing some unused code, fixes in base64url from mod_md

On the trunk:

*) mod_http2: DoS flow control protection is less agressive as long as active tasks stay

below worker capacity. Intended to fix problems with media streaming.

On the trunk:

mod_http2: v0.10.12, removed optimization for mutex handling in bucket beams that could lead to assertion failure in edge cases.

reverting r1807238 bc not addressing the issue

mod_http2: non-dev 1.10.12 for backport

Submitted by: icing

Reviewed by: icing, steffenal, ylavic

  1. … 11 more files in changeset.
Merge r1803420, r1803454, r1804090 from trunk:

mod_http2: version bump, partial fix for stream response getting stuck, see

mod_http2: signalling produce IO before waiting on beam buffer to drain.

mod_http2: non-dev version for backport

Submitted by: icing

Reviewed/backported by: icing, steffenal, ylavic

  1. … 7 more files in changeset.
On the 2.4.x branch:

Merged /httpd/httpd/trunk:r1789740,1790102,1790113,1790284,1790754,1790826-1790827,1790842

  1. … 20 more files in changeset.
On the 2.4.x branch:

Merged /httpd/httpd/trunk:r1786715,1787051,1787141,1787604,1788672,1788981,1789221,1789224,1789276,1789279,1789395,1789520,1789535,1789692

  1. … 31 more files in changeset.
On the 2.4.x branch:

Merged /httpd/httpd/trunk:r1784571,1785672,1785683,1786512,1786575-1786576

mod_http2/mod_proxy_http2 backport

  1. … 17 more files in changeset.
On the 2.4.x branch:

merge of r1780598,1781304,1782875,1782944,1782958,1782975 from trunk

  1. … 22 more files in changeset.
On the 2.4.x branch:

Merge r1775813 from trunk:

Fix mod_h2/github issue #126: correct lifetime of data sent on temp pools

* modules/http2/h2_bucket_beam.c

- ignore send pools that are sub-pools of the existing one

- added h2_beam_send_from() to allow explicit registering of the

correct pool for the sending

* modules/http2/h2_bucket_beam.h

- add prototype for h2_beam_send_from()

* modules/http2/h2_mplx.c

- adding logging of output beam state

* modules/http2/h2_stream.c

- register stream pool for sending data on input beam

* modules/http2/h2_task.c

- register task pool on output beam on creation

- adding trace logging

* modules/http2/h2_proxy_session.c

- fixing a type in a comment while we're at it

  1. … 7 more files in changeset.
Merge of r1766857,1767128,1767180,1767181,1767553 from trunk

mod_http2/mod_proxy_http2 improvments as in CHANGES

  1. … 22 more files in changeset.
Merge of r1765328,1766424,1766691,1766851 from trunk:

mod_http2: v1.7.7, connection shutdown revisited, AP_DEBUG_ASSERT transformed to real asserts

  1. … 21 more files in changeset.
Merge of r1766308 from trunk:

mod_http2: fixed potential crash in beam memory handling introduced in 1.7.x changes

  1. … 11 more files in changeset.
Merge of 1764243,1765318 from trunk:

mod_http2/mod_proxy_http2: 100-continue implementation, PING checks on aged backend connections

  1. … 16 more files in changeset.
Merge of r1764236 from trunk:

mod_proxy_http2: renaming duplicate symbol clash between h2_proxy_util and h2_util externals

  1. … 17 more files in changeset.
Merge of r1764005 from trunk:

mod_http2: reverting int->apr_uint32_t changes from 1.7.x

  1. … 24 more files in changeset.
Merge of r1763613 from trunk:

mod_http2: fixes compilation error on 32bit systems when generating a slave connection id

  1. … 7 more files in changeset.
Merge of 1761479,1761548,1762703,1763158 from trunk

mod_http2: rewrite of how responses and trailers are transferred between

master and slave connection. Reduction of internal states for tasks

and streams, stability. Heuristic id generation for slave connections

to better keep promise of connection ids unique at given point int time.

Fix for mod_cgid interop in high load situtations.

Fix for handling of incoming trailers when no request body is sent.

  1. … 39 more files in changeset.
Merge of 1761434,1761477 from trunk:

mod_http2: fix for output blocking race condition

  1. … 10 more files in changeset.
Merge of r1757985,r1758003 from trunk

mod_http2: fixed bug in stream shutdown, support for nghttp2 invalid header callback from 1.14.0 and onwards.

  1. … 13 more files in changeset.
merge of 1752145,1753498,1753541,1754129,1754414,1754534,1755323,1756844,1757524,1757534,1757540 from trunk

mod_http2: backport of latest changes

- intermediate responses

- graceful shutdown of connections

- ht debug draft update

  1. … 17 more files in changeset.
Merge of 1752087,1752096,1752145,1753498,1753541 from trunk:

mod_http2: removed timeouts on master connection while reuqest are being processsed

mod_http2: new H2CopyFiles directive

  1. … 16 more files in changeset.
Merge r1749693 from trunk:

assign IDs to new AH*'s

  1. … 4 more files in changeset.
Merge r1749688 from trunk:

spatch some AH* IDs to pick up the new INFO level messages,

also hit old DEBUG messages.

  1. … 4 more files in changeset.
Merge r1746988,r1747170 from trunk:

mod_http2: backport of 1.5.7

  1. … 7 more files in changeset.
mod_http2: backport of v1.5.6 plus mod_proxy_http2 dsp support
  1. … 31 more files in changeset.