summaryrefslogtreecommitdiff
path: root/main
Commit message (Expand)AuthorAgeFilesLines
* Bump version for PHP-5.5.0alpha2php-5.5.0alpha2David Soria Parra2012-12-181-2/+2
* Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2012-12-131-1/+1
|\
| * Fixed bug #63757 (getenv() produces memory leak with CGI SAPI)Dmitry Stogov2012-12-131-1/+1
| * 5.4.11-devStanislav Malyshev2012-12-041-3/+3
* | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2012-11-301-2/+0
|\ \ | |/
| * fix bug #61272 ob_start callback get passed empty stringMichael Wallner2012-11-281-2/+0
| * 5.4.10-devStanislav Malyshev2012-11-241-3/+3
* | Bump API versionsDavid Soria Parra2012-11-131-1/+1
* | Merge branch 'PHP-5.4'Gustavo Lopes2012-10-121-2/+10
|\ \ | |/
| * Merge branch 'PHP-5.3' into PHP-5.4Gustavo Lopes2012-10-121-2/+10
| |\
| | * Fix bug #63240 on stream_get_line()Gustavo Lopes2012-10-121-2/+10
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-10-094-0/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-094-0/+0
| |\ \ | | |/
| | * Fixed bug #63236 (Executable permission on various source files)Xinchen Hui2012-10-094-0/+0
| | * PHP-5.3 branch is 5.3.19 nowJohannes Schlüter2012-10-041-3/+3
| | * Fixed bug #60723 (error_log error time has changed to UTC ignoring default ti...Xinchen Hui2012-09-241-1/+9
| | * This will become 5.3.18Johannes Schlüter2012-09-131-3/+3
| * | 5.4.9-devStanislav Malyshev2012-10-031-3/+3
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-09-231-1/+9
|\ \ \ | |/ /
| * | Fixed bug #60723 (error_log error time has changed to UTC ignoring default ti...Xinchen Hui2012-09-231-1/+9
| * | Fix foldingRasmus Lerdorf2012-09-201-0/+1
* | | Fix foldingRasmus Lerdorf2012-09-201-0/+1
* | | Merge branch 'PHP-5.4'Dmitry Stogov2012-09-101-1/+1
|\ \ \ | |/ /
| * | Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flagDmitry Stogov2012-09-101-1/+1
| * | update version id tooStanislav Malyshev2012-08-281-1/+1
| * | 5.4.7 branchedStanislav Malyshev2012-08-281-2/+2
| * | Update version numbers to 5.4.7-dev.Adam Harvey2012-08-171-3/+3
* | | Merge branch 'PHP-5.4'Stanislav Malyshev2012-08-091-117/+80
|\ \ \ | |/ /
| * | fix bug #40459 - make all stream funcs that create object call ctorStanislav Malyshev2012-08-071-117/+80
* | | Merge branch 'pull-request/132'Stanislav Malyshev2012-08-055-1244/+0
|\ \ \
| * | | Removed Logo GUIDs and replaced with Data URIs and div hidden with JSAndrew Faulds2012-07-145-1244/+0
* | | | Merge branch 'PHP-5.4'Felipe Pena2012-07-141-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Felipe Pena2012-07-141-1/+1
| |\ \ | | |/
| | * - Fixed bug #62525 (sigabrt while converting floating point to string)Felipe Pena2012-07-141-1/+1
| | * This wil be PHP 5.3.16Johannes Schlüter2012-07-051-3/+3
| * | Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-06-271-1/+1
| |\ \ | | |/
* | | Merge branch 'PHP-5.4'Stanislav Malyshev2012-06-101-1/+1
|\ \ \ | |/ /
| * | typo fixStanislav Malyshev2012-06-101-1/+1
* | | Merge branch 'PHP-5.4'Stanislav Malyshev2012-06-081-0/+5
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Stanislav Malyshev2012-06-081-0/+5
| |\ \ | | |/
| | * improve overflow checksStanislav Malyshev2012-06-081-5/+5
| | * fix potential overflow in _php_stream_scandirStanislav Malyshev2012-06-071-3/+8
| | * PHP 5.3.15-devJohannes Schlüter2012-05-161-3/+3
| | * This will be PHP 5.3.14Johannes Schlüter2012-05-081-3/+3
* | | Merge branch 'PHP-5.4'Stanislav Malyshev2012-06-071-3/+8
|\ \ \ | |/ /
| * | fix potential overflow in _php_stream_scandirStanislav Malyshev2012-06-071-3/+8
| * | to 5.4.5-devStanislav Malyshev2012-05-151-2/+2
* | | cleanup mergeMichael Wallner2012-05-152-1/+3
|\ \ \ | |/ /
| * | fix bug #60761 zlib.output_compression fails on refreshMichael Wallner2012-05-152-1/+3
| * | Bump to 5.4.4-devChristopher Jones2012-05-141-3/+3
View Lorry Controller Status