Matteo Beccati [Wed, 12 Nov 2014 10:23:24 +0000 (11:23 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #53829 Compiling PHP with large file support will replace function gzopen by gzopen64
Remove unneeded md5 hashing from PHP-5.6 branch. It's removed from master already by my previous commit.
Rasmus Lerdorf [Mon, 10 Nov 2014 18:42:30 +0000 (10:42 -0800)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
Fixed bug #68370 ("unset($this)" can make the program crash)
Fixed NEWS for 5.5
Fix opcache.revalidate_freq per-request behavior
Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)
Rasmus Lerdorf [Mon, 10 Nov 2014 18:36:57 +0000 (10:36 -0800)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (70 commits)
convert_to_string also does the check
A better fix(do the convertion in compile time)
update UPGRADING.INTERNALS
better description for the toolset config option
use proper declarations for zend_stat_t
move these functions to the appropriate place
Fixed segfault in bug62500.phpt
Update NEWS
Fixed bug #68370 ("unset($this)" can make the program crash)
move more common ldflags into function
rename intel toolset to icc - shorter
fix gd compilation with icc toolset
either ms or intel linker is used, /libpath is supported
further catch up with phpize and improved clang arch setup
add /fallback for clang-cl
parametrize WINVER and update its value
further refactoring of toolset+phpize stuff
catch up the toolset changes with phpize
fix linking for clang, using linker directly
adjust pid_t declaration so it doesn't conflict with apache one
...
Rasmus Lerdorf [Mon, 10 Nov 2014 18:36:46 +0000 (10:36 -0800)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
Update NEWS
Fixed bug #68370 ("unset($this)" can make the program crash)
Fix opcache.revalidate_freq per-request behavior
Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)
Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
Rasmus Lerdorf [Thu, 6 Nov 2014 18:19:45 +0000 (10:19 -0800)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src: (142 commits)
Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
Update NEWS
Fixed bug #68331 - This was partial patch for https://wiki.php.net/rfc/session-lock-ini
fix dir separator in test
arg1-3 are not variable names to use; removed useless buffer variable
update NEWS
Fix bug #63595 GMP memory management conflicts with other libraries using GMP
Initialize the offset table - PCRE may sometimes miss offsets
set default response code to 200
set default response code to 200
set default response code to 200
Fixed bug #66584 Segmentation fault on statement deallocation
Add credit
fix ZTS build
Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction
Fixed Bug #68104 (Segfault while pre-evaluating a disabled function)
Temporarily disable wait/xml protocol...
don't try to send in the test results until we restored qa.php.net
Fix uninitialized value...
...
Anatol Belski [Thu, 6 Nov 2014 12:42:24 +0000 (13:42 +0100)]
Merge branch 'pull-request/869'
* pull-request/869:
Various fixes to allow support for new VS2014 features - Added some typeof checks to handle JS errors introduced in VS2014 - Added VS2014 to the list of compilers - Changed to use stdint.h if we are using VS2014 or higher - Skip defining timespec if we're using VS2014 or higher - Moved u_char typedef out to always be defined regardless of VS version
projects / php / log