On Fri, Jul 18, 2014 at 9:31 PM, Plüm, Rüdiger, Vodafone Group <[email protected]> wrote: > > >> -----Ursprüngliche Nachricht----- >> Von: [email protected] [mailto:[email protected]] Im Auftrag von >> Yann Ylavic >> Gesendet: Freitag, 18. Juli 2014 21:22 >> An: Yann Ylavic >> Cc: httpd; William A. Rowe Jr.; [email protected] >> Betreff: Re: svn commit: r1611771 - /httpd/httpd/branches/2.2.x/STATUS >> >> On Fri, Jul 18, 2014 at 9:14 PM, Yann Ylavic <[email protected]> wrote: >> > On Fri, Jul 18, 2014 at 9:11 PM, <[email protected]> wrote: >> >> Author: ylavic >> >> Date: Fri Jul 18 19:11:10 2014 >> >> New Revision: 1611771 >> >> >> >> URL: http://svn.apache.org/r1611771 >> >> Log: >> >> mod_deflate proposal v3. >> >> >> >> Modified: >> >> httpd/httpd/branches/2.2.x/STATUS >> >> >> >> Modified: httpd/httpd/branches/2.2.x/STATUS >> >> URL: >> http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=16117 >> 71&r1=1611770&r2=1611771&view=diff >> >> >> ======================================================================== >> ====== >> >> --- httpd/httpd/branches/2.2.x/STATUS (original) >> >> +++ httpd/httpd/branches/2.2.x/STATUS Fri Jul 18 19:11:10 2014 >> >> @@ -157,9 +157,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: >> >> https://svn.apache.org/r1604353 >> >> https://svn.apache.org/r1611725 >> >> 2.4.x patch: https://svn.apache.org/r1604458 (2.4.10) >> >> - 2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x- >> mod_deflate_reentrant_with_CHANGES_v2.patch >> >> + 2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x- >> mod_deflate_reentrant_with_CHANGES_v3.patch >> >> (modulo CHANGES) >> >> +1: ylavic, wrowe >> >> + ylavic: v3 without the merge conflict with PR 56062 above. >> > >> > Sorry about that William, the v2 patch included the fix for PR 56062 >> > already accepted above. >> > You probably need to (re)vote... >> >> >> and the following from v2 is not needed anymore : >> >> @@ -1253,7 +1477,8 @@ static apr_status_t inflate_out_filter(ap_filter_t >> } >> ctx->validation_buffer += VALIDATION_SIZE / 2; >> compLen = getLong(ctx->validation_buffer); >> - if (ctx->stream.total_out != compLen) { >> + /* gzip stores original size only as 4 byte value */ >> + if ((ctx->stream.total_out & 0xFFFFFFFF) != compLen) { > > Why is this rollover stuff no longer needed for files larger than 4 GB?
It is still needed, but not part of this (PR 46146) patch, rather the other one (PR 55782) on mod_deflate which is already accepted for backport. In any case I think we have a conflict between the 2 patches on this chunk, depending on which patch is applied first (probably PR 55782 since it already has the 3 votes). I think we need now merge the accepted patch now so that I can v4 a new one that will apply (neither v2 nor v3 will work if the other one is commited first). Any objection if I merge myself?
