From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 24 Jul 2015 07:57:36 +0000 (+0200)
Subject: Fix: json_post.flags=2 ignored with php7
X-Git-Tag: v1.0.1~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=e54f65df2bcb68b4493832c83c141da9f579964e;p=m6w6%2Fext-json_post

Fix: json_post.flags=2 ignored with php7

Detected on 32bits build, where 003.phpt is failing
(not detected on 64bits, because not covered)
---

diff --git a/package.xml b/package.xml
index 22f0d57..dff97b9 100644
--- a/package.xml
+++ b/package.xml
@@ -51,6 +51,7 @@ This extension does not provide any constants, functions or classes.
      <file role="test" name="001.phpt"/>
      <file role="test" name="002.phpt"/>
      <file role="test" name="003.phpt"/>
+     <file role="test" name="004.phpt"/>
      <file role="test" name="application.phpt"/>
    </dir>
   </dir>
diff --git a/php_json_post.c b/php_json_post.c
index fd3165c..4a0fcd3 100644
--- a/php_json_post.c
+++ b/php_json_post.c
@@ -63,7 +63,7 @@ static SAPI_POST_HANDLER_FUNC(php_json_post_handler)
 
 			ZVAL_NULL(&tmp);
 
-			php_json_decode(&tmp, json->val, json->len, JSON_POST_G(flags), PG(max_input_nesting_level));
+			php_json_decode_ex(&tmp, json->val, json->len, JSON_POST_G(flags), PG(max_input_nesting_level));
 
 			switch (Z_TYPE(tmp)) {
 			case IS_OBJECT: