Derick Rethans
b0d24d3d20
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-28 16:33:08 +00:00
Derick Rethans
d22cc5c816
Fixed bug #65199 (Wrong Day of Week) and fixed bug #63391 (Incorrect/inconsistent day of week prior to the year 1600)
2013-11-28 16:32:11 +00:00
Derick Rethans
88067b6e60
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/date/php_date.c
2013-11-28 14:30:08 +00:00
Derick Rethans
c1eb219aad
Merge branch 'date-time-dst-rfc' into PHP-5.4
...
This is a partial resolve of some DST issues, plenty of things to do, but as
this *does* fix a few issues it's worth merging it already.
2013-11-28 14:26:01 +00:00
Derick Rethans
aab0b2ce3b
Marking those two as XFAIL for now.
2013-11-28 14:24:39 +00:00
Derick Rethans
582f6e529e
Fixed a few DST changeover issues.
2013-11-28 12:02:36 +00:00
Derick Rethans
5d0c526199
Move add/sub to timelib.
2013-11-28 12:02:36 +00:00
Derick Rethans
324e6a5f82
Fix backwards transition diffs.
2013-11-28 12:02:36 +00:00
Derick Rethans
aa26ace21f
Split up tests into their different categories.
2013-11-28 12:02:35 +00:00
Derick Rethans
7a0df7be34
Group those tests a bit better, as some of the bd ones wanted a "ST" feature that doesn't exist yet.
2013-11-28 12:02:35 +00:00
Derick Rethans
6e8b2c91c4
Fixed forward transitions in diffs.
2013-11-28 12:02:35 +00:00
Derick Rethans
261c6b31ca
Always reset those parameters.
2013-11-28 12:02:35 +00:00
Derick Rethans
44a9e6b484
Fixed "Forward Transition" construction of DateTime objects.
...
This fixes the issue in
https://wiki.php.net/rfc/datetime_and_daylight_saving_time#forward_transitions
There is a period during transition to DST where a time (such as 02:30) does
not exist. PHP already calculated the correct timestamp for this, but failed to
"rounded forward" to the existing correct hour value.
2013-11-28 12:02:35 +00:00
Derick Rethans
4587ef569a
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-27 22:01:03 +00:00
Derick Rethans
fb0c2cf224
Merge branch 'bug53879' into PHP-5.4
2013-11-27 22:00:53 +00:00
Derick Rethans
23ab2575e1
Fixed bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date)
2013-11-27 21:59:46 +00:00
Dmitry Stogov
504c60dc44
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:php-src:
Fixed bug #66060 (Heap buffer over-read in DateInterval)
2013-11-27 14:58:54 +04:00
Dmitry Stogov
65803c8fac
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
NEWS
Fixed bug #66060 (Heap buffer over-read in DateInterval)
2013-11-27 14:58:35 +04:00
Dmitry Stogov
92b76680e9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #65969 (Chain assignment with T_LIST failure)
Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-11-27 14:39:40 +04:00
Dmitry Stogov
16d59aa171
Fixed bug #65969 (Chain assignment with T_LIST failure)
2013-11-27 14:26:34 +04:00
Remi Collet
0dfdb1a491
NEWS
2013-11-27 11:15:34 +01:00
Remi Collet
28d215d0a8
Fixed bug #66060 (Heap buffer over-read in DateInterval)
2013-11-27 11:15:08 +01:00
Remi Collet
12fe4e90be
Fixed bug #66060 (Heap buffer over-read in DateInterval)
2013-11-27 11:13:16 +01:00
Julien Pauli
e9c6a1cfd2
5.5.8-dev now
2013-11-27 09:34:40 +01:00
Stanislav Malyshev
5cd8ff9885
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.24-dev now
Conflicts:
configure.in
main/php_version.h
2013-11-27 00:14:42 -08:00
Stanislav Malyshev
63f3ff7b5f
5.4.24-dev now
2013-11-27 00:13:45 -08:00
Andrey Hristov
0fc90b100d
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-11-26 20:10:30 +02:00
Dmitry Stogov
de65817136
Fixed opcahce_reset() crash when opcache.protect_memory is set
2013-11-26 21:57:32 +04:00
Dmitry Stogov
2381b817aa
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Fixed a wrong test
2013-11-26 21:44:54 +04:00
Andrey Hristov
9a6b72a05a
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-26 19:15:43 +02:00
Andrey Hristov
5a3886f15c
merge fix
2013-11-26 19:15:30 +02:00
Andrey Hristov
0aadab0e2e
add test
2013-11-26 19:15:12 +02:00
Andrey Hristov
40dc242904
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
ext/mysqlnd/mysqlnd.c
2013-11-26 19:02:45 +02:00
Andrey Hristov
74ba88e186
Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)
2013-11-26 19:01:49 +02:00
Dmitry Stogov
d79dd9cc1c
Fixed bug #66176 (Invalid constant substitution)
2013-11-26 21:00:00 +04:00
Julien Pauli
ff20a9019d
Fixed a wrong test
2013-11-26 17:43:31 +01:00
Dmitry Stogov
27524b52b5
Fixed bug #66176 (Invalid constant substitution)
2013-11-26 19:55:49 +04:00
Dmitry Stogov
d85ac7fb3f
Fixed bug #66176 (Invalid constant substitution)
2013-11-26 17:47:02 +04:00
Dmitry Stogov
f28ac55b6d
Added test
2013-11-26 12:13:42 +04:00
Dmitry Stogov
a8c7e50f4d
Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)
2013-11-26 11:34:41 +04:00
Andrey Hristov
29ee38bf0d
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-11-25 21:33:04 +02:00
Andrey Hristov
1b0e6067d5
bring the news
2013-11-25 21:31:51 +02:00
Dmitry Stogov
b7b6c35eea
Fixed compatibility with old PHP versions
2013-11-25 14:09:57 +04:00
Dmitry Stogov
27dc82d0ec
Fixed bug #65915 (Inconsistent results with require return value)
2013-11-25 14:07:24 +04:00
Anatol Belski
ad5a63e8bc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed test
2013-11-21 21:29:02 +01:00
Anatol Belski
345032946c
fixed test
2013-11-21 21:24:47 +01:00
Andrey Hristov
763f4aef8b
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-21 21:29:37 +02:00
Andrey Hristov
ce09822269
And here is the real fix for #66124
2013-11-21 21:29:21 +02:00
Andrey Hristov
c2b2afacc0
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-21 21:15:22 +02:00
Andrey Hristov
4a1c9be857
Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i')
2013-11-21 21:14:42 +02:00
