6.5

diff --git a/ChangeLog b/ChangeLog
index be5136f15a5af1877e0ffeb6dfaa55a0fc666971..96e2ee5a6bd479bf1cd01395b6f227476656bfa6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Changes in squid-6.5 (5 Nov 2023):
+
+       - Bug 5309: frequent "lowestOffset () <= target_offset" assertion
+       - Bug 4977: Remove mem_hdr::freeDataUpto() assertion
+       - Fix handling of expanding HTTP header values
+       - Fix RFC 1123 date parsing
+       - Gracefully shutdown when helper process startup fails
+
 Changes in squid-6.4 (22 Oct 2023):
 
        - Regression: Restore support for legacy cache_object cache manager requests

diff --git a/configure.ac b/configure.ac
index 7bb110286992414e2e50dda24f8eeb3508c472f9..412d6b1cfe8d01f8a56b6fdfb955fd649605f1fc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-AC_INIT([Squid Web Proxy],[6.4-VCS],[https://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[6.5-VCS],[https://bugs.squid-cache.org/],[squid])
 AC_PREREQ(2.61)
 AC_CONFIG_HEADERS([include/autoconf.h])
 AC_CONFIG_AUX_DIR(cfgaux)

diff --git a/src/mem/old_api.cc b/src/mem/old_api.cc
index 2524b016d7e43c40258eb6cc9705284a173eac72..8cf5d7268bf98894881cb1f4b468a2950279cb47 100644 (file)
--- a/src/mem/old_api.cc
+++ b/src/mem/old_api.cc
@@ -414,7 +414,7 @@ memConfigure(void)
         new_pool_limit = Config.MemPools.limit;
     else {
         if (Config.MemPools.limit == 0)
-            debugs(13, DBG_IMPORTANT, "memory_pools_limit 0 has been chagned to memory_pools_limit none. Please update your config");
+            debugs(13, DBG_IMPORTANT, "memory_pools_limit 0 has been changed to memory_pools_limit none. Please update your config");
         new_pool_limit = -1;
     }