diff options
| author | Remi Collet <remi@remirepo.net> | 2020-10-15 07:50:52 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-10-15 07:50:52 +0200 |
| commit | 6e3ef0c458738caf7419171b4bcc25823b55db49 (patch) | |
| tree | 19df0ea12f5617d771f2842772c572a866421d4a /3713.patch | |
| parent | 930830304c4a7f05d7f4d4ec25cd83cd44b0eb9b (diff) | |
update to 4.5.5
drop patches merged upstream
Diffstat (limited to '3713.patch')
| -rw-r--r-- | 3713.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/3713.patch b/3713.patch deleted file mode 100644 index 87961db..0000000 --- a/3713.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c7c83174a0bdf01ce202afaccb1eff45717ca427 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Wed, 30 Sep 2020 11:35:59 +0200 -Subject: [PATCH] fix for 8.0.0RC1 - ---- - php_swoole.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/php_swoole.h b/php_swoole.h -index 35be68aae7..be7d2385dd 100644 ---- a/php_swoole.h -+++ b/php_swoole.h -@@ -1129,8 +1129,16 @@ static sw_inline char* php_swoole_url_encode(const char *value, size_t value_len - - static sw_inline char* php_swoole_http_build_query(zval *zdata, size_t *length, smart_str *formstr) - { -+#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 -+ 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 -+ { -+#endif - if (formstr->s) - { - smart_str_free(formstr); |