clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-30 14:26:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
91,386 Commits 494 Branches 1,367 Tags 793 MiB
6065b29fe4
Commit Graph

39311 Commits

Author SHA1 Message Date
Anatol Belski
6065b29fe4 Reverted ad4533fdba 
The E_ERROR to E_RECOVERABLE_ERROR should be readded with the
proper tests.
 2015-07-21 11:18:36 +02:00
Anatol Belski
af0f857c01 fix comment 2015-07-21 10:37:08 +02:00
Anatol Belski
4646e6e7d3 libwebp support for linux 2015-07-21 10:37:07 +02:00
Christoph M. Becker
00ba7e6215 Replaced libvpx by libwebp (first draft; Windows only) 
ext/gd/libgd/gd_webp.c has been taken from libgd[1]. Mainly, gd_error(X) has
been subsituted by zend_error(E_ERROR, X) and BGD_DECLARE(X) by X. Further
modifications are obvious from the diff.

All GD tests are passing, what raises hope, but we need more WebP tests,
anyway.

[1] <7ec030c4f1/src/gd_webp.c>
 2015-07-21 10:37:06 +02:00
Yasuo Ohgaki
ad4533fdba Change E_ERROR and some E_WARNING to E_RECOVERABLE_ERROR. 2015-07-21 12:59:23 +09:00
Christoph M. Becker
22767a48a7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Add tests for json_last_error()/json_last_error_msg() failures
 2015-07-21 02:00:16 +02:00
Kubo2
f18ba0f9c9 Add tests for json_last_error()/json_last_error_msg() failures 2015-07-21 01:50:40 +02:00
Christoph M. Becker
16d6a93f09 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  revised bug53156.phpt
  Fix #53156: imagerectangle problem with point ordering
 2015-07-21 01:20:02 +02:00
Christoph M. Becker
f1228ebc61 Merge branch 'pull-request/1425' into PHP-5.6 
* pull-request/1425:
  revised bug53156.phpt
  Fix #53156: imagerectangle problem with point ordering
 2015-07-21 01:13:04 +02:00
Christoph M. Becker
ea37ca7707 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fix #66387: Stack overflow with imagefilltoborder
 2015-07-20 23:44:04 +02:00
Christoph M. Becker
e7f2356665 Fix #66387: Stack overflow with imagefilltoborder 
The stack overflow is caused by the recursive algorithm in combination with a
very large negative coordinate passed to gdImageFillToBorder(). As there is
already a clipping for large positive coordinates to the width and height of
the image, it seems to be consequent to clip to zero also.
 2015-07-20 23:36:32 +02:00
Christoph M. Becker
2ec8611293 revised bug53156.phpt 2015-07-20 03:05:22 +02:00
Christoph M. Becker
72b73e24a0 Fix #53156: imagerectangle problem with point ordering 
Contrary to imagefilledrectangle(), imagerectangle() has the documented
limitation that the given points have to be the upper left and the lower right
corner, respectively. However, libgd already caters to upper right / lower left
pairs, and not catering to the other two combinations seems to be an oversight.
 2015-07-20 02:14:29 +02:00
Christoph M. Becker
440d715632 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Added basic test for imagewebp() and imagecreatefromwebp()
 2015-07-19 23:11:11 +02:00
Christoph M. Becker
90de2aeaac Added basic test for imagewebp() and imagecreatefromwebp() 2015-07-19 23:05:07 +02:00
Christoph M. Becker
6c8dbfd5c1 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fix #70102: imagecreatefromwebm() shifts colors
 2015-07-19 22:40:49 +02:00
Christoph M. Becker
a31fe58d80 Fix #70102: imagecreatefromwebm() shifts colors 
libgd internally uses ARGB format, so we have to decode to ARGB instead of
RGBA.
 2015-07-19 22:33:54 +02:00
Christoph M. Becker
209223b97e Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed Fix #66590, which may segfault
 2015-07-19 22:01:20 +02:00
Christoph M. Becker
d3958b32ca fixed Fix #66590, which may segfault 2015-07-19 21:54:55 +02:00
Anatol Belski
61ebc6c615 exclude a non windows test 2015-07-19 19:53:53 +02:00
Christoph M. Becker
f9d95a4003 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fix #66590: imagewebp() doesn't pad to even length
 2015-07-19 17:45:16 +02:00
Christoph M. Becker
96e42403d5 Fix #66590: imagewebp() doesn't pad to even length 
The code in the bundled libgd uses libvpx and writes the riff manually. The
code generates the correct even size, but neglects the padding. It's possible
older versions of libwebp would decode this, but libwebp 0.4.0 does not.

Let's apply the patch supplied by one of the WebP developers.
 2015-07-19 17:38:04 +02:00
Rasmus Lerdorf
3760cb6a59 wddx_add_vars() returns a bool 2015-07-19 07:05:03 -07:00
Christoph M. Becker
3ed0d18152 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix #70096: Repeated iptcembed() adds superfluous FF bytes

Conflicts:
	ext/standard/iptc.c
 2015-07-18 22:52:39 +02:00
Christoph M. Becker
8c483ce36c Fix #70096: Repeated iptcembed() adds superfluous FF bytes 
When there is already an APP13 marker segment in the file, iptcembed() doesn't
skip the first byte (0xFF) of this segment, what leads to unnecessary and
potentially invalid duplication of this byte. This patch fixes this issue.
 2015-07-18 22:48:54 +02:00
Nikita Popov
f809f28119 Check mbfl_filt_put_invalid_char return value 
And fix some libmbfl warnings
 2015-07-18 21:53:03 +02:00
Nikita Popov
4ac0d96faa Deduplicate usort code 2015-07-18 21:53:03 +02:00
Christoph M. Becker
77140d8b3d Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed PHPT that is always being skipped or otherwise would fail
 2015-07-18 21:35:54 +02:00
Christoph M. Becker
a66efb0b15 fixed PHPT that is always being skipped or otherwise would fail 2015-07-18 21:33:20 +02:00
Nikita Popov
df031961ad Correctly handle zend_hash_sort failure 
This can't actually happen right now, but should it become possible
we won't be leaking everything anymore.
 2015-07-18 20:07:00 +02:00
Nikita Popov
179c8a2a09 Fix usort modification detection 
This would delref the wrong array, leading to a segfault.
 2015-07-18 20:07:00 +02:00
Jakub Zelenka
4540e644ec Regenerate bison and re2c files in json 2015-07-18 17:41:17 +01:00
Nikita Popov
4854b11566 Partially fix XSLT warnings 
The two remaining issues seem to be genuine problems. We're treating
node->children as a string, even though it's actually an xmlNode.
The same code exists twice in xpath.c. In all cases gcov shows no
coverage for it.
 2015-07-17 21:12:15 +02:00
Nikita Popov
42e32c33e2 More warning fixes 2015-07-17 21:12:15 +02:00
Nikita Popov
36e49c702b Fix simplexml warnings 2015-07-17 21:12:15 +02:00
Anatol Belski
a685953969 fix duplicated line 2015-07-17 20:30:21 +02:00
Nikita Popov
5c95226d50 Various warning fixes 2015-07-17 20:18:25 +02:00
Nikita Popov
90d9adccec Fix zlib_filter warnings 2015-07-17 19:48:06 +02:00
Nikita Popov
8a9eee8f7e Fix mysqlnd warnings 2015-07-17 17:48:02 +02:00
Nikita Popov
0039a3e96f Fixed signed/unsigned warnings in wddx 
Also added extra const annotation to zend_memnstr.
 2015-07-17 17:19:23 +02:00
Anatol Belski
daba578dbe fix file cache path calculation at all the places 
moved the corresponding code into a separte function while on that
 2015-07-17 15:14:25 +02:00
Anatol Belski
4c87750c26 fix path handling for the file cache 2015-07-17 13:51:16 +02:00
Nikita Popov
208257eec5 Explicitly ignore mblen(NULL, 0) retval 2015-07-16 22:39:11 +02:00
Anatol Belski
0dce8373cd forked test for windows 2015-07-16 15:05:04 +02:00
Xinchen Hui
deeb6379cb Fixed bug #70079 (Segmentation fault after more than 100 SoapClient calls) 2015-07-16 18:32:42 +08:00
Christopher Jones
e6d9061e85 More OCI8 diff fixes (Rajendra) 2015-07-16 13:06:35 +10:00
Rasmus Lerdorf
73773c2175 unserialize() takes a 2nd optional arg and it can't be a bool 2015-07-15 09:59:31 -07:00
Xinchen Hui
32a4507abc Fixed segfault if opcache is disabled and with file_cache 2015-07-15 10:38:23 +08:00
Xinchen Hui
453ec91dfe Fixed bug #70067 (Cross-compile failure in opcache when SIZEOF_ZEND_LONG < SIZEOF_SIZE_T) 2015-07-14 18:59:36 +08:00
Christopher Jones
c20f00f765 PHP 7 OCI8: fix bug57702.phpt regression 2015-07-14 08:39:59 +10:00