summaryrefslogtreecommitdiff
path: root/main
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-01-011-34/+44
|\ | | | | | | | | | | | | | | | | * PHP-5.4: Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected. fix NEWS Conflicts: main/main.c
| * Bug #43177: If an eval() has a parse error, the overall exit status and ↵Stanislav Malyshev2013-01-011-35/+45
| | | | | | | | | | | | | | return code should not be affected. Without this fix, a webpage using eval() may return code 500. That might display fine and the 500 go unnoticed, but using AJAX or wget, the 500 will cause problems.
| * Happy New YearXinchen Hui2013-01-0166-66/+66
| |
* | Happy New YearXinchen Hui2013-01-0163-63/+63
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Rasmus Lerdorf2012-12-191-1/+1
|\ \ | |/
| * Fix for bug #63811Rasmus Lerdorf2012-12-191-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2012-12-131-1/+1
|\ \ | |/ | | | | | | | | | | | | * PHP-5.4: Fixed bug #63757 (getenv() produces memory leak with CGI SAPI) Conflicts: NEWS
| * 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
|\ \ | |/ | | | | | | * PHP-5.4: Fix bug #63240 on stream_get_line()
| * Merge branch 'PHP-5.3' into PHP-5.4Gustavo Lopes2012-10-121-2/+10
| |\ | | | | | | | | | | | | * PHP-5.3: Fix bug #63240 on stream_get_line()
| | * Fix bug #63240 on stream_get_line()Gustavo Lopes2012-10-121-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stream_get_line() could contain the delimiter string if that string had more than one character. The bug manifested itself when a read on the stream ended with part of the delimiter string and the read after would start with the rest of the delimiter string; provided that the data of first read did not complete the max length result of the call to stream_get_line() with the partial delimiter used in that max length return. In that case, the delimiter will still appear in the result, divided in two subsequent return values. That is not a bug. See <http://www.mail-archive.com/internals@lists.php.net/msg61325.html>
* | | 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 ↵Xinchen Hui2012-09-241-1/+9
| | | | | | | | | | | | | | | | | | timezo) Cherry pick to 5.3
| | * 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 ↵Xinchen Hui2012-09-231-1/+9
| | | | | | | | | | | | timezo)
| * | 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
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag
| * | 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
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.4: News for bug#40459 fix bug #40459 - make all stream funcs that create object call ctor
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * pull-request/132: OK, bye bye JavaScript, let's just include credits before license Nicer (JSLint-compliant!) credits reveal JavaScript Removed now-unnecessary expose_php checks for logo Fixed small misalignment in prev commit Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
| * | | Removed Logo GUIDs and replaced with Data URIs and div hidden with JSAndrew Faulds2012-07-145-1244/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - removed php_logo_guid() - removed php_egg_logo_guid() - removed php_real_logo_guid() - removed zend_logo_guid() - removed logo GUID handling - removed logo GUIDs from source - added logo data URIs instead for phpinfo() - added credits to phpinfo() page, but hidden by default
* | | | Merge branch 'PHP-5.4'Felipe Pena2012-07-141-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * PHP-5.4: - Fixed bug #62525 (sigabrt while converting floating point to string)
| * | Merge branch 'PHP-5.3' into PHP-5.4Felipe Pena2012-07-141-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: - Fixed bug #62525 (sigabrt while converting floating point to string)
| | * - 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
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: Improve JSON error handling Conflicts: ext/json/tests/bug54058.phpt ext/json/tests/bug61537.phpt
* | | Merge branch 'PHP-5.4'Stanislav Malyshev2012-06-101-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: typo fix
| * | typo fixStanislav Malyshev2012-06-101-1/+1
| | |
* | | Merge branch 'PHP-5.4'Stanislav Malyshev2012-06-081-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | * PHP-5.4: improve overflow checks add NEWS fix potential overflow in _php_stream_scandir
| * | Merge branch 'PHP-5.3' into PHP-5.4Stanislav Malyshev2012-06-081-0/+5
| |\ \ | | |/ | | | | | | | | | | | | * PHP-5.3: improve overflow checks fix potential overflow in _php_stream_scandir
| | * 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
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: fix potential overflow in _php_stream_scandir
View Lorry Controller Status