add master to the test matrix

[m6w6/ext-json_post] / php_json_post.c

diff --git a/php_json_post.c b/php_json_post.c
index 6bc8c333a92324dce45e9e11ce0973ce5ba834d2..4a0fcd30387a1d9346461aa53343e017a2e6e76b 100644 (file)
--- a/php_json_post.c
+++ b/php_json_post.c
@@ -30,7 +30,11 @@ PHP_INI_END()
 
 static void php_json_post_init_globals(zend_json_post_globals *json_post_globals)
 {
+#if PHP_VERSION_ID >= 50400
        json_post_globals->flags = PHP_JSON_OBJECT_AS_ARRAY;
+#else
+       json_post_globals->flags = 1;
+#endif
 }
 
 PHP_MINFO_FUNCTION(json_post)
@@ -42,50 +46,97 @@ PHP_MINFO_FUNCTION(json_post)
        DISPLAY_INI_ENTRIES();
 }
 
+#if PHP_VERSION_ID >= 70000
 static SAPI_POST_HANDLER_FUNC(php_json_post_handler)
 {
-       zval *zarg = arg;
-       char *json_str = NULL;
-       size_t json_len = 0;
+       zend_string *json = NULL;
 
-#if PHP_VERSION_ID >= 50600
        if (SG(request_info).request_body) {
                /* FG(stream_wrappers) not initialized yet, so we cannot use php://input */
                php_stream_rewind(SG(request_info).request_body);
-               json_len = php_stream_copy_to_mem(SG(request_info).request_body, &json_str, PHP_STREAM_COPY_ALL, 0);
+               json = php_stream_copy_to_mem(SG(request_info).request_body, PHP_STREAM_COPY_ALL, 0);
        }
+
+       if (json) {
+               if (json->len) {
+                       zval tmp;
+
+                       ZVAL_NULL(&tmp);
+
+                       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:
+                       case IS_ARRAY:
+                               zval_dtor(arg);
+                               ZVAL_COPY_VALUE(&PG(http_globals)[TRACK_VARS_POST], &tmp);
+                               break;
+                       default:
+                               break;
+                       }
+               }
+               zend_string_release(json);
+       }
+}
+
 #else
+
+static SAPI_POST_HANDLER_FUNC(php_json_post_handler)
+{
+       zval *zarg = arg;
+       char *json_str = NULL;
+       size_t json_len = 0;
+
+#      if PHP_VERSION_ID >= 50600
+       if (!SG(request_info).request_body) {
+               return;
+       }
+
+       /* FG(stream_wrappers) not initialized yet, so we cannot use php://input */
+       php_stream_rewind(SG(request_info).request_body);
+       json_len = php_stream_copy_to_mem(SG(request_info).request_body, &json_str, PHP_STREAM_COPY_ALL, 0);
+#      else
        json_str = SG(request_info).raw_post_data;
        json_len = SG(request_info).raw_post_data_length;
-#endif
+#      endif
 
        if (json_len) {
                zval zjson;
 
                INIT_ZVAL(zjson);
+
+#      if PHP_VERSION_ID >= 50400
                php_json_decode_ex(&zjson, json_str, json_len, JSON_POST_G(flags), PG(max_input_nesting_level) TSRMLS_CC);
-                       if (Z_TYPE(zjson) != IS_NULL) {
+               if (Z_TYPE(zjson) != IS_NULL) {
                        zval_dtor(zarg);
                        ZVAL_COPY_VALUE(zarg, (&zjson));
+#      else
+               php_json_decode(&zjson, json_str, json_len, (zend_bool)(JSON_POST_G(flags)&1), PG(max_input_nesting_level) TSRMLS_CC);
+               if (Z_TYPE(zjson) != IS_NULL) {
+                       zval_dtor(zarg);
+                       zarg->value = zjson.value;
+                       Z_TYPE_P(zarg) = Z_TYPE(zjson);
+#      endif
                }
        }
-#if PHP_VERSION_ID >= 50600
+#      if PHP_VERSION_ID >= 50600
        if (json_str) {
                efree(json_str);
        }
-#endif
+#      endif
 }
 
+#endif
+
 PHP_MINIT_FUNCTION(json_post)
 {
-       sapi_post_entry entry = {NULL, 0, NULL, NULL};
-
-       entry.post_reader = sapi_read_standard_form_data;
-       entry.post_handler = php_json_post_handler;
+       sapi_post_entry json_post_entries[] = {
+               { "text/json", sizeof("text/json")-1, sapi_read_standard_form_data, php_json_post_handler },
+               { "application/json", sizeof("application/json")-1, sapi_read_standard_form_data, php_json_post_handler },
+               { NULL, 0, NULL, NULL }
+       };
 
-       entry.content_type = "text/json";
-       entry.content_type_len = sizeof("text/json")-1;
-       sapi_register_post_entry(&entry TSRMLS_CC);
+       sapi_register_post_entries(json_post_entries TSRMLS_CC);
 
        ZEND_INIT_MODULE_GLOBALS(json_post, php_json_post_init_globals, NULL);
        REGISTER_INI_ENTRIES();