fix master

[m6w6/ext-json_post] / php_json_post.c

diff --git a/php_json_post.c b/php_json_post.c
index fd3165cf182633176106d64f8ee5603db69f8154..d9b72957726301f2eaf256fa75699a711570b149 100644 (file)
--- 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:
@@ -136,6 +136,9 @@ PHP_MINIT_FUNCTION(json_post)
                { NULL, 0, NULL, NULL }
        };
 
+#ifndef TSRMLS_CC
+#      define TSRMLS_CC
+#endif
        sapi_register_post_entries(json_post_entries TSRMLS_CC);
 
        ZEND_INIT_MODULE_GLOBALS(json_post, php_json_post_init_globals, NULL);