summaryrefslogtreecommitdiff
path: root/ext
Commit message (Collapse)AuthorAgeFilesLines
* Fix bug #68799: Free called on unitialized pointerStanislav Malyshev2015-01-213-1/+64
|
* Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())Stanislav Malyshev2015-01-213-2/+27
| | | | | Conflicts: ext/standard/var_unserializer.c
* Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-01-053-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 fileAnatol Belski2015-01-053-6/+6
| |
* | Merge branch 'PHP-5.5' into PHP-5.6Matteo Beccati2015-01-051-10/+2
|\ \ | |/ | | | | | | * PHP-5.5: Update test after fixing bug #68371
| * Update test after fixing bug #68371Matteo Beccati2015-01-051-10/+2
| |
* | Ref #68371 - Added support for PDO::PGSQL_ATTR_DISABLE_PREPARESMatteo Beccati2015-01-052-1/+9
| |
* | Merge branch 'PHP-5.5' into PHP-5.6Matteo Beccati2015-01-054-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 Beccati2015-01-054-0/+209
| |\ | | | | | | | | | attribute names
| | * Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific ↵Matteo Beccati2014-11-104-0/+209
| | | | | | | | | | | | attribute names
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-01-041-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: fix memory leak
| * | fix memory leakStanislav Malyshev2015-01-041-2/+2
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-01-0412-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.5Stanislav Malyshev2015-01-044-0/+65
| |\ \ | | | | | | | | | | | | | | | | | | | | * pull-request/742: Fixed typo GD: imagepalettetotruecolor tests
| * | | fix GD tests with no GD loadedStanislav Malyshev2015-01-048-1/+14
| | | |
| * | | updated libmagic.patch in 5.5Anatol Belski2015-01-041-328/+44
| | | |
* | | | updated libmagic.patch in 5.6Anatol Belski2015-01-041-292/+36
| | | |
* | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-01-043-2/+21
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * PHP-5.5: updated NEWS Fixed bug #68735 fileinfo out-of-bounds memory access
| * | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2015-01-043-2/+21
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fixed bug #68735 fileinfo out-of-bounds memory access
| | * | | Fixed bug #68735 fileinfo out-of-bounds memory accessAnatol Belski2015-01-043-2/+21
| | | | |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-01-045-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.5Anatol Belski2015-01-045-1544/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * PHP-5.4: removed dead code
| | * | | removed dead codeRemi Collet2015-01-045-1544/+2
| | | | |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2015-01-022-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.5: Fixes #67960 - Long/short day names reversed in jddayofweek()
| * | | | Fixes #67960 - Long/short day names reversed in jddayofweek()Greg Roach2015-01-022-4/+4
| | | | |
| * | | | updated libmagic.patchAnatol Belski2014-12-301-22/+25
| | | | |
* | | | | updated libmagic.patchAnatol Belski2014-12-301-43/+54
| | | | |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-301-4/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.5: Fixed bug #68671 incorrect expression in libmagic
| * | | | Fixed bug #68671 incorrect expression in libmagicAnatol Belski2014-12-301-4/+7
| | | | |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2014-12-301-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.5: Check the return value of lo_export.
| * | | | Check the return value of lo_export.Adam Harvey2014-12-301-3/+3
| | | | | | | | | | | | | | | | | | | | Patch by Ondřej Surý. Fixes bug #68697 (lo_export return -1 on failure).
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-301-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 upstreamAnatol Belski2014-12-301-22/+19
| | | | |
* | | | | Fixed bug #68665 (Invalid free)Anatol Belski2014-12-281-1/+0
| | | | |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Keyur Govande2014-12-261-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 Govande2014-12-261-1/+2
| | | | |
* | | | | Fix bug #68656 Report gd library versionRemi Collet2014-12-262-0/+8
| | | | |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2014-12-251-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Fixed testXinchen Hui2014-12-251-0/+2
| | | | |
* | | | | Fixed bug #68644 (strlen incorrect : mbstring + func_overload=2 +UTF-8 + ↵Xinchen Hui2014-12-242-3/+22
| | | | | | | | | | | | | | | | | | | | Opcache)
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Nikita Popov2014-12-191-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Fix bug #67111Nikita Popov2014-12-191-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.6Remi Collet2014-12-171-6/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.5: Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
| * | | | Better fix for #68601 for perfRemi Collet2014-12-171-6/+6
| | | | | | | | | | | | | | | | | | | | https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-12-163-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.5Stanislav Malyshev2014-12-163-32/+62
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: add CVE add missing test file Fix bug #68594 - Use after free vulnerability in unserialize()
| | * | | add missing test fileStanislav Malyshev2014-12-161-0/+7
| | | | |
| | * | | Fix bug #68594 - Use after free vulnerability in unserialize()Stanislav Malyshev2014-12-163-32/+62
| | | | |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-12-161-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.5: fix perms
| * | | | fix permsRemi Collet2014-12-161-0/+0
| | | | |