summaryrefslogtreecommitdiff
path: root/main/php_streams.h
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* Eliminate usages of _PP macrosNikita Popov2016-03-031-6/+0
| | | | | | | | | | | | | These are either in debug code (fix them), commented out (drop them) or in dead compatibility macros (drop them). One usage was in php_stream_get_from_zval(), which we have not used since at least PHP 5.2 and, judging from the fact that nobody complained about it causing compile errors in PHP 7, nobody else uses it either, so drop it. There are still remaining uses in mysqli embedded and odbc birdstep. These probably need to be dropped outright.
* Fix format attributes in ZTSNikita Popov2016-02-141-8/+0
|
* 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
| |
* | Fix typo in php_stream_from_res_no_verifyJakub Zelenka2015-11-291-1/+1
| | | | | | | | | | | | This macro is not used but it's wrong as zend_fetch_resource accepts only 3 args and just one res index. So obviously we need to use zend_fetch_resource2 here.
* | fixed wrong number for the new optionAnatol Belski2015-07-021-3/+3
| |
* | add missing stuff is the headerAnatol Belski2015-07-021-0/+6
| |
* | Only call stream_flush if anything was writtenBob Weinand2015-06-301-9/+11
| | | | | | | | This avoids flushing in readonly mode upon close
* | Fixed bug #68887 (resources are not freed correctly)Dmitry Stogov2015-04-081-0/+1
| |
* | Another minor cleanup, drop ENFORCE_SAFE_MODE (all except pdo_pgsql have ↵Kalle Sommer Nielsen2015-03-291-1/+0
| | | | | | | | #if's for checking already)
* | Merge branch 'PHP-5.6'Daniel Lowrey2015-03-051-0/+3
|\ \ | |/ | | | | | | | | | | | | * 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-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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
| |
* | Use zend_string* instead of char* for opened_patch handling. Avoid ↵Dmitry Stogov2015-03-041-3/+3
| | | | | | | | reallocations and improve string reuse.
* | found type is unnecessaryXinchen Hui2015-02-021-4/+4
| |
* | Use resource directlyXinchen Hui2015-02-021-0/+1
| |
* | Ported ftpXinchen Hui2015-02-021-0/+6
| |
* | Cleanup resource handling APIsXinchen Hui2015-02-021-2/+7
| |
* | bump yearXinchen Hui2015-01-151-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-151-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: made the apache ini holders to be zend_bool Removed useless local variable Use simpler functions Fixed test small fixes to UPGRADING Reorder to save alignment size (of course, only for common used structs)
| * | Reorder to save alignment size (of course, only for common used structs)Xinchen Hui2014-12-151-2/+2
| | |
* | | second shot on removing TSRMLS_*Anatol Belski2014-12-141-1/+1
| | |
* | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-121/+121
|/ /
* | Merge branch 'PHP-5.6'Ferenc Kovacs2014-10-151-3/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-3/+0
| | | | | | | | | | This reverts commit 30a73658c63a91c413305a4c4d49882fda4dab3e, reversing changes made to 7fac56e0729385bbd2bb040f06a20a697d9de5fd.
* | s/PHP 5/PHP 7/Johannes Schlüter2014-09-191-1/+1
| |
* | Revert "remove a few gcc format attributes from some printf-like functions"Nikita Popov2014-09-031-4/+4
| | | | | | | | This reverts commit 25f5ba94aca1e89ee5f0c66513e58826afa3b853.
* | remove a few gcc format attributes from some printf-like functionsNuno Lopes2014-08-311-4/+4
| | | | | | | | Since now PHP's printf-like functions have many custom specifiers, the amount of false-positives wasnt worth it
* | Merge branch 'PHP-5.6'Chris Wright2014-08-271-0/+3
|\ \ | |/ | | | | | | * PHP-5.6: Fix stream_select() issue with OpenSSL buffer
| * Merge branch 'PHP-5.5' into PHP-5.6Chris Wright2014-08-271-0/+3
| |\ | | | | | | | | | | | | * PHP-5.5: Fix stream_select() issue with OpenSSL buffer
| | * Merge branch 'PHP-5.4' into PHP-5.5Chris Wright2014-08-271-0/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 4Anatol Belski2014-08-251-10/+2
| | | |
* | | | master renames phase 3Anatol Belski2014-08-251-2/+2
| | | |
* | | | first shot on merging the core fro the int64 branchAnatol Belski2014-08-161-7/+17
| | | |
* | | | Make stream->context indirect trough zend_resource (stream->ctx->ptr).Dmitry Stogov2014-08-071-1/+4
| | | | | | | | | | | | | | | | Fixed ext/standard/tests/streams/bug61115.phpt
* | | | Fixed resource leakDmitry Stogov2014-07-311-9/+2
| | | |
* | | | Merge mainstream 'master' branch into refactoringDmitry Stogov2014-04-261-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.5' into PHP-5.6Stanislav Malyshev2014-04-201-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * 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-0/+1
| | |\ \ | | | |/ | | | | | | | | | | | | * 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-0/+1
| | | |
| | | * Bump yearXinchen Hui2014-01-031-1/+1
| | | |
| | | * Happy New YearXinchen Hui2013-01-011-1/+1
| | | |
| | * | Bump yearXinchen Hui2014-01-031-1/+1
| | | |
* | | | Refactor libxml (incompleted)Xinchen Hui2014-04-111-2/+2
| | | |
* | | | Refactor stream_get_record to return zend_stringXinchen Hui2014-03-051-1/+1
| | | |
* | | | Refactor _php_stream_scandir to avoid memleakXinchen Hui2014-03-021-4/+4
| | | |
* | | | Refactoring php_stream_copy_to_mem to return zend_stringXinchen Hui2014-02-241-5/+4
| | | |
* | | | Use better data structures (incomplete)Dmitry Stogov2014-02-131-2/+2
| | | |
View Lorry Controller Status