archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-21 01:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
99637 commits 526 branches 1434 tags 883 MiB
Commit graph

99637 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adam Baratz
2302eef5c9 Never quote values as raw binary data 
This reverts a1a18fca6e which was intended to fix
bug #52885. That commit introduced a BC break which wasn't universally
desirable. The issue of quoting binary data (or NVARCHAR strings, or other
nonstandard types) will have to be addressed separately.
 2016-09-12 17:32:50 -04:00
Christoph M. Becker
abb90fbc34 Refactor according to libgd 
Cf. <a3016ad0>.
 2016-09-12 22:37:32 +02:00
Anatol Belski
8cceb012a7 Add check in fgetcsv in case sizeof(unit) != sizeof(size_t) 
(cherry picked from commit 99ac11222cb2a4e9aa6a865f908b28def349c049)

Conflicts:
	ext/standard/file.c
 2016-09-12 18:59:38 +02:00
Adam Baratz
39f45e208c Add myself as pdo_dblib maintainer 2016-09-12 12:43:39 -04:00
Stanislav Malyshev
9528ce7315 Fix bug #73065: Out-Of-Bounds Read in php_wddx_push_element of wddx.c 
(cherry picked from commit bbaf784f8d213e201baf67e861f20b38c6e87d3b)

Conflicts:
	ext/wddx/wddx.c
 2016-09-12 18:13:04 +02:00
Stanislav Malyshev
c5f34c9eca Fix bug #73035 (Out of bound when verify signature of tar phar in phar_parse_tarfile) 
(cherry picked from commit 75ebf471ff46ec6e5ee279b3650c11d51ebaf9e3)
 2016-09-12 17:54:32 +02:00
Stanislav Malyshev
27876d22ef Fix bug #73052 - Memory Corruption in During Deserialized-object Destruction 
(cherry picked from commit b6e1e5e0b3e6221c7b14fa10cba30f5c5e719e1b)

Conflicts:
	Zend/zend_objects_API.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
 2016-09-12 17:53:44 +02:00
Stanislav Malyshev
022e75cba1 Fix bug #73029 - Missing type check when unserializing SplArray 
(cherry picked from commit 6d16288150be33392a3249e417a0929881feb9a2)

Conflicts:
	ext/spl/spl_array.c
 2016-09-12 17:42:23 +02:00
Stanislav Malyshev
060ab26cfe Fix bug #72860: wddx_deserialize use-after-free 
(cherry picked from commit ee552853ff4d72f626102025133e2cd1575043ee)

Conflicts:
	ext/wddx/wddx.c
 2016-09-12 17:33:32 +02:00
Stanislav Malyshev
92db16e456 Fix bug #73007: add locale length check 
(cherry picked from commit 9e07089626f373d0e7b24b7aeb8b8459aae5f5f8)

Conflicts:
	ext/intl/msgformat/msgformat_format.c
 2016-09-12 17:19:47 +02:00
Stanislav Malyshev
0bfb970f43 Fix bug #72928 - Out of bound when verify signature of zip phar in phar_parse_zipfile 
(cherry picked from commit 19484ab77466f99c78fc0e677f7e03da0584d6a2)
 2016-09-12 17:04:19 +02:00
Christoph M. Becker
01e798fa36 Merge branch 'PHP-7.1' 2016-09-12 13:45:26 +02:00
Christoph M. Becker
c7adfeb6c6 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-12 13:36:24 +02:00
Christoph M. Becker
82fa85fd08 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-12 13:27:57 +02:00
Christoph M. Becker
0cbf634657 Skip regression test for issue that has not yet been released in libgd 
<https://github.com/libgd/libgd/issues/177> has been assessed as enhancement,
so most likely it will be released with GD 2.3.
 2016-09-12 13:21:34 +02:00
Christoph M. Becker
e3e4932040 Merge branch 'PHP-7.1' 2016-09-12 12:50:45 +02:00
Christoph M. Becker
6ef0b09948 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-12 12:44:49 +02:00
Christoph M. Becker
c2044e60f3 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-12 12:39:14 +02:00
Christoph M. Becker
fcdc30b347 Skip test for external GD because of not yet published bugfix 2016-09-12 12:34:11 +02:00
Christoph M. Becker
ca5cfacffc Merge branch 'PHP-7.1' 2016-09-12 00:08:16 +02:00
Christoph M. Becker
6c3f90cab9 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-12 00:03:56 +02:00
Christoph M. Becker
c02cfd4e25 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-11 23:51:32 +02:00
Andrea Faulds
3cc9090101 Remove remaining zpp fallback code (master branch) 
Follow-up to d690014bf3
 2016-09-11 22:50:24 +01:00
Christoph M. Becker
6d0e773292 Skip tests for unpatched external libgd regarding libvpx 
Some issues have never been fixed in the external libgd's libvpx binding,
so we skip the respective tests.
 2016-09-11 23:49:09 +02:00
Andrea Faulds
695176458f Merge branch 'PHP-7.1' 2016-09-11 22:46:48 +01:00
Andrea Faulds
fc5497cb92 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-11 22:46:20 +01:00
Andrea Faulds
d690014bf3 Remove zpp fallback code (always use Fast ZPP) 
Squashed commit of the following:

commit 3e27fbb3d2
Author: Andrea Faulds <ajf@ajf.me>
Date:   Sun Sep 11 19:14:37 2016 +0100

    Keep dummy FAST_ZPP macro for compatibility

commit 8a7cfd00de
Author: Andrea Faulds <ajf@ajf.me>
Date:   Mon Sep 5 22:36:03 2016 +0100

    Remove FAST_ZPP macro and plain zpp fallback code
 2016-09-11 22:44:46 +01:00
Christoph M. Becker
7b21230663 Merge branch 'PHP-7.1' 2016-09-11 23:08:44 +02:00
Christoph M. Becker
c90f7f66ea Merge branch 'PHP-7.0' into PHP-7.1 2016-09-11 23:03:58 +02:00
Christoph M. Becker
529811cfb0 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-11 19:32:54 +02:00
Christoph M. Becker
6ef987e012 Split test for bundled vs. external libgd 
The behavior of imagecropauto($im, IMG_CROP_DEFAULT) is rather different
for the bundled and an external libgd, see
<https://github.com/libgd/libgd/issues/298>.
Therefore we split the test for now.
 2016-09-11 19:30:55 +02:00
Christoph M. Becker
f425a0d234 Merge branch 'PHP-7.1' 2016-09-11 18:44:59 +02:00
Christoph M. Becker
c911aa9def Merge branch 'PHP-7.0' into PHP-7.1 2016-09-11 18:40:46 +02:00
Christoph M. Becker
225478bccf Merge branch 'PHP-5.6' into PHP-7.0 2016-09-11 18:35:11 +02:00
Christoph M. Becker
38455293f7 Make test case more resilient 
This test case fails with external libgd, because libgd < 2.2.4 converts
palette images to truecolor (<https://github.com/libgd/libgd/issues/297>).

However, even if there happens no truecolor conversion, it is not guaranteed
that the palette indexes of the original and the cropped image are identical
(this is, for instance, not the case with current libgd master where the bug
has been fixed). Therefore we check for the expected RGBA value instead of
the palette index.
 2016-09-11 18:29:27 +02:00
Christoph M. Becker
30d2f99526 Merge branch 'PHP-7.1' 2016-09-11 14:57:17 +02:00
Christoph M. Becker
29cb3c89e5 Replace md5 image comparision with test_image_equals_file() 2016-09-11 14:56:11 +02:00
Christoph M. Becker
e878930c94 Merge branch 'PHP-7.1' 2016-09-11 14:20:13 +02:00
Christoph M. Becker
b843d65599 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-11 14:05:19 +02:00
Christoph M. Becker
cd16b64f01 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-11 13:26:30 +02:00
Anatol Belski
3d405fdc6b Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix bug category
  update NEWS
 2016-09-11 13:21:28 +02:00
Anatol Belski
c300fdfa36 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix bug category
  update NEWS
 2016-09-11 13:21:15 +02:00
Anatol Belski
95e4e6a3ce fix bug category 2016-09-11 13:20:25 +02:00
Anatol Belski
1b2007dada sync NEWS 2016-09-11 13:19:17 +02:00
Anatol Belski
0fdf2ffae1 update NEWS 2016-09-11 13:05:07 +02:00
Anatol Belski
65bf5e88c7 Revert "Merge branch 'PHP-5.6' into PHP-7.0" 
This reverts commit 946335ba70, reversing
changes made to 3437dbfa00.
 2016-09-11 12:59:43 +02:00
Christoph M. Becker
2970630133 Merge branch 'PHP-5.6' into PHP-7.0 
(cherry picked from commit f93fd8ce32)
 2016-09-11 12:59:43 +02:00
Christoph M. Becker
874697e30a Merge branch 'PHP-5.6' into PHP-7.0 
(cherry picked from commit 8f32d609c5)
 2016-09-11 12:59:43 +02:00
Anatol Belski
d947d974d5 Revert "Revert "Merge branch 'PHP-5.6' into PHP-7.0"" 
This reverts commit 62d5bfb527.
 2016-09-11 12:59:43 +02:00
Christoph M. Becker
dc09f30933 A picture is worth a thousand message digests 
The bundled GD test suites makes heavy use of md5() to verify the result
of drawing operations. This leads to fragile tests (even a slight change
in a PNG header would cause failure, and of course there is the
possibility of collisions), and even worse, eventual test failures are
rather unrevealing.

Therefore we replace all md5() verification with a simplistic
test_image_equals_file(), which is basically a simplified port of libgd's
gdTestImageCompareToFile(), adapted to the needs of PHPTs.

In the long run better tests helpers should be introduced (see also
<http://news.php.net/php.internals/94081>), but for now this solution
is preferable over the former.

(cherry picked from commit 24f9e96792)
 2016-09-11 12:56:53 +02:00