Anatol Belski
077b575d51
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix unitialized vars when sql.safe_mode=1
more check for php_stream_fopen_tmpfile failure
2013-05-15 11:17:18 +02:00
Anatol Belski
de82e7edf7
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix unitialized vars when sql.safe_mode=1
more check for php_stream_fopen_tmpfile failure
2013-05-15 11:14:58 +02:00
Anatol Belski
86db5fb4c2
Fix unitialized vars when sql.safe_mode=1
...
which can break the subsequent mysqlnd_connect() call
2013-05-15 11:12:17 +02:00
Pierre Joye
ba1af29805
more check for php_stream_fopen_tmpfile failure
2013-05-14 16:45:11 +02:00
Andrey Hristov
1f97fde89e
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
2013-05-14 13:01:18 +02:00
Andrey Hristov
9d2dda9058
Fix for Bug #64394 MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS undeclared when using Connector/C
2013-05-14 11:26:35 +02:00
Anatol Belski
75ee1a6113
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch after fix for #64830
2013-05-14 11:16:01 +02:00
Anatol Belski
1a46a102d9
updated libmagic.patch after fix for #64830
2013-05-14 11:14:37 +02:00
Anatol Belski
8c36156070
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-05-14 09:45:02 +02:00
Anatol Belski
ad210f2c10
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-05-14 09:44:48 +02:00
Anatol Belski
933e01bbac
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64830 mimetype detection segfaults on mp3 file
2013-05-14 09:41:38 +02:00
Anatol Belski
74555e7c26
Fixed bug #64830 mimetype detection segfaults on mp3 file
2013-05-14 09:40:43 +02:00
Pierre Joye
362402d748
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
php_stream_fopen_tmpfile may file, causing any following stream usage to crash
2013-05-14 09:21:30 +02:00
Pierre Joye
f37c54ab27
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
php_stream_fopen_tmpfile may file, causing any following stream usage to crash
2013-05-14 09:21:17 +02:00
Pierre Joye
533e636a62
php_stream_fopen_tmpfile may file, causing any following stream usage to crash
2013-05-14 09:20:53 +02:00
Anatol Belski
e191cb63ba
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix heap overflow warnings on win x64 debug crt
2013-05-13 14:26:50 +02:00
Anatol Belski
156576fcce
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix heap overflow warnings on win x64 debug crt
2013-05-13 14:25:25 +02:00
Anatol Belski
fe21accfb4
fix heap overflow warnings on win x64 debug crt
2013-05-13 14:24:21 +02:00
Anatol Belski
e44849b0f4
Fixed bug #64825 Invalid free unserializing DateTimeZone
2013-05-12 21:29:16 +02:00
Anatol Belski
95ea1e7ca7
fixed variable corruption under win x64
2013-05-11 02:47:48 +02:00
Xinchen Hui
b3f6cc20e0
Merge branch 'PHP-5.4' into PHP-5.5
2013-05-09 15:57:44 +08:00
Xinchen Hui
699dc04c55
Missed SKIPIF
2013-05-09 15:57:25 +08:00
Gustavo Lopes
8687332e08
Fix bug #64506 : fix build with --disable-ipv6
2013-05-08 19:58:27 +02:00
Anatol Belski
4091e94660
Fixed bug #64769 mbstring PHPTs crash on Windows x64
...
The tricky business going there in oniguruma is saving a pointer
in an int variable, passing that variable into a function and making
it a pointer again. On 64bit windows casting a pointer to a 32 bit
int will truncate that pointer. This kind of things won't work on
Windows x64.
[SNIPPET]
unsigned long ul0[2], ul1, *ul2;
ul0[0] = 42uL;
ul0[0] = 24uL;
ul1 = (unsigned long)ul0;
ul2 = (unsigned long *)ul1;
/* now it's broken, accessing ul2[0] will crash. */
[/SNIPPET]
To make it portable, ULONG_PTR should be used in this case.
In oniguruma this behaviour is to see at least in the following
codepath:
ext/mbstring/oniguruma/enc/unicode.c:10938
ext/mbstring/oniguruma/st.c:308
ext/mbstring/oniguruma/enc/unicode.c:10859
2013-05-08 19:22:37 +02:00
Remi Collet
36eee5b994
Fixed bug #64785 : restore 5.4 behaviour, libpng is mandatory
2013-05-08 07:37:40 +02:00
Remi Collet
de7415ea55
gd: fix 2 failed tests (bundled lib) due to arithmetic precision (allow minor diff).
2013-05-06 10:25:36 +02:00
Remi Collet
96a575123d
gd: fix previous (bad include)
2013-05-06 10:07:06 +02:00
Remi Collet
9480de29db
Revert removal of overflow2 use in gd.c
...
Function provided by gd_security with bundled libgd
Function provided by gd_compat with system libgd
This fix failed test imageloadfont_invalid.phpt
This test now also pass with system libgd
2013-05-06 10:00:45 +02:00
Remi Collet
4cea61a0fa
gd: fix include...
2013-05-05 10:39:33 +02:00
Remi Collet
0cae9a15d7
Move (back) missing functions in system libgd to gd_compat
...
- display libPng version in all cases
- gd_compat.c in ext/gd (nothing in ext/gd/libgd)
2013-05-05 09:54:27 +02:00
Remi Collet
9a48b6506c
gd: don't include png.h (breaks build on some old version), so report libPNG version only with external libgd
2013-05-05 08:35:29 +02:00
Remi Collet
54d6f8b34e
gd: missing comma
2013-05-05 06:52:28 +02:00
Remi Collet
2ab270011d
gd: fix typo and cleanups
2013-05-04 20:36:32 +02:00
Remi Collet
00b097d2a3
fix build with bundled libgd
2013-05-04 16:51:56 +02:00
Ondřej Surý
2a2ac5f2be
Move png and jpeg version functions to gd.c so the external library build doesn't include anything from libgd/.
2013-05-04 16:50:13 +02:00
Ondřej Surý
e6704501f8
Remove extra unused functions from gd_compat.h
2013-05-04 16:50:11 +02:00
Ondřej Surý
5e9c6c3b64
Rewrite Xpm library check so it doesn't break on MultiArch systems
2013-05-04 16:50:08 +02:00
Ondřej Surý
8a90aad35b
Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef
2013-05-04 16:50:06 +02:00
Ondřej Surý
2fc17d83cb
* Remove overflow2, getmbi and skipheaders from gd_compat.h * Add missing return in _php_ctx_getmbi * Reintroduce imagecreatefromxbm by checking for gdCreateImageFromXbm
2013-05-04 16:50:03 +02:00
Ondřej Surý
8a07908215
Remove overflow2, getmbi and skipheader, since they are not needed anymore.
2013-05-04 16:49:59 +02:00
Ondřej Surý
6aedadce0a
Allow to use new GD-2.1.0 function from system library
2013-05-04 16:49:35 +02:00
Anatol Belski
b2ef8672c7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
better fix for bug #64770
better fix for bug #64770
2013-05-04 12:20:19 +02:00
Anatol Belski
ec4388158d
better fix for bug #64770
2013-05-04 12:19:52 +02:00
Anatol Belski
5c701d19ac
better fix for bug #64770
2013-05-04 12:16:38 +02:00
Boris Lytochkin
67d83de11c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
remove OS-specific OIDs from 'WALK multiple on single OID with OID suffix as keys' test part
2013-05-04 00:06:06 +04:00
Boris Lytochkin
8c3b8f39aa
remove OS-specific OIDs from
...
'WALK multiple on single OID with OID suffix as keys' test part
2013-05-04 00:04:52 +04:00
Boris Lytochkin
eff60f993c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
re-work walkaround for net-snmp BUGid 2027834, no need to detect it anymore add test for Bug #64159 bump default buffer size for values(32->512): do not reallocate buffers in 99% cases
2013-05-03 23:10:11 +04:00
Boris Lytochkin
c34274acb8
re-work walkaround for net-snmp BUGid 2027834, no need to detect it anymore
...
add test for Bug #64159
bump default buffer size for values(32->512): do not reallocate buffers in 99% cases
2013-05-03 23:06:34 +04:00
Boris Lytochkin
1c8befe893
cut PHP_VERSION_ID - we know API version now
2013-05-03 19:22:21 +04:00
Anatol Belski
6d41711fd9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed bug #64770 stream_select() fails with pipes
2013-05-03 17:04:53 +02:00