diff options
| author | Remi Collet <remi@remirepo.net> | 2023-11-08 13:43:21 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2023-11-08 13:43:21 +0100 |
| commit | fb12e02e68457a8d466639290675e00b5817b01a (patch) | |
| tree | 7c22bf6da4bceff2a9fd435203d87a92ab749150 /openswoole-php83.patch | |
| parent | b8766f3b78bc9a0cc00a035b87d255a85eaeb132 (diff) | |
update to 22.1.0
drop patches merged upstream
raise dependency on PHP 8.1
Diffstat (limited to 'openswoole-php83.patch')
| -rw-r--r-- | openswoole-php83.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/openswoole-php83.patch b/openswoole-php83.patch deleted file mode 100644 index cfc37e2..0000000 --- a/openswoole-php83.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7aef32c30f37b9278ab86a0f0b64c0e740a6d06e Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Mon, 4 Sep 2023 08:36:21 +0200 -Subject: [PATCH] fix php_url_encode_hash_ex call for 8.3 - ---- - ext-src/php_swoole_private.h | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/ext-src/php_swoole_private.h b/ext-src/php_swoole_private.h -index 08053f6c9..7bcfaaa84 100644 ---- a/ext-src/php_swoole_private.h -+++ b/ext-src/php_swoole_private.h -@@ -1041,10 +1041,14 @@ static sw_inline char *php_swoole_http_build_query(zval *zdata, size_t *length, - #if PHP_VERSION_ID < 80000 - if (php_url_encode_hash_ex( - HASH_OF(zdata), formstr, NULL, 0, NULL, 0, NULL, 0, NULL, NULL, (int) PHP_QUERY_RFC1738) == FAILURE) { --#else -+#elif PHP_VERSION_ID < 80300 - if (HASH_OF(zdata)) { - php_url_encode_hash_ex(HASH_OF(zdata), formstr, NULL, 0, NULL, 0, NULL, 0, NULL, NULL, (int) PHP_QUERY_RFC1738); - } else { -+#else -+ if (HASH_OF(zdata)) { -+ php_url_encode_hash_ex(HASH_OF(zdata), formstr, NULL, NULL, NULL, NULL, NULL, (int) PHP_QUERY_RFC1738); -+ } else { - #endif - if (formstr->s) { - smart_str_free(formstr); |