diff -ruN squid-2.5.STABLE10-RC3/ChangeLog squid-2.5.STABLE10/ChangeLog
--- squid-2.5.STABLE10-RC3/ChangeLog Tue May 10 06:15:04 2005
+++ squid-2.5.STABLE10/ChangeLog Mon May 16 16:38:57 2005
@@ -1,4 +1,4 @@
-Changes to squid-2.5.STABLE10 (not yet released)
+Changes to squid-2.5.STABLE10 (17 May 2005)
- [Minor Security] Fix race condition in relation to old Netscape
Set-Cookie specifications
diff -ruN squid-2.5.STABLE10-RC3/RELEASENOTES.html squid-2.5.STABLE10/RELEASENOTES.html
--- squid-2.5.STABLE10-RC3/RELEASENOTES.html Wed May 11 08:42:41 2005
+++ squid-2.5.STABLE10/RELEASENOTES.html Mon May 16 16:41:25 2005
@@ -7,7 +7,7 @@
Squid 2.5 release notes
-Squid Developers
$Id: release-2.5.html,v 1.1.2.51 2005/05/10 12:15:04 hno Exp $
+Squid Developers
$Id: release-2.5.html,v 1.1.2.54 2005/05/11 15:00:58 hno Exp $
This document contains the release notes for version 2.5 of Squid.
Squid is a WWW Cache application developed by the National Laboratory
@@ -401,14 +401,14 @@
Support for proxying huge objects greater than 2GB in size
IP-Filter 4.0 support in --enable-ipf-transparent
cachemgr.cgi now uses a configuration controlling which servers
-may be managed. This to prevent abuse of the program. See >prefix</etc/cachemgr.conf
+may be managed. This to prevent abuse of the program. See <prefix>/etc/cachemgr.conf
for details. The configuration is read first from the current directory
-(normally where you installed cachemgr.cgi) and if not found there from
-The internal DNS client has been hardened against spoofing of DNS
-responses.
->prefix</etc/cachemgr.conf. If neither is found only access
+(normally where you installed cachemgr.cgi) and if not found there from
+<prefix>/etc/cachemgr.conf. If neither is found only access
to localhost and the full server name is provided, or the cachemgr default
host if specified to configure.
+The internal DNS client has been hardened against spoofing of DNS
+responses.
The SNMP agent now supports the use of SNMPv2, and has a few
other related minor bugfixes.
a number of other minor and cosmetic bugfixes. See the list of
diff -ruN squid-2.5.STABLE10-RC3/configure squid-2.5.STABLE10/configure
--- squid-2.5.STABLE10-RC3/configure Wed May 11 08:42:32 2005
+++ squid-2.5.STABLE10/configure Mon May 16 16:41:14 2005
@@ -1022,7 +1022,7 @@
# Define the identity of the package.
PACKAGE=squid
-VERSION=2.5.STABLE10-RC3
+VERSION=2.5.STABLE10
cat >> confdefs.h <&6
echo "configure:1079: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
diff -ruN squid-2.5.STABLE10-RC3/configure.in squid-2.5.STABLE10/configure.in
--- squid-2.5.STABLE10-RC3/configure.in Wed May 11 08:42:32 2005
+++ squid-2.5.STABLE10/configure.in Mon May 16 16:41:14 2005
@@ -3,15 +3,15 @@
dnl
dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
dnl
-dnl $Id: configure.in,v 1.251.2.91 2005/05/11 13:32:47 hno Exp $
+dnl $Id: configure.in,v 1.251.2.92 2005/05/16 22:38:57 hno Exp $
dnl
dnl
dnl
AC_INIT(src/main.c)
AC_CONFIG_AUX_DIR(cfgaux)
-AM_INIT_AUTOMAKE(squid, 2.5.STABLE10-RC3)
+AM_INIT_AUTOMAKE(squid, 2.5.STABLE10)
AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.251.2.91 $)dnl
+AC_REVISION($Revision: 1.251.2.92 $)dnl
AC_PREFIX_DEFAULT(/usr/local/squid)
AM_MAINTAINER_MODE
diff -ruN squid-2.5.STABLE10-RC3/include/version.h squid-2.5.STABLE10/include/version.h
--- squid-2.5.STABLE10-RC3/include/version.h Wed May 11 08:42:32 2005
+++ squid-2.5.STABLE10/include/version.h Mon May 16 16:41:14 2005
@@ -9,5 +9,5 @@
*/
#ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 1115822549
+#define SQUID_RELEASE_TIME 1116283270
#endif
diff -ruN squid-2.5.STABLE10-RC3/src/dns_internal.c squid-2.5.STABLE10/src/dns_internal.c
--- squid-2.5.STABLE10-RC3/src/dns_internal.c Tue May 10 10:06:56 2005
+++ squid-2.5.STABLE10/src/dns_internal.c Wed May 11 13:18:47 2005
@@ -1,6 +1,6 @@
/*
- * $Id: dns_internal.c,v 1.45.2.8 2005/05/10 16:06:56 wessels Exp $
+ * $Id: dns_internal.c,v 1.45.2.9 2005/05/11 19:18:47 hno Exp $
*
* DEBUG: section 78 DNS lookups; interacts with lib/rfc1035.c
* AUTHOR: Duane Wessels
@@ -451,11 +451,13 @@
while (idnsFindQuery(id)) {
id++;
- if (id == first_id)
+ if (id == first_id) {
+ debug(78, 1) ("idnsQueryID: Warning, too many pending DNS requests\n");
break;
+ }
}
- return squid_random() & 0xFFFF;
+ return id;
}