summaryrefslogtreecommitdiffstats
path: root/3713.patch
blob: 87961dba813fd7f46d0d9645b280b5e56411f611 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
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);