X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_env.c;h=ee7d27fe3277e739baf4643450efb05b6b5a9f06;hp=4f239e509360aad962fcf129884701c85862d166;hb=f753226f1f45e10ef3916256ec1bc0416c8644a8;hpb=eba42bcdd8a59dacc713f04e68d6293ab52861c6

diff --git a/php_http_env.c b/php_http_env.c
index 4f239e5..ee7d27f 100644
--- a/php_http_env.c
+++ b/php_http_env.c
@@ -741,13 +741,6 @@ PHP_HTTP_BEGIN_ARGS(negotiate, 2)
 	PHP_HTTP_ARG_VAL(result_array, 1)
 PHP_HTTP_END_ARGS;
 
-PHP_HTTP_EMPTY_ARGS(statPersistentHandles);
-
-PHP_HTTP_BEGIN_ARGS(cleanPersistentHandles, 0)
-	PHP_HTTP_ARG_VAL(name, 0)
-	PHP_HTTP_ARG_VAL(ident, 0)
-PHP_HTTP_END_ARGS;
-
 static zend_class_entry *php_http_env_class_entry;
 
 zend_class_entry *php_http_env_get_class_entry(void)
@@ -773,9 +766,6 @@ static zend_function_entry php_http_env_method_entry[] = {
 	PHP_HTTP_ENV_ME(negotiateCharset)
 	PHP_HTTP_ENV_ME(negotiate)
 
-	PHP_HTTP_ENV_ME(statPersistentHandles)
-	PHP_HTTP_ENV_ME(cleanPersistentHandles)
-
 	EMPTY_FUNCTION_ENTRY
 };
 
@@ -991,37 +981,19 @@ PHP_METHOD(HttpEnv, negotiate)
 	}
 }
 
-PHP_METHOD(HttpEnv, statPersistentHandles)
-{
-	if (SUCCESS == zend_parse_parameters_none()) {
-		object_init(return_value);
-		if (php_http_persistent_handle_statall(HASH_OF(return_value) TSRMLS_CC)) {
-			return;
-		}
-		zval_dtor(return_value);
-	}
-	RETURN_FALSE;
-}
-
-PHP_METHOD(HttpEnv, cleanPersistentHandles)
-{
-	char *name_str = NULL, *ident_str = NULL;
-	int name_len = 0, ident_len = 0;
-
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!", &name_str, &name_len, &ident_str, &ident_len)) {
-		php_http_persistent_handle_cleanup(name_str, name_len, ident_str, ident_len TSRMLS_CC);
-	}
-}
-
 #ifdef PHP_HTTP_HAVE_JSON
 #include "ext/json/php_json.h"
 
 static SAPI_POST_HANDLER_FUNC(php_http_json_post_handler)
 {
 	if (SG(request_info).raw_post_data) {
-		zval_dtor(arg);
-		((zval *) arg)->type = IS_NULL;
-		php_json_decode(arg, SG(request_info).raw_post_data, SG(request_info).raw_post_data_length, 1, PG(max_input_nesting_level) TSRMLS_CC);
+		zval *zarg = arg;
+		zval_dtor(zarg);
+		ZVAL_NULL(zarg);
+		php_json_decode(zarg, SG(request_info).raw_post_data, SG(request_info).raw_post_data_length, 1, PG(max_input_nesting_level) TSRMLS_CC);
+		if (Z_TYPE_P(zarg) == IS_NULL) {
+			array_init(zarg);
+		}
 	}
 }