Re: [Squid-cvs] s2_4 squid/src Makefile.in,1.3.4.4,1.3.4.5 asn.c,1.4.2.3,1.4.2.4 cache_manager.c,1.3.4.3,1.3.4.4 client_side.c,1.5.2.9,1.5.2.10 enums.h,1.5.2.3,1.5.2.4 errorpage.c,1.4.2.3,1.4.2.4 forw

All commits are mailed to the SourceForge squid-cvs mailing list
(archived), and also recorded in the CVS history.

The following command sequence can be used to bring back your "lost"
changes from CVS into a new workingtree based on Squid-2.4:

cvs update -j1.2.4.3 -j1.2.4.2 include/Array.h
cvs update -j1.3.4.3 -j1.3.4.2 lib/Array.c
cvs update -j1.3.4.6 -j1.3.4.5 src/Makefile.in
cvs update -j1.4.2.5 -j1.4.2.4 src/asn.c
cvs update -j1.3.4.5 -j1.3.4.4 src/cache_manager.c
cvs update -j1.5.2.11 -j1.5.2.10 src/client_side.c
cvs update -j1.5.2.5 -j1.5.2.4 src/enums.h
cvs update -j1.4.2.5 -j1.4.2.4 src/errorpage.c
cvs update -j1.4.4.3 -j1.4.4.2 src/forward.c
cvs update -j1.4.2.9 -j1.4.2.8 src/ftp.c
cvs update -j1.4.2.4 -j1.4.2.3 src/globals.h
cvs update -j1.4.2.5 -j1.4.2.4 src/gopher.c
cvs update -j1.4.4.6 -j1.4.4.5 src/http.c
cvs update -j1.3.4.3 -j1.3.4.2 src/icp_v2.c
cvs update -j1.3.4.5 -j1.3.4.4 src/internal.c
cvs update -j1.3.4.3 -j1.3.4.2 src/mem.c
cvs update -j1.3.4.5 -j1.3.4.4 src/mime.c
cvs update -j1.5.2.6 -j1.5.2.5 src/neighbors.c
cvs update -j1.3.4.4 -j1.3.4.3 src/peer_select.c
cvs update -j1.4.4.11 -j1.4.4.10 src/protos.h
cvs update -j1.4.4.3 -j1.4.4.2 src/pump.c
cvs update -j1.5.2.4 -j1.5.2.3 src/refresh.c
cvs update -j1.4.4.4 -j1.4.4.3 src/stat.c
cvs update -j1.4.4.7 -j1.4.4.6 src/store.c
cvs update -j1.4.4.3 -j1.4.4.2 src/store_client.c
cvs update -j1.4.4.4 -j1.4.4.3 src/store_swapmeta.c
cvs update -j1.4.4.4 -j1.4.4.3 src/store_swapout.c
cvs update -j1.6.2.13 -j1.6.2.12 src/structs.h
cvs update -j1.3.4.5 -j1.3.4.4 src/typedefs.h
cvs update -j1.3.4.5 -j1.3.4.4 src/urn.c
cvs update -j1.3.4.3 -j1.3.4.2 src/wais.c
cvs update -j1.3.4.3 -j1.3.4.2 src/whois.c

Attached to this message you can also find a patch with your changes.

Regards
Henrik

On Mon, 11 Nov 2002, Yee Man Chan wrote:

> Hi Henrik,
>
> I tried to re-commit it to DSA. Unfortunately,
> stupid me ran cvs update on my code, so now it all
> revert back to 2.4 HEAD. I didn't keep a backup, so I
> lost all my changes! :*-( Do you know how to undo cvs
> update? Or can you give me the patch of my changes? It
> seems to me the patches were sent to you already.
>
> Thanks a lot.
> Yee Man
> --- Henrik Nordstrom <hno@marasystems.com> wrote:
> > Sorry, but you committed this on the Squid-2.4 HEAD
> > branch, not your DSA
> > branch.
> >
> > Your changes have been automatically removed from
> > the Squid-2.4 HEAD
> > branch. Please commit them again, but this time in a
> > proper branch.
> >
> > Regards
> > Henrik
> >
> >
> > mån 2002-11-11 klockan 09.25 skrev Yee Man Chan:
> > > Update of /cvsroot/squid/squid/src
> > > In directory usw-pr-cvs1:/tmp/cvs-serv3399/src
> > >
> > > Modified Files:
> > > Tag: s2_4
> > > Makefile.in asn.c cache_manager.c client_side.c
> > enums.h
> > > errorpage.c forward.c ftp.c globals.h gopher.c
> > http.c icp_v2.c
> > > internal.c mem.c mime.c neighbors.c peer_select.c
> > protos.h
> > > pump.c refresh.c stat.c store.c store_client.c
> > > store_swapmeta.c store_swapout.c structs.h
> > typedefs.h urn.c
> > > wais.c whois.c
> > > Log Message:
> > > compilable re-write of DSA
> > >
> > >
> > > Index: Makefile.in
> > >
> >
> ===================================================================
> > > RCS file:
> > /cvsroot/squid/squid/src/Attic/Makefile.in,v
> > > retrieving revision 1.3.4.4
> > > retrieving revision 1.3.4.5
> > > diff -w -u -r1.3.4.4 -r1.3.4.5
> > > --- Makefile.in 13 Apr 2001 19:04:56 -0000 1.3.4.4
> > > +++ Makefile.in 11 Nov 2002 08:25:31 -0000 1.3.4.5
> > > @@ -76,6 +76,7 @@
> > > SHELL = /bin/sh
> > >
> > > INCLUDE = -I. -I../include
> > -I$(top_srcdir)/include
> > > +DEFINES = -DDSA
> > > CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES)
> > > SQUID_LIBS = -L../lib $(CRYPTLIB) $(REGEXLIB)
> > @SQUID_PTHREAD_LIB@ \
> > > $(SNMPLIB) $(MALLOCLIB) -lmiscutil
> > $(XTRA_LIBS)
> > >
> > > Index: asn.c
> > >
> >
> ===================================================================
> > > RCS file: /cvsroot/squid/squid/src/asn.c,v
> > > retrieving revision 1.4.2.3
> > > retrieving revision 1.4.2.4
> > > diff -w -u -r1.4.2.3 -r1.4.2.4
> > > --- asn.c 14 Aug 2002 11:20:35 -0000 1.4.2.3
> > > +++ asn.c 11 Nov 2002 08:25:31 -0000 1.4.2.4
> > > @@ -62,7 +62,11 @@
> > > };
> > >
> > > struct _ASState {
> > > +#ifdef DSA
> > > + InstanceEntry *entry;
> > > +#else
> > > StoreEntry *entry;
> > > +#endif
> > > store_client *sc;
> > > request_t *request;
> > > int as_number;
> > > @@ -187,7 +191,11 @@
> > > asnCacheStart(int as)
> > > {
> > > LOCAL_ARRAY(char, asres, 4096);
> > > +#ifdef DSA
> > > + InstanceEntry *e;
> > > +#else
> > > StoreEntry *e;
> > > +#endif
> > > request_t *req;
> > > ASState *asState = xcalloc(1,
> > sizeof(ASState));
> > > cbdataAdd(asState, cbdataXfree, 0);
> > > @@ -197,19 +205,34 @@
> > > req = urlParse(METHOD_GET, asres);
> > > assert(NULL != req);
> > > asState->request = requestLink(req);
> > > +#ifdef DSA
> > > + if ((e = instanceGetPublic(asres,
> > METHOD_GET)) == NULL) {
> > > + e = instanceCreateEntry(asres, asres,
> > null_request_flags, METHOD_GET);
> > > + asState->sc = storeClientListAdd(e->p, asState);
> > > +#else
> > > if ((e = storeGetPublic(asres, METHOD_GET))
> > == NULL) {
> > > e = storeCreateEntry(asres, asres,
> > null_request_flags, METHOD_GET);
> > > asState->sc = storeClientListAdd(e, asState);
> > > +#endif
> > > fwdStart(-1, e, asState->request);
> > > } else {
> > > +#ifdef DSA
> > > + storeLockObject(e->p);
> > > + asState->sc = storeClientListAdd(e->p, asState);
> > > +#else
> > > storeLockObject(e);
> > > asState->sc = storeClientListAdd(e, asState);
> > > +#endif
> > > }
> > > asState->entry = e;
> > > asState->seen = 0;
> > > asState->offset = 0;
> > > storeClientCopy(asState->sc,
> > > +#ifdef DSA
> > > + e->p,
> > > +#else
> > > e,
> > > +#endif
> > > asState->seen,
> > > asState->offset,
> > > 4096,
> > > @@ -222,7 +245,11 @@
> > > asHandleReply(void *data, char *buf, ssize_t
> > size)
> > > {
> > > ASState *asState = data;
> > > +#ifdef DSA
> > > + StoreEntry *e = asState->entry->p;
> > > +#else
> > > StoreEntry *e = asState->entry;
> > > +#endif
> > > char *s;
> > > char *t;
> > > debug(53, 3) ("asHandleReply: Called with
> > size=%d\n", size);
> > > @@ -269,7 +296,11 @@
> > > debug(53, 3) ("asState->seen = %d,
> > asState->offset = %d\n",
> > > asState->seen, asState->offset);
> > > if (e->store_status == STORE_PENDING) {
> > > +#ifdef DSA
> > > + debug(53, 3) ("asHandleReply: store_status ==
> > STORE_PENDING: %s\n", storeUrl(e));
> > > +#else
> > > debug(53, 3) ("asHandleReply: store_status ==
> > STORE_PENDING: %s\n", storeUrl(e));
> > > +#endif
> > > storeClientCopy(asState->sc,
> > > e,
> > > asState->seen,
> > > @@ -299,9 +330,15 @@
> > > asStateFree(void *data)
> > > {
> > > ASState *asState = data;
> > > +#ifdef DSA
> > > + debug(53, 3) ("asnStateFree: %s\n",
> > storeUrl(asState->entry->p));
> > > + storeUnregister(asState->sc,
> > asState->entry->p, asState);
> > > + storeUnlockObject(asState->entry->p);
> > > +#else
> > > debug(53, 3) ("asnStateFree: %s\n",
> > storeUrl(asState->entry));
> > > storeUnregister(asState->sc, asState->entry,
> > asState);
> > > storeUnlockObject(asState->entry);
> > > +#endif
> > > requestUnlink(asState->request);
> > > cbdataFree(asState);
> > > }
> > >
> > > Index: cache_manager.c
> > >
> >
> ===================================================================
> > > RCS file:
> > /cvsroot/squid/squid/src/cache_manager.c,v
> > > retrieving revision 1.3.4.3
> > > retrieving revision 1.3.4.4
> > > diff -w -u -r1.3.4.3 -r1.3.4.4
> > > --- cache_manager.c 15 Jan 2001 22:49:18 -0000
> > 1.3.4.3
> > > +++ cache_manager.c 11 Nov 2002 08:25:31 -0000
> > 1.3.4.4
> > > @@ -38,7 +38,11 @@
> > > #define MGR_PASSWD_SZ 128
> > >
> > > typedef struct {
> > > +#ifdef DSA
> > > + InstanceEntry *entry;
> > > +#else
> > > StoreEntry *entry;
> > > +#endif
> > > char *action;
> > > char *user_name;
> >
> === message truncated ===
>
>
> __________________________________________________
> Do you Yahoo!?
> U2 on LAUNCH - Exclusive greatest hits videos
> http://launch.yahoo.com/u2
>