--------------------- PatchSet 10221 Date: 2007/12/12 11:48:55 Author: adri Branch: s27_adri Tag: (none) Log: internalStaticCheck(const char *) -> (String); remove strBuf() call. Members: src/client_side.c:1.202.2.9.4.5->1.202.2.9.4.6 src/internal.c:1.15.12.1->1.15.12.2 src/protos.h:1.146.2.4.4.9->1.146.2.4.4.10 Index: squid/src/client_side.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v retrieving revision 1.202.2.9.4.5 retrieving revision 1.202.2.9.4.6 diff -u -r1.202.2.9.4.5 -r1.202.2.9.4.6 --- squid/src/client_side.c 12 Dec 2007 09:52:09 -0000 1.202.2.9.4.5 +++ squid/src/client_side.c 12 Dec 2007 11:48:55 -0000 1.202.2.9.4.6 @@ -1,6 +1,6 @@ /* - * $Id: client_side.c,v 1.202.2.9.4.5 2007/12/12 09:52:09 adri Exp $ + * $Id: client_side.c,v 1.202.2.9.4.6 2007/12/12 11:48:55 adri Exp $ * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels @@ -3862,7 +3862,7 @@ if (!http->flags.internal && internalCheck(strBuf(request->urlpath))) { if (internalHostnameIs(request->host)) http->flags.internal = 1; - else if (Config.onoff.global_internal_static && internalStaticCheck(strBuf(request->urlpath))) + else if (Config.onoff.global_internal_static && internalStaticCheck(request->urlpath)) http->flags.internal = 1; if (http->flags.internal) { request_t *old_request = requestLink(request); Index: squid/src/internal.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/internal.c,v retrieving revision 1.15.12.1 retrieving revision 1.15.12.2 diff -u -r1.15.12.1 -r1.15.12.2 --- squid/src/internal.c 12 Dec 2007 10:00:21 -0000 1.15.12.1 +++ squid/src/internal.c 12 Dec 2007 11:48:58 -0000 1.15.12.2 @@ -1,6 +1,6 @@ /* - * $Id: internal.c,v 1.15.12.1 2007/12/12 10:00:21 adri Exp $ + * $Id: internal.c,v 1.15.12.2 2007/12/12 11:48:58 adri Exp $ * * DEBUG: section 76 Internal Squid Object handling * AUTHOR: Duane, Alex, Henrik @@ -72,9 +72,9 @@ } int -internalStaticCheck(const char *urlpath) +internalStaticCheck(String urlpath) { - return (0 == strncmp(urlpath, "/squid-internal-static", 22)); + return (0 == strNCmp(urlpath, "/squid-internal-static", 22)); } /* Index: squid/src/protos.h =================================================================== RCS file: /cvsroot/squid-sf//squid/src/protos.h,v retrieving revision 1.146.2.4.4.9 retrieving revision 1.146.2.4.4.10 diff -u -r1.146.2.4.4.9 -r1.146.2.4.4.10 --- squid/src/protos.h 12 Dec 2007 09:52:10 -0000 1.146.2.4.4.9 +++ squid/src/protos.h 12 Dec 2007 11:48:58 -0000 1.146.2.4.4.10 @@ -1,6 +1,6 @@ /* - * $Id: protos.h,v 1.146.2.4.4.9 2007/12/12 09:52:10 adri Exp $ + * $Id: protos.h,v 1.146.2.4.4.10 2007/12/12 11:48:58 adri Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -1227,7 +1227,7 @@ extern void internalStart(request_t *, StoreEntry *); extern int internalCheck(const char *urlpath); -extern int internalStaticCheck(const char *urlpath); +extern int internalStaticCheck(String urlpath); extern char *internalLocalUri(const char *dir, const char *name); extern char *internalStoreUri(const char *dir, const char *name); extern char *internalRemoteUri(const char *, u_short, const char *, const char *);