php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-20 14:31:06 +02:00
Code Issues Packages Projects Releases Wiki Activity
73,729 Commits 547 Branches 1,483 Tags
3fd39c13f9b3e982ffccf66b40ec1ed05b5146d6
Commit Graph

73729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
3fd39c13f9 updated NEWS 2013-05-12 14:09:59 +02:00
Anatol Belski
2d8ce75f39 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  Fixed bug #64821 Custom Exceptions crash when internal properties overridden
 2013-05-12 14:09:16 +02:00
Anatol Belski
89159926ad updated NEWS 2013-05-12 14:08:42 +02:00
Anatol Belski
dd188e9538 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #64821 Custom Exceptions crash when internal properties overridden
 2013-05-12 14:06:59 +02:00
Anatol Belski
d6505acbf5 Fixed bug #64821 Custom Exceptions crash when internal properties overridden 
If user inherits Exception and overrides the properties to arbitrary data types,
or simply doesn't run parent::__construct(), here we go. Just convert everything
to the appropriate data type, like Exception::__toString() does.
 2013-05-12 14:00:32 +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
98302ee3cc Fix NEWS (wrong bug # AND wrong section...) 
It's bug #64508, not #64506.
 2013-05-08 20:03:43 +02:00
Gustavo Lopes
8687332e08 Fix bug #64506: fix build with --disable-ipv6 2013-05-08 19:58:27 +02:00
Anatol Belski
7b09e5fe35 Fixed news, rc1 is already branched 2013-05-08 19:24:51 +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
David Soria Parra
288f04c430 News for RC2 2013-05-08 18:57:06 +02:00
David Soria Parra
e30dbcce77 NEWS for RC1 2013-05-08 18:44:05 +02:00
Johannes Schlüter
9ef017af00 Merge branch 'PHP-5.4' into PHP-5.5 2013-05-08 18:03:12 +02:00
Johannes Schlüter
898ddcb9e1 Merge branch 'PHP-5.3' into PHP-5.4 2013-05-08 18:02:35 +02:00
Johannes Schlüter
1cc2162b83 PHP 5.3.25 NEWS 2013-05-08 18:01:39 +02:00
Remi Collet
36eee5b994 Fixed bug #64785 : restore 5.4 behaviour, libpng is mandatory 2013-05-08 07:37:40 +02:00
Ard Biesheuvel
5b121eb04d Fix #64780 (PHP 5.5 builds are broken with GCC 3) 
A recent change (by me) introduced a call to __builtin_offsetof()
into zend_operators.h which is not defined by GCC prior to
version 4.

Changed the code to use offsetof() instead: this is defined in
<stddef.h>, so #include this header conditionally (#ifdef GNUC)
 2013-05-07 20:37:04 +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
d981c191d4 NEWS 2013-05-04 16:54:22 +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
Xinchen Hui
9155d17fef Fix #64749 (warning: cast from pointer to integer of different size) 2013-05-04 20:43:42 +08: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
f1e5127e7a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  better fix for bug #64770
 2013-05-04 12:18:06 +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
3a413f216a Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4 
* 'PHP-5.4' of https://git.php.net/push/php-src:
  updated NEWS
  Fixed bug #64770 stream_select() fails with pipes
 2013-05-03 19:24:24 +04:00
Boris Lytochkin
f1269d80c5 Merge branch 'PHP-5.3' of https://git.php.net/push/php-src into PHP-5.3 
* 'PHP-5.3' of https://git.php.net/push/php-src:
  Fixed bug #64770 stream_select() fails with pipes
 2013-05-03 19:23:46 +04:00
Boris Lytochkin
1c8befe893 cut PHP_VERSION_ID - we know API version now 2013-05-03 19:22:21 +04:00
Boris Lytochkin
74ef9b6cea Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5 
* 'PHP-5.5' of https://git.php.net/push/php-src:
  updated NEWS
  updated NEWS
  Fixed bug #64770 stream_select() fails with pipes
 2013-05-03 19:10:22 +04:00
Anatol Belski
f7830e4f98 updated NEWS 2013-05-03 17:05:54 +02:00