cvs: php-src(PHP_5_1) /ext/mysqli mysqli.c /ext/xmlreader php_xmlreader.c /ext/xsl php_xsl.c
| From: | Dmitry Stogov | Date: | Tue, 15 Nov 2005 14:28:41 +0000 |
| Subject: | cvs: php-src(PHP_5_1) /ext/mysqli mysqli.c /ext/xmlreader php_xmlreader.c /ext/xsl php_xsl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-35124@lists.php.net to get a copy of this message | ||
dmitry Tue Nov 15 09:28:41 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/xsl php_xsl.c
/php-src/ext/mysqli mysqli.c
/php-src/ext/xmlreader php_xmlreader.c
Log:
Allow recursive calls to __get/__set for different properties
http://cvs.php.net/diff.php/php-src/ext/xsl/php_xsl.c?r1=1.32.2.1&r2=1.32.2.2&ty=u
Index: php-src/ext/xsl/php_xsl.c
diff -u php-src/ext/xsl/php_xsl.c:1.32.2.1 php-src/ext/xsl/php_xsl.c:1.32.2.2
--- php-src/ext/xsl/php_xsl.c:1.32.2.1 Mon Nov 14 17:03:02 2005
+++ php-src/ext/xsl/php_xsl.c Tue Nov 15 09:28:38 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xsl.c,v 1.32.2.1 2005/11/14 22:03:02 tony2001 Exp $ */
+/* $Id: php_xsl.c,v 1.32.2.2 2005/11/15 14:28:38 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -120,8 +120,7 @@
intern = emalloc(sizeof(xsl_object));
intern->std.ce = class_type;
- intern->std.in_get = 0;
- intern->std.in_set = 0;
+ intern->std.guards = NULL;
intern->ptr = NULL;
intern->prop_handler = NULL;
intern->parameter = NULL;
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.72.2.4&r2=1.72.2.5&ty=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.4 php-src/ext/mysqli/mysqli.c:1.72.2.5
--- php-src/ext/mysqli/mysqli.c:1.72.2.4 Wed Oct 12 09:31:46 2005
+++ php-src/ext/mysqli/mysqli.c Tue Nov 15 09:28:40 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.72.2.4 2005/10/12 13:31:46 tony2001 Exp $
+ $Id: mysqli.c,v 1.72.2.5 2005/11/15 14:28:40 dmitry Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -344,8 +344,7 @@
intern = emalloc(sizeof(mysqli_object));
memset(intern, 0, sizeof(mysqli_object));
intern->zo.ce = class_type;
- intern->zo.in_get = 0;
- intern->zo.in_set = 0;
+ intern->zo.guards = NULL;
intern->ptr = NULL;
intern->valid = 0;
intern->prop_handler = NULL;
http://cvs.php.net/diff.php/php-src/ext/xmlreader/php_xmlreader.c?r1=1.13.2.2&r2=1.13.2.3&ty=u
Index: php-src/ext/xmlreader/php_xmlreader.c
diff -u php-src/ext/xmlreader/php_xmlreader.c:1.13.2.2
php-src/ext/xmlreader/php_xmlreader.c:1.13.2.3
--- php-src/ext/xmlreader/php_xmlreader.c:1.13.2.2 Mon Nov 14 17:03:02 2005
+++ php-src/ext/xmlreader/php_xmlreader.c Tue Nov 15 09:28:40 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xmlreader.c,v 1.13.2.2 2005/11/14 22:03:02 tony2001 Exp $ */
+/* $Id: php_xmlreader.c,v 1.13.2.3 2005/11/15 14:28:40 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -352,8 +352,7 @@
intern = emalloc(sizeof(xmlreader_object));
intern->std.ce = class_type;
- intern->std.in_get = 0;
- intern->std.in_set = 0;
+ intern->std.guards = NULL;
intern->ptr = NULL;
intern->input = NULL;
intern->schema = NULL;