From: squidadm <squidadm@users.noreply.github.com>
Date: Sun, 3 Sep 2023 06:17:45 +0000 (+1200)
Subject: 6.3 (#1467)
X-Git-Tag: SQUID_6_3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9c06aa6a9b001fa816b1669571f8d47e18fbb3f;p=thirdparty%2Fsquid.git

6.3 (#1467)

Reference point for automated CONTRIBUTORS updates
---

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 815f0c37cc..c756a70d78 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -46,6 +46,7 @@ Thank you!
     Andrew Doran <ad@interlude.eu.org>
     Andrew Evdokimov <ae@elahi.ru>
     Andrew Hoying <andrew_hoying@blm.gov>
+    Andrew Novikov <as.asaw@gmail.com>
     Andrew Tridgell
     Andrey <rybakovandrey85@gmail.com>
     Andrey Shorin <tolsty@tushino.com>
@@ -143,6 +144,7 @@ Thank you!
     Edward Chernenko <edwardspec@gmail.com>
     Edward Moy <moy@parc.xerox.com>
     Egervary Gergely <gergely@egervary.hu>
+    Egor Ignatov <master.egor.ignatov@gmail.com>
     Eldar Akchurin <al.akchurin@googlemail.com>
     Eliezer Croitoru <eliezer@ngtech.co.il>
     Elmar Vonlanthen <Elmar.Vonlanthen@united-security-providers.ch>
@@ -457,6 +459,7 @@ Thank you!
     Sergio Durigan Junior <sergiodj@sergiodj.net>
     Sergio Rabellino <rabellino@di.unito.it>
     Shigechika Aikawa <shige@luck.imasy.or.jp>
+    Shmaya <34206053+ShmayaFrankel@users.noreply.github.com>
     Silamael <Silamael@coronamundi.de>
     Simon Deziel
     squidcontrib <56416132+squidcontrib@users.noreply.github.com>
diff --git a/ChangeLog b/ChangeLog
index 6c00799ef2..1e389058a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
-Changes in squid-6.3 (some time in September 2023):
+Changes in squid-6.3 (03 Sep 2023):
 
+	- Bug 5294: ERR_CANNOT_FORWARD returned instead of ERR_DNS_FAIL
+	- Bug 4981: Work around in-call job invalidation bugs
+	- basic_smb_lm_auth: fix 'no previous declaration' warnings
+	- CacheManager: require /squid-internal-mgr/ URL path prefix
 	- ESI: Fix build [-Wsingle-bit-bitfield-constant-conversion]
-	- ... and documentation updates
+	- ... and some documentation changes
 
 Changes in squid-6.2 (06 Aug 2023):
 
diff --git a/configure.ac b/configure.ac
index 043db32a00..4938e43ce6 100644
--- 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.2-VCS],[https://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[6.3-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/tests/testCacheManager.cc b/src/tests/testCacheManager.cc
index 424aabf860..a9f7ee1883 100644
--- a/src/tests/testCacheManager.cc
+++ b/src/tests/testCacheManager.cc
@@ -37,7 +37,7 @@ CacheManagerInternals::testValidUrl(const AnyP::Uri &url)
         (void)ParseUrl(url);
     } catch (...) {
         std::cerr << "\nFAIL: " << url <<
-            Debug::Extra << "error: " << CurrentException << "\n";
+                  Debug::Extra << "error: " << CurrentException << "\n";
         CPPUNIT_FAIL("rejected a valid URL");
     }
 }
@@ -48,7 +48,7 @@ CacheManagerInternals::testInvalidUrl(const AnyP::Uri &url, const char *const pr
     try {
         (void)ParseUrl(url);
         std::cerr << "\nFAIL: " << url <<
-            Debug::Extra << "error: should be rejected due to '" << problem << "'\n";
+                  Debug::Extra << "error: should be rejected due to '" << problem << "'\n";
     } catch (const TextException &) {
         return; // success -- the parser signaled bad input
     }