Implement new Curl URL Api

Author: adoy

ext/curl/config.m4

@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
     $CURL_LIBS
   ])
 
-  PHP_NEW_EXTENSION(curl, interface.c multi.c share.c curl_file.c, $ext_shared)
+  PHP_NEW_EXTENSION(curl, interface.c multi.c share.c curl_file.c url.c, $ext_shared)
   PHP_INSTALL_HEADERS([ext/curl], [php_curl.h])
   PHP_SUBST(CURL_SHARED_LIBADD)
 fi

ext/curl/config.w32

@@ -26,7 +26,7 @@ if (PHP_CURL != "no") {
 			CHECK_LIB("libssh2.lib", "curl", PHP_CURL) &&
 			CHECK_LIB("nghttp2.lib", "curl", PHP_CURL))
 		) {
-		EXTENSION("curl", "interface.c multi.c share.c curl_file.c");
+		EXTENSION("curl", "interface.c multi.c share.c curl_file.c url.c");
 		AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');
 		ADD_FLAG("CFLAGS_CURL", "/D CURL_STATICLIB /D PHP_CURL_EXPORTS=1");
 		PHP_INSTALL_HEADERS("ext/curl", "php_curl.h");

ext/curl/curl.stub.php

@@ -26,6 +26,17 @@ final class CurlShareHandle
 {
 }
 
+#if LIBCURL_VERSION_NUM >= 0x073E00 /* Available since 7.62.0 */
+/**
+ * @strict-properties
+ * @not-serializable
+ */
+final class CurlUrl implements Stringable
+{
+    public function __toString(): string {}
+}
+#endif
+
 function curl_close(CurlHandle $handle): void {}
 
 /** @refcount 1 */
@@ -109,6 +120,20 @@ function curl_share_strerror(int $error_code): ?string {}
 /** @refcount 1 */
 function curl_strerror(int $error_code): ?string {}
 
+#if LIBCURL_VERSION_NUM >= 0x073E00 /* Available since 7.62.0 */
+function curl_url(?string $url = null): CurlUrl|false {}
+
+function curl_url_set(CurlUrl $url, int $part, string $content, int $flags = 0): bool {}
+
+function curl_url_get(CurlUrl $url, int $part, int $flags = 0): string|false {}
+
+function curl_url_errno(CurlUrl $url): int {}
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x075000 /* Available since 7.80.0 */
+function curl_url_strerror(int $error_code): ?string {}
+#endif
+
 /**
  * @return array<string, int|string|array>|false
  * @refcount 1

ext/curl/curl_arginfo.h

@@ -110,6 +110,9 @@ typedef struct {
 	zval private_data;
 	/* CurlShareHandle object set using CURLOPT_SHARE. */
 	struct _php_curlsh *share;
+#if LIBCURL_VERSION_NUM >= 0x073f00 /* 7.63.0 */
+	struct _php_curlurl *url;
+#endif
 	zend_object                   std;
 } php_curl;
 
@@ -137,6 +140,16 @@ typedef struct _php_curlsh {
 	zend_object std;
 } php_curlsh;
 
+#if LIBCURL_VERSION_NUM >= 0x073e00 /* 7.62.0 */
+typedef struct _php_curlurl {
+	CURLU *url;
+	struct {
+		int no;
+	} err;
+	zend_object std;
+} php_curlurl;
+#endif
+
 php_curl *init_curl_handle_into_zval(zval *curl);
 void init_curl_handle(php_curl *ch);
 void _php_curl_cleanup_handle(php_curl *);
@@ -156,8 +169,19 @@ static inline php_curlsh *curl_share_from_obj(zend_object *obj) {
 
 #define Z_CURL_SHARE_P(zv) curl_share_from_obj(Z_OBJ_P(zv))
 
+#if LIBCURL_VERSION_NUM >= 0x073e00 /* 7.62.0 */
+static inline php_curlurl *curl_url_from_obj(zend_object *obj) {
+    return (php_curlurl *)((char *)(obj) - XtOffsetOf(php_curlurl, std));
+}
+
+#define Z_CURL_URL_P(zv) curl_url_from_obj(Z_OBJ_P(zv))
+#endif
+
 void curl_multi_register_handlers(void);
 void curl_share_register_handlers(void);
+#if LIBCURL_VERSION_NUM >= 0x073e00 /* 7.62.0 */
+void curl_url_register_handlers(void);
+#endif
 void curlfile_register_class(void);
 int curl_cast_object(zend_object *obj, zval *result, int type);