summaryrefslogtreecommitdiff
path: root/main
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ | | | | | | | | * PHP-7.0: Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"
| * Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-09-231-1/+1
| |\ | | | | | | | | | | | | * PHP-5.6: Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"
| | * Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"Anatol Belski2016-09-231-1/+1
| | | | | | | | | | | | This reverts commit f9a699f6c3aa7acea922242a0f14731f6b829742.
| | * Fixed bug #73037 SoapServer reports Bad Request when gzippedAnatol Belski2016-09-231-1/+1
| | | | | | | | | | | | (cherry picked from commit 410c68788ae4826807e8ced3f4a02e676142b22a)
| | * 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
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Fixed bug #73037 SoapServer reports Bad Request when gzipped
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | E_RECOVERABLE errors are reported as "Catchable fatal error". This is misleading, because they actually can't be caught via try-catch statements. Therefore we change the wording to "Recoverable fatal error" as suggested by Nikita.
* | | | Bump PHP_API_VERSIONNikita Popov2016-09-041-1/+1
|/ / /
* | | Decouple DEBUG_FILE_UPLOAD from ZEND_DEBUGNikita Popov2016-08-191-1/+3
| | | | | | | | | | | | | | | Enabling ZEND_DEBUG should not result in intrusive program behavior changes.
* | | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-08-172-3/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: (48 commits) Update NEWs Unused label Fixed bug #72853 (stream_set_blocking doesn't work) fix test Bug #72663 - part 3 Bug #72663 - part 2 Bug #72663 - part 1 Update NEWS BLock test with memory leak fix tests Fix TSRM build Fix bug #72850 - integer overflow in uuencode Fixed bug #72849 - integer overflow in urlencode Fix bug #72848 - integer overflow in quoted_printable_encode caused heap corruption Fix bug #72838 - Integer overflow lead to heap corruption in sql_regcase Fix bug #72837 - integer overflow in bzdecompress caused heap corruption Fix bug #72836 - integer overflow in base64_decode caused heap corruption Fix for bug #72807 - do not produce strings with negative length Fix for bug #72790 and bug #72799 Fix bug #72730 - imagegammacorrect allows arbitrary write access ... Conflicts: ext/standard/var_unserializer.c
| * | Merge branch 'PHP-5.6' into PHP-7.0Xinchen Hui2016-08-171-0/+12
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | * PHP-5.6: Fixed bug #72853 (stream_set_blocking doesn't work) Conflicts: main/streams/plain_wrapper.c
| | * Fixed bug #72853 (stream_set_blocking doesn't work)Xinchen Hui2016-08-171-1/+13
| | | | | | | | | | | | Implemented PHP_STREAM_OPTION_META_DATA_API for plain_wrappers
| | * 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
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0.10: Fix bug #72749: wddx_deserialize allows illegal memory access Fixed bug #72627: Memory Leakage In exif_process_IFD_in_TIFF fix tests Fix bug#72697 - select_colors write out-of-bounds Fix bug #72708 - php_snmp_parse_oid integer overflow in memory allocation Fix bug #72730 - imagegammacorrect allows arbitrary write access Fix bug #72750: wddx_deserialize null dereference Fix bug #72771: ftps:// opendir wrapper is vulnerable to protocol downgrade attack fix tests add missing skipif section Fix for bug #72790 and bug #72799 Fix bug #72837 - integer overflow in bzdecompress caused heap corruption Fix bug #72742 - memory allocator fails to realloc small block to large one Use size_t for path length Check for string overflow Fix for bug #72782: mcrypt accepts only ints, so don't pass anything else Fix bug #72674 - check both curl_escape and curl_unescape
| | * | 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
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * PHP-7.0: fix test fix blocking pipe stream option value
| * | | fix blocking pipe stream option valueAnatol Belski2016-08-171-3/+3
| |/ / | | | | | | | | | | | | | | | As revealed by #72857, this value conflicts with the xport option. Wrong code can otherwise cause streams misbehave, fe if local and network streams APIs are mixed.
* | | Fix PUTC warningNikita Popov2016-08-071-2/+2
| | | | | | | | | | | | | | | Change the macro to not provide a useless return value using a comma expression, which generates warnings.
* | | 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
| |\ \ | | |/ | | | | | | | | | Conflicts: main/streams/streams.c
| | * Fixed bug #72686 (zlib: url support is broken).Pierrick Charron2016-07-271-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | zlib: support is broken since a really long time. It never worked on versions >= PHP5.6 so we can just remove this dead code. Bug was introduced 2006-05-14 (Before 5.2.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
| | | | | | | | | | | | | | | | | | | | | | | | As the tests already show, the data URI wrapper is supposed to fail for corrupt input, but for some reason, one case of invalid input is still allowed to pass?! Strict base64 makes a lot more sense here. Also, Chromium and Firefox fail on invalid base64, so it's a logical choice for PHP as well.
* | | Merge branch 'PHP-7.0'Stanislav Malyshev2016-07-192-0/+22
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: (27 commits) fix #72519, possible OOB using imagegif fix #72512, invalid read or write for palette image when invalid transparent index is used Apparently some envs miss SIZE_MAX Fix tests Fix bug #72618: NULL Pointer Dereference in exif_process_user_comment Partial fix for bug #72613 - do not allow reading past error read Partial fix for bug #72613 - do not treat negative returns from bz2 as size_t Fix bug #72606: heap-buffer-overflow (write) simplestring_addn simplestring.c Fix for bug #72558, Integer overflow error within _gdContributionsAlloc() Fix bug #72603: Out of bound read in exif_process_IFD_in_MAKERNOTE update NEWS Fixed bug #72570 Segmentation fault when binding parameters on a query without placeholders Fix bug #72562 - destroy var_hash properly Fix bug #72551 and bug #72552 - check before converting size_t->int Fix bug #72541 - size_t overflow lead to heap corruption Fix bug #72533 (locale_accept_from_http out-of-bounds access) Fix fir bug #72520 Fix for bug #72513 Fix for bug #72513 CS fix and comments with bug ID ... Conflicts: ext/standard/basic_functions.c
| * | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-07-192-0/+22
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: fix #72519, possible OOB using imagegif fix #72512, invalid read or write for palette image when invalid transparent index is used Apparently some envs miss SIZE_MAX Fix tests Fix bug #72618: NULL Pointer Dereference in exif_process_user_comment Partial fix for bug #72613 - do not treat negative returns from bz2 as size_t Fix bug #72606: heap-buffer-overflow (write) simplestring_addn simplestring.c Fix for bug #72558, Integer overflow error within _gdContributionsAlloc() Fix bug #72603: Out of bound read in exif_process_IFD_in_MAKERNOTE Fix bug #72562 - destroy var_hash properly Fix bug #72533 (locale_accept_from_http out-of-bounds access) Fix fir bug #72520 Fix for bug #72513 Fix for bug #72513 CS fix and comments with bug ID Fix for HTTP_PROXY issue. 5.6.24RC1 add tests for bug #72512 Fixed bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access Fixed bug #72479 - same as #72434 Conflicts: Zend/zend_virtual_cwd.c ext/bz2/bz2.c ext/exif/exif.c ext/session/session.c ext/snmp/snmp.c ext/standard/basic_functions.c main/SAPI.c main/php_variables.c
| | * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2016-07-192-36/+59
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: fix #72519, possible OOB using imagegif fix #72512, invalid read or write for palette image when invalid transparent index is used Apparently some envs miss SIZE_MAX Fix tests Fix bug #72618: NULL Pointer Dereference in exif_process_user_comment Partial fix for bug #72613 - do not treat negative returns from bz2 as size_t Fix bug #72606: heap-buffer-overflow (write) simplestring_addn simplestring.c Fix for bug #72558, Integer overflow error within _gdContributionsAlloc() Fix bug #72603: Out of bound read in exif_process_IFD_in_MAKERNOTE Fix bug #72562 - destroy var_hash properly Fix bug #72533 (locale_accept_from_http out-of-bounds access) Fix fir bug #72520 Fix for bug #72513 CS fix and comments with bug ID Fix for HTTP_PROXY issue. add tests for bug #72512 Fixed bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access Fixed bug #72479 - same as #72434 Conflicts: ext/bz2/bz2.c main/SAPI.c main/php_variables.c
| | | * CS fix and comments with bug IDStanislav Malyshev2016-07-122-3/+4
| | | |
| | | * Fix for HTTP_PROXY issue.Stanislav Malyshev2016-07-102-41/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following changes are made: - _SERVER/_ENV only has HTTP_PROXY if the local environment has it, and only one from the environment. - getenv('HTTP_PROXY') only returns one from the local environment - getenv has optional second parameter, telling it to only consider local environment
| | | * 5.5.38 nowJulien Pauli2016-06-211-3/+3
| | | |
| | | * 5.5.37 nowJulien Pauli2016-05-251-3/+3
| | | |
| | | * 5.5.36 nowJulien Pauli2016-04-261-3/+3
| | | |
| | | * Fix bug #72093: bcpowmod accepts negative scale and corrupts _one_ definitionStanislav Malyshev2016-04-241-3/+3
| | | | | | | | | | | | | | | | | | | | We can not modify result since it can be copy of _zero_ or _one_, etc. and "copy" in bcmath is just bumping the refcount.
| | | * 5.5.35 nowJulien Pauli2016-03-291-3/+3
| | | |
| | | * Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcutStanislav Malyshev2016-03-281-3/+3
| | | |
| | | * Fix bug #71798 - Integer Overflow in php_raw_url_encodeStanislav Malyshev2016-03-271-3/+3
| | | |
| | | * Going for 5.5.34Julien Pauli2016-03-021-3/+3
| | | |
| | | * Fix versionStanislav Malyshev2016-03-011-3/+3
| | | |
| | | * Update NEWSStanislav Malyshev2016-03-011-3/+3
| | | |
| | | * Going for 5.5.33 nowJulien Pauli2016-02-021-3/+3
| | | |
| | * | 5.6.25 is nextFerenc Kovacs2016-07-071-3/+3
| | | |
View Lorry Controller Status