Anatol Belski [Sun, 12 May 2013 12:00:32 +0000 (14:00 +0200)]
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.
Anatol Belski [Wed, 8 May 2013 16:58:32 +0000 (18:58 +0200)]
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:
Anatol Belski [Wed, 8 May 2013 16:58:32 +0000 (18:58 +0200)]
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:
Remi Collet [Mon, 6 May 2013 08:02:34 +0000 (10:02 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Revert removal of overflow2 use in gd.c Function provided by gd_security with bundled libgd Function provided by gd_compat with system libgd
Remi Collet [Sun, 5 May 2013 07:56:52 +0000 (09:56 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
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)
Remi Collet [Sat, 4 May 2013 14:54:46 +0000 (16:54 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
NEWS
fix build with bundled libgd
Move png and jpeg version functions to gd.c so the external library build doesn't include anything from libgd/.
Remove extra unused functions from gd_compat.h
Rewrite Xpm library check so it doesn't break on MultiArch systems
Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef
* Remove overflow2, getmbi and skipheaders from gd_compat.h * Add missing return in _php_ctx_getmbi * Reintroduce imagecreatefromxbm by checking for gdCreateImageFromXbm
Remove overflow2, getmbi and skipheader, since they are not needed anymore.
Allow to use new GD-2.1.0 function from system library
Ondřej Surý [Fri, 3 May 2013 10:40:45 +0000 (12:40 +0200)]
* Remove overflow2, getmbi and skipheaders from gd_compat.h * Add missing return in _php_ctx_getmbi * Reintroduce imagecreatefromxbm by checking for gdCreateImageFromXbm
Boris Lytochkin [Fri, 3 May 2013 19:22:27 +0000 (23:22 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
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
cut PHP_VERSION_ID - we know API version now
Boris Lytochkin [Fri, 3 May 2013 19:10:11 +0000 (23:10 +0400)]
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
Boris Lytochkin [Fri, 3 May 2013 19:06:34 +0000 (23:06 +0400)]
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
Boris Lytochkin [Fri, 3 May 2013 07:23:20 +0000 (11:23 +0400)]
Merge branch 'master' of https://git.php.net/push/php-src
* 'master' of https://git.php.net/push/php-src: (346 commits)
NEWS
NEWS
NEWS
From code coverity scan, syscall return value must be check.
fix more resource leaks
From code coverity scan - fix some memory leak - fix some resources leak (fd) - create fpm_worker_pool_free (shared use) - possible null dref (wp->user and wp->home can be null)
fixed size array cannot be null
use limit_extensions as we use security_limit_extensions later (free)
unused variable
fix possible null deref (detected by code coverity scan)
updated lib versions
Oops
Harden loopback tests
Fix race condition when ext/hash/tests run in parallel
Remove trailing space in NEWS
NEWS for 514afd67
Fix bug #64729: compilation failure on x32
don't include smart_str.h in a too global header, fixes #64718
NEWS
When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm the SCRIPT_FILENAME may contains the QUERY_STRING.
...
Boris Lytochkin [Fri, 3 May 2013 07:22:42 +0000 (11:22 +0400)]
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: (310 commits)
NEWS
NEWS
NEWS
From code coverity scan, syscall return value must be check.
fix more resource leaks
From code coverity scan - fix some memory leak - fix some resources leak (fd) - create fpm_worker_pool_free (shared use) - possible null dref (wp->user and wp->home can be null)
fixed size array cannot be null
use limit_extensions as we use security_limit_extensions later (free)
unused variable
fix possible null deref (detected by code coverity scan)
updated lib versions
Remove trailing space in NEWS
NEWS for 514afd67
Fix bug #64729: compilation failure on x32
don't include smart_str.h in a too global header, fixes #64718
NEWS
When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm the SCRIPT_FILENAME may contains the QUERY_STRING.
Added SoapClient constructor option 'ssl_method' to specify ssl method
fix #64738, fix implicit type declaration
Avoid possible conditional jump depended on uninitialised value
...
Boris Lytochkin [Fri, 3 May 2013 07:22:16 +0000 (11:22 +0400)]
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: (109 commits)
NEWS
NEWS
From code coverity scan, syscall return value must be check.
fix more resource leaks
From code coverity scan - fix some memory leak - fix some resources leak (fd) - create fpm_worker_pool_free (shared use) - possible null dref (wp->user and wp->home can be null)
fixed size array cannot be null
use limit_extensions as we use security_limit_extensions later (free)
unused variable
fix possible null deref (detected by code coverity scan)
Remove trailing space in NEWS
NEWS for 514afd67
Fix bug #64729: compilation failure on x32
When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm the SCRIPT_FILENAME may contains the QUERY_STRING.
Revert "Add CURL_WRAPPERS_ENABLE constant"
Also fixed bug #64726 in 5.3
Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB pointer has closed)
Fix memory realted to #64726
updated libmagic.patch
Fixed bug bug #64713 Compilation warnings in finfo
Fix Test Bug #64714
...
Boris Lytochkin [Fri, 3 May 2013 07:21:48 +0000 (11:21 +0400)]
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: (39 commits)
NEWS
From code coverity scan, syscall return value must be check.
fix more resource leaks
From code coverity scan - fix some memory leak - fix some resources leak (fd) - create fpm_worker_pool_free (shared use) - possible null dref (wp->user and wp->home can be null)
fixed size array cannot be null
use limit_extensions as we use security_limit_extensions later (free)
unused variable
fix possible null deref (detected by code coverity scan)
Also fixed bug #64726 in 5.3
Fix memory realted to #64726
Fix Test Bug #64714
PHP 5.3.26 this will be
Fix NEWS
Fix bug #64458 (dns_get_record result with string of length -1)
Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function is not yet set to the calling function.
Fixed stream_socket_pair() on Windows x64 and
- Updated to version 2013.3 (2013c)
lower the limit, should fit in a byte
updated lib versions
allow lcov 1.10
...
projects / php / log