Stable 26.3: bump to 26.3.53.4

.gitmodules

@@ -214,7 +214,7 @@
 	url = https://github.com/ClickHouse/nats.c
 [submodule "contrib/vectorscan"]
 	path = contrib/vectorscan
-	url = https://github.com/ClickHouse/vectorscan.git
+	url = https://github.com/ClickHouse/vectorscan
 [submodule "contrib/llvm-project"]
 	path = contrib/llvm-project
 	url = https://github.com/ClickHouse/llvm-project
@@ -335,10 +335,10 @@
 	url = https://github.com/ClickHouse/double-conversion.git
 [submodule "contrib/mongo-cxx-driver"]
 	path = contrib/mongo-cxx-driver
-	url = https://github.com/mongodb/mongo-cxx-driver.git
+	url = https://github.com/ClickHouse/mongo-cxx-driver.git
 [submodule "contrib/mongo-c-driver"]
 	path = contrib/mongo-c-driver
-	url = https://github.com/ClickHouse/mongo-c-driver.git
+	url = https://github.com/ClickHouse/mongo-c-driver
 [submodule "contrib/numactl"]
 	path = contrib/numactl
 	url = https://github.com/ClickHouse/numactl.git

base/poco/Foundation/include/Poco/ListMap.h

@@ -139,10 +139,21 @@ class ListMap
     /// sequentially at all times.
     /// Returns iterator pointing to the newly inserted value
     {
-        Iterator it = find(val.first);
-        while (it != _list.end() && isEqual(it->first, val.first))
-            ++it;
-        return _list.insert(it, val);
+        /// All entries with the same key sit next to each other, so the new
+        /// value belongs right after the last entry with this key. Look for
+        /// that entry starting from the back of the list. This makes adding
+        /// many values with the same key (e.g. a repeated HTTP query parameter)
+        /// cheap, because the match is usually the last element. If the key
+        /// is not in the map we still walk the whole list and append at the
+        /// end, same as before.
+        typename Container::reverse_iterator it = _list.rbegin();
+        typename Container::reverse_iterator itEnd = _list.rend();
+        for (; it != itEnd; ++it)
+        {
+            if (isEqual(it->first, val.first))
+                return _list.insert(it.base(), val);
+        }
+        return _list.insert(_list.end(), val);
     }
 
     void erase(Iterator it) { _list.erase(it); }

base/poco/NetSSL_OpenSSL/include/Poco/Net/SecureSocketImpl.h

@@ -141,6 +141,13 @@ namespace Net
         poco_socket_t sockfd();
         /// Returns the underlying socket descriptor.
 
+        SSL * ssl() const;
+        /// Returns the underlying OpenSSL SSL object, or null if the SSL handshake
+        /// has not been performed yet.
+        ///
+        /// The object is normally guarded by the socket's mutex; a caller that uses it
+        /// directly must ensure the socket is not accessed concurrently.
+
         X509 * peerCertificate() const;
         /// Returns the peer's certificate.
 
@@ -209,7 +216,7 @@ namespace Net
         /// Returns true iff the given host name is the local host
         /// (either "localhost" or "127.0.0.1").
 
-        bool mustRetry(int rc, Poco::Timespan & remaining_time);
+        bool mustRetry(int rc, int sslError, int socketError, Poco::Timespan & remaining_time);
         /// Returns true if the last operation should be retried,
         /// otherwise false.
         ///
@@ -223,7 +230,7 @@ namespace Net
         /// not become readable or writable within the sockets
         /// receive or send timeout.
 
-        int handleError(int rc);
+        int handleError(int rc, int sslError, int socketError, unsigned long errorCode);
         /// Handles an SSL error by throwing an appropriate exception.
 
         void reset();
@@ -244,6 +251,10 @@ namespace Net
         Poco::AutoPtr<SocketImpl> _pSocket;
         Context::Ptr _pContext;
         bool _needHandshake;
+        bool _fatalError;
+        bool _pendingWrite = false;
+        /// Whether the last `SSL_write` returned `SSL_ERROR_WANT_WRITE`. OpenSSL keeps that record pending
+        /// until `SSL_write` is retried, even after other operations change what `SSL_get_error` reports.
         std::string _peerHostName;
         Session::Ptr _pSession;
 
@@ -263,6 +274,12 @@ namespace Net
     }
 
 
+    inline SSL * SecureSocketImpl::ssl() const
+    {
+        return _pSSL;
+    }
+
+
     inline Context::Ptr SecureSocketImpl::context() const
     {
         return _pContext;

base/poco/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocketImpl.h

@@ -179,6 +179,10 @@ namespace Net
         Context::Ptr context() const;
         /// Returns the SSL context used by this socket.
 
+        SSL * ssl() const;
+        /// Returns the underlying OpenSSL SSL object, or null if the SSL handshake
+        /// has not been performed yet.
+
         void setLazyHandshake(bool flag = true);
         /// Enable lazy SSL handshake. If enabled, the SSL handshake
         /// will be performed the first time date is sent or
@@ -283,6 +287,12 @@ namespace Net
     }
 
 
+    inline SSL * SecureStreamSocketImpl::ssl() const
+    {
+        return _impl.ssl();
+    }
+
+
     inline Session::Ptr SecureStreamSocketImpl::currentSession()
     {
         return _impl.currentSession();