summaryrefslogtreecommitdiff
path: root/main/streams
Commit message (Collapse)AuthorAgeFilesLines
* fix pipe peek timeoutAnatol Belski2015-07-021-3/+3
|
* Fix alignment on 32-bitChristoph M. Becker2015-07-021-1/+2
|
* fix c/p issueAnatol Belski2015-07-021-6/+6
|
* initial stuff to make allow blocking pipes on windowsAnatol Belski2015-07-021-2/+22
|
* Use ZSTR_ API to access zend_string elements (this is just renaming without ↵Dmitry Stogov2015-06-305-31/+31
| | | | 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
* further cleanups with S_IF* macros generalized declarationsAnatol Belski2015-05-251-4/+0
|
* Fix undeclared identifier 'PHP_STREAM_KEEP_RSRC'Di Wu2015-04-091-1/+1
| | | | | | Identifier named `PHP_STREAM_FREE_KEEP_RSRC` but use `PHP_STREAM_KEEP_RSRC` Reference Line 131
* Fixed bug #68887 (resources are not freed correctly)Dmitry Stogov2015-04-082-10/+5
|
* CleanupDmitry Stogov2015-04-071-16/+4
|
* no more winxp, but reallyAnatol Belski2015-04-041-4/+2
|
* Optimize zend_string_realloc() add more specialized versions ↵Dmitry Stogov2015-03-201-2/+2
| | | | zend_string_extend() and zend_string_truncate()
* fix conditionAnatol Belski2015-03-191-1/+1
|
* use portable fseekAnatol Belski2015-03-111-1/+1
|
* Revert "Add stream_socket_crypto_info() function"Daniel Lowrey2015-03-092-34/+1
| | | | | | | | | | | | | | 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.
* Fixed buildWei Dai2015-03-091-1/+1
|
* Fix #67626Julien Pauli2015-03-081-2/+12
|
* ZTS cleanupReeze Xia2015-03-081-1/+1
|
* Merge branch 'PHP-5.6'Daniel Lowrey2015-03-051-4/+10
|\ | | | | | | | | | | | | | | * PHP-5.6: Fixed bug (#69195 Inconsistent stream crypto values across versions) Conflicts: ext/standard/http_fopen_wrapper.c
| * Fixed bug (#69195 Inconsistent stream crypto values across versions)Daniel Lowrey2015-03-051-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP 5.6.0 altered the semantics of the following constants: - STREAM_CRYPTO_METHOD_SSLv23_CLIENT - STREAM_CRYPTO_METHOD_SSLv23_SERVER - STREAM_CRYPTO_METHOD_TLS_CLIENT - STREAM_CRYPTO_METHOD_TLS_SERVER Instead of representing the SSLv23_*() handshake methods the v23 constants were changed to allow only SSLv2 or SSLv3 connections. Likewise, the TLS methods were modified from using only the TLSv1 handshake to allowing TLS1,1.1, and 1.2. This created a situation in which users upgrading from previous versions faced a potential security degradation if they did not update code to use different constants. In the interest of compatibility across PHP versions the original semantics have been restored with the following caveat: **IMPORTANT** The SSLv23 client/server methods will no longer negotiate the use of the insecure SSLv2 or SSLv3 protocols by default. Users wishing to allow these protocols must explicitly add them to the method bitmask via the appropriate flags.
* | 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
| * Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-02-051-0/+4
| |\ | | | | | | | | | | | | Conflicts: main/streams/memory.c
| | * Conflicts:Nayana Hettiarachchi2015-02-051-0/+4
| | | | | | | | | | | | main/streams/memory.c
* | | Avoid repeatable strlen() callsDmitry Stogov2015-03-051-10/+9
| | |
* | | Merge branch 'pull-request/1142'Reeze Xia2015-03-052-2/+2
|\ \ \ | | | | | | | | | | | | | | | | * pull-request/1142: Fixed wrong parameter type of php_stream_mmap_range()
| * | | Fixed wrong parameter type of php_stream_mmap_range()Reeze Xia2015-03-042-2/+2
| | | | | | | | | | | | | | | | | | | | There are several warings about this. The mode type should be php_stream_mmap_access_t but not php_stream_mmap_operate_t
* | | | Merge branch 'tls-alpn'Daniel Lowrey2015-03-042-1/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 stream_socket_crypto_info() functionDaniel Lowrey2015-02-282-1/+34
| | | | |
* | | | | 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-047-53/+45
|/ / / | | | | | | | | | reallocations and improve string reuse.
* | | Use new ZEND_HASH_FOREACH_... API.Dmitry Stogov2015-02-101-16/+9
| | |
* | | Remove extra spaceXinchen Hui2015-02-051-1/+1
| | |
* | | return size_tXinchen Hui2015-02-051-1/+1
| | |
* | | #68986 bug fixNayana Hettiarachchi2015-02-051-0/+4
| | |
* | | Cleanup resource handling APIsXinchen Hui2015-02-023-5/+5
| | |
* | | Merge branch 'pull-request/1032'Stanislav Malyshev2015-02-011-3/+6
|\ \ \ | | | | | | | | | | | | | | | | * pull-request/1032: do_fstat changes
| * | | do_fstat changesJoshua Rogers2015-02-011-3/+6
| | | | | | | | | | | | | | | | Check return values of 'do_fstat' function in all places.
* | | | Merge branch 'PHP-5.6'Stanislav Malyshev2015-01-311-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: fix group name handling Conflicts: main/streams/plain_wrapper.c
| * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-01-311-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | * PHP-5.5: fix group name handling
| | * | fix group name handlingStanislav Malyshev2015-01-311-1/+1
| | | |
* | | | fix warningsMichael Wallner2015-01-301-0/+3
| |_|/ |/| |
* | | Merge branch 'PHP-5.6'Bob Weinand2015-01-261-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: NEWS main/streams/filter.c
| * | Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6Bob Weinand2015-01-261-1/+1
| |\ \ | | |/ | | | | | | | | | Conflicts: NEWS
| | * Fix call after close if multiple filters are attachedBob Weinand2015-01-261-1/+1
| | |
| | * Bump yearXinchen Hui2015-01-1518-18/+18
| | |
| * | bump yearXinchen Hui2015-01-1518-18/+18
| | |
* | | bump yearXinchen Hui2015-01-1518-18/+18
| | |
* | | trailing whitespace removalStanislav Malyshev2015-01-1014-125/+125
| | |