Merge pull request #743 from crazywhalecc/feat/h3

Feature: add http/3 support to curl.

Author: henderkes

config/lib.json

@@ -86,6 +86,8 @@
             "libssh2",
             "brotli",
             "nghttp2",
+            "nghttp3",
+            "ngtcp2",
             "zstd",
             "libcares"
         ],
@@ -615,7 +617,44 @@
             "openssl"
         ],
         "lib-suggests": [
-            "libxml2"
+            "libxml2",
+            "nghttp3",
+            "ngtcp2"
+        ]
+    },
+    "nghttp3": {
+        "source": "nghttp3",
+        "static-libs-unix": [
+            "libnghttp3.a"
+        ],
+        "static-libs-windows": [
+            "nghttp3.lib"
+        ],
+        "headers": [
+            "nghttp3"
+        ],
+        "lib-depends": [
+            "openssl"
+        ],
+        "lib-suggests": [
+            "ngtcp2"
+        ]
+    },
+    "ngtcp2": {
+        "source": "ngtcp2",
+        "static-libs-unix": [
+            "libngtcp2.a",
+            "libngtcp2_crypto_ossl.a"
+        ],
+        "static-libs-windows": [
+            "ngtcp2.lib",
+            "ngtcp2_crypto_ossl.lib"
+        ],
+        "headers": [
+            "ngtcp2"
+        ],
+        "lib-depends": [
+            "openssl"
         ]
     },
     "onig": {

config/source.json

@@ -714,6 +714,26 @@
             "path": "COPYING"
         }
     },
+    "nghttp3": {
+        "type": "ghrel",
+        "repo": "ngtcp2/nghttp3",
+        "match": "nghttp3.+\\.tar\\.xz",
+        "prefer-stable": true,
+        "license": {
+            "type": "file",
+            "path": "COPYING"
+        }
+    },
+    "ngtcp2": {
+        "type": "ghrel",
+        "repo": "ngtcp2/ngtcp2",
+        "match": "ngtcp2.+\\.tar\\.xz",
+        "prefer-stable": true,
+        "license": {
+            "type": "file",
+            "path": "COPYING"
+        }
+    },
     "onig": {
         "type": "ghrel",
         "repo": "kkos/oniguruma",

docs/en/guide/extension-notes.md

@@ -6,6 +6,8 @@ which will be listed one by one here.
 
 ## curl
 
+HTTP3 support is not enabled by default, compile with `--with-libs="nghttp2,nghttp3,ngtcp2"` to enable HTTP3 support for PHP >= 8.4.
+
 When using curl to request HTTPS, there may be an `error:80000002:system library::No such file or directory` error.
 For details on the solution, see [FAQ - Unable to use ssl](../faq/#unable-to-use-ssl).
 
@@ -156,4 +158,4 @@ Parallel is only supported on PHP 8.0 ZTS and above.
 
 1. This is not technically an extension, but a library.
 2. Building with `--with-libs="mimalloc"` on Linux or macOS will override the default allocator.
-3. This is experimental for now, but is recommended in threaded environments.
+3. This is experimental for now, but is recommended in threaded environments.

docs/zh/guide/extension-notes.md

@@ -4,6 +4,8 @@
 
 ## curl
 
+HTTP3 支持默认未启用，需在编译时添加 `--with-libs="nghttp2,nghttp3,ngtcp2"` 以启用 PHP 8.4 及以上版本的 HTTP3 支持。
+
 使用 curl 请求 HTTPS 时，可能存在 `error:80000002:system library::No such file or directory` 错误，
 解决办法详见 [FAQ - 无法使用 ssl](../faq/#无法使用-ssl)。
 

src/SPC/builder/linux/LinuxBuilder.php

@@ -80,6 +80,9 @@ public function makeAutoconfArgs(string $name, array $libSpecs): string
         $ret = '';
         foreach ($libSpecs as $libName => $arr) {
             $lib = $this->getLib($libName);
+            if ($lib === null && str_starts_with($libName, 'lib')) {
+                $lib = $this->getExt(substr($libName, 3));
+            }
 
             $arr = $arr ?? [];
 

src/SPC/builder/linux/library/nghttp3.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class nghttp3 extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\nghttp3;
+
+    public const NAME = 'nghttp3';
+}

src/SPC/builder/linux/library/ngtcp2.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class ngtcp2 extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\ngtcp2;
+
+    public const NAME = 'ngtcp2';
+}

src/SPC/builder/macos/MacOSBuilder.php

@@ -55,6 +55,9 @@ public function makeAutoconfArgs(string $name, array $lib_specs): string
         $ret = '';
         foreach ($lib_specs as $libName => $arr) {
             $lib = $this->getLib($libName);
+            if ($lib === null && str_starts_with($libName, 'lib')) {
+                $lib = $this->getExt(substr($libName, 3));
+            }
 
             $arr = $arr ?? [];
 

src/SPC/builder/macos/library/nghttp3.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class nghttp3 extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\nghttp3;
+
+    public const NAME = 'nghttp3';
+}

src/SPC/builder/macos/library/ngtcp2.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class ngtcp2 extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\ngtcp2;
+
+    public const NAME = 'ngtcp2';
+}