Checkout Tools
  • last updated 6 hours ago
Constraints: committers
Constraints: files
Constraints: dates
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 r1835118 from trunk:

On the trunk:

* silencing gcc uninitialized warning

* refrainning from apr_table_addn() use since pool debug assumptions are in conflict

* adding more assertions

* copy-porting changes to base64 encoding code from mod_md

Submitted by: icing

Reviewed by: icing, minfrin, jim

  1. … 8 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.
  1. … 30 more files in changeset.
On the 2.4.x branch:

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

  1. … 54 more files in changeset.
Merge r1818804, r1818951, r1818958, r1818960, r1819027, r1819214, r1820035 from trunk:

mpm_event: close connections not reported as handled by any module.

This avoids losing track of them and leaking scoreboard entries.

PR 61551.

mpm_event: follow up to r1818804.

Address corner case where connection is aborted due to ap_run_pre_connection()

failure, and update comment about ap_run_process_connection() expected return

status and state.

mpm_event: follow up to r1818804 and r1818951.

Align comment and fix typos.

mpm_event: follow up to r1818804.

Allow DONE as a successful ap_run_process_connection() return value, for

instance h2_conn_run() and h2_task_process_conn() uses it, third-party

modules may too...

mpm_event: follow up to r1818804 and r1818951.

Be more correct in comment about CONN_STATE_WRITE_COMPLETION.

We currently have/need no state to simply wait for readability on a socket,

so the previous comment was misleading. Write completion can't be used for

a simple "wait for read event and come back to process_connection hooks".

mpm_event: follow up to r1818804 and r1818960.

Align mod_http2 with expected returned state from process_connection hooks in

async MPMs.

When the master connection is handled, enter CONN_STATE_LINGER in any case.

Add missing APLOGNO

Submitted by: ylavic, jailletc36

Reviewed by: ylavic, icing, covener

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

  1. … 24 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.
Merge of r1769596,1769600,1770395,1770998 from trunk

mod_http2: PUSH triggers only on GET

mod_proxy_http2: 1xx responses not forwarded unconditionally on HTTP/1.x connections

  1. … 6 more files in changeset.
Merge of r1767936,1768160,1769192,1769550 from trunk:

mod_http2: new directive 'H2PushResource' to enable early pushes before

processing of the main request starts. Resources are announced to the

client in Link headers on a 103 early hint response.

All responses with status code <400 are inspected for Link header and

trigger pushes accordingly. 304 still does prevent pushes.

'H2PushResource' can mark resources as 'critical' which gives them higher

priority than the main resource. This leads to preferred scheduling for

processing and, when content is available, will send it first. 'critical'

is also recognized on Link headers.

mod_proxy_http2: uris in Link headers are now mapped back to a suitable

local url when available. Relative uris with an absolute path are mapped

as well. This makes reverse proxy mapping available for resources

announced in this header.

With 103 interim responses being forwarded to the main client connection,

this effectively allows early pushing of resources by a reverse proxied

backend server.

adding support for newly proposed 103 status code.

  1. … 22 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 r1763246 from trunk:

mod_http2: fixing Windows build issues by replacing hook with own implemenation

  1. … 6 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 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 of 1742260,1742359,1742444,1742445,1742446,1742447,1742460,1743335,1743517,1743788 from trunk:

mod_http2/mod_proxy_http2 update with latest changes from trunk to 1.5.4.

Update of CMake and Netware makefiles.

  1. … 11 more files in changeset.
mod_http2: backport of 1.5.2 to 2.4.x
  1. … 47 more files in changeset.
backport of mod_http2 v1.3.2 minus event conn-status fixup
  1. … 54 more files in changeset.
Add APLOGNO, first chunk (those that were

detected by coccinelle).

There are some more but they are easier to

backport once these here are applied.

Backport of r1725392, r1725394, r1725395

and r1725468 from trunk.

Submitted by: rjung

Reviewed by: jim, ylavic

  1. … 38 more files in changeset.
mod_http2 v1.2.2 from trunk
  1. … 46 more files in changeset.
mod_http v1.0.11, fixes duplicate response headers when post_req_hook gets invoked twice
  1. … 2 more files in changeset.
merged mod_http2 1.0.8 from trunk
  1. … 25 more files in changeset.
mod_http2, version 1.0.7
  1. … 31 more files in changeset.
update of mod_http2 with current trunk version
  1. … 55 more files in changeset.