Re: cvs commit: squid3/src/ICAP ICAPConfig.cc ICAPConfig.h ....

On Sat, 2007-05-19 at 02:38 +1200, Amos Jeffries wrote:

> Oh dear I was sure y test build had --enable-icap.
> Seems not though, very sorry.

Blame evil #ifdefs!

> > Index: ICAP/ICAPXaction.cc
> > ===================================================================
> > RCS file: /squid/squid3/src/ICAP/ICAPXaction.cc,v
> > retrieving revision 1.16
> > diff -u -r1.16 ICAPXaction.cc
> > --- ICAP/ICAPXaction.cc 18 May 2007 06:41:30 -0000 1.16
> > +++ ICAP/ICAPXaction.cc 18 May 2007 08:35:46 -0000
> <snip>
>
> > @@ -118,14 +118,10 @@
> >
> > disableRetries(); // we only retry pconn failures
> >
> > -<<<<<<< ICAPXaction.cc
> > if (connection < 0) {
> > connection = comm_open(SOCK_STREAM, 0, getOutgoingAddr(NULL), 0,
> > COMM_NONBLOCKING, s.uri.c_str());
> > -=======
> > - connection = comm_open(SOCK_STREAM, 0, getOutgoingAddr(NULL), 0,
> > - COMM_NONBLOCKING, s.uri.buf());
> > ->>>>>>> 1.15
> > + }
>
> This change is more of a problem. To me it looks like the latter bit
> that you have removed is part of a previous conflict that got overlooked.
>
> ALEX: am I right in thinking the part _after_ the ==== is the new piece
> that should be kept after converting to use c_str()?

Yes, I think you are right.

Thank you,

Alex.
Received on Fri May 18 2007 - 09:27:22 MDT