cvs: /php4 main.c
| From: | Zeev Suraski | Date: | Sat, 29 Jan 2000 12:57:38 +0000 |
| Subject: | cvs: /php4 main.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-9554@lists.php.net to get a copy of this message | ||
zeev Sat Jan 29 04:57:38 2000 EDT
Modified files:
/php4 main.c
Log:
Fix buglets in the argv/argc code
Index: php4/main.c
diff -u php4/main.c:1.187 php4/main.c:1.188
--- php4/main.c:1.187 Sat Jan 29 03:55:43 2000
+++ php4/main.c Sat Jan 29 04:57:08 2000
@@ -19,7 +19,7 @@
*/
-/* $Id: main.c,v 1.187 2000/01/29 11:55:43 zeev Exp $ */
+/* $Id: main.c,v 1.188 2000/01/29 12:57:08 zeev Exp $ */
#include <stdio.h>
@@ -1134,12 +1134,12 @@
}
if (PG(track_vars)) {
- if (!PG(register_globals)) {
+ if (PG(register_globals)) {
arr->refcount++;
argc->refcount++;
}
- zend_hash_update(&EG(symbol_table), "argv", sizeof("argv"), &arr,
sizeof(pval *), NULL);
- zend_hash_add(&EG(symbol_table), "argc", sizeof("argc"), &argc,
sizeof(pval *), NULL);
+ zend_hash_update(track_vars_array->value.ht, "argv", sizeof("argv"),
&arr, sizeof(pval *), NULL);
+ zend_hash_update(track_vars_array->value.ht, "argc", sizeof("argc"),
&argc, sizeof(pval *), NULL);
}
}