summaryrefslogtreecommitdiff
path: root/main/SAPI.c
Commit message (Collapse)AuthorAgeFilesLines
* Trim trailing whitespace in source code filesPeter Kokot2018-10-131-1/+1
|
* year++Xinchen Hui2018-01-021-1/+1
|
* Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2017-11-281-0/+6
|\ | | | | | | | | * PHP-7.1: Follow up on bug #75574 for FCGI side
| * Follow up on bug #75574 for FCGI sideAnatol Belski2017-11-281-0/+6
| |
| * Update copyright headers to 2017Sammy Kaye Powers2017-01-041-1/+1
| |
* | remove useless castAnatol Belski2017-07-091-1/+1
| |
* | Update copyright headers to 2017Sammy Kaye Powers2017-01-021-1/+1
| |
* | further normalizations, uint vs uint32_tAnatol Belski2016-11-261-11/+11
|/ | | | | | fix merge mistake yet one more replacement run
* Merge branch 'PHP-7.0'Stanislav Malyshev2016-07-191-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-191-0/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-191-18/+22
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-121-1/+1
| | | |
| | | * Fix for HTTP_PROXY issue.Stanislav Malyshev2016-07-101-22/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Rewrite watchpoints to be much more stableBob Weinand2016-07-111-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This mainly involves a separate abstraction layer for elements (e.g. $a->b) and watchpoints (on pointer of the Bucket for example). Also better comparison handling (value backup vs. page dumps). It is not yet finished (there are sometimes false positives announced and names not yet perfect), but the functionality is working and not crashing as far as I have tested. Future scope is also relative watchpoints, e.g. "w $this->val expression()" which does not have the symbol tables as basis, but the value (in this example: return value of expression()) as basis.
* | | | Added ZEND_ATTRIBUTE_FORMAT to some middind functions.Dmitry Stogov2016-06-211-1/+1
|/ / / | | | | | | | | | | | | "%p" replaced by ZEND_LONG_FMT to avoid compilation warnings. Fixed most incorrect use cases of format specifiers.
* | | fix #70189 (SAPI sends empty Content-Type when default_mimetype is empty)Joe Watkins2016-03-271-9/+18
| | |
* | | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-011-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * | Happy new year (Update copyright to 2016)Lior Kaplan2016-01-011-1/+1
| | |
* | | Fixed bug memleak in header_register_callbackXinchen Hui2015-12-111-9/+9
| | |
* | | remove unnecessary macrosAnatol Belski2015-09-021-10/+4
| | |
* | | Merge branch 'PHP-5.6'Christoph M. Becker2015-08-111-1/+6
|\ \ \ | |/ / | | | | | | | | | * PHP-5.6: Fix #69487: SAPI may truncate POST data
| * | Fix #69487: SAPI may truncate POST dataChristoph M. Becker2015-08-111-1/+6
| | | | | | | | | | | | | | | | | | | | | If SG(request_info).request_body can't be completely written (e.g. due to a full drive), only parts of the POST data will be available. This patch changes this, so that SG(request_info).request_body will be reset in this case, and a warning will be thrown.
| * | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-02-051-7/+2
| |\ \ | | |/ | | | | | | | | | * PHP-5.5: Update header handling to RFC 7230
| | * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-02-051-7/+2
| | |\ | | | | | | | | | | | | | | | | * PHP-5.4: Update header handling to RFC 7230
| | | * Update header handling to RFC 7230Stanislav Malyshev2015-02-051-7/+2
| | | |
| | * | Bump yearXinchen Hui2015-01-151-1/+1
| | |/
| * | bump yearXinchen Hui2015-01-151-1/+1
| | |
* | | fix datatype mismatchesAnatol Belski2015-03-241-6/+6
| | |
* | | fix datatype mismatchesAnatol Belski2015-03-241-3/+3
| | |
* | | Revive Zend Signals handler (and fixed bug #61083)Xinchen Hui2015-03-051-4/+0
| | |
* | | made ZEND_TSRMLS_CACHE_* macros look like function callsAnatol Belski2015-02-161-1/+1
| | | | | | | | | | | | which also comply with the current semantics for such macros
* | | Update header handling to RFC 7230Stanislav Malyshev2015-02-051-7/+2
| | |
* | | bump yearXinchen Hui2015-01-151-1/+1
| | |
* | | trailing whitespace removalStanislav Malyshev2015-01-101-18/+18
| | |
* | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-98/+98
| | |
* | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-181-7/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (398 commits) NEWS add test for bug #68381 Fixed bug #68381 Set FPM log level earlier during init proper dllexport move to size_t where zend_string is used internally fix some datatype mismatches return after the warning, to fix uninitialized salt usage fix datatype mismatches add missing type specifier fix datatype mismatches fix unsigned check "extern" shouldn't be used for definitions joined identical conditional blocks simplify fpm tests SEND_VAR_NO_REF optimization Add test for bug #68442 Add various tests for FPM - covering recent bugs (68420, 68421, 68423, 68428) - for UDS - for ping and status URI - for multi pool and multi mode Include small MIT FastCGI client library from https://github.com/adoy/PHP-FastCGI-Client Get rid of zend_free_op structure (use zval* instead). Get rid of useless TSRMLS arguments. Add new FPM test for IPv4/IPv6 ... Conflicts: win32/build/config.w32
| * | | fix datatype mismatch warnsAnatol Belski2014-10-281-7/+7
| | | |
* | | | move SG to use global tsrmls pointerAnatol Belski2014-10-151-0/+3
| | | |
* | | | reworked the patch, less new stuff but workyAnatol Belski2014-09-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TLS is already used in TSRM, the way exporting the tsrm cache through a thread local variable is not portable. Additionally, the current patch suffers from bugs which are hard to find, but prevent it to be worky with apache. What is done here is mainly uses the idea from the RFC patch, but - __thread variable is removed - offset math and declarations are removed - extra macros and definitions are removed What is done merely is - use an inline function to access the tsrm cache. The function uses the portable tsrm_tls_get macro which is cheap - all the TSRM_* macros are set to placebo. Thus this opens the way remove them later Except that, the logic is old. TSRMLS_FETCH will have to be done once per thread, then tsrm_get_ls_cache() can be used. Things seeming to be worky are cli, cli server and apache. I also tried to enable bz2 shared and it has worked out of the box. The change is yet minimal diffing to the current master bus is a worky start, IMHO. Though will have to recheck the other previously done SAPIs - embed and cgi. The offsets can be added to the tsrm_resource_type struct, then it'll not be needed to declare them in the userspace. Even the "done" member type can be changed to int16 or smaller, then adding the offset as int16 will not change the struct size. As well on the todo might be removing the hashed storage, thread_id != thread_id and linked list logic in favour of the explicit TLS operations.
* | | | native tls initial patchkrakjoe2014-09-201-2/+2
|/ / /
* | | s/PHP 5/PHP 7/Johannes Schlüter2014-09-191-1/+1
| | |
* | | fix signed/unsigned mismatchAnatol Belski2014-09-151-1/+1
| | |
* | | Refactored INI subsystem to use zend_string* instead of char*Dmitry Stogov2014-09-011-2/+2
| | |
* | | Fixed incompatible pointer type (int64)Xinchen Hui2014-08-261-1/+1
| | |
* | | master renames phase 3Anatol Belski2014-08-251-1/+1
| | |
* | | master renames phase 1Anatol Belski2014-08-251-4/+4
| | |
* | | fixes to %pd format usageAnatol Belski2014-08-241-1/+1
| | |
* | | first shot on merging the core fro the int64 branchAnatol Belski2014-08-161-2/+2
| | |
* | | Merge branch 'master' into testDmitry Stogov2014-07-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (48 commits) change locale - looks like not everybody has sl_SI Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone fix format Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting) Make sure the generator script also creates a newline at the end of file Add newline at end of file to prevent compilation warning Fix handling of session user module custom handlers. Reference bug report instead of github issue in NEWS file add more exts for Travis Update NEWS Fix phpdbg.1 man page installation when build != src directory BFN for bug #67551 (php://input temp file will be located in sys_temp_dir instead of upload_tmp_dir) reorder restore API compatibility finish refactor php_stream_temp_create{,_ex} and use it for the php://input stream refactor _php_stream_fopen_{temporary_,tmp}file() fix length overflow of HTTP_RAW_POST_DATA Update NEWS Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault happen) ... Conflicts: ext/opcache/zend_accelerator_util_funcs.c ext/session/mod_user.c ext/spl/spl_array.c ext/spl/spl_dllist.c ext/standard/file.c ext/standard/streamsfuncs.c ext/standard/string.c main/streams/memory.c
| * \ \ Merge branch 'PHP-5.6'Michael Wallner2014-07-031-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: BFN for bug #67551 (php://input temp file will be located in sys_temp_dir instead of upload_tmp_dir) reorder restore API compatibility finish refactor php_stream_temp_create{,_ex} and use it for the php://input stream refactor _php_stream_fopen_{temporary_,tmp}file() fix length overflow of HTTP_RAW_POST_DATA Conflicts: main/php_content_types.c
View Lorry Controller Status