summaryrefslogtreecommitdiff
path: root/main/streams/streams.c
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | This should be betterXinchen Hui2015-12-301-3/+2
| |
* | Make sure context is set to null to prevent use after freeCaleb Champlin2015-11-091-0/+1
| |
* | Fixed memory leak in php_stream_context_set_option()Dmitry Stogov2015-10-291-8/+9
| |
* | Use ZSTR_ API to access zend_string elements (this is just renaming without ↵Dmitry Stogov2015-06-301-12/+12
| | | | | | | | semantick changes).
* | Only call stream_flush if anything was writtenBob Weinand2015-06-301-4/+16
| | | | | | | | This avoids flushing in readonly mode upon close
* | Improved zend_string API (Francois Laupretre)Dmitry Stogov2015-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit d96eab8d79b75ac83d49d49ae4665f948d15a804 Author: Francois Laupretre <francois@tekwire.net> Date: Fri Jun 26 01:23:31 2015 +0200 Use the new 'ZSTR' macros in the rest of the code. Does not change anything to the generated code (thanks to compat macros) but cleaner. commit b3526439104ac7a89a8e0c79dbebf33b22bd01b8 Author: Francois Laupretre <francois@tekwire.net> Date: Thu Jun 25 13:45:06 2015 +0200 Improve zend_string API Add missing methods
* | Fixed bug #68887 (resources are not freed correctly)Dmitry Stogov2015-04-081-8/+3
| |
* | CleanupDmitry Stogov2015-04-071-16/+4
| |
* | Optimize zend_string_realloc() add more specialized versions ↵Dmitry Stogov2015-03-201-2/+2
| | | | | | | | zend_string_extend() and zend_string_truncate()
* | Merge branch 'PHP-5.6'Daniel Lowrey2015-03-051-1/+1
|\ \ | |/ | | | | | | | | | | | | * PHP-5.6: Fix stream_select() issue with OpenSSL buffer Conflicts: main/streams/streams.c
| * Fix stream_select() issue with OpenSSL bufferChris Wright2015-03-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Ensure data from OpenSSL internal buffer has been transfered to PHP stream buffer before a select() emulation operation is performed Addresses bug #65137 https://bugs.php.net/bug.php?id=65137 Conflicts: ext/openssl/xp_ssl.c
| * bump yearXinchen Hui2015-01-151-1/+1
| |
* | Silence a empty while loop warningReeze Xia2015-03-041-1/+3
| |
* | Use zend_string* instead of char* for opened_patch handling. Avoid ↵Dmitry Stogov2015-03-041-8/+8
| | | | | | | | reallocations and improve string reuse.
* | Use new ZEND_HASH_FOREACH_... API.Dmitry Stogov2015-02-101-16/+9
| |
* | Cleanup resource handling APIsXinchen Hui2015-02-021-3/+3
| |
* | bump yearXinchen Hui2015-01-151-1/+1
| |
* | trailing whitespace removalStanislav Malyshev2015-01-101-4/+4
| |
* | second shot on removing TSRMLS_*Anatol Belski2014-12-141-1/+1
| |
* | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-138/+138
| |
* | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-191-1/+1
| |
* | fix datatype mismatch warningsAnatol Belski2014-10-271-6/+7
| |
* | fix datatype mismatchesAnatol Belski2014-10-271-1/+1
| |
* | Merge branch 'PHP-5.6'Ferenc Kovacs2014-10-151-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | * PHP-5.6: removing the NEWS entry as we had to revert this fix for now Revert "Merge branch 'PHP-5.5' into PHP-5.6" Revert "fix TS build" Revert "Merge branch 'PHP-5.4' into PHP-5.5" Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams" Revert "Bug #41631: Fix regression from first attempt (6569db8)"
| * Revert "Merge branch 'PHP-5.4' into PHP-5.5"Ferenc Kovacs2014-10-151-4/+4
| | | | | | | | | | This reverts commit 30a73658c63a91c413305a4c4d49882fda4dab3e, reversing changes made to 7fac56e0729385bbd2bb040f06a20a697d9de5fd.
* | s/PHP 5/PHP 7/Johannes Schlüter2014-09-191-1/+1
| |
* | Merge branch 'PHP-5.6'Chris Wright2014-08-271-4/+4
|\ \ | |/ | | | | | | * PHP-5.6: Fix stream_select() issue with OpenSSL buffer
| * Merge branch 'PHP-5.5' into PHP-5.6Chris Wright2014-08-271-4/+4
| |\ | | | | | | | | | | | | * PHP-5.5: Fix stream_select() issue with OpenSSL buffer
| | * Merge branch 'PHP-5.4' into PHP-5.5Chris Wright2014-08-271-4/+4
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fix stream_select() issue with OpenSSL buffer Conflicts: ext/openssl/xp_ssl.c
| | | * Fix stream_select() issue with OpenSSL bufferChris Wright2014-08-271-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure data from OpenSSL internal buffer has been transfered to PHP stream buffer before a select() emulation operation is performed Addresses bug #65137 https://bugs.php.net/bug.php?id=65137 Conflicts: ext/openssl/xp_ssl.c
* | | | master renames phase 1Anatol Belski2014-08-251-8/+8
| | | |
* | | | first shot on merging the core fro the int64 branchAnatol Belski2014-08-161-4/+4
| | | |
* | | | Make stream->context indirect trough zend_resource (stream->ctx->ptr).Dmitry Stogov2014-08-071-8/+9
| | | | | | | | | | | | | | | | Fixed ext/standard/tests/streams/bug61115.phpt
* | | | Fixed resource leakDmitry Stogov2014-07-311-0/+4
| | | |
* | | | Hide warning message after fatal errorsDmitry Stogov2014-06-201-9/+11
| | | |
* | | | Don't use cast (compiler friendly)Xinchen Hui2014-05-261-2/+2
| | | |
* | | | Fixed segafult while stream is referenced by persistent resource (like dba)Xinchen Hui2014-05-211-1/+1
| | | |
* | | | Fixed resources apply_dtorXinchen Hui2014-05-191-1/+2
| | | |
* | | | Merge mainstream 'master' branch into refactoringDmitry Stogov2014-04-261-24/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ Merge branch 'PHP-5.6'Stanislav Malyshev2014-04-201-22/+26
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * PHP-5.6: Fix bug #65701: Do not use cache for file file copy
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-04-201-22/+26
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * PHP-5.5: Fix bug #65701: Do not use cache for file file copy
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-201-22/+26
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #65701: Do not use cache for file file copy
| | | | * Fix bug #65701: Do not use cache for file file copyBoro Sitnikovski2014-04-201-22/+26
| | | | |
| * | | | Merge branch 'PHP-5.6'Michael Wallner2014-04-031-2/+7
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: NEWS NEWS Fix Bug #66736 fpassthru broken
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2014-04-031-2/+7
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | * PHP-5.5: NEWS Fix Bug #66736 fpassthru broken
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2014-04-031-2/+7
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | * PHP-5.4: Fix Bug #66736 fpassthru broken
| | | | * Fix Bug #66736 fpassthru brokenMichael Wallner2014-04-031-2/+7
| | | | |
| * | | | Merge branch 'PHP-5.6'Michael Wallner2014-04-021-0/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: NEWS NEWS Fixed bug #61019 (Out of memory on command stream_get_contents)
View Lorry Controller Status