diff options
| author | Anatol Belski <ab@php.net> | 2014-05-24 13:58:35 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-05-24 13:58:35 +0200 |
| commit | 1d28acb437483d90fd31a82a1cfef74cbe64fdce (patch) | |
| tree | 0d989385744ba6cf6da29f41f10adf345f6fe0e9 /ext/date/php_date.c | |
| parent | ce8f7cb79485c76c21ecb95b568696b6249cbebd (diff) | |
| parent | 80a2716b56b0eabae018108605ce3ecfecd5ce3c (diff) | |
| download | php-git-1d28acb437483d90fd31a82a1cfef74cbe64fdce.tar.gz | |
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
Further test fixes for the fdb2709 breakage.
Fix broken test caused by fdb2709.
Fix run-tests.php with Valgrind >= 3.10.0.
Add microseconds to the serialised form of DateTime objects.
Improved test for bug #62479
Diffstat (limited to 'ext/date/php_date.c')
| -rw-r--r-- | ext/date/php_date.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index c8c2d8e776..7fc4010a48 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -2205,7 +2205,7 @@ static HashTable *date_object_get_properties(zval *object TSRMLS_DC) /* first we add the date and time in ISO format */ MAKE_STD_ZVAL(zv); - ZVAL_STRING(zv, date_format("Y-m-d H:i:s", 12, dateobj->time, 1), 0); + ZVAL_STRING(zv, date_format("Y-m-d H:i:s.u", 14, dateobj->time, 1), 0); zend_hash_update(props, "date", 5, &zv, sizeof(zv), NULL); /* then we add the timezone name (or similar) */ |