cvs: php-src /main php_variables.c
| From: | Wez Furlong | Date: | Tue, 19 Jul 2005 19:25:33 +0000 |
| Subject: | cvs: php-src /main php_variables.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-32994@lists.php.net to get a copy of this message | ||
wez Tue Jul 19 15:25:33 2005 EDT
Modified files:
/php-src/main php_variables.c
Log:
revert my last change; chasing ghosts.
# the lesson is, ensure that php4 and php5 aren't loaded at the same time
http://cvs.php.net/diff.php/php-src/main/php_variables.c?r1=1.99&r2=1.100&ty=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.99 php-src/main/php_variables.c:1.100
--- php-src/main/php_variables.c:1.99 Tue Jul 19 14:59:46 2005
+++ php-src/main/php_variables.c Tue Jul 19 15:25:33 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_variables.c,v 1.99 2005/07/19 18:59:46 wez Exp $ */
+/* $Id: php_variables.c,v 1.100 2005/07/19 19:25:33 wez Exp $ */
#include <stdio.h>
#include "php.h"
@@ -625,9 +625,7 @@
case 'p':
case 'P':
if (!_gpc_flags[0] && !SG(headers_sent) && SG(request_info).request_method
&& !strcasecmp(SG(request_info).request_method, "POST")) {
- if (sapi_module.treat_data) {
- sapi_module.treat_data(PARSE_POST, NULL, NULL TSRMLS_CC); /* POST Data */
- }
+ sapi_module.treat_data(PARSE_POST, NULL, NULL TSRMLS_CC); /* POST Data */
_gpc_flags[0] = 1;
if (PG(register_globals)) {
php_autoglobal_merge(&EG(symbol_table), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_POST])
TSRMLS_CC);
@@ -637,9 +635,7 @@
case 'c':
case 'C':
if (!_gpc_flags[1]) {
- if (sapi_module.treat_data) {
- sapi_module.treat_data(PARSE_COOKIE, NULL, NULL TSRMLS_CC); /* Cookie Data */
- }
+ sapi_module.treat_data(PARSE_COOKIE, NULL, NULL TSRMLS_CC); /* Cookie Data */
_gpc_flags[1] = 1;
if (PG(register_globals)) {
php_autoglobal_merge(&EG(symbol_table), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE])
TSRMLS_CC);
@@ -649,9 +645,7 @@
case 'g':
case 'G':
if (!_gpc_flags[2]) {
- if (sapi_module.treat_data) {
- sapi_module.treat_data(PARSE_GET, NULL, NULL TSRMLS_CC); /* GET Data */
- }
+ sapi_module.treat_data(PARSE_GET, NULL, NULL TSRMLS_CC); /* GET Data */
_gpc_flags[2] = 1;
if (PG(register_globals)) {
php_autoglobal_merge(&EG(symbol_table), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_GET])
TSRMLS_CC);