com php-src: backport ext/date: ext/date/php_date.c

From: Date: Sat, 15 Feb 2014 19:25:16 +0000
Subject: com php-src: backport ext/date: ext/date/php_date.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-76073@lists.php.net to get a copy of this message
Commit: 1648d83e6d6398516cc57fd066298e098492e11a Author: Anatol Belski <ab@php.net> Sat, 15 Feb 2014 20:25:16 +0100 Parents: f6b64e93dd00ee8e7a1b7b29fca1571097f11d30 Branches: str_size_and_int64_56_backport Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1648d83e6d6398516cc57fd066298e098492e11a Log: backport ext/date Changed paths: M ext/date/php_date.c Diff: diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 78c156d..ff97de6 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -2404,7 +2404,7 @@ static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC) PHP_DATE_INTERVAL_ADD_PROPERTY("d", d); PHP_DATE_INTERVAL_ADD_PROPERTY("h", h); PHP_DATE_INTERVAL_ADD_PROPERTY("i", i); - PHP_DATE_INTERVAL_ADD_PROPERTY("s", s); + PHP_DATE_INTERVAL_ADD_PROPERTY("S", s); PHP_DATE_INTERVAL_ADD_PROPERTY("weekday", weekday); PHP_DATE_INTERVAL_ADD_PROPERTY("weekday_behavior", weekday_behavior); PHP_DATE_INTERVAL_ADD_PROPERTY("first_last_day_of", first_last_day_of); @@ -3995,7 +3995,7 @@ zval *date_interval_read_property(zval *object, zval *member, int type, const ze GET_VALUE_FROM_STRUCT(d, "d"); GET_VALUE_FROM_STRUCT(h, "h"); GET_VALUE_FROM_STRUCT(i, "i"); - GET_VALUE_FROM_STRUCT(s, "s"); + GET_VALUE_FROM_STRUCT(s, "S"); GET_VALUE_FROM_STRUCT(invert, "invert"); GET_VALUE_FROM_STRUCT(days, "days"); /* didn't find any */ @@ -4070,7 +4070,7 @@ void date_interval_write_property(zval *object, zval *member, zval *value, const SET_VALUE_FROM_STRUCT(d, "d"); SET_VALUE_FROM_STRUCT(h, "h"); SET_VALUE_FROM_STRUCT(i, "i"); - SET_VALUE_FROM_STRUCT(s, "s"); + SET_VALUE_FROM_STRUCT(s, "S"); SET_VALUE_FROM_STRUCT(invert, "invert"); /* didn't find any */ (zend_get_std_object_handlers())->write_property(object, member, value, key TSRMLS_CC);

« previous php.cvs (#76073) next »