summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 5.6.5php-5.6.5PHP-5.6.5Ferenc Kovacs2015-01-212-3/+3
|
* add protection against nullsStanislav Malyshev2015-01-211-0/+5
|
* fix NEWSFerenc Kovacs2015-01-211-2/+13
|
* 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
* add missing date to NEWSphp-5.6.5RC1Ferenc Kovacs2015-01-061-1/+1
|
* bump version to 5.6.5RC1Ferenc Kovacs2015-01-062-3/+3
|
* Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2015-01-061-2/+0
|\ | | | | | | | | * PHP-5.5: cleanup old unused typedef
| * cleanup old unused typedefRemi Collet2015-01-061-2/+0
| |
* | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2015-01-069-10/+51
|\ \ | |/ | | | | | | | | | | | | | | * PHP-5.5: Handle NULL strings in sapi_cli_server_register_variable(). Allow CLI server test scripts to specify the name of the router file. Conflicts: sapi/cli/tests/php_cli_server.inc
| * Handle NULL strings in sapi_cli_server_register_variable().Adam Harvey2015-01-063-0/+42
| | | | | | | | Fixes bug #68745 (Invalid HTTP requests make web server segfault).
| * Allow CLI server test scripts to specify the name of the router file.Adam Harvey2015-01-066-10/+9
| | | | | | | | | | This is required to write tests that behave differently when an index.php isn't present in the document root. (Such as the one I'm about to commit.)
* | 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
| |
* | NEWSRemi Collet2015-01-051-0/+1
| |
* | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2015-01-051-1/+1
|\ \ | |/ | | | | | | | | * PHP-5.5: NEWS Fix bug #68751 listen.allowed_clients is broken
| * NEWSRemi Collet2015-01-051-0/+3
| |
| * Fix bug #68751 listen.allowed_clients is brokenRemi Collet2015-01-051-1/+1
| |
* | 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
| |
* | Merge branch 'PHP-5.5' into PHP-5.6Matteo Beccati2015-01-050-0/+0
|\ \ | |/ | | | | | | * PHP-5.5: Updated NEWS for #68371
| * Updated NEWS for #68371Matteo Beccati2015-01-051-1/+5
| |
* | 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-042-2/+4
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
| * | Merge branch 'pull-request/975' into PHP-5.5Stanislav Malyshev2015-01-042-2/+4
| |\ \ | | | | | | | | | | | | | | | | * pull-request/975: Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
| | * | Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR ↵Ferenc Kovacs2015-01-031-2/+2
| | | | | | | | | | | | | | | | correctly
* | | | 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
| | * | | Fixed typoCarlos André Ferrari2014-07-251-1/+1
| | | | |
| | * | | GD: imagepalettetotruecolor testsCarlos André Ferrari2014-07-254-0/+65
| | | | |
| * | | | fix GD tests with no GD loadedStanislav Malyshev2015-01-048-1/+14
| | | | |
* | | | | updated libmagic.patch in 5.6Anatol Belski2015-01-041-292/+36
| | | | |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-01-040-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * PHP-5.5: updated libmagic.patch in 5.5 updated libmagic.patch in 5.4
| * | | | updated libmagic.patch in 5.5Anatol Belski2015-01-041-328/+44
| | | | |
| * | | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2015-01-040-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: updated libmagic.patch in 5.4
| | * | | | updated libmagic.patch in 5.4Anatol Belski2015-01-041-315/+139
| | | | | |
* | | | | | updated NEWSAnatol Belski2015-01-041-0/+4
| | | | | |
* | | | | | 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
| * | | | | updated NEWSAnatol Belski2015-01-041-0/+4
| | | | | |
| * | | | | 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-044-2/+28
| | | | | |
* | | | | | 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()