summaryrefslogtreecommitdiff
path: root/main/streams/streams.c
Commit message (Collapse)AuthorAgeFilesLines
* 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)
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2014-04-021-0/+4
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | * PHP-5.5: NEWS Fixed bug #61019 (Out of memory on command stream_get_contents)
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2014-04-021-0/+4
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | * PHP-5.4: Fixed bug #61019 (Out of memory on command stream_get_contents)
| | | | * Fixed bug #61019 (Out of memory on command stream_get_contents)Michael Wallner2014-04-021-0/+4
| | | | |
| | | | * Bump yearXinchen Hui2014-01-031-1/+1
| | | | |
| | | * | Bump yearXinchen Hui2014-01-031-1/+1
| | | | |
* | | | | Combine HashTable.flags and HashTable.nApplyCount into single 32-bit wordDmitry Stogov2014-04-211-8/+5
| | | | |
* | | | | Changed data layout to allow more efficient operationsDmitry Stogov2014-04-021-4/+4
| | | | |
* | | | | Don't include trailing zero into hash caclculationDmitry Stogov2014-03-141-4/+4
| | | | |
* | | | | Refactor stream_get_record to return zend_stringXinchen Hui2014-03-051-6/+6
| | | | |
* | | | | Fixed wrapper errors realted testsXinchen Hui2014-03-041-5/+4
| | | | |
* | | | | Refactor _php_stream_scandir to avoid memleakXinchen Hui2014-03-021-10/+10
| | | | |
* | | | | Resource closing without destructionDmitry Stogov2014-02-271-2/+2
| | | | |
* | | | | Refactoring php_stream_copy_to_mem to return zend_stringXinchen Hui2014-02-241-19/+24
| | | | |
* | | | | Fixed segfault in file_get_contentsXinchen Hui2014-02-211-8/+12
| | | | |
* | | | | Use better data structures (incomplete)Dmitry Stogov2014-02-191-1/+3
| | | | |
* | | | | Use better data structures (incomplete)Dmitry Stogov2014-02-101-91/+76
|/ / / /
* | | | Merge branch 'PHP-5.6'Xinchen Hui2014-01-031-1/+1
|\ \ \ \ | |/ / /
| * | | Bump yearXinchen Hui2014-01-031-1/+1
| | | |
* | | | Kill a TSRMLS_FETCH() in php_stream_context_set() by passing TSRMLS_CC to itKalle Sommer Nielsen2013-12-181-2/+1
|/ / / | | | | | | | | | # For mysqlnd: Relevant PHP_API_VERSION are put in place for cross version compatibility
* | | Constify streams API and a few other calls down the rabbit hole.Andrey Hristov2013-07-301-31/+31
|/ / | | | | | | | | (`char *` to `const char *` for parameters and few return values) In a few places int len moved to size_t len.
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-07-101-1/+3
|\ \ | |/ | | | | | | * PHP-5.4: fix possible resource leak and make sure there's something to qsort()
| * fix possible resource leak and make sure there's something to qsort()Anatol Belski2013-07-101-1/+3
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-04-021-2/+4
|\ \ | |/ | | | | | | * PHP-5.4: keep previous test to avoid any behavior change
| * keep previous test to avoid any behavior changeRemi Collet2013-04-021-2/+4
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-04-021-8/+5
|\ \ | |/ | | | | | | | | * PHP-5.4: fix comment Fixed Bug #64565 copy doesn't report failure on partial copy
| * fix commentRemi Collet2013-04-021-3/+1
| |
| * Fixed Bug #64565 copy doesn't report failure on partial copyRemi Collet2013-04-021-5/+4
| | | | | | | | | | | | | | | | | | _php_stream_copy_to_stream_ex, when mmap is possible, doesn't check if actually written bytes match read bytes. Fix this (paranoid check) to be consistent with non mmap mode Seems hard to add a unit test, as this rely on a full filesystem.
| * Happy New YearXinchen Hui2013-01-011-1/+1
| |
* | Happy New YearXinchen Hui2013-01-011-1/+1
| |
* | Merge branch 'PHP-5.4'Gustavo Lopes2012-10-121-2/+10
|\ \ | |/ | | | | | | * PHP-5.4: Fix bug #63240 on stream_get_line()
| * Merge branch 'PHP-5.3' into PHP-5.4Gustavo Lopes2012-10-121-2/+10
| |\ | | | | | | | | | | | | * PHP-5.3: Fix bug #63240 on stream_get_line()
| | * Fix bug #63240 on stream_get_line()Gustavo Lopes2012-10-121-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stream_get_line() could contain the delimiter string if that string had more than one character. The bug manifested itself when a read on the stream ended with part of the delimiter string and the read after would start with the rest of the delimiter string; provided that the data of first read did not complete the max length result of the call to stream_get_line() with the partial delimiter used in that max length return. In that case, the delimiter will still appear in the result, divided in two subsequent return values. That is not a bug. See <http://www.mail-archive.com/internals@lists.php.net/msg61325.html>
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-10-091-0/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-091-0/+0
| |\ \ | | |/