cvs: php4 /ext/standard array.c /ext/wddx wddx.c
| From: | Andi Gutmans | Date: | Tue, 05 Feb 2002 20:43:49 +0000 |
| Subject: | cvs: php4 /ext/standard array.c /ext/wddx wddx.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-9288@lists.php.net to get a copy of this message | ||
andi Tue Feb 5 15:43:49 2002 EDT
Modified files:
/php4/ext/standard array.c
/php4/ext/wddx wddx.c
Log:
- Add TSRMLS_FETCH()'s needed for the new object overloading in ZE2.
Index: php4/ext/standard/array.c
diff -u php4/ext/standard/array.c:1.155 php4/ext/standard/array.c:1.156
--- php4/ext/standard/array.c:1.155 Fri Feb 1 15:17:32 2002
+++ php4/ext/standard/array.c Tue Feb 5 15:43:48 2002
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.155 2002/02/01 20:17:32 andrei Exp $ */
+/* $Id: array.c,v 1.156 2002/02/05 20:43:48 andi Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -237,8 +237,10 @@
{
long cnt = 0;
zval **element;
-
HashTable *target_hash;
+
+ TSRMLS_FETCH();
+
target_hash = HASH_OF(array);
if (Z_TYPE_P(array) == IS_ARRAY)
Index: php4/ext/wddx/wddx.c
diff -u php4/ext/wddx/wddx.c:1.88 php4/ext/wddx/wddx.c:1.89
--- php4/ext/wddx/wddx.c:1.88 Thu Jan 24 11:18:50 2002
+++ php4/ext/wddx/wddx.c Tue Feb 5 15:43:49 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: wddx.c,v 1.88 2002/01/24 16:18:50 andrei Exp $ */
+/* $Id: wddx.c,v 1.89 2002/02/05 20:43:49 andi Exp $ */
#include "php.h"
#include "php_wddx.h"
@@ -548,6 +548,7 @@
char tmp_buf[WDDX_BUF_LEN];
ulong ind = 0;
int type;
+ TSRMLS_FETCH();
target_hash = HASH_OF(arr);