com php-src: Use array specific functions: sapi/cgi/cgi_main .c sapi/fpm/fpm/fpm_main.c sapi/litespeed/lsapi_mai n.c
| From: | Dmitry Stogov | Date: | Thu, 07 Dec 2017 12:20:17 +0000 |
| Subject: | com php-src: Use array specific functions: sapi/cgi/cgi_main .c sapi/fpm/fpm/fpm_main.c sapi/litespeed/lsapi_mai n.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-100521@lists.php.net to get a copy of this message | ||
Commit: c890d469fab27500f0fa1070dccb16b36aa8be76
Author: Dmitry Stogov <dmitry@zend.com> Thu, 7 Dec 2017 15:20:17 +0300
Parents: 747a5928ad46470ce84688f5b5a8d52fdff42e39
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c890d469fab27500f0fa1070dccb16b36aa8be76
Log:
Use array specific functions
Changed paths:
M sapi/cgi/cgi_main.c
M sapi/fpm/fpm/fpm_main.c
M sapi/litespeed/lsapi_main.c
Diff:
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 3580ff3..2884c28 100644
--- 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 36be193..8687a03 100644
--- 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 b3471ca..1770465 100644
--- 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;
}