2efb63bf00
Merge branch 'PHP-7.0' into PHP-7.1
2017-01-19 01:22:10 +01:00
8c75dbc498
Merge branch 'PHP-5.6' into PHP-7.0
2017-01-19 01:20:57 +01:00
cf649f59cb
update NEWS
2017-01-19 01:16:31 +01:00
fec3a65ba4
Merge branch 'PHP-7.0' into PHP-7.1
2017-01-18 21:20:00 +01:00
8ba6d622e5
Removing zmemcheck from .gdbinit
...
It doesn't seem to make sense anymore
2017-01-18 21:19:48 +01:00
6d89640d55
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix bug #73949 leak in mysqli_fetch_object
2017-01-18 18:23:59 +00:00
f9226f9bf3
Fix bug #73949 leak in mysqli_fetch_object
2017-01-18 18:22:57 +00:00
bbe21ccf38
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Remove remnants of TSMRLS_* macro calls
2017-01-18 17:46:11 +00:00
fb8486f3bd
Remove remnants of TSMRLS_* macro calls
2017-01-18 17:42:45 +00:00
bce548d8e6
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
DNS CAA record type implementation and tests for https://bugs.php.net/bug.php?id=73850
2017-01-18 17:23:29 +00:00
280e9cb28d
DNS CAA record type implementation and tests for https://bugs.php.net/bug.php?id=73850
2017-01-18 17:23:08 +00:00
85589ca660
Add php_openssl_store_errors to bailouts
2017-01-18 15:02:52 +00:00
d2f07edf71
Merge branch 'PHP-7.0' into PHP-7.1
2017-01-18 14:47:49 +00:00
e7e96fe2e0
Change free to OPENSSL_free
2017-01-18 14:45:41 +00:00
7673c9847b
NEWS
2017-01-18 13:02:33 +01:00
2ce8a4cf87
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
NEWS
Fix #73956 Link use CC instead of CXX
2017-01-18 13:02:19 +01:00
6af7753e36
NEWS
2017-01-18 13:02:03 +01:00
6af22d0d3e
Fix #73956 Link use CC instead of CXX
2017-01-18 13:00:49 +01:00
9977bdf9b3
Remove more TSRMLS_CC macros
2017-01-18 10:00:15 +00:00
43612e9593
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix ce comparison
2017-01-18 05:06:07 +00:00
a22f181736
Fix ce comparison
2017-01-18 05:05:53 +00:00
4edaa3f1e7
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
updates to release docs
2017-01-17 20:33:44 +00:00
e00c2f335c
updates to release docs
2017-01-17 20:33:25 +00:00
13e6dacb6b
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixes in .gdbinit for ZE 3
2017-01-17 17:07:53 +00:00
db894fa6aa
Fixes in .gdbinit for ZE 3
...
1. Fixed print_pi function
2. Fixed printing properties in ____printzv_contents
3. Added optional max length parameter in ____print_str
2017-01-17 17:07:31 +00:00
1e225a6115
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
[ci skip] sync NEWS
2017-01-17 10:57:56 +01:00
3f960255f4
[ci skip] sync NEWS
2017-01-17 10:56:17 +01:00
cea050b8da
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix #73869 : Signed Integer Overflow gd_io.c
Fix #73868 : DOS vulnerability in gdImageCreateFromGd2Ctx()
2017-01-17 09:35:26 +01:00
5d07438cb3
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix #73869 : Signed Integer Overflow gd_io.c
Fix #73868 : DOS vulnerability in gdImageCreateFromGd2Ctx()
2017-01-17 09:33:51 +01:00
d2274b01cb
Fix #73869 : Signed Integer Overflow gd_io.c
...
GD2 stores the number of horizontal and vertical chunks as words (i.e. 2
byte unsigned). These values are multiplied and assigned to an int when
reading the image, what can cause integer overflows. We have to avoid
that, and also make sure that either chunk count is actually greater
than zero. If illegal chunk counts are detected, we bail out from
reading the image.
(cherry picked from commit 5b5d9db3988b829e0b121b74bb3947f01c2796a1)
2017-01-17 09:30:58 +01:00
f1b2afc9d9
Fix #73868 : DOS vulnerability in gdImageCreateFromGd2Ctx()
...
We must not pretend that there are image data if there are none. Instead
we fail reading the image file gracefully.
(cherry picked from commit cdb648dc4115ce0722f3cc75e6a65115fc0e56ab)
2017-01-17 09:30:43 +01:00
abe094dde8
Update NEWS
2017-01-17 15:35:29 +08:00
e180e45a18
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache)
2017-01-17 15:35:06 +08:00
b28c2e20ca
Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache)
2017-01-17 15:34:19 +08:00
05f2f730e6
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix bug #73648 - integer overflow in substr
2017-01-16 12:14:03 -08:00
d1d002fc4d
Fix bug #73648 - integer overflow in substr
2017-01-16 12:11:50 -08:00
29433f9fd5
Make unserialize() ref unwrapping compatible with 7.0
...
Also fix output difference in merged test (unrelated).
2017-01-16 14:25:58 +01:00
590ef15f6a
Merge branch 'PHP-7.0' into PHP-7.1
2017-01-16 14:12:10 +01:00
e0ca519a8b
Merge branch 'PHP-5.6' into PHP-7.0
2017-01-16 14:11:41 +01:00
6477bb724e
Add additional serialize tests for fixed bugs
...
These have been fixed as a side-effect of the delayed __wakeup
patch.
2017-01-16 13:24:13 +01:00
34d6b63501
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix bug #73634 - grapheme_strpos illegal memory access
Fix typo
2017-01-16 01:18:50 -08:00
6736527aeb
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix typo
2017-01-16 01:18:38 -08:00
8c44d07fd4
Fix bug #73634 - grapheme_strpos illegal memory access
2017-01-16 01:18:16 -08:00
50b38322b9
Fix typo
2017-01-16 00:23:06 -08:00
bac4c97602
Fix bug #73939 memory allocation in signal handler when HAVE_STRUCT_SIGINFO_T
2017-01-16 04:32:27 +00:00
d11bed5909
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Add test ini_set with invalid time zone
2017-01-16 04:13:26 +00:00
cc9893eb44
Add test ini_set with invalid time zone
...
Wasn't covered before according to gcov.php.net.
2017-01-16 04:13:01 +00:00
ca6f679417
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix test
2017-01-15 18:42:44 -08:00
2c7909697a
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix test
2017-01-15 18:42:33 -08:00
814966ad33
Fix test
2017-01-15 18:42:22 -08:00
Ferenc Kovacs