Dmitry Stogov [Wed, 20 Aug 2014 11:04:40 +0000 (15:04 +0400)]
Removed a hack that allowed passing of function return value by reference depending on value of reference-counter (Fixed Zend/tests/bug35393.phpt test failure)
Dmitry Stogov [Wed, 20 Aug 2014 11:04:03 +0000 (15:04 +0400)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
phpdbg doesn't build due to the phpng merge, distable its build & test runs
phpdbg doesn't build due to the phpng merge, distable it
Tjerk Meesters [Wed, 20 Aug 2014 04:13:19 +0000 (12:13 +0800)]
Fixed off-by-one memory allocation that could lead to invalid memory reads on strlen()
Always properly null terminate strings before ini parsing
Remove unnecessary memset() statements
Lior Kaplan [Tue, 19 Aug 2014 22:36:56 +0000 (01:36 +0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Add NEWS entry for bug #67730
Add CVE ID for bug #67539
Add NEWS entry for bug #67492
Add NEWS entry for bug #67730
Add NEWS entry for bug #67730
Add CVE ID for bug #67539
Sara Golemon [Tue, 19 Aug 2014 19:46:53 +0000 (12:46 -0700)]
Switch use of strtok() to gd_strtok_r()
strtok() is not thread safe, so this will potentially break in
very bad ways if used in ZTS mode.
I'm not sure why gd_strtok_r() exists since it seems to do the
same thing as strtok_r(), but I'll assume it's a portability
decision and do as the Romans do.
Anatol Belski [Tue, 19 Aug 2014 10:51:05 +0000 (12:51 +0200)]
Merge branch 'master' of git.php.net:php-src
# By Stanislav Malyshev (5) and Remi Collet (1)
# Via Stanislav Malyshev
* 'master' of git.php.net:php-src:
5.4.32
fix potentially missing NUL termination
Fix bug #67730 - Null byte injection possible with imagexxx functions
Fixed bug #67717 - segfault in dns_get_record
Fix bug #67716 - Segfault in cdf.c
5.4.32 RC1
Anatol Belski [Mon, 18 Aug 2014 20:36:57 +0000 (22:36 +0200)]
Merge branch 'master' of git.php.net:php-src
# By Derick Rethans (3) and Dmitry Stogov (1)
# Via Derick Rethans (3) and Dmitry Stogov (1)
* 'master' of git.php.net:php-src:
Improved error message
BFN.
Fixed bug #67109: First uppercase letter breaks date string parsing.
Fixed bug #66985: Some timezones are no longer valid in PHP 5.5.10.
Ferenc Kovacs [Mon, 18 Aug 2014 15:04:17 +0000 (17:04 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
mention the changes regarding ReflectionClass::newInstanceWithoutConstructor in UPGRADING see the discussion on the mailing list and in the pull request for details: https://github.com/php/php-src/pull/733
Ferenc Kovacs [Mon, 18 Aug 2014 14:59:03 +0000 (16:59 +0200)]
mention the changes regarding ReflectionClass::newInstanceWithoutConstructor in UPGRADING
see the discussion on the mailing list and in the pull request for details:
https://github.com/php/php-src/pull/733
Dmitry Stogov [Mon, 18 Aug 2014 05:05:16 +0000 (09:05 +0400)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Updated NEWS for d790ec
Correct typo in comments: 'initialized'
typofixes
typofixes
Fixes missing Reflector interface constraints being enforced by the engine
Fixed version id
Update NEWS
Update NEWS
Fix another failing test
Add NEWS
Better version checking
Better version checking
Better version checking
Fix failing tests
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
Keyur Govande [Fri, 15 Aug 2014 23:06:55 +0000 (23:06 +0000)]
Merge branch 'pull-request/772' into PHP-5.4
* pull-request/772:
Fix failing tests
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
Before the patch, a value of 9.99 in a FLOAT column came out of mysqli
as 9.9998998641968. This is because it would naively cast a 4-byte float
into PHP's internal 8-byte double.
To fix this, with GCC we use the built-in decimal support to "up-convert"
the 4-byte float to a 8-byte double.
When that is not available, we fall back to converting the float
to a string and then converting the string to a double. This mimics
what MySQL does.
projects / php / log