summaryrefslogtreecommitdiff
path: root/main
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-01-011-3/+1
|\
| * Flush stderr on win32 in cli_log_messageNikita Popov2017-01-011-3/+1
| * move dev to nextAnatol Belski2016-11-221-3/+3
| * move dev to 7.0.14Anatol Belski2016-10-251-3/+3
| * Fix bug #73189 - Memcpy negative size parameter php_resolve_pathStanislav Malyshev2016-10-121-3/+4
| * Clear FG(user_stream_current_filename) when bailing outSara Golemon2016-10-111-6/+11
* | Care about intput and output encoding, as per default encoding RFCAnatol Belski2016-12-141-0/+6
* | Bump versions and NEWS for 7.1.1-devDavey Shafik2016-12-021-3/+3
* | Fix bug #73189 - Memcpy negative size parameter php_resolve_pathStanislav Malyshev2016-10-141-3/+4
* | Clear FG(user_stream_current_filename) when bailing outSara Golemon2016-10-141-6/+11
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-10-061-1/+1
|\ \ | |/
| * fix datatypeAnatol Belski2016-10-061-1/+1
| * prepare nextAnatol Belski2016-09-271-3/+3
* | Ensure symtable exists before checking itNikita Popov2016-09-281-1/+2
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-09-231-1/+1
|\ \ | |/
| * Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-09-231-1/+1
| |\
| | * Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"Anatol Belski2016-09-231-1/+1
| | * Fixed bug #73037 SoapServer reports Bad Request when gzippedAnatol Belski2016-09-231-1/+1
| | * Fixed bug #72505 (readfile() mangles files larger than 2G)Xinchen Hui2016-09-161-1/+1
| | * 5.6.27 will be nextFerenc Kovacs2016-09-011-3/+3
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-09-231-1/+1
|\ \ \ | |/ /
| * | Fixed bug #73037 SoapServer reports Bad Request when gzippedAnatol Belski2016-09-231-1/+1
| * | prepare for nextAnatol Belski2016-08-301-3/+3
* | | Merge branch 'pull-request/2115' into PHP-7.1Christoph M. Becker2016-09-061-1/+1
|\ \ \
| * | | Fix #72948: Uncatchable "Catchable" fatal error for class to string conversionsChristoph M. Becker2016-09-031-1/+1
* | | | Bump PHP_API_VERSIONNikita Popov2016-09-041-1/+1
|/ / /
* | | Decouple DEBUG_FILE_UPLOAD from ZEND_DEBUGNikita Popov2016-08-191-1/+3
* | | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-08-172-3/+15
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Xinchen Hui2016-08-171-0/+12
| |\ \ | | |/
| | * Fixed bug #72853 (stream_set_blocking doesn't work)Xinchen Hui2016-08-171-1/+13
| | * 5.6.26 will be nextFerenc Kovacs2016-08-041-3/+3
| * | Merge branch 'PHP-7.0.10' into PHP-7.0Stanislav Malyshev2016-08-161-3/+3
| |\ \
| | * | Use size_t for path lengthStanislav Malyshev2016-08-101-3/+3
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-08-171-3/+3
|\ \ \ \ | |/ / /
| * | | fix blocking pipe stream option valueAnatol Belski2016-08-171-3/+3
| |/ /
* | | Fix PUTC warningNikita Popov2016-08-071-2/+2
* | | Fixed bug #72743 (Out-of-bound read in php_stream_filter_create)Xinchen Hui2016-08-041-2/+2
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-08-031-1/+1
|\ \ \ | |/ /
| * | Fix bug #72724Nikita Popov2016-08-031-1/+1
| * | prepare nextAnatol Belski2016-08-021-3/+3
| * | fix php_version.hAnatol Belski2016-08-021-3/+3
* | | Merge branch 'PHP-7.0' into PHP-7.1Pierrick Charron2016-07-271-5/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Pierrick Charron2016-07-271-5/+0
| |\ \ | | |/
| | * Fixed bug #72686 (zlib: url support is broken).Pierrick Charron2016-07-271-5/+0
| * | Fixed bug #72629 (Caught exception assignment to variables ignores references).Xinchen Hui2016-07-201-3/+3
* | | Require strict base64 in data URILauri Kenttä2016-07-221-1/+1
* | | Merge branch 'PHP-7.0'Stanislav Malyshev2016-07-192-0/+22
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-07-192-0/+22
| |\ \ | | |/
| | * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2016-07-192-36/+59
| | |\
| | | * CS fix and comments with bug IDStanislav Malyshev2016-07-122-3/+4