summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-01-150-0/+0
|\
| * Bump yearXinchen Hui2015-01-15844-859/+859
* | Merge branch 'PHP-5.5' into PHP-5.6Daniel Lowrey2015-01-140-0/+0
|\ \ | |/
| * Merge branch 'PHP-5.4' into PHP-5.5Daniel Lowrey2015-01-141-2/+2
| |\
| | * Update NEWSDaniel Lowrey2015-01-141-0/+3
| | * Fixed bug #55618 (use case-insensitive cert name matching)Daniel Lowrey2015-01-141-2/+2
* | | Update NEWSXinchen Hui2015-01-131-1/+2
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-01-121-1/+1
|\ \ \ | |/ /
| * | Fixed bug #68771 SQL syntax error in sqlite libAnatol Belski2015-01-121-1/+1
* | | updated libs_versions.txtAnatol Belski2015-01-121-1/+1
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-01-121-2/+2
|\ \ \ | |/ /
| * | updated libs_versions.txtAnatol Belski2015-01-121-2/+2
| * | Fix bug #68784Rasmus Lerdorf2015-01-091-1/+1
| * | We can't output absolute S and T values for theRasmus Lerdorf2015-01-091-21/+11
* | | Fix bug #68784Rasmus Lerdorf2015-01-091-1/+1
* | | We can't output absolute S and T values for theRasmus Lerdorf2015-01-091-21/+11
* | | Updated NEWSJulien Pauli2015-01-091-0/+4
* | | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2015-01-091-1/+1
|\ \ \ | |/ /
| * | Fix bug #68260Julien Pauli2015-01-092-1/+4
* | | Fixed bug (try block removed while combined with xdebug)Xinchen Hui2015-01-092-1/+2
* | | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2015-01-081-0/+16
|\ \ \ | |/ /
| * | Calling crypt() with a salt of *0 should always return *1.Adam Harvey2015-01-081-0/+16
| * | 5.5.22 nowJulien Pauli2015-01-073-5/+8
* | | fix testAnatol Belski2015-01-081-0/+1
* | | PHP-5.6.6 is nextFerenc Kovacs2015-01-063-5/+7
* | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2015-01-061-2/+0
|\ \ \ | |/ /
| * | cleanup old unused typedefRemi Collet2015-01-061-2/+0
* | | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2015-01-069-10/+51
|\ \ \ | |/ /
| * | Handle NULL strings in sapi_cli_server_register_variable().Adam Harvey2015-01-063-0/+42
| * | Allow CLI server test scripts to specify the name of the router file.Adam Harvey2015-01-066-10/+9
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-01-053-6/+6
|\ \ \ | |/ /
| * | 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
|\ \ \ | |/ /
| * | 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
|\ \ \ | |/ /
| * | 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
|\ \ \ | |/ /
| * | 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
|\ \ \ | |/ /
| * | Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific a...Matteo Beccati2015-01-054-0/+209
| |\ \
| | * | Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific a...Matteo Beccati2014-11-104-0/+209
* | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-01-041-2/+2
|\ \ \ \ | |/ / /
| * | | fix memory leakStanislav Malyshev2015-01-041-2/+2
* | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-01-042-2/+4
|\ \ \ \ | |/ / /
| * | | Merge branch 'pull-request/975' into PHP-5.5Stanislav Malyshev2015-01-042-2/+4
| |\ \ \
| | * | | Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR corre...Ferenc Kovacs2015-01-031-2/+2
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-01-0412-1/+79
|\ \ \ \ \ | |/ / / /