tony2001 Sat Nov 26 07:35:28 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/date php_date.c
Log:
fix Timezone class too
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.43.2.23&r2=1.43.2.24&ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.23
php-src/ext/date/php_date.c:1.43.2.24
--- php-src/ext/date/php_date.c:1.43.2.23 Sat Nov 26 04:40:54 2005
+++ php-src/ext/date/php_date.c Sat Nov 26 07:35:27 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.43.2.23 2005/11/26 09:40:54 tony2001 Exp $ */
+/* $Id: php_date.c,v 1.43.2.24 2005/11/26 12:35:27 tony2001 Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -1058,11 +1058,16 @@
{
php_timezone_obj *intern;
zend_object_value retval;
+ zval *tmp;
intern = emalloc(sizeof(php_timezone_obj));
memset(intern, 0, sizeof(php_timezone_obj));
intern->std.ce = class_type;
+ ALLOC_HASHTABLE(intern->std.properties);
+ zend_hash_init(intern->std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
+ zend_hash_copy(intern->std.properties, &class_type->default_properties,
(copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
+
retval.handle = zend_objects_store_put(intern,
(zend_objects_store_dtor_t)zend_objects_destroy_object,
(zend_objects_free_object_storage_t) date_object_free_storage_timezone, NULL
TSRMLS_CC);
retval.handlers = &date_object_handlers_timezone;
@@ -1091,6 +1096,14 @@
static void date_object_free_storage_timezone(void *object TSRMLS_DC)
{
+ php_date_obj *intern = (php_date_obj *)object;
+
+ if (intern->std.properties) {
+ zend_hash_destroy(intern->std.properties);
+ efree(intern->std.properties);
+ intern->std.properties = NULL;
+ }
+
efree(object);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
