summaryrefslogtreecommitdiff
path: root/main/php_variables.c
diff options
context:
space:
mode:
Diffstat (limited to 'main/php_variables.c')
-rw-r--r--main/php_variables.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/php_variables.c b/main/php_variables.c
index 8e2bb87f30..2bfe566a1a 100644
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -639,7 +639,7 @@ static void php_build_argv(char *s, zval *track_vars_array TSRMLS_DC)
int count = 0;
char *ss, *space;
- if (!(SG(request_info).argc || track_vars_array)) {
+ if (!(SG(request_info).argc || (s && *s))) {
return;
}
@@ -696,7 +696,7 @@ static void php_build_argv(char *s, zval *track_vars_array TSRMLS_DC)
argc->is_ref = 0;
argc->refcount = 0;
- if (SG(request_info).argc) {
+ if (Z_LVAL_P(argc)) {
arr->refcount++;
argc->refcount++;
zend_hash_update(&EG(symbol_table), "argv", sizeof("argv"), &arr, sizeof(zval *), NULL);