Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.6.9 is readyphp-5.6.9PHP-5.6.9 | Ferenc Kovacs | 2015-05-14 | 3 | -4/+23 |
| | |||||
* | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-05-14 | 35 | -186/+47117 |
| | | | | | * PHP-5.5: Upgrade to PCRE 8.37 due to various bugfixes | ||||
* | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-05-13 | 20 | -261/+314 |
| | | | | | | | | | | | | | | | | | | * PHP-5.5: fix format update NEWS Add test for bug #69522 Update tests Fix bug #69522 - do not allow int overflow Forgot test file Fix bug #69403 and other int overflows Fixed bug #69418 - more s->p fixes for filenames Fixed bug #69364 - use smart_str to assemble strings Fix bug #69453 - don't try to cut empty string Fix bug #69545 - avoid overflow when reading list Conflicts: ext/standard/pack.c | ||||
* | fix date | Ferenc Kovacs | 2015-05-01 | 1 | -1/+1 |
| | |||||
* | 5.6.9RC1php-5.6.9RC1 | Ferenc Kovacs | 2015-04-30 | 3 | -4/+4 |
| | |||||
* | Merge branch 'PHP-5.5' into PHP-5.6 | Julien Pauli | 2015-04-29 | 0 | -0/+0 |
|\ | | | | | | | | | | | | | | | | | * PHP-5.5: 5.5.26 now Conflicts: configure.in main/php_version.h | ||||
| * | 5.5.26 now | Julien Pauli | 2015-04-29 | 3 | -5/+9 |
| | | |||||
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Derick Rethans | 2015-04-29 | 1 | -5/+5 |
|\ \ | |/ | |||||
| * | Use new structures for tzdb header here as well | Derick Rethans | 2015-04-29 | 1 | -5/+5 |
| | | |||||
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Derick Rethans | 2015-04-29 | 1 | -6/+6 |
|\ \ | |/ | |||||
| * | This doesn't work in PHP 5.5 - sigh, I wish the libs were kept in sync | Derick Rethans | 2015-04-29 | 1 | -6/+6 |
| | | |||||
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Derick Rethans | 2015-04-29 | 3 | -100/+124 |
|\ \ | |/ | |||||
| * | Split header reading in 32bit and 64bit variants. | Derick Rethans | 2015-04-29 | 3 | -103/+127 |
| | | | | | | | | | | | | We need to use the 64bit header for the second set of transitions, as there could be a different amount of transitions. This also opens up the way towards real 64bit support. | ||||
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Derick Rethans | 2015-04-28 | 9 | -67/+67 |
|\ \ | |/ | |||||
| * | Merge whitespace changes that have been made to timelib and PHP-5.6 and master | Derick Rethans | 2015-04-28 | 9 | -67/+67 |
| | | |||||
* | | updated NEWS | Anatol Belski | 2015-04-28 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2015-04-28 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | * PHP-5.5: backported patch for bug #69472 | ||||
| * | backported patch for bug #69472 | Anatol Belski | 2015-04-28 | 2 | -1/+3 |
| | | |||||
* | | updated NEWS | Anatol Belski | 2015-04-28 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2015-04-28 | 1 | -0/+9 |
|\ \ | |/ | | | | | | | | | * PHP-5.5: updated NEWS Fixed bug #69381 out of memory with sage odbc driver | ||||
| * | updated NEWS | Anatol Belski | 2015-04-28 | 1 | -0/+2 |
| | | |||||
| * | Fixed bug #69381 out of memory with sage odbc driver | Frederic Marchal | 2015-04-28 | 1 | -0/+9 |
| | | | | | | | | | | | | | | This is just a hotfix as there are still drivers with no full ODBC 3.x support. This patch origins from bug #68350 which was solved by the proper 3.0 migration, another driver (Sage) turned out to have the real issue. | ||||
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2015-04-28 | 1 | -0/+4 |
|\ \ | |/ | | | | | | | | | * PHP-5.5: fix VC9 build with PCRE Revert "Fix segfault in ext/date since 957aa2" | ||||
| * | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2015-04-28 | 1 | -0/+4 |
| |\ | | | | | | | | | | | | | * PHP-5.4: fix VC9 build with PCRE | ||||
| | * | fix VC9 build with PCRE | Anatol Belski | 2015-04-28 | 1 | -0/+4 |
| | | | |||||
| * | | Revert "Fix segfault in ext/date since 957aa2" | Matteo Beccati | 2015-04-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | This reverts commit b5e5098c50397ed910a79ac1d64b7d0fff2c02e1. A proper fix from Derick is underway. I apologise for stepping on his toes ;) | ||||
* | | | Revert "Fix segfault in ext/date since 957aa2" | Matteo Beccati | 2015-04-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | This reverts commit b5e5098c50397ed910a79ac1d64b7d0fff2c02e1. A proper fix from Derick is underway. I apologise for stepping on his toes ;) | ||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2015-04-28 | 0 | -0/+0 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: relax tests with huge year (new zic) ignore second value for huge timestamp test (new zic) relax test for date < INT32_MIN (new zic) relax bigbang content (new zic) Make date transitions tests more flexible | ||||
| * | | relax tests with huge year (new zic) | Remi Collet | 2015-04-28 | 3 | -9/+9 |
| | | | |||||
| * | | ignore second value for huge timestamp test (new zic) | Remi Collet | 2015-04-28 | 1 | -2/+2 |
| | | | |||||
| * | | relax test for date < INT32_MIN (new zic) | Remi Collet | 2015-04-28 | 1 | -11/+11 |
| | | | |||||
| * | | relax bigbang content (new zic) | Remi Collet | 2015-04-28 | 1 | -3/+3 |
| | | | |||||
| * | | Make date transitions tests more flexible | Remi Collet | 2015-04-28 | 2 | -8/+8 |
| | | | | | | | | | | | | | | | | | | zic in recent glibc (2.20) introduce a new transitionn so use a range to avoid failure when total number of transitions is different (243/244) | ||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Matteo Beccati | 2015-04-28 | 1 | -2/+2 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.5: Fix segfault in ext/date since 957aa2 | ||||
| * | | Fix segfault in ext/date since 957aa2 | Matteo Beccati | 2015-04-28 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-04-27 | 65 | -4343/+5103 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.5: Upgrade PCRE to 8.36, it fixes some crashes | ||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2015-04-27 | 65 | -4343/+5103 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.4: Upgrade PCRE to 8.36, it fixes some crashes | ||||
| | * | Upgrade PCRE to 8.36, it fixes some crashes | Stanislav Malyshev | 2015-04-27 | 54 | -8792/+16018 |
| | | | | | | | | | | | | We probably will need to go to 8.37 once it is released. | ||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Derick Rethans | 2015-04-26 | 2 | -587/+640 |
|\ \ \ | |/ / | |||||
| * | | Fixed location reading due to file format changes | Derick Rethans | 2015-04-26 | 2 | -587/+640 |
| | | | |||||
* | | | - Updated to version 2015.4 (2015d) | Derick Rethans | 2015-04-24 | 1 | -14757/+41804 |
| | | | |||||
* | | | Empty merge | Derick Rethans | 2015-04-24 | 0 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | - Updated to version 2015.4 (2015d) | Derick Rethans | 2015-04-24 | 1 | -14757/+41804 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Yasuo Ohgaki | 2015-04-24 | 1 | -0/+1 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.5: Set NULL after efree | ||||
| * | | Set NULL after efree | Yasuo Ohgaki | 2015-04-24 | 1 | -0/+1 |
| | | | |||||
| * | | Add entry for bug #69152 in 5.5.24 | Lior Kaplan | 2015-04-22 | 1 | -0/+2 |
| | | | |||||
| * | | Add merged bug fixes into 5.5.24 | Lior Kaplan | 2015-04-22 | 1 | -9/+9 |
| | | | | | | | | | | | | Done in commits 25cb6f00 and 363e6ce6 | ||||
* | | | Add entry for bug #69152 in 5.6.8 | Lior Kaplan | 2015-04-22 | 1 | -0/+2 |
| | | | |||||
* | | | Format alignment | Lior Kaplan | 2015-04-22 | 1 | -6/+6 |
| | | | |||||
* | | | Bug #68846 was fixed in 5.6.8 by 934d6ed9 | Lior Kaplan | 2015-04-22 | 1 | -0/+4 |
| | | |