diff options
author | Bob Weinand <bobwei9@hotmail.com> | 2014-04-12 23:54:29 +0200 |
---|---|---|
committer | Bob Weinand <bobwei9@hotmail.com> | 2014-04-12 23:54:29 +0200 |
commit | 9302be375436c1b77654443406389c5976a0c20b (patch) | |
tree | ffa93146dac0c7efb1ea31bd641c584ce33c152d /main/php_variables.c | |
parent | e08172e0d592644648811e7704b1702e3a036da4 (diff) | |
parent | edd90e5ae3157cb64ebea5940574d846590b26fa (diff) | |
download | php-git-9302be375436c1b77654443406389c5976a0c20b.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
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 ddd9408bb7..01be8ca7e3 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -518,7 +518,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); |