pajoye Tue, 23 Aug 2011 18:32:53 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=315380
Log:
- ws
Changed paths:
U php/php-src/branches/PHP_5_4/main/php_variables.c
U php/php-src/trunk/main/php_variables.c
Modified: php/php-src/branches/PHP_5_4/main/php_variables.c
===================================================================
--- php/php-src/branches/PHP_5_4/main/php_variables.c 2011-08-23 18:25:13 UTC
(rev 315379)
+++ php/php-src/branches/PHP_5_4/main/php_variables.c 2011-08-23 18:32:53 UTC
(rev 315380)
@@ -597,7 +597,7 @@
|| (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 @@
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 @@
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);
Modified: php/php-src/trunk/main/php_variables.c
===================================================================
--- php/php-src/trunk/main/php_variables.c 2011-08-23 18:25:13 UTC (rev
315379)
+++ php/php-src/trunk/main/php_variables.c 2011-08-23 18:32:53 UTC (rev
315380)
@@ -597,7 +597,7 @@
|| (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 @@
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 @@
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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
