Skip to content
  1. Jul 08, 2014
  3. Jul 05, 2014
  5. Jun 28, 2014
  7. Jun 26, 2014
  9. Jun 25, 2014
  11. Jun 24, 2014
  13. Jun 23, 2014
  15. Jun 22, 2014
  17. Jun 21, 2014
    • Yann Ylavic's avatar
      Vote for r1604350. · a31b2b06
      Yann Ylavic authored 
      git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1604469 13f79535-47bb-0310-9956-ffa450edef68
      a31b2b06
    • Jeff Trawick's avatar
      Merge r1604461 from trunk: · 48275fbb
      Jeff Trawick authored 
      Follow-up to r1601076: Provide documentation for -m option.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1604463 13f79535-47bb-0310-9956-ffa450edef68
      48275fbb
    • Jeff Trawick's avatar
      silly typo · 1993d33e
      Jeff Trawick authored 
      git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1604462 13f79535-47bb-0310-9956-ffa450edef68
      1993d33e
    • Yann Ylavic's avatar
      Merge r1572092 from trunk: · b28d15c9
      Yann Ylavic authored 
      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



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1604460 13f79535-47bb-0310-9956-ffa450edef68
      b28d15c9
    • Yann Ylavic's avatar
      Merge r1572655, r1572663, r1572668, r1572669, r1572670, r1572671, r1573224,... · e14a33bd
      Yann Ylavic authored 
      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.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1604458 13f79535-47bb-0310-9956-ffa450edef68
      e14a33bd
    • Jeff Trawick's avatar
      doc xforms · 4502e66d
      Jeff Trawick authored 
      git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1604385 13f79535-47bb-0310-9956-ffa450edef68
      4502e66d
    • Jeff Trawick's avatar
      Merge r1604382 from trunk: · 212aa0b0
      Jeff Trawick authored 
      Follow up r1573626 with some wordsmithing, a compatibility note,
and indentation.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1604383 13f79535-47bb-0310-9956-ffa450edef68
      212aa0b0
    • Jeff Trawick's avatar
      Merge r1573626 from trunk: · 826997dd
      Jeff Trawick authored 
      mod_proxy: Allow reverse-proxy to be set via explicit handler.

Submitted by: ryo takatsuki <ryotakatsuki gmail com>
Reviewed by: ylavic, jim, mrumph


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1604378 13f79535-47bb-0310-9956-ffa450edef68
      826997dd
    • Jeff Trawick's avatar
      Merge r1601076 from trunk: · 9542b00d
      Jeff Trawick authored 
      ab: support custom HTTP method with -m argument.

PR: 56604
Submitted by: Roman Jurkov <winfinit gmail.com>
Reviewed by: ylavic, trawick, covener

(r1601680 and r1601700 not reflected in mergeinfo due to
a collision with an unrelated trunk change)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1604373 13f79535-47bb-0310-9956-ffa450edef68
      9542b00d
    • Jeff Trawick's avatar
      merge 1592032 from trunk: · 9c6902fe
      Jeff Trawick authored 
      mod_proxy_fcgi: better error messages, and fix an old bug where the error
                condition was forgotten

Submitted by: trawick
Reviewed by: ylavic, covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1604369 13f79535-47bb-0310-9956-ffa450edef68
      9c6902fe
    • Eric Covener's avatar
      · e5fd04ff
      Eric Covener authored 
      promotions


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1604362 13f79535-47bb-0310-9956-ffa450edef68
      e5fd04ff