Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix bug #68799: Free called on unitialized pointer | Stanislav Malyshev | 2015-01-21 | 3 | -1/+64 |
| | |||||
* | Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize()) | Stanislav Malyshev | 2015-01-21 | 3 | -2/+27 |
| | | | | | Conflicts: ext/standard/var_unserializer.c | ||||
* | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2015-01-05 | 3 | -6/+6 |
|\ | | | | | | | | | * PHP-5.5: fix ACLs tests, make it create dir where it has to, not file | ||||
| * | fix ACLs tests, make it create dir where it has to, not file | Anatol Belski | 2015-01-05 | 3 | -6/+6 |
| | | |||||
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Matteo Beccati | 2015-01-05 | 1 | -10/+2 |
|\ \ | |/ | | | | | | | * PHP-5.5: Update test after fixing bug #68371 | ||||
| * | Update test after fixing bug #68371 | Matteo Beccati | 2015-01-05 | 1 | -10/+2 |
| | | |||||
* | | Ref #68371 - Added support for PDO::PGSQL_ATTR_DISABLE_PREPARES | Matteo Beccati | 2015-01-05 | 2 | -1/+9 |
| | | |||||
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Matteo Beccati | 2015-01-05 | 4 | -0/+219 |
|\ \ | |/ | | | | | | | * PHP-5.5: Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names | ||||
| * | Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific ↵ | Matteo Beccati | 2015-01-05 | 4 | -0/+209 |
| |\ | | | | | | | | | | attribute names | ||||
| | * | Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific ↵ | Matteo Beccati | 2014-11-10 | 4 | -0/+209 |
| | | | | | | | | | | | | attribute names | ||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-01-04 | 1 | -2/+2 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.5: fix memory leak | ||||
| * | | fix memory leak | Stanislav Malyshev | 2015-01-04 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-01-04 | 12 | -1/+79 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | * PHP-5.5: fix GD tests with no GD loaded Fixed typo GD: imagepalettetotruecolor tests | ||||
| * | | Merge branch 'pull-request/742' into PHP-5.5 | Stanislav Malyshev | 2015-01-04 | 4 | -0/+65 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | * pull-request/742: Fixed typo GD: imagepalettetotruecolor tests | ||||
| * | | | fix GD tests with no GD loaded | Stanislav Malyshev | 2015-01-04 | 8 | -1/+14 |
| | | | | |||||
| * | | | updated libmagic.patch in 5.5 | Anatol Belski | 2015-01-04 | 1 | -328/+44 |
| | | | | |||||
* | | | | updated libmagic.patch in 5.6 | Anatol Belski | 2015-01-04 | 1 | -292/+36 |
| | | | | |||||
* | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2015-01-04 | 3 | -2/+21 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | * PHP-5.5: updated NEWS Fixed bug #68735 fileinfo out-of-bounds memory access | ||||
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2015-01-04 | 3 | -2/+21 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fixed bug #68735 fileinfo out-of-bounds memory access | ||||
| | * | | | Fixed bug #68735 fileinfo out-of-bounds memory access | Anatol Belski | 2015-01-04 | 3 | -2/+21 |
| | | | | | |||||
* | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2015-01-04 | 5 | -1645/+2 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: removed dead code Conflicts: ext/fileinfo/libmagic/readelf.c ext/fileinfo/libmagic/readelf.h | ||||
| * | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2015-01-04 | 5 | -1544/+2 |
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | * PHP-5.4: removed dead code | ||||
| | * | | | removed dead code | Remi Collet | 2015-01-04 | 5 | -1544/+2 |
| | | | | | |||||
* | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Ferenc Kovacs | 2015-01-02 | 2 | -4/+4 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | * PHP-5.5: Fixes #67960 - Long/short day names reversed in jddayofweek() | ||||
| * | | | | Fixes #67960 - Long/short day names reversed in jddayofweek() | Greg Roach | 2015-01-02 | 2 | -4/+4 |
| | | | | | |||||
| * | | | | updated libmagic.patch | Anatol Belski | 2014-12-30 | 1 | -22/+25 |
| | | | | | |||||
* | | | | | updated libmagic.patch | Anatol Belski | 2014-12-30 | 1 | -43/+54 |
| | | | | | |||||
* | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-12-30 | 1 | -4/+7 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | * PHP-5.5: Fixed bug #68671 incorrect expression in libmagic | ||||
| * | | | | Fixed bug #68671 incorrect expression in libmagic | Anatol Belski | 2014-12-30 | 1 | -4/+7 |
| | | | | | |||||
* | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Adam Harvey | 2014-12-30 | 1 | -3/+3 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | * PHP-5.5: Check the return value of lo_export. | ||||
| * | | | | Check the return value of lo_export. | Adam Harvey | 2014-12-30 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | Patch by Ondřej Surý. Fixes bug #68697 (lo_export return -1 on failure). | ||||
* | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-12-30 | 1 | -22/+19 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream remove BOM from NEWS | ||||
| * | | | | Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream | Anatol Belski | 2014-12-30 | 1 | -22/+19 |
| | | | | | |||||
* | | | | | Fixed bug #68665 (Invalid free) | Anatol Belski | 2014-12-28 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Keyur Govande | 2014-12-26 | 1 | -1/+2 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | * PHP-5.5: Fix for failing tests. gcc 4.8.3 would optimize away the assigment. | ||||
| * | | | | Fix for failing tests. gcc 4.8.3 would optimize away the assigment. | Keyur Govande | 2014-12-26 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Fix bug #68656 Report gd library version | Remi Collet | 2014-12-26 | 2 | -0/+8 |
| | | | | | |||||
* | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2014-12-25 | 1 | -0/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed test | Xinchen Hui | 2014-12-25 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Fixed bug #68644 (strlen incorrect : mbstring + func_overload=2 +UTF-8 + ↵ | Xinchen Hui | 2014-12-24 | 2 | -3/+22 |
| | | | | | | | | | | | | | | | | | | | | Opcache) | ||||
* | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Nikita Popov | 2014-12-19 | 1 | -3/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fix bug #67111 | Nikita Popov | 2014-12-19 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loop variables need to be freed for both "break" and "continue". I'm adding the test to Zend/ because it's good to have a test for this even without opcache. | ||||
* | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-12-17 | 1 | -6/+6 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | * PHP-5.5: Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467 | ||||
| * | | | | Better fix for #68601 for perf | Remi Collet | 2014-12-17 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467 | ||||
* | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-12-16 | 3 | -32/+62 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: update news add CVE add missing test file Fix bug #68594 - Use after free vulnerability in unserialize() Conflicts: ext/standard/var_unserializer.c | ||||
| * | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-12-16 | 3 | -32/+62 |
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: add CVE add missing test file Fix bug #68594 - Use after free vulnerability in unserialize() | ||||
| | * | | | add missing test file | Stanislav Malyshev | 2014-12-16 | 1 | -0/+7 |
| | | | | | |||||
| | * | | | Fix bug #68594 - Use after free vulnerability in unserialize() | Stanislav Malyshev | 2014-12-16 | 3 | -32/+62 |
| | | | | | |||||
* | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-12-16 | 1 | -0/+0 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | * PHP-5.5: fix perms | ||||
| * | | | | fix perms | Remi Collet | 2014-12-16 | 1 | -0/+0 |
| | | | | |