Adam Harvey
6f52f566f3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
2013-12-03 14:51:03 -08:00
Adam Harvey
d1314893fd
Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
...
These were returned to the general allocation pool by RFC 3330, and hence
shouldn't cause an IP address validation failure due to being reserved. At
least 128.0.0.0/16 is in use on the public Internet today.
Fixes bug #66229 (128.0.0.0/16 isn't reserved any longer).
2013-12-03 14:46:15 -08:00
Michael Wallner
9c0a70c1de
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #65196
2013-12-02 17:01:25 +01:00
Michael Wallner
22fa3fbc5f
Fix bug #65196
...
Passing DOMDocumentFragment to DOMDocument::saveHTML()
produces invalid markup, because a DocumentFragment is just a container
for child nodes and not a real node itself.
2013-12-02 17:00:13 +01:00
Michael Wallner
e4b310d2a9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #49634x
2013-12-02 12:10:59 +01:00
Michael Wallner
6408a1a59e
fix bug #49634x
2013-12-02 12:10:00 +01:00
Dmitry Stogov
2f5ab04c5f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed tests
2013-12-02 12:04:07 +04:00
Dmitry Stogov
edbefd1d5c
Fixed tests
2013-12-02 11:53:35 +04:00
Felipe Pena
78f69a2b4f
- Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)
2013-11-30 11:39:57 -02:00
nikita2206
5f09944662
Fixed bug #65768 : DateTimeImmutable::diff does not work
...
This commit also prevents user classes from directly implementing
DateTimeInterface, because ext/date relies on classes implementing
it to support certain internal structures.
2013-11-29 23:31:07 +01:00
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
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
23ab2575e1
Fixed bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date)
2013-11-27 21:59:46 +00: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
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
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
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
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
Yasuo Ohgaki
b8b92bd790
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
2013-11-20 07:23:54 +09:00
Yasuo Ohgaki
0d558afc05
Fix WS in serialization_error_002.phpt
2013-11-20 07:17:53 +09:00
Aaron Hamid
050dd59c63
added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
2013-11-20 07:14:53 +09:00
Jeff Welch
72a8489a12
Fixed tests that fail with non-default serialize_precision configurations.
...
See:
* https://bugs.php.net/bug.php?id=64760
* 4dc4302
2013-11-20 06:17:34 +09:00