Checkout Tools
  • last updated 1 hour ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge r1868313 from trunk:

Honor "Accept-Encoding: foo;q=0" as per RFC 7231; which means 'foo' is

"not acceptable". PR 58158

Submitted by: jailletc36

Reviewed/backported by: jailletc36, jim, ylavic

  1. … 3 more files in changeset.
Merge r1486027, r1828909, r1839249, r1842888, r1844343, r1846651 from trunk:

Clarify the existing behavior.

* modules/generators/mod_info.c: Constify fixed tables and mark

module-private global variables static. No functional change.

Axe an old and apparently out-dated comment.

There is a typo in the comment.

HN_UPDATE_SEC has been renamed HM_UPDATE_SEC.

The TODO seems to have been taken into account in r759862.

* modules/filters/mod_deflate.c

(deflate_out_filter): Fix typo setting output note. (Coverity warning)

(deflate_in_filter): Fix redundant assignment. (clang warning)

* modules/md/md_acme_authz.c (md_acme_authz_update): Fix typo in log

message.

* modules/dav/main/mod_dav.c (dav_method_propfind): Tag the scratchpool.

Submitted by: minfrin, jorton, jailletc36

Reviewed by: jailletc36, icing, jorton

  1. … 6 more files in changeset.
Merge r1843242 from trunk:

mod_brotli, mod_deflate: Restore the separate handling of 304 Not Modified

responses allowing these modules to properly set or fix-up the response

headers such as Vary or ETag.

This change follows up on r1837056 that disabled that special handling and

thus resulted in a potential violation of RFC7232, 4.1:

The server generating a 304 response MUST generate any of the following

header fields that would have been sent in a 200 (OK) response to the

same request: Cache-Control, Content-Location, Date, ETag, Expires,

and Vary.)

References:

https://lists.apache.org/thread.html/f5733ca6743757e8aa8b58a0cd9e27680971551c2a20f5606c66507e@%3Cdev.httpd.apache.org%3E

https://tools.ietf.org/html/rfc7232#section-4.1

Submitted by: kotkov

Reviewed by: kotkov, ylavic, jim

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

*) http: Enforce consistently no response body with both 204 and 304

statuses. [Yann Ylavic]

  1. … 8 more files in changeset.
Merge r1619483 from trunk:

mod_deflate: follow up to r1619444.

Fix counting of inflated bytes in deflate_in_filter() when asked to flush, since

we now count bytes per inflate() call everywhere, we can't count all the produced

bytes there.

We still need to include all the produced bytes in the brigade.

Submitted by: ylavic

Reviewed/backported by: jim

  1. … 2 more files in changeset.
Merge r1601624 from trunk:

Strip useless apr_brigade_cleanup() calls.

Submitted/backported by: ylavic

Reviewed by: jailletc36, jim, ylavic

  1. … 7 more files in changeset.
Merge r1602978, r1683044, r1683884, r1673368, r1701717, r1683047 from trunk:

Core filters do not need mod_proxy.h

Small speed optimization when parsing <Limit>, <LimitExcept> and environment variables

Save a few bytes in conf pool

Remove some spaces between some return statements and ';' + fix a strange formating in a 'for' loop

In order to save a few cycles, delay a hash table lookup which is not necessary needed

Constify + save a few bytes in conf pool

Submitted by: ylavic, jailletc36, jailletc36, jailletc36, jailletc36, jailletc36

Reviewed/backported by: jim

  1. … 7 more files in changeset.
Merge r1619453 from trunk

* mod_deflate: Add missing APLOGNO.

Submitted by: ylavic

Reviewed by: jailletc36, gsmith, druggeri

Backported by: jailletc36

  1. … 1 more file in changeset.
Merge r1619383, r1619444, r1662245, r1662246 from trunk:

A misplaced check for inflation limits prevented limiting relatively

small inputs. PR56872

Submitted By: Edward Lu

Committed By: covener

mod_deflate: follow up to r1619383.

deflate_in_filter():

- use inflated bytes per inflate() call to compute the total output bytes,

- check zlib errors before limits,

- add missing check_ratio() when asked to flush.

deflate_out_filter():

- check ratio after each inflate() call.

mod_deflate: follow up to r1619383 and r1619444: CHANGES entry.

CHANGES: follow up to r1662245: Add PR number.

Submitted by: covener, ylavic, ylavic, ylavic

Reviewed/backported by: jim

  1. … 4 more files in changeset.
Merge r1611979, r1611725, r1588448, r1642803, r1657949, r1451108 (part of it),

r1643672, r1496178 from trunk

* Synch with trunk:

- Add missing APLOGNO.

- mod_deflate: don't require <limits.h> by using APR_INT32_MAX instead of INT_MAX.

- Move two variable assignments off the fast path.

- Fix curly braces style. Remove useless empty lines

- tab vs space

- Removed tabs.

- dump fcgi headers with trace8 instead of debug+compile-time flag.

- Drop severity of "LDAP: Setting referrals to ON" from DEBUG to TRACE4

Submitted by: jailletc36, ylavic, minfrin, fuankg, covener

Reviewed by: jailletc36, minfrin, ylavic

Backported by: jailletc36

  1. … 12 more files in changeset.
Add missing APLOGNO + fix a typo in a comment

r1610518 in trunk

  1. … 1 more file in changeset.
backport r1610501 from trunk:

*) SECURITY: CVE-2014-0118 (cve.mitre.org)

mod_deflate: The DEFLATE input filter (inflates request bodies) now

limits the length and compression ratio of inflated request bodies to avoid

denial of sevice via highly compressed bodies. See directives

DeflateInflateLimitRequestBody, DeflateInflateRatioLimit,

and DeflateInflateRatioBurst.

Thanks to Giancarlo Pellegrino and Davide Balzarotti for reporting the issue.

Submitted By: ylavic, covener

Reviewed By: jorton, covener, jim

  1. … 2 more files in changeset.
Merge r1572896, r1572911 from trunk:

mod_deflate:

Don't fail when asked to flush inflated data to the user-agent and that

coincides with the end of stream ("Zlib error flushing inflate buffer").

PR 56196.

Submitted By: [Christoph Fausak <christoph.fausak glueckkanja com>]

Committed By: ylavic

mod_deflate: follows up r1572896.

Be safe from successive or post end-of-stream flush buckets.

Submitted by: ylavic

Reviewed/backported by: jim

  1. … 3 more files in changeset.
fix c++/c99 comment

r1604353 in trunk

Merge r1572092 from trunk:

mod_deflate: fix decompression of files larger than 4GB. According to RFC1952,

Input SIZE (compLen) contains the size of the original input data modulo 2^32.

PR: 56062

Submitted by: Lukas Bezdicka

Reviewed by: jkaluza, ylavic, covener

  1. … 3 more files in changeset.
Merge r1572655, r1572663, r1572668, r1572669, r1572670, r1572671, r1573224, r1586745, r1587594, r1587639, r1590509 from trunk.

Commit 1 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.

PR 46146 (patches from duplicated PR 55666)

Handle Zlib header buffering in the inflate output filter :

- add the new deflate_ctx_t fields needed to re-enter the Zlib header parsing,

- introduce the new consume_zlib_flags() function to parse/consume the ZLib flags (will be used by the other filters too),

- use it to handle incomplete header in the output filter (deflate).

This alone fixes PR 55666, but the issue remains for PR 46146 (inflate/deflate input filters), hence the following patches.

Commit 2 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.

PR 46146 (patches from duplicated PR 55666)

Handle Zlib header buffering in the inflate input filter :

- loop until all the header is received,

- handle non blocking reads returning empty brigade,

- fix a double ap_get_brigade() when an EOS brigade is encountered while reading the header,

- in that case and no data was received so far, don't return an error but SUCCESS with the EOS, otherwise fail,

- don't remove the Content-Length and Content-MD5 headers until some data is read.

Still does not handle Zlib flags for now, next commits.

Commit 3 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.

PR 46146 (patches from duplicated PR 55666)

Handle Zlib validation bytes buffering (CRC + length) in the inflate input filter :

- use validation_buffer and validation_length as state,

- loop until all the bytes are received.

Commit 4 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.

PR 46146 (patches from duplicated PR 55666)

Handle non blocking reads which would block in the inflate input filter (not an error).

Commit 5 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.

PR 46146 (patches from duplicated PR 55666)

Handle Zlib flags in the inflate input filter as in the output filter, using consume_zlib_flags().

Commit 6 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.

PR 46146 (patches from duplicated PR 55666)

Ignore empty buckets and split buckets longer than INT_MAX (since zlib uses 32-bit ints only) in all filters.

mod_deflate: when consuming zlibs flags, APR_INCOMPLETE implies no more bytes available.

mod_deflate: update empty log tags.

mod_deflate: Delay INFLATE input filter's self removal until all the buffered

buckets are out (including EOS). PR 46146.

mod_deflate: Don't return gzip-ed data when reading FLUSH bucket in INFLATE

input filter, forward the FLUSH but keep reading should EOS/more

follow (should not happen, but mod_deflate won't fix it).

mod_deflate: follow up to r1587639.

Don't break the looped brigade when moving the FLUSH bucket to the returned bb

and continue reading.

Reviewed by: ylavic, jim, covener

  1. … 3 more files in changeset.
Multiple backports from trunk:

- rotatelog: Factor out from doRotate, main; make error handling consistant

and print the actual error to stderr

PR 45084

Backport of r1374247 from trunk.

- rotatelog: Cleanups, no functional change. Drop revision history,

"svn log" works; use APR_PATH_MAX; constify more

Backport of r1409800 from trunk.

- rotatelog: error[120] is already defined in this function. Just use

it instead of shadowing.

Backport of r1416121 from trunk.

- rotatelog: Use apr_snprintf(... "%pm"...) instead of explicit call

to apr_strerror

Backport of r1463736 from trunk.

- mod_deflate: style fix (no code change)

Backport of r1499679 from trunk.

- mod_socache_shmcb: Correct the use of the printf formatter.

Backport of r1493925 from trunk.

- mod_cache_socache: Fixed signed<->unsigned compiler warning.

Backport of r1490550 from trunk.

- mod_ssl: add missing space between directive description and syntax

Backport of r1509983 from trunk.

- mpm/winnt: style consistency in winnt's worker_main

Backport of r1520760 from trunk.

Proposed by: jailletc36

Reviewed by: jim, rjung

  1. … 7 more files in changeset.
mod_deflate: Improve error detection when decompressing request bodies

with trailing garbage: handle case where trailing bytes are in

the same bucket.

trunk: http://svn.apache.org/r1502772

Submitted by: rjung

Reviewed by: jim, humbedooh

  1. … 3 more files in changeset.
Merge r1484832, r1484914 from trunk:

mod_deflate: Remove assumptions as to when an EOS bucket might arrive.

Gracefully step aside if the body size is zero.

mod_deflate: Make sure we process any EOS bucket in our brigade and

save going the long way round.

Submitted by: minfrin

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Make mod_deflate skip compression if compression is enabled at SSL level.

Backport of r1359057 from trunk.

Submitted by: sf

Reviewed by: jorton, rjung

Backported by: rjung

  1. … 3 more files in changeset.
Backport r1209766, r1210252, r1210284:

Add lots of unique tags to error log messages

ssl_util.c: Downgrade some dynamic locking messages from level DEBUG

to TRACE1-3

  1. … 164 more files in changeset.