X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-json_post;a=blobdiff_plain;f=php_json_post.c;h=77ceb8d3854fe20c208d2a3c76885223210df949;hp=f767b22b7e738513a342350bdfbda2b47414e011;hb=c1b0270e93fc2706027296233553933d03d3fd1e;hpb=98b35c8f1a7c1c1bc818ee163048a76c81dd7141

diff --git a/php_json_post.c b/php_json_post.c
index f767b22..77ceb8d 100644
--- a/php_json_post.c
+++ b/php_json_post.c
@@ -25,13 +25,15 @@
 ZEND_DECLARE_MODULE_GLOBALS(json_post);
 
 PHP_INI_BEGIN()
-    STD_PHP_INI_ENTRY("json_post.flags", "1", PHP_INI_PERDIR, OnUpdateLong, flags, zend_json_post_globals, json_post_globals)
-	STD_PHP_INI_ENTRY("json_post.error_response", "0", PHP_INI_PERDIR, OnUpdateLong, error_response, zend_json_post_globals, json_post_globals)
-	STD_PHP_INI_ENTRY("json_post.error_exit", "0", PHP_INI_PERDIR, OnUpdateBool, error_exit, zend_json_post_globals, json_post_globals)
+	STD_PHP_INI_ENTRY("json_post.flags", "1", PHP_INI_PERDIR, OnUpdateLong, flags, zend_json_post_globals, json_post_globals)
+	STD_PHP_INI_ENTRY("json_post.onerror.response", "0", PHP_INI_PERDIR, OnUpdateLong, onerror.response, zend_json_post_globals, json_post_globals)
+	STD_PHP_INI_ENTRY("json_post.onerror.exit", "0", PHP_INI_PERDIR, OnUpdateBool, onerror.exit, zend_json_post_globals, json_post_globals)
+	STD_PHP_INI_ENTRY("json_post.onerror.warning", "0", PHP_INI_PERDIR, OnUpdateBool, onerror.warning, zend_json_post_globals, json_post_globals)
 PHP_INI_END()
 
 static void php_json_post_init_globals(zend_json_post_globals *json_post_globals)
 {
+	memset(json_post_globals, 0, sizeof(*json_post_globals));
 #if PHP_VERSION_ID >= 50400
 	json_post_globals->flags = PHP_JSON_OBJECT_AS_ARRAY;
 #else
@@ -39,21 +41,12 @@ static void php_json_post_init_globals(zend_json_post_globals *json_post_globals
 #endif
 }
 
-#if PHP_VERSION_ID < 70000
-ZEND_EXTERN_MODULE_GLOBALS(json);
-static inline void zend_print_long_to_buf(char *p, long l) {
-	do {
-		*--p = (char) (l % 10) + '0';
-	} while (l /= 10);
-}
-#endif
-
 #ifndef TSRMLS_CC
+#	define TSRMLS_D
 #	define TSRMLS_C
 #	define TSRMLS_CC
 #endif
 
-
 PHP_MINFO_FUNCTION(json_post)
 {
 	php_info_print_table_start();
@@ -63,8 +56,19 @@ PHP_MINFO_FUNCTION(json_post)
 	DISPLAY_INI_ENTRIES();
 }
 
+#if PHP_VERSION_ID < 70000
+#	undef JSON_G
+#	ifdef ZTS
+#		define JSON_G(v) TSRMG(JSON_POST_G(json_module)->globals_id_ptr, zend_json_globals *, v)
+#	else
+#		define JSON_G(v) ((zend_json_globals *) JSON_POST_G(json_module)->globals_ptr)->v
+#	endif
+#endif
+
 static SAPI_POST_HANDLER_FUNC(php_json_post_handler)
 {
+	int module_number = 0;
+
 #if PHP_VERSION_ID >= 70000
 	zend_string *json = NULL;
 
@@ -150,17 +154,23 @@ static SAPI_POST_HANDLER_FUNC(php_json_post_handler)
 #	endif
 #endif
 
+	REGISTER_LONG_CONSTANT("JSON_POST_ERROR", JSON_G(error_code), CONST_CS);
+
 	if (JSON_G(error_code)) {
-		if (JSON_POST_G(error_response)) {
-			char header[] = "X-JSON-Error-Code:   ";
-			zend_print_long_to_buf(header + sizeof(header) - 1, (JSON_G(error_code) & 0xff));
-			sapi_header_op(SAPI_HEADER_SET_STATUS, (void *) (long) JSON_POST_G(error_response) TSRMLS_CC);
-			sapi_add_header(header, sizeof(header)-1, 1);
+		if (JSON_POST_G(onerror.response)) {
+			sapi_header_op(SAPI_HEADER_SET_STATUS, (void *) (zend_long) JSON_POST_G(onerror.response) TSRMLS_CC);
 		}
-		if (JSON_POST_G(error_exit)) {
+		if (JSON_POST_G(onerror.warning)) {
+			zend_error(E_WARNING, "json_post: json_decode failed with error code: %d", JSON_G(error_code));
+		}
+		if (JSON_POST_G(onerror.exit)) {
 			sapi_send_headers(TSRMLS_C);
 			zend_bailout();
 		}
+#if PHP_VERSION_ID >= 70000 && PHP_VERSION_ID < 80000
+		/* ext/json in PHP-7 fails to reset error_code in RINIT */
+		JSON_G(error_code) = 0;
+#endif
 	}
 }
 
@@ -175,6 +185,11 @@ PHP_MINIT_FUNCTION(json_post)
 	sapi_register_post_entries(json_post_entries TSRMLS_CC);
 
 	ZEND_INIT_MODULE_GLOBALS(json_post, php_json_post_init_globals, NULL);
+
+#if PHP_VERSION_ID < 70000
+	zend_hash_find(&module_registry, ZEND_STRS("json"), (void **) &JSON_POST_G(json_module));
+#endif
+
 	REGISTER_INI_ENTRIES();
 	return SUCCESS;
 }