summaryrefslogtreecommitdiff
path: root/main
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-8.0'Nikita Popov2021-01-193-4/+18
|\
| * Merge branch 'PHP-7.4' into PHP-8.0Nikita Popov2021-01-193-4/+18
| |\
| | * Fixed bug #42560sj-i2021-01-193-4/+18
* | | Replace zend_bool uses with boolNikita Popov2021-01-1512-61/+61
* | | Make convert_to_*_ex simple aliases of convert_to_*Nikita Popov2021-01-141-1/+1
* | | Merge branch 'PHP-8.0'Christoph M. Becker2020-12-231-1/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.4' into PHP-8.0Christoph M. Becker2020-12-231-1/+2
| |\ \ | | |/
| | * Fix #80384: limit read buffer sizeAdam Seitz2020-12-231-1/+2
| * | Next is 8.0.2Gabriel Caruso2020-12-151-3/+3
* | | Back memory stream by a zend_stringNikita Popov2020-12-182-72/+43
* | | Remove unused smax member from memory streamNikita Popov2020-12-181-2/+0
* | | Merge branch 'PHP-8.0'Christoph M. Becker2020-12-081-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.4' into PHP-8.0Christoph M. Becker2020-12-081-1/+1
| |\ \ | | |/
| | * Fix #77069: stream filter loses final block of dataChristoph M. Becker2020-12-081-1/+1
| | * Update version in 7.4 branchDerick Rethans2020-11-071-3/+3
* | | Merge branch 'PHP-8.0'Nikita Popov2020-11-303-5/+16
|\ \ \ | |/ /
| * | Suppress stream errors in mysqlndNikita Popov2020-11-303-5/+16
| * | 8.0 branch should be prepping for 8.0.1Sara Golemon2020-11-191-3/+3
* | | Merge branch 'PHP-8.0'Sammy Kaye Powers2020-11-161-0/+5
|\ \ \ | |/ /
| * | Fire open observer end handlers after a zend_bailoutSammy Kaye Powers2020-11-161-0/+5
* | | Merge branch 'PHP-8.0'Christoph M. Becker2020-11-121-7/+0
|\ \ \ | |/ /
| * | Strip trailing line breaks and periods from Windows error messagesChristoph M. Becker2020-11-121-7/+0
* | | Merge branch 'PHP-8.0'Nikita Popov2020-10-211-1/+1
|\ \ \ | |/ /
| * | Fix invalid memory read on libpathtwosee2020-10-211-1/+1
* | | Remove IGNORE_URL_WIN macroChristoph M. Becker2020-10-182-4/+1
* | | Merge branch 'PHP-8.0'Nikita Popov2020-10-161-1/+1
|\ \ \ | |/ /
| * | Properly handle NULL output start filenameNikita Popov2020-10-161-1/+1
* | | Remove unused globalNikita Popov2020-10-162-12/+11
* | | Merge branch 'PHP-8.0'Nikita Popov2020-10-162-6/+16
|\ \ \ | |/ /
| * | Make sure output start filename is not freed earlyNikita Popov2020-10-162-6/+16
* | | Suppress bogus [-Wlogical-op] warning from GCCGeorge Peter Banyard2020-10-103-4/+12
* | | Prepare for PHP 8.1Gabriel Caruso2020-10-092-4/+4
|/ /
* | Expose php_during_module_startup() and php_during_module_shutdown()Sammy Kaye Powers2020-10-052-2/+4
* | Prepare for PHP 8.0 RC1Gabriel Caruso2020-09-301-1/+1
* | Fix #78792: zlib.output_compression disabled by Content-Type: image/Christoph M. Becker2020-09-291-7/+0
* | Merge branch 'PHP-7.4'Stanislav Malyshev2020-09-281-1/+3
|\ \ | |/
| * Merge branch 'PHP-7.3' into PHP-7.4Stanislav Malyshev2020-09-281-1/+3
| |\
| | * Merge branch 'PHP-7.2' into PHP-7.3Stanislav Malyshev2020-09-281-2/+6
| | |\
| | | * Do not decode cookie names anymoreStanislav Malyshev2020-09-261-2/+6
| | | * bump version to 7.2.34-devRemi Collet2020-08-041-3/+3
| | | * bump version to 7.2.32-devRemi Collet2020-05-121-3/+3
* | | | Clear error flag instead of toggling itChristoph M. Becker2020-09-231-6/+6
* | | | Merge branch 'PHP-7.4' into masterChristoph M. Becker2020-09-231-3/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-09-231-3/+1
| |\ \ \ | | |/ /
| | * | Fix #76735: Incorrect message in fopen on invalid modeChristoph M. Becker2020-09-231-3/+1
* | | | Merge branch 'PHP-7.4' into masterChristoph M. Becker2020-09-221-6/+7
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-09-221-6/+7
| |\ \ \ | | |/ /
| | * | Fix #76943: Inconsistent stream_wrapper_restore() errorsChristoph M. Becker2020-09-221-6/+7
* | | | Merge branch 'PHP-7.4' into masterChristoph M. Becker2020-09-221-1/+17
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-09-221-1/+17
| |\ \ \ | | |/ /