diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-04-12 23:54:57 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-04-12 23:54:57 +0200 |
| commit | 53b1dce587e73bd445d4b2fc35c196d2d20741dd (patch) | |
| tree | aafe05fe3085a6625370eb62a566d6c256ce42a3 /main/php_variables.c | |
| parent | 096e40a027eb3df6364c3674660b8c9592e1f1b6 (diff) | |
| parent | 9302be375436c1b77654443406389c5976a0c20b (diff) | |
| download | php-git-53b1dce587e73bd445d4b2fc35c196d2d20741dd.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
Diffstat (limited to 'main/php_variables.c')
| -rw-r--r-- | main/php_variables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/php_variables.c b/main/php_variables.c index f529898bf0..d1e51b9023 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -593,7 +593,7 @@ static void php_build_argv(char *s, zval *track_vars_array TSRMLS_DC) Z_ADDREF_P(arr); Z_ADDREF_P(argc); zend_hash_update(&EG(symbol_table), "argv", sizeof("argv"), &arr, sizeof(zval *), NULL); - zend_hash_add(&EG(symbol_table), "argc", sizeof("argc"), &argc, sizeof(zval *), NULL); + zend_hash_update(&EG(symbol_table), "argc", sizeof("argc"), &argc, sizeof(zval *), NULL); } if (track_vars_array) { Z_ADDREF_P(arr); |