diff options
| author | Pierre Joye <pajoye@php.net> | 2011-08-23 18:32:53 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2011-08-23 18:32:53 +0000 |
| commit | 687e310a462844a894c96f86dc844ac782025961 (patch) | |
| tree | be3df33f114bd113819706289524be82dc5dcbed /main/php_variables.c | |
| parent | ad3ecfc8c1ca1f4dad3c71d2df192cac495fb09e (diff) | |
| download | php-git-687e310a462844a894c96f86dc844ac782025961.tar.gz | |
- ws
Diffstat (limited to 'main/php_variables.c')
| -rw-r--r-- | main/php_variables.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/php_variables.c b/main/php_variables.c index 8bd1b01c33..40ad26fc9d 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -597,7 +597,7 @@ static void php_autoglobal_merge(HashTable *dest, HashTable *src TSRMLS_DC) || (key_type == HASH_KEY_IS_STRING && zend_hash_find(dest, string_key, string_key_len, (void **) &dest_entry) != SUCCESS) || (key_type == HASH_KEY_IS_LONG && zend_hash_index_find(dest, num_key, (void **)&dest_entry) != SUCCESS) || Z_TYPE_PP(dest_entry) != IS_ARRAY - ) { + ) { Z_ADDREF_PP(src_entry); if (key_type == HASH_KEY_IS_STRING) { if (!globals_check || string_key_len != sizeof("GLOBALS") || memcmp(string_key, "GLOBALS", sizeof("GLOBALS") - 1)) { @@ -662,7 +662,7 @@ static zend_bool php_auto_globals_create_post(char *name, uint name_len TSRMLS_D zval *vars; if (PG(variables_order) && - (strchr(PG(variables_order),'P') || strchr(PG(variables_order),'p')) && + (strchr(PG(variables_order),'P') || strchr(PG(variables_order),'p')) && !SG(headers_sent) && SG(request_info).request_method && !strcasecmp(SG(request_info).request_method, "POST")) { @@ -736,7 +736,7 @@ static zend_bool php_auto_globals_create_server(char *name, uint name_len TSRMLS zval **argc, **argv; if (zend_hash_find(&EG(symbol_table), "argc", sizeof("argc"), (void**)&argc) == SUCCESS && - zend_hash_find(&EG(symbol_table), "argv", sizeof("argv"), (void**)&argv) == SUCCESS) { + zend_hash_find(&EG(symbol_table), "argv", sizeof("argv"), (void**)&argv) == SUCCESS) { Z_ADDREF_PP(argc); Z_ADDREF_PP(argv); zend_hash_update(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]), "argv", sizeof("argv"), argv, sizeof(zval *), NULL); |