Checkout Tools
  • last updated 7 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.
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 https://github.com/icing/mod_h2/issues/120

mod_http2: non-dev 1.10.12 for backport

Submitted by: icing

Reviewed by: icing, steffenal, ylavic

  1. … 11 more files in changeset.
Merge r1800978 from trunk:

On the trunk:

mod_http2: Simplify ready queue, less memory and better performance. Update

mod_http2 version to 1.10.7.

Submitted by: icing

Reviewed by: icing, jim, ylavic

  1. … 8 more files in changeset.
SECURITY: CVE-2017-9789: Read after free in mod_http2.

When under stress, closing many connections, the HTTP/2

handling code would sometimes access memory after it has

been freed, resulting in potentially erratic behaviour.

Merge r1800689 from trunk:

Disable and give warning when mpm_prefork is encountered.

The server will continue to work, but HTTP/2 will no longer be negotiated.

Submitted by: icing

Reviewed by: icing, ylavic, jim

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

Merged /httpd/httpd/trunk:r1791790,1792195

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

Merged /httpd/httpd/trunk:r1790850,1790855,1791377,1791388,1791669,1791773

  1. … 14 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:

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

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

mod_proxy_http2: resolving last 2 reported dup symbol clashes

  1. … 6 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 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 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 r1747550 from trunk:

mod_proxy_http2 no longer shares objects with mod_http2

h2_casecmpstr eliminated, uses backported ap_cstr_casecmp*

  1. … 11 more files in changeset.
mod_http2: backport of v1.5.6 plus mod_proxy_http2 dsp support
  1. … 31 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 v1.5.3
  1. … 20 more files in changeset.
mod_http2: backport of 1.5.2 to 2.4.x
  1. … 47 more files in changeset.
Merge: r1740108, r1740084, r1739932 from trunk

mod_http2: disabling mmap on file buckets, changing r->protocol to HTTP/2.0

  1. … 5 more files in changeset.
Merge r1736463,r1737006,r1737021,r1737102,r1737125,r1737254 from trunk:

mod_http2: backport of version 1.4.6

  1. … 22 more files in changeset.
mod_http2: backport of 1.4.3
  1. … 13 more files in changeset.
backport of mod_http2 v1.4.2
  1. … 24 more files in changeset.
mod_http2: backport of fix for streams without :authority header
  1. … 3 more files in changeset.
backported mod_http2 1.4.0 from trunk
  1. … 26 more files in changeset.
backport of mod_http2 v1.3.2 minus event conn-status fixup
  1. … 54 more files in changeset.