summaryrefslogtreecommitdiff
path: root/main
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch 'PHP-5.4'Nikita Popov2012-05-061-1/+6
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-05-061-1/+6
| |\ \ | | |/
| | * Fixed Bug #61961 (file_get_content leaks when access empty file with max length)Reeze Xia2012-05-061-1/+6
| * | Merge branch 'PHP-5.3' into PHP-5.4Christopher Jones2012-05-031-3/+3
| |\ \ | | |/
| | * Bump to next versionChristopher Jones2012-05-031-3/+3
| * | Update to 5.4.2-devChristopher Jones2012-04-191-4/+4
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-04-151-7/+7
|\ \ \ | |/ /
| * | Fixed bug #61728 (php-fpm SIGSEGV running friendica on nginx)Xinchen Hui2012-04-151-7/+7
* | | Merge branch '5.4'Gustavo André dos Santos Lopes2012-04-071-2/+2
|\ \ \ | |/ /
| * | Merge branch '5.3' into 5.4Gustavo André dos Santos Lopes2012-04-071-2/+2
| |\ \ | | |/
| | * Fixed bug in new stream_get_line() when using NUL as a delimiter.Gustavo André dos Santos Lopes2012-04-071-2/+2
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-04-061-1/+3
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-04-061-1/+3
| |\ \ | | |/
| | * Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (withou...Xinchen Hui2012-04-061-1/+3
| | * Cherry-pick 4cc74767Gustavo André dos Santos Lopes2012-04-041-10/+19
| | * Fix warning "suggest parentheses around assignment"Xinchen Hui2012-04-041-1/+1
| | * Fixed bug #61605 (header_remove() does not remove all headers)Xinchen Hui2012-04-041-6/+32
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-04-041-6/+32
|\ \ \ | |/ /
View Lorry Controller Status