- Jun 21, 2014
-
-
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
-
Jeff Trawick authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1604385 13f79535-47bb-0310-9956-ffa450edef68
-
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
-
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
-
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
-
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
-
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
-
Eric Covener authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1604358 13f79535-47bb-0310-9956-ffa450edef68
-
Eric Covener authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1604352 13f79535-47bb-0310-9956-ffa450edef68
-
Daniel Gruno authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1604340 13f79535-47bb-0310-9956-ffa450edef68
-
Daniel Gruno authored
- IVM changed to use shm - More verbose error logging (no functional change) - Miscellaneous refactoring that was in trunk but not in 2.4.x (no functional change as such) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1604339 13f79535-47bb-0310-9956-ffa450edef68
-
- Jun 20, 2014
-
-
Christophe Jaillet authored
Stray whitespace (r1602730 in trunk) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1604089 13f79535-47bb-0310-9956-ffa450edef68
-
- Jun 19, 2014
-
-
Mike Rumph authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1603966 13f79535-47bb-0310-9956-ffa450edef68
-
- Jun 17, 2014
-
-
Yann Ylavic authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1603168 13f79535-47bb-0310-9956-ffa450edef68
-
Jeff Trawick authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1603148 13f79535-47bb-0310-9956-ffa450edef68
-
Jim Jagielski authored
core: avoid a double apr_time_now() call on the first succeeding read. * Correctly escape user provided data. PR: 56532 Submitted by: Maksymilian <max cert.cx> Reviewed by: rpluem Save a few bytes of memory. This can be done in temp_pool. Fix layout don't pass uninitialized rv passed to ap_log_rerror() (rv wasn't interesting / follow an existing example) stop throwing away a pointer on the heap (clang scan-build) add the URI to DEBUG message 00765 (and drop an exclamation point): Cache provider's store_body failed! Doxygen fix + reorg to match how other header files are built Submitted by: ylavic, rpluem, jailletc36, jailletc36, trawick, covener, jailletc36 Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1603141 13f79535-47bb-0310-9956-ffa450edef68
-
Jim Jagielski authored
Fix bug introduced in r1591508 which resulted in the final empty FCGI_STDIN not being sent. Interaction with latest uWSGI (and probably other protocol implementations) breaks without this. Reindent after small fix in r1603027 mod_proxy_fcgi: follow up to r1592032. Also break the outer loop when "sending stdin" fails. Submitted by: trawick, ylavic Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1603140 13f79535-47bb-0310-9956-ffa450edef68
-
Jim Jagielski authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1603139 13f79535-47bb-0310-9956-ffa450edef68
-
Jim Jagielski authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1603138 13f79535-47bb-0310-9956-ffa450edef68
-
Yann Ylavic authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1603133 13f79535-47bb-0310-9956-ffa450edef68
-
Jeff Trawick authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1603129 13f79535-47bb-0310-9956-ffa450edef68
-
Yann Ylavic authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1603126 13f79535-47bb-0310-9956-ffa450edef68
-
Yann Ylavic authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1603115 13f79535-47bb-0310-9956-ffa450edef68
-
Jeff Trawick authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1603031 13f79535-47bb-0310-9956-ffa450edef68
-
- Jun 15, 2014
-
-
Richard Bowen authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1602768 13f79535-47bb-0310-9956-ffa450edef68
-
Richard Bowen authored
you do it wrong. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1602766 13f79535-47bb-0310-9956-ffa450edef68
-
Richard Bowen authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1602762 13f79535-47bb-0310-9956-ffa450edef68
-
Richard Bowen authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1602760 13f79535-47bb-0310-9956-ffa450edef68
-
Richard Bowen authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1602759 13f79535-47bb-0310-9956-ffa450edef68
-
Richard Bowen authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1602757 13f79535-47bb-0310-9956-ffa450edef68
-
Richard Bowen authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1602706 13f79535-47bb-0310-9956-ffa450edef68
-
Richard Bowen authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1602705 13f79535-47bb-0310-9956-ffa450edef68
-
Lucien Gentis authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1602688 13f79535-47bb-0310-9956-ffa450edef68
-
Lucien Gentis authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1602687 13f79535-47bb-0310-9956-ffa450edef68
-
- Jun 14, 2014
-
-
Lucien Gentis authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1602602 13f79535-47bb-0310-9956-ffa450edef68
-
Lucien Gentis authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1602601 13f79535-47bb-0310-9956-ffa450edef68
-
- Jun 13, 2014
-
-
Takashi Sato authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1602320 13f79535-47bb-0310-9956-ffa450edef68
-
Takashi Sato authored
(simply copy from trunk except revision ref) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1602319 13f79535-47bb-0310-9956-ffa450edef68
-
- Jun 12, 2014
-
-
Takashi Sato authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1602135 13f79535-47bb-0310-9956-ffa450edef68
-
- Jun 11, 2014
-
-
Jeff Trawick authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1601998 13f79535-47bb-0310-9956-ffa450edef68
-