summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 5.6.0alpha1php-5.6.0alpha1Ferenc Kovacs2014-01-213-4/+4
|
* Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2014-01-212-0/+2
|\ | | | | | | | | * PHP-5.5: fix these tests so they properly clean up after themselves.
| * Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2014-01-212-0/+2
| |\ | | | | | | | | | | | | * PHP-5.4: fix these tests so they properly clean up after themselves.
| | * fix these tests so they properly clean up after themselves.Ferenc Kovacs2014-01-202-0/+2
| | |
| | * Update NEWS for bug fix #62479Will Fitch2014-01-191-0/+3
| | |
| * | Updating NEWS with PDO changeWill Fitch2014-01-201-0/+4
| | |
* | | Updating NEWS with 66509 changeWill Fitch2014-01-201-0/+1
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-01-204-446/+486
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.5: Skip those test which fails on ARM architecture dos2unix
| * | Skip those test which fails on ARM architectureRemi Collet2014-01-204-1/+41
| | | | | | | | | | | | Add minimal tests for all arch.
| * | dos2unixRemi Collet2014-01-202-446/+446
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2014-01-201-1/+1
|\ \ \ | |/ /
| * | release 7.0.3Xinchen Hui2014-01-201-1/+1
| | |
* | | fixed glob compilation with vc12Anatol Belski2014-01-201-3/+10
| | |
* | | support for Visual C+ 2013Anatol Belski2014-01-201-0/+2
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-01-208-4/+131
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Skip readline tests which fail with libedit Add specific libedit test (output slightly differs)
| * | Skip readline tests which fail with libeditRemi Collet2014-01-208-4/+131
| | | | | | | | | | | | Add specific libedit test (output slightly differs)
* | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-01-201-0/+5
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714
| * | Fixed Bug #66412 readline_clear_history() with libedit causes segfault after ↵Remi Collet2014-01-202-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | #65714 Checking all libedit functions, this check is done in each functions (add_history, read_history, write_history, ...) but is missing in clear_history. Test coverage: readline_clear_history_001.phpt
* | | Merge branch 'PHP-5.5' into PHP-5.6Yasuo Ohgaki2014-01-1914-95/+22
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
| * | Merge branch 'PHP-5.4' into PHP-5.5Yasuo Ohgaki2014-01-1914-95/+22
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
| | * Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.Yasuo Ohgaki2014-01-1914-95/+22
| | |
* | | fix C89 compatAnatol Belski2014-01-191-1/+3
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Will Fitch2014-01-182-2/+85
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fix #62479: Some chars not parsed in passwords
| * | Merge branch 'PHP-5.4' into PHP-5.5Will Fitch2014-01-182-2/+85
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: Fix #62479: Some chars not parsed in passwords
| | * Fix #62479: Some chars not parsed in passwordsWill Fitch2014-01-182-2/+85
| | | | | | | | | | | | | | | This fixes an issue where backslashes and spaces aren't correctly parsed for passwords.
* | | Merge branch 'PHP-5.5' into PHP-5.6Will Fitch2014-01-182-1/+16
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fix bug #66509: copy() arginfo incorrect since 5.4
| * | Merge branch 'PHP-5.4' into PHP-5.5Will Fitch2014-01-183-1/+19
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #66509: copy() arginfo incorrect since 5.4 Conflicts: NEWS
| | * Fix bug #66509: copy() arginfo incorrect since 5.4Will Fitch2014-01-183-1/+17
| | | | | | | | | | | | | | | | | | Since 5.4, the ZEND_BEGIN_ARG_INFO_EX was replaced by non _EX, causing Reflection to assume the $context parameter is required.
* | | Fix argument unpacking across stack pagesNikita Popov2014-01-184-4/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | If multiple unpacks were used (or mixed with normal arguments) parts of the arguments could land on different stack pages. If this occurs the arguments will now be copied to a new stack page. The code used to do this is copied verbatim from the PHP 5.4 branch and only modified to reduce the amount of inlined code.
* | | Merge branch 'phpdbg' into PHP-5.6Johannes Schlüter2014-01-185-57/+82
|\ \ \
| * | | zts fixkrakjoe2014-01-171-1/+1
| | | |
| * | | ...krakjoe2014-01-171-15/+18
| | | |
| * | | remove goto from zend_try/zend_end_try/zend_catch blockskrakjoe2014-01-172-21/+19
| | | |
| * | | fix #50krakjoe2014-01-161-7/+9
| | | |
| * | | issues raised in #46, don't quit on CTRL+C if not executingkrakjoe2014-01-131-2/+8
| | | |
| * | | patch versionkrakjoe2014-01-131-1/+1
| | | |
| * | | fix #46 ignore EOFkrakjoe2014-01-132-18/+27
| | | |
| * | | Revert "fix #46 ignore EOF"krakjoe2014-01-132-27/+18
| | | | | | | | | | | | | | | | This reverts commit 333264fdb718f337fb19d208e3d41aeef31f2ca1.
| * | | fix #46 ignore EOFcyanogenmod2014-01-132-18/+27
| | | |
| * | | work on #46 (handle quit local consoles gracefully)krakjoe2014-01-121-10/+17
| | | |
| * | | update versionkrakjoe2013-12-271-2/+1
| | | |
| * | | upstream mergeJoe Watkins2013-12-251-1/+2
| | | |
* | | | Add a couple of missing items to UPGRADING.Adam Harvey2014-01-171-0/+6
| | | | | | | | | | | | | | | | Usual grumble about please ensuring UPGRADING gets updated goes here. :)
* | | | Clarify always_populate_raw_post_data situation in 5.6Michael Wallner2014-01-172-14/+7
| | | |
* | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-01-171-0/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | * PHP-5.5: added appropriate exception handling flag to ext\intl Update NEWS
| * | | added appropriate exception handling flag to ext\intlAnatol Belski2014-01-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the doc page http://msdn.microsoft.com/en-us/library/1deeycx5.aspx it's appropriate as none of the extern C functions do throw exceptions. This also fixes the warning C4530.
| * | | Update NEWSYasuo Ohgaki2014-01-171-2/+2
| | | |
* | | | fix indentationAntony Dovgal2014-01-177-54/+59
| | | |
* | | | Add some basic and apparmor tests to fpmGernot Vormayr2014-01-177-1/+251
| | | |
* | | | Add --force-stderr to fpmGernot Vormayr2014-01-174-5/+16
| | | |