Re: [PATCH] Revised fix for download corruption

The patch is for 2.5.STABLE1. Should also apply to 20021109 snapshot.

Is included in 20021111 snapshot.

Regards
Henrik

On Sun, 10 Nov 2002, Edward D. Millington wrote:

> Last night I download the 20021110 snapshot and had to run tar mxzf on
> it to config and make it.
>
> With this same download not, I cannot get it patch. I see that it is
> referencing squid/src.
>
> I did a mv squid-2.5.STABLE1-20021110 /tmp/squid and try patching
> squid again.
>
> #tar xzf squid-2.5.STABLE1-20021110.tar.gz
> #mv squid-2.5.STABLE1-20021110 squid
> #patch -p0 < squid-2.5.STABLE1-aufs.patch
>
> result:
>
> patching file squid/src/fs/aufs/aiops.c
> Reversed (or previously applied) patch detected! Assume -R? [n] n
> Apply anyway? [n] y
> Hunk #1 FAILED at 185.
> Hunk #2 FAILED at 211.
> Hunk #3 FAILED at 523.
> Hunk #4 FAILED at 593.
> Hunk #5 FAILED at 609.
> 5 out of 5 hunks FAILED -- saving rejects to file
> squid/src/fs/aufs/aiops.c.rej
> patching file squid/src/fs/aufs/async_io.c
> Reversed (or previously applied) patch detected! Assume -R? [n] n
> Apply anyway? [n] y
> Hunk #1 FAILED at 53.
> Hunk #2 FAILED at 148.
> Hunk #3 FAILED at 157.
> patch: **** malformed patch at line 171: back_data)
>
>
> Am I doing something wrong here?
>
> > Yes.
> >
> > Regards
> > Henrik
> >
> >
> > On Sunday 10 November 2002 14.43, Edward D. Millington wrote:
> > > Is this the patch?
> > >
> > > squid-2.5.STABLE1-aufs.patch
> > >
> > > > The patch has been updated to work around this
> > > >
> > > > http://www.squid-cache.org/Versions/v2/2.5/bugs/
> > > >
> > > > Regards
> > > > Henrik
> > > >
> > > > On Sunday 10 November 2002 12.29, Henrik Nordstrom wrote:
> > > > > Some careful testing has revealed yet another cbdata barrier
> > > > > error in aufs causing similar errors.. this time in aioCancel.
> > > > > Makes the same damn read bug resurface
> > > > >
> > > > > How to repeat:
> > > > > half_closed_clients off (makes detection simpler, not stricly
> > > > > required)
> > > > > patch aio to be slow at scheduling operations
> > > > > run under a malloc debugger such as valgrind ("memory_pools
> > > > > off" required for valgrind to see this error)
> > > > > abort a request
> > > > >
> > > > > Regards
> > > > > Henrik
> > > > >
> > > > > On Tuesday 05 November 2002 23.39, Phil Oester wrote:
> > > > > > After 5 hours of testing with my 'corruption' patch, your
> > > > > > patch has shown zero corruption (as expected).
> > > > > >
> > > > > > I'll load this up on some of our boxes today and see if
> > > > > > anything breaks ;-)
> > > > > >
> > > > > > -Phil
> > > > > >
> > > > > > On Tue, Nov 05, 2002 at 12:31:03PM +0100, Henrik Nordstrom
> > wrote:
> > > > > > > Attached is a preleminary Squid-2.5 patch that inforces the
> > > > > > > cbdata barrier on aufs reads.
> > > > > > >
> > > > > > > Quick summary: The responsibility of copying the read data
> > > > > > > into the buffer is moved up to the storeAufsRead() layer
> > > > > > > who can correcly verify if the swapin request has been
> > > > > > > aborted. It also adds a few cbdata verifications to insure
> > > > > > > that aborted events is properly ignored and a few on-free
> > > > > > > checks to avoid memory or filedescriptor leakage.
>
Received on Sun Nov 10 2002 - 09:56:48 MST