header file. */
#undef HAVE_ASSERT_H
+/* Basic auth module is built */
+#undef HAVE_AUTH_MODULE_BASIC
+
+/* Digest auth module is built */
+#undef HAVE_AUTH_MODULE_DIGEST
+
+/* Negotiate auth module is built */
+#undef HAVE_AUTH_MODULE_NEGOTIATE
+
+/* NTLM auth module is built */
+#undef HAVE_AUTH_MODULE_NTLM
+
/* Define to 1 if you have the `backtrace_symbols_fd' function. */
#undef HAVE_BACKTRACE_SYMBOLS_FD
diff -u -r -N squid-3.0.STABLE11/include/version.h squid-3.0.STABLE12/include/version.h
--- squid-3.0.STABLE11/include/version.h 2008-12-23 17:19:34.000000000 +1300
+++ squid-3.0.STABLE12/include/version.h 2009-01-21 14:59:10.000000000 +1300
@@ -9,5 +9,5 @@
*/
#ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 1230005959
+#define SQUID_RELEASE_TIME 1232503139
#endif
diff -u -r -N squid-3.0.STABLE11/Makefile.am squid-3.0.STABLE12/Makefile.am
--- squid-3.0.STABLE11/Makefile.am 2008-12-23 17:19:20.000000000 +1300
+++ squid-3.0.STABLE12/Makefile.am 2009-01-21 14:59:00.000000000 +1300
@@ -42,3 +42,6 @@
install-pinger:
chown root $(DEFAULT_PINGER)
chmod 4711 $(DEFAULT_PINGER)
+
+all-am:
+ @echo "Build Successful."
diff -u -r -N squid-3.0.STABLE11/Makefile.in squid-3.0.STABLE12/Makefile.in
--- squid-3.0.STABLE11/Makefile.in 2008-12-23 17:19:20.000000000 +1300
+++ squid-3.0.STABLE12/Makefile.in 2009-01-21 14:59:00.000000000 +1300
@@ -772,6 +772,9 @@
install-pinger:
chown root $(DEFAULT_PINGER)
chmod 4711 $(DEFAULT_PINGER)
+
+all-am:
+ @echo "Build Successful."
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -u -r -N squid-3.0.STABLE11/RELEASENOTES.html squid-3.0.STABLE12/RELEASENOTES.html
--- squid-3.0.STABLE11/RELEASENOTES.html 2008-12-23 17:20:28.000000000 +1300
+++ squid-3.0.STABLE12/RELEASENOTES.html 2009-01-21 15:00:19.000000000 +1300
@@ -1,11 +1,11 @@
-
- Squid 3.0.STABLE11 release notes
+
+ Squid 3.0.STABLE12 release notes
-Squid 3.0.STABLE11 release notes
+Squid 3.0.STABLE12 release notes
Squid Developers
@@ -15,7 +15,7 @@
-The Squid Team are pleased to announce the release of Squid-3.0.STABLE11.
+The Squid Team are pleased to announce the release of Squid-3.0.STABLE12.
This new release is available for download from
http://www.squid-cache.org/Versions/v3/3.0/ or the
mirrors.
@@ -846,6 +846,9 @@
fake_auth helper for NTLM now accepts the '-S' parameter to strip NTLM domain off the username string.
This is useful for class 4 Delay Pools in Squid 3.x
+half_closed_clients
+New defaut vaue of OFF
+
diff -u -r -N squid-3.0.STABLE11/src/access_log.cc squid-3.0.STABLE12/src/access_log.cc
--- squid-3.0.STABLE11/src/access_log.cc 2008-12-23 17:19:32.000000000 +1300
+++ squid-3.0.STABLE12/src/access_log.cc 2009-01-21 14:59:08.000000000 +1300
@@ -604,23 +604,22 @@
case LFT_TIME_GMT: {
const char *spec;
-
struct tm *t;
spec = fmt->data.timespec;
- if (!spec)
- spec = "%d/%b/%Y:%H:%M:%S";
-
- if (fmt->type == LFT_TIME_LOCALTIME)
+ if (fmt->type == LFT_TIME_LOCALTIME) {
+ if (!spec)
+ spec = "%d/%b/%Y:%H:%M:%S %z";
t = localtime(&squid_curtime);
- else
+ } else {
+ if (!spec)
+ spec = "%d/%b/%Y:%H:%M:%S";
t = gmtime(&squid_curtime);
+ }
strftime(tmp, sizeof(tmp), spec, t);
-
out = tmp;
}
-
break;
case LFT_TIME_TO_HANDLE_REQUEST:
diff -u -r -N squid-3.0.STABLE11/src/cf.data.pre squid-3.0.STABLE12/src/cf.data.pre
--- squid-3.0.STABLE11/src/cf.data.pre 2008-12-23 17:19:32.000000000 +1300
+++ squid-3.0.STABLE12/src/cf.data.pre 2009-01-21 14:59:09.000000000 +1300
@@ -3205,16 +3205,20 @@
NAME: half_closed_clients
TYPE: onoff
LOC: Config.onoff.half_closed_clients
-DEFAULT: on
+DEFAULT: off
DOC_START
Some clients may shutdown the sending side of their TCP
connections, while leaving their receiving sides open. Sometimes,
Squid can not tell the difference between a half-closed and a
- fully-closed TCP connection. By default, half-closed client
- connections are kept open until a read(2) or write(2) on the
- socket returns an error. Change this option to 'off' and Squid
- will immediately close client connections when read(2) returns
- "no more data to read."
+ fully-closed TCP connection.
+
+ By default, Squid will immediately close client connections when
+ read(2) returns "no more data to read."
+
+ Change this option to 'off' and Squid will keep open connections
+ until a read(2) or write(2) on the socket returns an error.
+ This may show some benefits for reverse proxies. But if not
+ it is recommended to leave OFF.
DOC_END
NAME: pconn_timeout
diff -u -r -N squid-3.0.STABLE11/src/client_side.cc squid-3.0.STABLE12/src/client_side.cc
--- squid-3.0.STABLE11/src/client_side.cc 2008-12-23 17:19:32.000000000 +1300
+++ squid-3.0.STABLE12/src/client_side.cc 2009-01-21 14:59:09.000000000 +1300
@@ -527,7 +527,8 @@
checklist->reply = HTTPMSGLOCK(al.reply);
if (!Config.accessList.log || checklist->fastCheck()) {
- al.request = HTTPMSGLOCK(request);
+ if(request)
+ al.request = HTTPMSGLOCK(request);
accessLogLog(&al, checklist);
updateCounters();
diff -u -r -N squid-3.0.STABLE11/src/Debug.h squid-3.0.STABLE12/src/Debug.h
--- squid-3.0.STABLE11/src/Debug.h 2008-12-23 17:19:31.000000000 +1300
+++ squid-3.0.STABLE12/src/Debug.h 2009-01-21 14:59:08.000000000 +1300
@@ -53,6 +53,15 @@
#define assert(EX) ((EX)?((void)0):xassert("EX", __FILE__, __LINE__))
#endif
+/* defined debug section limits */
+#define MAX_DEBUG_SECTIONS 100
+
+/* defined names for Debug Levels */
+#define DBG_CRITICAL 0 /**< critical messages always shown when they occur */
+#define DBG_IMPORTANT 1 /**< important messages always shown when their section is being checked */
+/* levels 2-8 are still being discussed amongst the developers */
+#define DBG_DATA 9 /**< output is a large data dump only necessary for advanced debugging */
+
class Debug
{
diff -u -r -N squid-3.0.STABLE11/src/defines.h squid-3.0.STABLE12/src/defines.h
--- squid-3.0.STABLE11/src/defines.h 2008-12-23 17:19:32.000000000 +1300
+++ squid-3.0.STABLE12/src/defines.h 2009-01-21 14:59:09.000000000 +1300
@@ -59,7 +59,6 @@
/* Select types. */
#define COMM_SELECT_READ (0x1)
#define COMM_SELECT_WRITE (0x2)
-#define MAX_DEBUG_SECTIONS 100
#define COMM_NONBLOCKING 0x01
#define COMM_NOCLOEXEC 0x02
diff -u -r -N squid-3.0.STABLE11/src/htcp.cc squid-3.0.STABLE12/src/htcp.cc
--- squid-3.0.STABLE11/src/htcp.cc 2008-12-23 17:19:32.000000000 +1300
+++ squid-3.0.STABLE12/src/htcp.cc 2009-01-21 14:59:09.000000000 +1300
@@ -1553,7 +1553,7 @@
}
}
-void
+int
htcpQuery(StoreEntry * e, HttpRequest * req, peer * p)
{
cache_key *save_key;
@@ -1567,7 +1567,7 @@
http_state_flags flags;
if (htcpInSocket < 0)
- return;
+ return 0;
old_squid_format = p->options.htcp_oldsquid;
@@ -1612,7 +1612,7 @@
if (!pktlen) {
debugs(31, 1, "htcpQuery: htcpBuildPacket() failed");
- return;
+ return -1;
}
htcpSend(pkt, (int) pktlen, &p->in_addr);
@@ -1621,6 +1621,8 @@
storeKeyCopy(save_key, (const cache_key *)e->key);
queried_addr[stuff.msg_id % N_QUERIED_KEYS] = p->in_addr;
debugs(31, 3, "htcpQuery: key (" << save_key << ") " << storeKeyText(save_key));
+
+ return 1;
}
/*
diff -u -r -N squid-3.0.STABLE11/src/htcp.h squid-3.0.STABLE12/src/htcp.h
--- squid-3.0.STABLE11/src/htcp.h 2008-12-23 17:19:32.000000000 +1300
+++ squid-3.0.STABLE12/src/htcp.h 2009-01-21 14:59:09.000000000 +1300
@@ -62,7 +62,22 @@
SQUIDCEXTERN void neighborsHtcpReply(const cache_key *, htcpReplyData *, const struct sockaddr_in *);
SQUIDCEXTERN void htcpInit(void);
-SQUIDCEXTERN void htcpQuery(StoreEntry * e, HttpRequest * req, peer * p);
+
+/**
+ * \ingroup ServerProtocolHTCP
+ *
+ * Generate and Send an HTCP query to the specified peer.
+ *
+ * \param e
+ * \param req
+ * \param p
+ * \retval 1 Successfully sent request.
+ * \retval 0 Unable to send request at this time. HTCP may be shutting down or starting up.
+ * Don't wait for a reply or count in stats as sent.
+ * \retval -1 Error sending request.
+ */
+SQUIDCEXTERN int htcpQuery(StoreEntry * e, HttpRequest * req, peer * p);
+
SQUIDCEXTERN void htcpSocketShutdown(void);
SQUIDCEXTERN void htcpSocketClose(void);
diff -u -r -N squid-3.0.STABLE11/src/main.cc squid-3.0.STABLE12/src/main.cc
--- squid-3.0.STABLE11/src/main.cc 2008-12-23 17:19:33.000000000 +1300
+++ squid-3.0.STABLE12/src/main.cc 2009-01-21 14:59:09.000000000 +1300
@@ -230,7 +230,6 @@
#endif
" -R Do not set REUSEADDR on port.\n"
" -S Double-check swap during rebuild.\n"
- " -V Virtual host httpd-accelerator.\n"
" -X Force full debugging.\n"
" -Y Only return UDP_HIT or UDP_MISS_NOFETCH during fast reload.\n",
appname, CACHE_HTTP_PORT, DefaultConfigFile, CACHE_ICP_PORT);
diff -u -r -N squid-3.0.STABLE11/src/Mem.h squid-3.0.STABLE12/src/Mem.h
--- squid-3.0.STABLE11/src/Mem.h 2008-12-23 17:19:32.000000000 +1300
+++ squid-3.0.STABLE12/src/Mem.h 2009-01-21 14:59:08.000000000 +1300
@@ -1,6 +1,5 @@
-
/*
- * $Id: Mem.h,v 1.4.4.1 2008/02/26 00:15:55 amosjeffries Exp $
+ * $Id$
*
* DEBUG: section 13 High Level Memory Pool Management
* AUTHOR: Harvest Derived
@@ -39,8 +38,11 @@
/* forward decls */
class CacheManager;
+class StoreEntry;
+class MemPoolStats;
+class MemPoolMeter;
-#include
+#include
class Mem
{
diff -u -r -N squid-3.0.STABLE11/src/neighbors.cc squid-3.0.STABLE12/src/neighbors.cc
--- squid-3.0.STABLE11/src/neighbors.cc 2008-12-23 17:19:33.000000000 +1300
+++ squid-3.0.STABLE12/src/neighbors.cc 2009-01-21 14:59:09.000000000 +1300
@@ -647,9 +647,6 @@
if (Config.peers == NULL)
return 0;
- if (theOutIcpConnection < 0)
- fatal("neighborsUdpPing: There is no ICP socket!");
-
assert(entry->swap_status == SWAPOUT_NONE);
mem->start_ping = current_time;
@@ -673,9 +670,6 @@
debugs(15, 4, "neighborsUdpPing: pinging peer " << p->host << " for '" << url << "'");
- if (p->type == PEER_MULTICAST)
- mcastSetTtl(theOutIcpConnection, p->mcast.ttl);
-
debugs(15, 3, "neighborsUdpPing: key = '" << entry->getMD5Text() << "'");
debugs(15, 3, "neighborsUdpPing: reqnum = " << reqnum);
@@ -683,34 +677,42 @@
#if USE_HTCP
if (p->options.htcp) {
+ if (Config.Port.htcp <= 0) {
+ debugs(15, DBG_CRITICAL, "HTCP is disabled! Cannot send HTCP request to peer.");
+ continue;
+ }
+
debugs(15, 3, "neighborsUdpPing: sending HTCP query");
- htcpQuery(entry, request, p);
+ if (htcpQuery(entry, request, p) <= 0) continue; // unable to send.
} else
#endif
- if (p->icp.port == echo_port) {
- debugs(15, 4, "neighborsUdpPing: Looks like a dumb cache, send DECHO ping");
- echo_hdr.reqnum = reqnum;
- query = _icp_common_t::createMessage(ICP_DECHO, 0, url, reqnum, 0);
- icpUdpSend(theOutIcpConnection,
- &p->in_addr,
- query,
- LOG_ICP_QUERY,
- 0);
+ {
+ if (Config.Port.icp <= 0 || theOutIcpConnection <= 0) {
+ debugs(15, DBG_CRITICAL, "ICP is disabled! Cannot send ICP request to peer.");
+ continue;
} else {
- flags = 0;
- if (Config.onoff.query_icmp)
- if (p->icp.version == ICP_VERSION_2)
- flags |= ICP_FLAG_SRC_RTT;
+ if (p->type == PEER_MULTICAST)
+ mcastSetTtl(theOutIcpConnection, p->mcast.ttl);
- query = _icp_common_t::createMessage(ICP_QUERY, flags, url, reqnum, 0);
+ if (p->icp.port == echo_port) {
+ debugs(15, 4, "neighborsUdpPing: Looks like a dumb cache, send DECHO ping");
+ echo_hdr.reqnum = reqnum;
+ query = _icp_common_t::createMessage(ICP_DECHO, 0, url, reqnum, 0);
+ icpUdpSend(theOutIcpConnection, &p->in_addr, query, LOG_ICP_QUERY, 0);
+ } else {
+ flags = 0;
+
+ if (Config.onoff.query_icmp)
+ if (p->icp.version == ICP_VERSION_2)
+ flags |= ICP_FLAG_SRC_RTT;
- icpUdpSend(theOutIcpConnection,
- &p->in_addr,
- query,
- LOG_ICP_QUERY,
- 0);
+ query = _icp_common_t::createMessage(ICP_QUERY, flags, url, reqnum, 0);
+
+ icpUdpSend(theOutIcpConnection, &p->in_addr, query, LOG_ICP_QUERY, 0);
+ }
}
+ }
queries_sent++;
diff -u -r -N squid-3.0.STABLE11/src/Server.cc squid-3.0.STABLE12/src/Server.cc
--- squid-3.0.STABLE11/src/Server.cc 2008-12-23 17:19:32.000000000 +1300
+++ squid-3.0.STABLE12/src/Server.cc 2009-01-21 14:59:08.000000000 +1300
@@ -562,7 +562,8 @@
assert(entry);
BodyPipeCheckout bpc(*adaptedBodySource);
- const StoreIOBuffer ioBuf(&bpc.buf, bpc.offset);
+ const StoreIOBuffer ioBuf(&bpc.buf, currentOffset);
+ currentOffset += bpc.buf.size;
entry->write(ioBuf);
bpc.buf.consume(contentSize);
bpc.checkIn();
diff -u -r -N squid-3.0.STABLE11/src/tests/testAuth.cc squid-3.0.STABLE12/src/tests/testAuth.cc
--- squid-3.0.STABLE11/src/tests/testAuth.cc 2008-12-23 17:19:33.000000000 +1300
+++ squid-3.0.STABLE12/src/tests/testAuth.cc 2009-01-21 14:59:09.000000000 +1300
@@ -11,10 +11,18 @@
CPPUNIT_TEST_SUITE_REGISTRATION( testAuth );
CPPUNIT_TEST_SUITE_REGISTRATION( testAuthConfig );
CPPUNIT_TEST_SUITE_REGISTRATION( testAuthUserRequest );
+#ifdef HAVE_AUTH_MODULE_BASIC
CPPUNIT_TEST_SUITE_REGISTRATION( testAuthBasicUserRequest );
+#endif
+#ifdef HAVE_AUTH_MODULE_DIGEST
CPPUNIT_TEST_SUITE_REGISTRATION( testAuthDigestUserRequest );
+#endif
+#ifdef HAVE_AUTH_MODULE_NTLM
CPPUNIT_TEST_SUITE_REGISTRATION( testAuthNTLMUserRequest );
+#endif
+#ifdef HAVE_AUTH_MODULE_NEGOTIATE
CPPUNIT_TEST_SUITE_REGISTRATION( testAuthNegotiateUserRequest );
+#endif
/* Instantiate all auth framework types */
void
@@ -60,7 +68,8 @@
AuthScheme *theScheme;
if ((theScheme = AuthScheme::Find(type_str)) == NULL) {
- fatalf("Unknown authentication scheme '%s'.\n", type_str);
+ return NULL;
+ //fatalf("Unknown authentication scheme '%s'.\n", type_str);
}
config.push_back(theScheme->createConfig());
@@ -120,8 +129,16 @@
{"ntlm", ntlm_parms, 1},
{"negotiate", negotiate_parms, 1}};
- for (unsigned scheme=0; scheme < 4; scheme++)
- setup_scheme(getConfig(params[scheme].name), params[scheme].params, params[scheme].paramlength);
+ for (unsigned scheme=0; scheme < 4; scheme++) {
+ AuthConfig *schemeConfig;
+ schemeConfig = getConfig(params[scheme].name);
+ if (schemeConfig != NULL)
+ setup_scheme (schemeConfig, params[scheme].params,
+ params[scheme].paramlength);
+ else
+ fprintf(stderr,"Skipping unknown authentication scheme '%s'.\n",
+ params[scheme].name);
+ }
authenticateInit(&config);
@@ -162,6 +179,7 @@
}
}
+#ifdef HAVE_AUTH_MODULE_BASIC
#include "auth/basic/auth_basic.h"
/* AuthBasicUserRequest::AuthBasicUserRequest works
*/
@@ -185,7 +203,9 @@
CPPUNIT_ASSERT_EQUAL(0, strcmp("John", temp->username()));
delete temp;
}
+#endif /* HAVE_AUTH_MODULE_BASIC */
+#ifdef HAVE_AUTH_MODULE_DIGEST
#include "auth/digest/auth_digest.h"
/* AuthDigestUserRequest::AuthDigestUserRequest works
*/
@@ -209,7 +229,9 @@
CPPUNIT_ASSERT_EQUAL(0, strcmp("John", temp->username()));
delete temp;
}
+#endif /* HAVE_AUTH_MODULE_DIGEST */
+#ifdef HAVE_AUTH_MODULE_NTLM
#include "auth/ntlm/auth_ntlm.h"
/* AuthNTLMUserRequest::AuthNTLMUserRequest works
*/
@@ -233,7 +255,9 @@
CPPUNIT_ASSERT_EQUAL(0, strcmp("John", temp->username()));
delete temp;
}
+#endif /* HAVE_AUTH_MODULE_NTLM */
+#ifdef HAVE_AUTH_MODULE_NEGOTIATE
#include "auth/negotiate/auth_negotiate.h"
/* AuthNegotiateUserRequest::AuthNegotiateUserRequest works
*/
@@ -257,3 +281,5 @@
CPPUNIT_ASSERT_EQUAL(0, strcmp("John", temp->username()));
delete temp;
}
+
+#endif /* HAVE_AUTH_MODULE_NEGOTIATE */
diff -u -r -N squid-3.0.STABLE11/src/tests/testAuth.h squid-3.0.STABLE12/src/tests/testAuth.h
--- squid-3.0.STABLE11/src/tests/testAuth.h 2008-12-23 17:19:33.000000000 +1300
+++ squid-3.0.STABLE12/src/tests/testAuth.h 2009-01-21 14:59:09.000000000 +1300
@@ -2,6 +2,8 @@
#ifndef SQUID_SRC_TEST_AUTH_H
#define SQUID_SRC_TEST_AUTH_H
+#include "config.h"
+
#include
/*
@@ -45,6 +47,7 @@
void construction();
};
+#ifdef HAVE_AUTH_MODULE_BASIC
class testAuthBasicUserRequest : public CPPUNIT_NS::TestFixture
{
CPPUNIT_TEST_SUITE( testAuthBasicUserRequest );
@@ -58,7 +61,9 @@
void construction();
void username();
};
+#endif
+#ifdef HAVE_AUTH_MODULE_DIGEST
class testAuthDigestUserRequest : public CPPUNIT_NS::TestFixture
{
CPPUNIT_TEST_SUITE( testAuthDigestUserRequest );
@@ -72,7 +77,9 @@
void construction();
void username();
};
+#endif
+#ifdef HAVE_AUTH_MODULE_NTLM
class testAuthNTLMUserRequest : public CPPUNIT_NS::TestFixture
{
CPPUNIT_TEST_SUITE( testAuthNTLMUserRequest );
@@ -86,7 +93,9 @@
void construction();
void username();
};
+#endif
+#ifdef HAVE_AUTH_MODULE_NEGOTIATE
class testAuthNegotiateUserRequest : public CPPUNIT_NS::TestFixture
{
CPPUNIT_TEST_SUITE( testAuthNegotiateUserRequest );
@@ -100,6 +109,7 @@
void construction();
void username();
};
+#endif
#endif
diff -u -r -N squid-3.0.STABLE11/src/tests/testEvent.cc squid-3.0.STABLE12/src/tests/testEvent.cc
--- squid-3.0.STABLE11/src/tests/testEvent.cc 2008-12-23 17:19:33.000000000 +1300
+++ squid-3.0.STABLE12/src/tests/testEvent.cc 2009-01-21 14:59:09.000000000 +1300
@@ -1,4 +1,4 @@
-#include "squid.h"
+#include "config.h"
#include
#include "CapturingStoreEntry.h"
diff -u -r -N squid-3.0.STABLE11/src/tests/testEventLoop.cc squid-3.0.STABLE12/src/tests/testEventLoop.cc
--- squid-3.0.STABLE11/src/tests/testEventLoop.cc 2008-12-23 17:19:33.000000000 +1300
+++ squid-3.0.STABLE12/src/tests/testEventLoop.cc 2009-01-21 14:59:09.000000000 +1300
@@ -1,4 +1,4 @@
-#include "squid.h"
+#include "config.h"
#include
#include "AsyncEngine.h"
diff -u -r -N squid-3.0.STABLE11/src/tests/testHttpRequest.cc squid-3.0.STABLE12/src/tests/testHttpRequest.cc
--- squid-3.0.STABLE11/src/tests/testHttpRequest.cc 2008-12-23 17:19:33.000000000 +1300
+++ squid-3.0.STABLE12/src/tests/testHttpRequest.cc 2009-01-21 14:59:09.000000000 +1300
@@ -1,4 +1,4 @@
-#include "squid.h"
+#include "config.h"
#include
#include "Mem.h"
diff -u -r -N squid-3.0.STABLE11/src/tests/testString.cc squid-3.0.STABLE12/src/tests/testString.cc
--- squid-3.0.STABLE11/src/tests/testString.cc 2008-12-23 17:19:33.000000000 +1300
+++ squid-3.0.STABLE12/src/tests/testString.cc 2009-01-21 14:59:09.000000000 +1300
@@ -1,8 +1,8 @@
-#include "squid.h"
+#include "config.h"
+#include "testString.h"
#include "event.h"
#include "Mem.h"
#include "SquidString.h"
-#include "testString.h"
CPPUNIT_TEST_SUITE_REGISTRATION( testString );
diff -u -r -N squid-3.0.STABLE11/src/tests/testUfs.cc squid-3.0.STABLE12/src/tests/testUfs.cc
--- squid-3.0.STABLE11/src/tests/testUfs.cc 2008-12-23 17:19:33.000000000 +1300
+++ squid-3.0.STABLE12/src/tests/testUfs.cc 2009-01-21 14:59:09.000000000 +1300
@@ -1,4 +1,4 @@
-#include "squid.h"
+#include "config.h"
#include
#include "testUfs.h"
diff -u -r -N squid-3.0.STABLE11/src/tests/testURL.cc squid-3.0.STABLE12/src/tests/testURL.cc
--- squid-3.0.STABLE11/src/tests/testURL.cc 2008-12-23 17:19:33.000000000 +1300
+++ squid-3.0.STABLE12/src/tests/testURL.cc 2009-01-21 14:59:09.000000000 +1300
@@ -1,4 +1,4 @@
-#include "squid.h"
+#include "config.h"
#include
#include