Move back to main branch of httpfs extension

.github/config/out_of_tree_extensions.cmake

@@ -18,8 +18,9 @@
 ################# HTTPFS
 duckdb_extension_load(httpfs
     GIT_URL https://github.com/duckdb/duckdb_httpfs
-    GIT_TAG 3491b7a5f7c488f79873263f34a5ba7e47f273c6
+    GIT_TAG ee6f3d2629fc95ee6c2ae4c5c6499e2d33351ebb
     INCLUDE_DIR extension/httpfs/include
+    APPLY_PATCHES
     )
 
 ################# ARROW

.github/patches/extensions/httpfs/like_fun_glob.patch

@@ -0,0 +1,44 @@
+diff --git a/extension/httpfs/hffs.cpp b/extension/httpfs/hffs.cpp
+index 2fe028d..0273141 100644
+--- a/extension/httpfs/hffs.cpp
++++ b/extension/httpfs/hffs.cpp
+@@ -7,7 +7,7 @@
+ #include "duckdb/common/types/hash.hpp"
+ #include "duckdb/main/database.hpp"
+ #include "duckdb/main/secret/secret_manager.hpp"
+-#include "duckdb/function/scalar/string_functions.hpp"
++#include "duckdb/function/scalar/string_common.hpp"
+
+ #include <chrono>
+ #include <string>
+@@ -117,7 +117,7 @@ static bool Match(vector<string>::const_iterator key, vector<string>::const_iter
+ 			}
+ 			return false;
+ 		}
+-		if (!LikeFun::Glob(key->data(), key->length(), pattern->data(), pattern->length())) {
++		if (!Glob(key->data(), key->length(), pattern->data(), pattern->length())) {
+ 			return false;
+ 		}
+ 		key++;
+diff --git a/extension/httpfs/s3fs.cpp b/extension/httpfs/s3fs.cpp
+index 01260b9..82d1eca 100644
+--- a/extension/httpfs/s3fs.cpp
++++ b/extension/httpfs/s3fs.cpp
+@@ -12,7 +12,7 @@
+ #endif
+
+ #include "duckdb/common/string_util.hpp"
+-#include "duckdb/function/scalar/string_functions.hpp"
++#include "duckdb/function/scalar/string_common.hpp"
+ #include "duckdb/main/secret/secret_manager.hpp"
+ #include "duckdb/storage/buffer_manager.hpp"
+
+@@ -869,7 +869,7 @@ static bool Match(vector<string>::const_iterator key, vector<string>::const_iter
+ 			}
+ 			return false;
+ 		}
+-		if (!LikeFun::Glob(key->data(), key->length(), pattern->data(), pattern->length())) {
++		if (!Glob(key->data(), key->length(), pattern->data(), pattern->length())) {
+ 			return false;
+ 		}
+ 		key++;