summaryrefslogtreecommitdiff
path: root/ext/standard/streamsfuncs.c
Commit message (Collapse)AuthorAgeFilesLines
* Add FAST_ZPP to various important stream funcsBob Weinand2015-09-201-58/+145
|
* Fixed bug #69521 (Segfault in gc_collect_cycles()).Xinchen Hui2015-07-021-9/+4
|
* Use ZSTR_ API to access zend_string elements (this is just renaming without ↵Dmitry Stogov2015-06-301-9/+9
| | | | semantick changes).
* Get rid of more ZVAL_ZVAL() macrosDmitry Stogov2015-06-121-1/+1
|
* Avoid zval duplication in ZVAL_ZVAL() macro (it was necessary only in few ↵Dmitry Stogov2015-06-121-2/+2
| | | | | | places). Switch from ZVAL_ZVAL() to simpler macros where possible (it makes sense to review remaining places)
* Fixes for x32 ABINikita Popov2015-05-231-1/+1
| | | | | | | I'm assuming that we want to have 64bit zend_longs on x32 here. This fixes two typos in __x86_64__ macros and adds sign-extension when assigning STREAM_COPY_ALL to zend_long.
* Merge branch 'PHP-5.6'Stanislav Malyshev2015-04-141-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: (27 commits) fix non-standard C update NEWS 5.4.41 next fix CVE num update NEWS Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode) fix test fix type in fix for #69085 fix memory leak & add test Fix tests fix CVE num Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability) Fix test Additional fix for bug #69324 More fixes for bug #69152 Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar) Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) ... Conflicts: Zend/zend_exceptions.c ext/curl/interface.c ext/dom/document.c ext/fileinfo/libmagic/softmagic.c ext/gd/gd.c ext/hash/hash.c ext/pgsql/pgsql.c ext/phar/phar.c ext/phar/phar_internal.h ext/standard/http_fopen_wrapper.c ext/standard/link.c ext/standard/streamsfuncs.c ext/xmlwriter/php_xmlwriter.c ext/zlib/zlib.c
| * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-04-141-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: (27 commits) fix non-standard C update NEWS 5.4.41 next fix CVE num update NEWS Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode) fix test fix type in fix for #69085 fix memory leak & add test Fix tests fix CVE num Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability) Fix test Additional fix for bug #69324 More fixes for bug #69152 Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar) Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) ... Conflicts: ext/standard/http_fopen_wrapper.c
| | * Merge branch 'PHP-5.4.40' into PHP-5.5.24Stanislav Malyshev2015-04-111-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4.40: Additional fix for bug #69324 More fixes for bug #69152 Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar) Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) Fixed bug #68901 (use after free) Fixed bug #68740 (NULL Pointer Dereference) Fix bug #66550 (SQLite prepared statement use-after-free) Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467 Fix bug #68601 buffer read overflow in gd_gif_in.c Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4" Fixed bug #69293 Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
| | | * Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)Stanislav Malyshev2015-04-111-1/+1
| | | |
| | * | Bump yearXinchen Hui2015-01-151-1/+1
| | | |
| * | | bump yearXinchen Hui2015-01-151-1/+1
| | | |
* | | | Revert "Add stream_socket_crypto_info() function"Daniel Lowrey2015-03-091-40/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 13acb7ec653c543c56437ed417c3889fbf54f608. With the added capability to negotiate application layer protocols via the TLS ALPN extension userland needs a method to access the negotiated protocol on a given stream. The reverted commit added a new stream_socket_crypto_info() function for this purpose. This original approach was discarded in favor of using the already-existing stream_get_meta_data() API which specifically exists for just such purposes and requires the addition of no new functions.
* | | | Merge branch 'tls-alpn'Daniel Lowrey2015-03-041-0/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tls-alpn: Improve test to target specific issue Misc updates/cleanup Add TLS ALPN extension support in crypto client/server streams Add stream_socket_crypto_info() function Update for compatibility with newer openssl libs
| * | | | Add TLS ALPN extension support in crypto client/server streamsDaniel Lowrey2015-02-281-0/+1
| | | | |
| * | | | Add stream_socket_crypto_info() functionDaniel Lowrey2015-02-281-0/+39
| | | | |
* | | | | Use zend_string* instead of char* for opened_patch handling. Avoid ↵Dmitry Stogov2015-03-041-5/+3
|/ / / / | | | | | | | | | | | | reallocations and improve string reuse.
* | | | found type is unnecessaryXinchen Hui2015-02-021-1/+1
| | | |
* | | | Cleanup resource handling APIsXinchen Hui2015-02-021-4/+4
| | | |
* | | | Optimized php_addslashesXinchen Hui2015-01-191-6/+5
| | | |
* | | | bump yearXinchen Hui2015-01-151-1/+1
| | | |
* | | | trailing whitespace removalStanislav Malyshev2015-01-101-4/+4
| | | |
* | | | second shot on removing TSRMLS_*Anatol Belski2014-12-141-3/+3
| | | |
* | | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-112/+112
| | | |
* | | | fix datatype mismatchesAnatol Belski2014-10-241-15/+27
| | | |
* | | | s/PHP 5/PHP 7/Johannes Schlüter2014-09-191-1/+1
| | | |
* | | | first show to make 's' work with size_tAnatol Belski2014-08-271-7/+7
| | | |
* | | | master renames phase 7PRE_AST_MERGEAnatol Belski2014-08-251-1/+1
| | | |
* | | | master renames phase 3Anatol Belski2014-08-251-2/+2
| | | |
* | | | master renames phase 1Anatol Belski2014-08-251-68/+68
| | | |
* | | | fixes to %pd format usageAnatol Belski2014-08-241-2/+2
| | | |
* | | | yet more fixes to zppAnatol Belski2014-08-201-38/+38
| | | |
* | | | further fixes on coreAnatol Belski2014-08-161-1/+1
| | | |
* | | | fix macros in the 5 basic extensionsAnatol Belski2014-08-161-23/+23
| | | |
* | | | cleanup (use zend_string* instead of char*)Dmitry Stogov2014-08-131-39/+20
| | | |
* | | | Make stream->context indirect trough zend_resource (stream->ctx->ptr).Dmitry Stogov2014-08-071-3/+4
| | | | | | | | | | | | | | | | Fixed ext/standard/tests/streams/bug61115.phpt
* | | | Merge branch 'master' into testDmitry Stogov2014-07-071-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.5' into PHP-5.6Michael Wallner2014-07-021-1/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.5: fix integer overflow in {stream,file}_{get,put}_contents()
| | * | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2014-07-021-1/+5
| | |\ \ | | | |/ | | | | | | | | | | | | * PHP-5.4: fix integer overflow in {stream,file}_{get,put}_contents()
| | | * fix integer overflow in {stream,file}_{get,put}_contents()Michael Wallner2014-07-021-1/+5
| | | |
| | | * Bump yearXinchen Hui2014-01-031-1/+1
| | | |
| | | * Merge branch 'pull-request/341'Stanislav Malyshev2013-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | * pull-request/341: (23 commits) typofixes
| | * | Bump yearXinchen Hui2014-01-031-1/+1
| | | |
* | | | Use reference counting instead of zval duplicationDmitry Stogov2014-06-051-7/+5
| | | |
* | | | Merge branch 'master' into phpngDmitry Stogov2014-05-131-6/+16
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (41 commits) fix test - output can be chunked fix test fix test Fixed test for commit 997be125eb0228c5b1b6dd278f617791e71192c6 Add bug fix to NEWS Update UPGRADING according to bug fix fix test improve CURL tests to allow testing without separate server improve CURL tests to allow testing without separate server Fixed bug #67199 mb_regex_encoding mishmash Fix bug #67248 (imageaffinematrixget missing check of parameters) Fix bug #67247 spl_fixedarray_resize integer overflow fix news add tests stuff to README Updated NEWS Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions... - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org) - Move checking - Fixed missing NULL check in SimpleXMLElement::xpath() - Fixed missing NULL check ... Conflicts: ext/bz2/bz2.c ext/gd/gd.c ext/mbstring/php_mbregex.c ext/session/tests/031.phpt ext/simplexml/simplexml.c ext/spl/spl_fixedarray.c
| * | | Bug #67224: stream_socket_enable_crypto()Daniel Lowrey2014-05-071-6/+16
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Allow crypto_method context value in stream_socket_enable_crypto() - As of 5.6.x stream crypto type may be specified in the SSL context, making the $crypto_type parameter to stream_socket_enable_crypto() optional. This commit checks for a crypto type in the context prior to erroring out. - Update NEWS/UPGRADING
| | * | | Allow crypto_method context value in stream_socket_enable_crypto()Chris Wright2014-02-271-6/+16
| | | | |
* | | | | Make they are in the same style of Z_ISREFXinchen Hui2014-05-031-1/+1
| | | | |
* | | | | Merge mainstream 'master' branch into refactoringDmitry Stogov2014-04-261-22/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During merge I had to revert: Nikita's patch for php_splice() (it probably needs to be applyed again) Bob Weinand's patches related to constant expression handling (we need to review them carefully) I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway) Conflicts: Zend/zend.h Zend/zend_API.c Zend/zend_ast.c Zend/zend_compile.c Zend/zend_compile.h Zend/zend_constants.c Zend/zend_exceptions.c Zend/zend_execute.c Zend/zend_execute.h Zend/zend_execute_API.c Zend/zend_hash.c Zend/zend_highlight.c Zend/zend_language_parser.y Zend/zend_language_scanner.c Zend/zend_language_scanner_defs.h Zend/zend_variables.c Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/date/php_date.c ext/dom/documenttype.c ext/hash/hash.c ext/iconv/iconv.c ext/mbstring/tests/zend_multibyte-10.phpt ext/mbstring/tests/zend_multibyte-11.phpt ext/mbstring/tests/zend_multibyte-12.phpt ext/mysql/php_mysql.c ext/mysqli/mysqli.c ext/mysqlnd/mysqlnd_reverse_api.c ext/mysqlnd/php_mysqlnd.c ext/opcache/ZendAccelerator.c ext/opcache/zend_accelerator_util_funcs.c ext/opcache/zend_persist.c ext/opcache/zend_persist_calc.c ext/pcre/php_pcre.c ext/pdo/pdo_dbh.c ext/pdo/pdo_stmt.c ext/pdo_pgsql/pgsql_driver.c ext/pgsql/pgsql.c ext/reflection/php_reflection.c ext/session/session.c ext/spl/spl_array.c ext/spl/spl_observer.c ext/standard/array.c ext/standard/basic_functions.c ext/standard/html.c ext/standard/mail.c ext/standard/php_array.h ext/standard/proc_open.c ext/standard/streamsfuncs.c ext/standard/user_filters.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re main/php_variables.c sapi/phpdbg/phpdbg.c sapi/phpdbg/phpdbg_bp.c sapi/phpdbg/phpdbg_frame.c sapi/phpdbg/phpdbg_help.c sapi/phpdbg/phpdbg_list.c sapi/phpdbg/phpdbg_print.c sapi/phpdbg/phpdbg_prompt.c
| * | | | remove obsolete commentAnatol Belski2014-03-191-3/+0
| | | | |
View Lorry Controller Status