summaryrefslogtreecommitdiff
path: root/main
Commit message (Expand)AuthorAgeFilesLines
* 5.6.8Ferenc Kovacs2015-04-151-2/+2
* 5.6.8RC1php-5.6.8RC1Ferenc Kovacs2015-04-011-4/+4
* 5.6.9 is up nextFerenc Kovacs2015-04-011-3/+3
* oops, no idea how this got inStanislav Malyshev2015-03-171-3/+3
* Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-03-171-3/+3
|\
* \ Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-03-081-1/+1
|\ \ | |/
| * Merge branch 'pull-request/1106' into PHP-5.5Stanislav Malyshev2015-03-081-1/+11
| |\
| | * Fix #67626Julien Pauli2015-02-201-1/+11
| * | 5.5.24 nowJulien Pauli2015-03-051-3/+3
* | | Fix #67626Julien Pauli2015-03-081-1/+11
* | | Fixed bug (#69195 Inconsistent stream crypto values across versions)Daniel Lowrey2015-03-051-4/+10
* | | Fix stream_select() issue with OpenSSL bufferChris Wright2015-03-052-4/+7
* | | 5.6.8 up nextFerenc Kovacs2015-03-051-3/+3
* | | Merge branch 'PHP-5.5' into PHP-5.6Reeze Xia2015-03-031-10/+12
|\ \ \ | |/ /
| * | Improve fix for bug 67741Reeze Xia2015-03-031-10/+12
| * | Fixed bug #67741 (auto_prepend_file messes up __LINE__)Reeze Xia2015-03-031-1/+14
* | | Fixed bug #67741 (auto_prepend_file messes up __LINE__)Reeze Xia2015-03-031-1/+14
* | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-02-271-2/+1
|\ \ \ | |/ /
| * | ReorderXinchen Hui2015-02-271-2/+1
* | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-02-271-0/+5
|\ \ \ | |/ /
| * | Fixed bug #69121 (Segfault in get_current_user when script owner is not in pa...Xinchen Hui2015-02-271-0/+5
| * | Fix bug #68166Rasmus Lerdorf2015-02-221-1/+1
| |/
* | Fix bug #68166Rasmus Lerdorf2015-02-221-1/+1
* | Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2015-02-181-11/+12
|\ \ | |/
| * Fixed bug #65593 (Segfault when calling ob_start from output buffering callback)Michael Wallner2015-02-181-11/+12
* | Fix another invalid free of CG(interned_empty_string)manuel2015-02-071-1/+1
* | Invalid free of CG(interned_empty_string)manuel2015-02-061-1/+1
* | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-02-051-7/+2
|\ \ | |/
| * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-02-051-7/+2
| |\
| | * Update header handling to RFC 7230Stanislav Malyshev2015-02-051-7/+2
* | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-02-051-0/+4
|\ \ \ | |/ /
| * | Conflicts:Nayana Hettiarachchi2015-02-051-0/+4
| * | 5.5.23 nowJulien Pauli2015-02-041-3/+3
* | | 5.6.7 nowJulien Pauli2015-02-041-3/+3
* | | Fixed indentXinchen Hui2015-02-031-1/+1
* | | Fixed Bug #67988 htmlspecialchars() does not respect default_charset specifie...Yasuo Ohgaki2015-02-031-7/+1
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-01-311-1/+1
|\ \ \ | |/ /
| * | fix group name handlingStanislav Malyshev2015-01-311-1/+1
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-01-312-5/+5
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-01-312-5/+5
| |\ \ | | |/
| | * Use better constant since MAXHOSTNAMELEN may mean shorter nameStanislav Malyshev2015-01-312-5/+5
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-01-311-2/+11
|\ \ \ | |/ /
| * | Add mitigation for CVE-2015-0235 (bug #68925)Stanislav Malyshev2015-01-311-1/+0
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-01-311-1/+11
| |\ \ | | |/
| | * Add mitigation for CVE-2015-0235 (bug #68925)Stanislav Malyshev2015-01-311-1/+11
* | | Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6Bob Weinand2015-01-261-1/+1
|\ \ \ | |/ /
| * | Fix call after close if multiple filters are attachedBob Weinand2015-01-261-1/+1
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-01-201-0/+5
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-01-201-0/+5
| |\ \ | | |/
| | * add protection against nullsStanislav Malyshev2015-01-201-0/+5
View Lorry Controller Status