summaryrefslogtreecommitdiff
path: root/main/streams
Commit message (Collapse)AuthorAgeFilesLines
* simplify expressionJoe Watkins2016-04-281-1/+1
|
* Fix bug #71629: sync php_url_decode definitionStanislav Malyshev2016-02-211-2/+2
|
* Merge branch 'PHP-5.6.18' into PHP-7.0.3Stanislav Malyshev2016-02-011-1/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6.18: fix tests fix NEWS Update NEWS update NEWS Fixed bug #71488: Stack overflow when decompressing tar archives update NEWS add missing headers for SIZE_MAX backport the escapeshell* functions hardening branch add tests Fix bug #71459 - Integer overflow in iptcembed() prepare 5.6.18RC1 Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) Fix skip message to work improve fix for bug #71201 Fixed bug #71323 - Output of stream_get_meta_data can be falsified by its input Fix bug #71391: NULL Pointer Dereference in phar_tar_setupmetadata() Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream() Fix bug #71335: Type Confusion in WDDX Packet Deserialization Fix bug #71354 - remove UMR when size is 0 Conflicts: configure.in ext/phar/dirstream.c ext/phar/phar_object.c ext/phar/tar.c ext/standard/exec.c ext/standard/iptc.c ext/standard/math.c ext/standard/streamsfuncs.c ext/wddx/wddx.c main/php_version.h main/streams/memory.c
| * Merge branch 'PHP-5.5.32' into PHP-5.6.18Stanislav Malyshev2016-02-011-14/+16
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5.32: Fixed bug #71488: Stack overflow when decompressing tar archives update NEWS add missing headers for SIZE_MAX backport the escapeshell* functions hardening branch add tests Fix bug #71459 - Integer overflow in iptcembed() Fixed bug #71323 - Output of stream_get_meta_data can be falsified by its input Fix bug #71391: NULL Pointer Dereference in phar_tar_setupmetadata() Fix bug #71335: Type Confusion in WDDX Packet Deserialization Fix bug #71354 - remove UMR when size is 0
| | * Fixed bug #71323 - Output of stream_get_meta_data can be falsified by its inputStanislav Malyshev2016-01-161-14/+16
| | |
* | | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-0118-18/+18
|\ \ \ | |/ / | | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * | Happy new year (Update copyright to 2016)Lior Kaplan2016-01-0118-18/+18
| | |
| * | Fixed bug #70198 Checking liveness does not work as expectedAnatol Belski2015-08-111-1/+11
| | |
| * | Fixed bug #69900 Too long timeout on pipesAnatol Belski2015-07-281-3/+3
| | |
| * | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-03-081-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: added missing parentheses Fix #67626 Fix #63486 Conflicts: main/streams/userspace.c
| | * Merge branch 'pull-request/1106' into PHP-5.5Stanislav Malyshev2015-03-081-1/+11
| | |\ | | | | | | | | | | | | | | | | * pull-request/1106: Fix #67626
| | | * Fix #67626Julien Pauli2015-02-201-1/+11
| | |/
| * | Fix #67626Julien Pauli2015-03-081-1/+11
| | |
* | | 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
| | |
* | | Add support for IPV6_V6ONLY on socketsBob Weinand2015-11-061-0/+10
| | |
* | | Fixed memory leak in php_stream_context_set_option()Dmitry Stogov2015-10-291-8/+9
| | |
* | | Removed or simplified incorrect SEPARATE_*() macros usage.Dmitry Stogov2015-09-291-3/+1
| | |
* | | add overflow checkAnatol Belski2015-09-021-1/+5
| | |
* | | Revert "Revert "suggest parentheses around ‘&&’ within ‘||’""Xinchen Hui2015-08-111-1/+1
| | | | | | | | | | | | This reverts commit ec1e8929c4e4c287d919945811475905e1391b7f.
* | | Revert "suggest parentheses around ‘&&’ within ‘||’"Xinchen Hui2015-08-111-1/+1
| | | | | | | | | | | | This reverts commit 4f2c0e045132de51473b643c68e07e5b2c2e218b.
* | | suggest parentheses around ‘&&’ within ‘||’Xinchen Hui2015-08-111-1/+1
| | |
* | | add EAGAIN checksAnatol Belski2015-08-111-3/+5
| | | | | | | | | | | | | | | EAGAIN and EWOULDBLOCK should be checked together and don't necessary, have same value. So checking both is better for portability.
* | | Fixed bug #70198 Checking liveness does not work as expectedAnatol Belski2015-08-111-1/+11
| | |
* | | 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
| | |
View Lorry Controller Status