Re: Squid NTLM authentication

On Fri, Apr 14, 2000, Henrik Nordstrom wrote:
> Adrian Chadd wrote:
>
> > I've just thrown in another copy-kill - client_side.c . I think however
> > that if you have patches like this, we're going to have to work a little
> > more closely together, or we are both going to have a codebase
> > merge nightmare on our hands.
>
> I am not to worried. The patch I am talking about mostly touches the
> request parsing in client_side.c, while your changes should touch other
> areas. Merging changes which are a few lines apart using CVS is a piece
> of cake (it does it for you).

Yup.
I'll be playing with your merge scripts when I get a CVS repo here at home
again. I don't want to trash anything in the current sourcetree.

> > I'll look at merging the modio code into the latest squid-dev and
> > stick that back in the modio branch. I will take a look at your
> > patch to kill pump.c and try to merge that in too. I'm just scared
> > that this is going to become a nightmare too quickly. :-)
>
> My patch does not belong in modio. It has absolutely nothing to do with
> what you are doing in modio.

Well, I'm branching out into the rest of the storage manager.
Take a look at the latest patches to eliminate another call to stmemCopy().
I've converted over the routines in client_side.c, and I'm going to
convert the rest to using the non-copy storeClientCopy() routine
after I've finished merging my code with the latest squid-DEVEL.

You mentioned in an email to squid-dev that you want to kill pump.c .
It wouldn't be that hard to convert over to the non-copy version
of storeClientCopy(), without causing you too much grief.

I'm working on some documentation of the Adrianified stoage manager
which I'll be committing as soon as I get the hang of docbook. :)

Adrian
Received on Fri Apr 14 2000 - 16:22:53 MDT