summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Followup for bug #72785Nikita Popov2016-09-064-498/+529
* Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-09-062-1/+5
|\
| * Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-09-062-1/+5
| |\
| | * Fix #73025: Heap Buffer Overflow in virtual_popen of zend_virtual_cwd.cChristoph M. Becker2016-09-062-1/+5
| | * Update NEWSYasuo Ohgaki2016-09-061-0/+1
| * | Update NEWSYasuo Ohgaki2016-09-061-0/+1
* | | Update NEWSYasuo Ohgaki2016-09-061-0/+3
* | | Merge branch 'PHP-7.0' into PHP-7.1Yasuo Ohgaki2016-09-062-1/+90
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Yasuo Ohgaki2016-09-062-1/+90
| |\ \ | | |/
| | * Fixed Bug #66964 mb_convert_variables() cannot detect recursionYasuo Ohgaki2016-09-062-12/+102
* | | Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1Yasuo Ohgaki2016-09-0687-334/+871
|\ \ \
| * | | Fix bug #72785 - allowed_classes only applies to outermost unserialize()Stanislav Malyshev2016-09-056-98/+103
| * | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-09-063-6/+37
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-09-064-6/+41
| | |\ \ | | | |/
| | | * Fix #70752: Depacking with wrong password leaves 0 length filesChristoph M. Becker2016-09-064-7/+42
| * | | Merge branch 'PHP-7.0' into PHP-7.1Andrea Faulds2016-09-051-2/+2
| |\ \ \ | | |/ /
| | * | Unbreak FAST_ZPP dead codeAndrea Faulds2016-09-051-2/+2
| * | | Merge branch 'PHP-7.0' into PHP-7.1Julien Pauli2016-09-050-0/+0
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.6' into PHP-7.0Julien Pauli2016-09-050-0/+0
| | |\ \ | | | |/
| | | * Updated NEWSJulien Pauli2016-09-051-0/+4
| | | * Fixes #72590: Opcache restart with kill_all_lockers does not workKeyur2016-09-051-2/+2
| * | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-09-051-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-09-051-1/+1
| | |\ \ | | | |/
| | | * Limit editorconfig to C codeNikita Popov2016-09-051-1/+1
| * | | Updated NEWSJulien Pauli2016-09-051-0/+4
| * | | Merge branch 'PHP-7.0' into PHP-7.1Julien Pauli2016-09-050-0/+0
| |\ \ \ | | |/ /
| | * | Updated NEWSJulien Pauli2016-09-051-0/+4
| | * | Merge branch 'PHP-5.6' into PHP-7.0Julien Pauli2016-09-050-0/+0
| | |\ \ | | | |/
| | | * Updated NEWSJulien Pauli2016-09-051-0/+4
| * | | Merge branch 'PHP-7.0' into PHP-7.1Julien Pauli2016-09-053-42/+31
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.6' into PHP-7.0Julien Pauli2016-09-053-42/+31
| | |\ \ | | | |/
| | | * Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG...Julien Pauli2016-09-053-42/+31
| * | | Change the name of the second parameter of image writer functionsChristoph M. Becker2016-09-051-14/+14
| * | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-09-051-0/+16
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-09-051-0/+16
| | |\ \ | | | |/
| | | * Added editorconfig fileRichard Fussenegger2016-09-051-0/+16
| * | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-09-052-0/+102
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-09-052-0/+102
| | |\ \ | | | |/
| | | * Implement #47456: Missing PCRE option 'J'Christoph M. Becker2016-09-052-0/+102
| * | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-09-051-0/+6
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-09-051-0/+6
| | |\ \ | | | |/
| | | * Merge branch 'pull-request/2061' into PHP-5.6Stanislav Malyshev2016-09-051-0/+6
| | | |\
| | | | * Recognize TDS versions 7.3 and 7.4Lior Kaplan2016-08-071-0/+6
| * | | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-09-051-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-09-051-2/+2
| | |\ \ \ | | | |/ /
| | | * | Use integer placeholders, since values can vary with the TDS versionAdam Baratz2016-09-051-3/+3
| * | | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-09-042-2/+17
| |\ \ \ \ | | |/ / /
| | * | | phpdbg: couple of network function return checks. PossibleDavid Carlier2016-09-042-2/+17
| * | | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-09-041-1/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-09-041-1/+4
| | |\ \ \ | | | |/ /