Use array specific functions

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 3580ff393ee74b0c10f21e8b63387c6ea569db55..2884c28ee79041dad3e028172930a29eb27f4b8b 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -672,8 +672,8 @@ static void cgi_php_import_environment_variables(zval *array_ptr)
 
        if (Z_TYPE(PG(http_globals)[TRACK_VARS_ENV]) == IS_ARRAY &&
                Z_ARR_P(array_ptr) != Z_ARR(PG(http_globals)[TRACK_VARS_ENV])) {
-               zval_dtor(array_ptr);
-               ZVAL_DUP(array_ptr, &PG(http_globals)[TRACK_VARS_ENV]);
+               zend_array_destroy(Z_ARR_P(array_ptr));
+               Z_ARR_P(array_ptr) = zend_array_dup(Z_ARR(PG(http_globals)[TRACK_VARS_ENV]));
                return;
        }
 

diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index 36be193048b0bb40e4e9c9261f8c695e69f62f38..8687a03c8985b6d61b6d37c669d4e46b66128d32 100644 (file)
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -568,15 +568,15 @@ void cgi_php_import_environment_variables(zval *array_ptr) /* {{{ */
                Z_ARR_P(array_ptr) != Z_ARR(PG(http_globals)[TRACK_VARS_ENV]) &&
                zend_hash_num_elements(Z_ARRVAL(PG(http_globals)[TRACK_VARS_ENV])) > 0
        ) {
-               zval_dtor(array_ptr);
-               ZVAL_DUP(array_ptr, &PG(http_globals)[TRACK_VARS_ENV]);
+               zend_array_destroy(Z_ARR_P(array_ptr));
+               Z_ARR_P(array_ptr) = zend_array_dup(Z_ARR(PG(http_globals)[TRACK_VARS_ENV]));
                return;
        } else if (Z_TYPE(PG(http_globals)[TRACK_VARS_SERVER]) == IS_ARRAY &&
                Z_ARR_P(array_ptr) != Z_ARR(PG(http_globals)[TRACK_VARS_SERVER]) &&
                zend_hash_num_elements(Z_ARRVAL(PG(http_globals)[TRACK_VARS_SERVER])) > 0
        ) {
-               zval_dtor(array_ptr);
-               ZVAL_DUP(array_ptr, &PG(http_globals)[TRACK_VARS_SERVER]);
+               zend_array_destroy(Z_ARR_P(array_ptr));
+               Z_ARR_P(array_ptr) = zend_array_dup(Z_ARR(PG(http_globals)[TRACK_VARS_SERVER]));
                return;
        }
 

diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c
index b3471ca02d12398a2ccd0b04d4b9140e062842d5..17704652d6d8be945f739666e3644c8257f37764 100644 (file)
--- a/sapi/litespeed/lsapi_main.c
+++ b/sapi/litespeed/lsapi_main.c
@@ -244,15 +244,15 @@ static void litespeed_php_import_environment_variables(zval *array_ptr)
         Z_ARR_P(array_ptr) != Z_ARR(PG(http_globals)[TRACK_VARS_ENV]) &&
         zend_hash_num_elements(Z_ARRVAL(PG(http_globals)[TRACK_VARS_ENV])) > 0
        ) {
-        zval_dtor(array_ptr);
-        ZVAL_DUP(array_ptr, &PG(http_globals)[TRACK_VARS_ENV]);
+               zend_array_destroy(Z_ARR_P(array_ptr));
+               Z_ARR_P(array_ptr) = zend_array_dup(Z_ARR(PG(http_globals)[TRACK_VARS_ENV]));
                return;
     } else if (Z_TYPE(PG(http_globals)[TRACK_VARS_SERVER]) == IS_ARRAY &&
         Z_ARR_P(array_ptr) != Z_ARR(PG(http_globals)[TRACK_VARS_SERVER]) &&
         zend_hash_num_elements(Z_ARRVAL(PG(http_globals)[TRACK_VARS_SERVER])) > 0
        ) {
-        zval_dtor(array_ptr);
-        ZVAL_DUP(array_ptr, &PG(http_globals)[TRACK_VARS_SERVER]);
+               zend_array_destroy(Z_ARR_P(array_ptr));
+               Z_ARR_P(array_ptr) = zend_array_dup(Z_ARR(PG(http_globals)[TRACK_VARS_SERVER]));
                return;
        }