clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 05:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
98,367 Commits 494 Branches 1,367 Tags 786 MiB
21f0be4792
Commit Graph

98367 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Popov
21f0be4792 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-27 19:48:50 +02:00
Nikita Popov
b7cbaa7f43 Fix bug #73181 2016-09-27 19:47:48 +02:00
Anatol Belski
8a6b089408 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  prepare next
 2016-09-27 12:51:24 +02:00
Anatol Belski
cb29c01ed6 prepare next 2016-09-27 12:49:52 +02:00
Adam Baratz
228be4c39d update NEWS 2016-09-26 17:13:50 -04:00
Adam Baratz
3d321a4aa4 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update NEWS
  Ignore potentially misleading dberr values
 2016-09-26 17:13:14 -04: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
b4e90e9591 update NEWS 2016-09-26 19:55:43 +02:00
Anatol Belski
f324e5e628 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update NEWS
 2016-09-26 19:55:05 +02:00
Anatol Belski
3a058e3817 update NEWS 2016-09-26 19:54:10 +02:00
Anatol Belski
5e4a93b28e Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1 2016-09-26 18:55:08 +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
4e3746380a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73172 parse error: Invalid numeric literal
 2016-09-26 18:49:40 +02:00
Anatol Belski
39e5991705 Fixed bug #73172 parse error: Invalid numeric literal 2016-09-26 18:47:30 +02:00
Christoph M. Becker
b3f4bc7592 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-26 18:45:05 +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
5e24fe9fde Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update libs_versions.txt
  update libs_versions.txt
 2016-09-26 15:42:32 +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
6be2e79c2c On PHP-7.1 and above we have to check CALL_INFO instead of symbol_table. 2016-09-26 16:16:07 +03:00
Dmitry Stogov
bca7f02933 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73156 (segfault on undefined function)
 2016-09-26 14:17:27 +03:00
Dmitry Stogov
d279118422 Fixed bug #73156 (segfault on undefined function) 2016-09-26 14:14:57 +03:00
Anatol Belski
2b8024bb04 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add an include path for freetype which is relevant for cmake builds
 2016-09-25 20:57:30 +02:00
Anatol Belski
4e7b5ca459 Add an include path for freetype which is relevant for cmake builds 2016-09-25 20:55:13 +02:00
Nikita Popov
bd893061d6 Use SEND_USER for CONST|TMP as well 
Otherwise we're missing the "expected to be a reference, value
given" warning that appears for ordinary calls to call_user_func().

Also update an UPGRADING note with recent changes wrt
call_user_func().
 2016-09-25 12:39:23 +02:00
Christoph M. Becker
daba342f57 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-25 10:49:43 +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
Nikita Popov
c7651c2396 Fix a couple of ASSIGN_DIM/OBJ inference bugs 
Account for possible null return values better.
 2016-09-24 22:43:27 +02:00
Nikita Popov
db801763e4 Add range inference for ZEND_STRLEN 
On 32-bit systems we conservatively allow negative lengths.
On 64-bit systems, the range could additionally be restricted to
the canonical 48-bit size.
 2016-09-24 22:43:27 +02:00
Christoph M. Becker
75a1384ebf Merge branch 'PHP-7.0' into PHP-7.1 2016-09-24 18:18:34 +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
453102b4a0 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-24 13:22:00 +02:00
Nikita Popov
8831a12da1 Fixed bug #73163 2016-09-24 13:18:43 +02:00
Christoph M. Becker
c733f92d72 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-24 12:47:07 +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
394e9b3d15 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-24 11:37:23 +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
Christoph M. Becker
bc9efac0fe Merge branch 'PHP-7.0' into PHP-7.1 2016-09-24 10:58:39 +02:00
Christoph M. Becker
0a4b72fa94 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-24 10:48:24 +02:00
Christoph M. Becker
c7936ead8f Fix #73155: imagegd2() writes wrong chunk sizes on boundaries 2016-09-24 10:33:49 +02:00
Christoph M. Becker
20ebc108dc Merge branch 'PHP-7.0' into PHP-7.1 2016-09-24 00:37:37 +02:00
Christoph M. Becker
7028ba1d32 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-24 00:36:53 +02:00
Christoph M. Becker
1da79a6c6e Fix #73157 (again): imagegd2() ignores 3rd param if 4 are given 
Obviously, there was a bad merge.
 2016-09-24 00:35:24 +02:00