Derick Rethans
c0219b323e
Fixed tests due to changes in underlaying data
2016-09-30 20:49:44 +01:00
Derick Rethans
7deb32abc9
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-30 20:31:05 +01:00
Derick Rethans
91fd4bf000
Fixed parsing of AM/PM without all the expected dots in place
2016-09-30 20:21:48 +01:00
Christoph M. Becker
dd93712911
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-30 11:40:55 +02:00
Christoph M. Becker
e72165bb86
Fix #73203 : passing additional_parameters causes mail to fail
...
We make sure that there's no unsigned underflow, which happened for `y==0`.
2016-09-30 11:38:09 +02:00
Joe Watkins
e60620b974
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
2016-09-30 07:22:50 +01:00
Joe Watkins
a8d031fbd8
fix user filter bug
2016-09-30 07:21:01 +01:00
Christoph M. Becker
81cbbb68af
Merge branch 'pull-request/2128' into PHP-7.0
2016-09-29 14:39:39 +02:00
Anatol Belski
62bed405da
sync win32 makefile with makedist zendparse exports
...
With a newer bison this part is relevant. Whil bison 2.4.1 is still
used, this changes cater for the forward compatibility.
2016-09-29 12:56:49 +02:00
Dmitry Stogov
e7f4355d9b
Better fix for bug #72854 (avoid extra copy and creating reference to stack variable)
2016-09-29 10:56:01 +03:00
Stanislav Malyshev
da7e89cde8
Fix bug #73189 - Memcpy negative size parameter php_resolve_path
2016-09-28 23:30:48 -07:00
Stanislav Malyshev
29e2a204fb
Fixed bug #73174 - heap overflow in php_pcre_replace_impl
2016-09-28 22:29:59 -07:00
Ferenc Kovacs
581e890483
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
configure.in
main/php_version.h
2016-09-29 00:58:02 +02:00
Ferenc Kovacs
703c247c7d
5.6.28 is next
2016-09-29 00:55:36 +02:00
Derick Rethans
83780a6cd2
Updated to version 2016.7 (2016g)
2016-09-28 23:30:27 +01:00
Derick Rethans
03ac064b2e
Empty merge
2016-09-28 23:30:27 +01:00
Derick Rethans
6a544f2d1e
Updated to version 2016.7 (2016g)
2016-09-28 23:30:26 +01:00
Nikita Popov
e520b9e127
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-28 23:22:11 +02:00
Nikita Popov
1f5412982c
Handle resource keys in constexpr arrays
2016-09-28 23:11:02 +02:00
Nikita Popov
40b8105cca
Fix the constant array case as well
2016-09-28 23:05:21 +02:00
Nikita Popov
437942d972
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-28 22:36:58 +02:00
Nikita Popov
99bf19c177
Check next_index_insert failure in ADD_ARRAY_ELEMENT
2016-09-28 22:35:27 +02:00
Nikita Popov
b7cbaa7f43
Fix bug #73181
2016-09-27 19:47:48 +02:00
Anatol Belski
cb29c01ed6
prepare next
2016-09-27 12:49:52 +02:00
Anatol Belski
fcc232173e
set versions
2016-09-27 12:38:38 +02:00
Adam Baratz
6887c4a061
update NEWS
2016-09-26 17:09:11 -04:00
Chris Kings-Lynne
48b5a1f9b9
Ignore potentially misleading dberr values
...
FreeTDS had a buggy behavior where it would pass invalid values:
https://sourceforge.net/p/freetds/bugs/59/
The fix for this issue -- bc22b2ef817fb5d102bd758111ff3634b39a1319 on their
repo -- was to always use SYBESMSG for dberr. This makes it so the existing
pdo_dblib code would work as is. But by ignoring the dberr value in this
function, it will behave correctly, even with older versions of FreeTDS.
2016-09-26 17:07:46 -04:00
Anatol Belski
3a058e3817
update NEWS
2016-09-26 19:54:10 +02:00
Anatol Belski
f36babf643
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
2016-09-26 18:54:43 +02:00
Anatol Belski
39e5991705
Fixed bug #73172 parse error: Invalid numeric literal
2016-09-26 18:47:30 +02:00
Christoph M. Becker
5e102d5685
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-26 18:43:03 +02:00
Christoph M. Becker
4f0960a800
Fix #53745 : cgi.discard_path option is missing from php.ini
...
Also cgi.check_shebang_line has been missing.
2016-09-26 18:41:09 +02:00
Anatol Belski
eaee65080e
update libs_versions.txt
2016-09-26 15:41:41 +02:00
Anatol Belski
5dd3ea1567
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update libs_versions.txt
2016-09-26 15:41:16 +02:00
Anatol Belski
66baefec44
update libs_versions.txt
2016-09-26 15:39:01 +02:00
Dmitry Stogov
d279118422
Fixed bug #73156 (segfault on undefined function)
2016-09-26 14:14:57 +03:00
Stanislav Malyshev
1c0e9126fb
Fix bug #73150 : missing NULL check in dom_document_save_html
2016-09-25 21:25:01 -07:00
Stanislav Malyshev
0e6fe3a4c9
Fix bug #73147 : Use After Free in PHP7 unserialize()
2016-09-25 19:53:59 -07:00
Stanislav Malyshev
1b29e4488e
Fix bug #73091 - Unserializing DateInterval object may lead to __toString invocation
2016-09-25 16:43:24 -07:00
Stanislav Malyshev
e1709b7e58
Fix bug #73082
2016-09-25 16:07:14 -07:00
Anatol Belski
4e7b5ca459
Add an include path for freetype which is relevant for cmake builds
2016-09-25 20:55:13 +02:00
Christoph M. Becker
fa9d41f66c
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-25 10:46:44 +02:00
Christoph M. Becker
c696bc8cfa
Fix test_image_equals_file() wrt. palette images
...
The recently introduced test_image_equals_file() doesn't properly work for
palette images, because in this case only the palette indexes are compared,
what can lead to false positives and negatives as shown in the added test.
To fix that we convert palette images to truecolor, what is supposed to be
faster than calling imagecolorsforindex() for each pixel.
We furthermore rely on PHP's refcounting to free unused images; after all,
this is not C.
2016-09-25 10:34:03 +02:00
Christoph M. Becker
bc22582cf7
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-24 18:05:21 +02:00
Christoph M. Becker
c596b02a5b
Merge branch 'pull-request/2120' into PHP-5.6
2016-09-24 17:52:15 +02:00
Nikita Popov
8831a12da1
Fixed bug #73163
2016-09-24 13:18:43 +02:00
Christoph M. Becker
5c81298597
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-24 12:41:48 +02:00
Christoph M. Becker
8f5eda4bf6
Fix #73161 : imagecreatefromgd2() may leak memory
2016-09-24 12:36:54 +02:00
Christoph M. Becker
61722743f4
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-24 11:31:54 +02:00
Christoph M. Becker
709731797c
Fix #73159 : imagegd2(): unrecognized formats may result in corrupted files
...
We must not apply the format correction twice for truecolor images.
2016-09-24 11:28:20 +02:00
