From aff4973f331104c00c67cc29c1fd48ffc150a522 Mon Sep 17 00:00:00 2001 From: wukezhan Date: Tue, 8 Mar 2016 23:45:36 +0800 Subject: [PATCH] replace merge with replace --- src/air_config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/air_config.c b/src/air_config.c index e196f13..8c10af8 100644 --- a/src/air_config.c +++ b/src/air_config.c @@ -184,7 +184,7 @@ PHP_METHOD(air_config, set) { return ; } zval *origin_data = air_config_get_data(TSRMLS_CC); - php_array_merge(Z_ARRVAL_P(origin_data), Z_ARRVAL_P(data), 1 TSRMLS_CC); + php_array_replace_recursive(Z_ARRVAL_P(origin_data), Z_ARRVAL_P(data) TSRMLS_CC); } /* }}} */