summaryrefslogtreecommitdiff
path: root/main/streams/plain_wrapper.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-08-171-0/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: (48 commits) Update NEWs Unused label Fixed bug #72853 (stream_set_blocking doesn't work) fix test Bug #72663 - part 3 Bug #72663 - part 2 Bug #72663 - part 1 Update NEWS BLock test with memory leak fix tests Fix TSRM build Fix bug #72850 - integer overflow in uuencode Fixed bug #72849 - integer overflow in urlencode Fix bug #72848 - integer overflow in quoted_printable_encode caused heap corruption Fix bug #72838 - Integer overflow lead to heap corruption in sql_regcase Fix bug #72837 - integer overflow in bzdecompress caused heap corruption Fix bug #72836 - integer overflow in base64_decode caused heap corruption Fix for bug #72807 - do not produce strings with negative length Fix for bug #72790 and bug #72799 Fix bug #72730 - imagegammacorrect allows arbitrary write access ... Conflicts: ext/standard/var_unserializer.c
| * Merge branch 'PHP-5.6' into PHP-7.0Xinchen Hui2016-08-171-0/+12
| |\ | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Fixed bug #72853 (stream_set_blocking doesn't work) Conflicts: main/streams/plain_wrapper.c
| | * Fixed bug #72853 (stream_set_blocking doesn't work)Xinchen Hui2016-08-171-1/+13
| | | | | | | | | | | | Implemented PHP_STREAM_OPTION_META_DATA_API for plain_wrappers
* | | Fixed the UTF-8 and long path support in the streams on Windows.Anatol Belski2016-06-201-2/+10
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since long the default PHP charset is UTF-8, however the Windows part is out of step with this important point. The current implementation in PHP doesn't technically permit to handle UTF-8 filepath and several other things. Till now, only the ANSI compatible APIs are being used. Here is more about it https://msdn.microsoft.com/en-us/library/windows/desktop/dd317752%28v=vs.85%29.aspx The patch fixes not only issues with multibyte filenames under incompatible codepages, but indirectly also issues with some other multibyte encodings like BIG5, Shift-JIS, etc. by providing a clean way to access filenames in UTF-8. Below is a small list of issues from the bug tracker, that are getting fixed: https://bugs.php.net/63401 https://bugs.php.net/41199 https://bugs.php.net/50203 https://bugs.php.net/71509 https://bugs.php.net/64699 https://bugs.php.net/64506 https://bugs.php.net/30195 https://bugs.php.net/65358 https://bugs.php.net/61315 https://bugs.php.net/70943 https://bugs.php.net/70903 https://bugs.php.net/63593 https://bugs.php.net/54977 https://bugs.php.net/54028 https://bugs.php.net/43148 https://bugs.php.net/30730 https://bugs.php.net/33350 https://bugs.php.net/35300 https://bugs.php.net/46990 https://bugs.php.net/61309 https://bugs.php.net/69333 https://bugs.php.net/45517 https://bugs.php.net/70551 https://bugs.php.net/50197 https://bugs.php.net/72200 https://bugs.php.net/37672 Yet more related tickets can for sure be found - on bugs.php.net, Stackoverflow and Github. Some of the bugs are pretty recent, some descend to early 2000th, but the user comments in there last even till today. Just for example, bug #30195 was opened in 2004, the latest comment in there was made in 2014. It is certain, that these bugs descend not only to pure PHP use cases, but get also redirected from the popular PHP based projects. Given the modern systems (and those supported by PHP) are always based on NTFS, there is no excuse to keep these issues unresolved. The internalization approach on Windows is in many ways different from UNIX and Linux, while it supports and is based on Unicode. It depends on the current system code page, APIs used and exact kind how the binary was compiled The locale doesn't affect the way Unicode or ANSI API work. PHP in particular is being compiled without _UNICODE defined and this is conditioned by the way we handle strings. Here is more about it https://msdn.microsoft.com/en-us/library/tsbaswba.aspx However, with any system code page ANSI functions automatically convert paths to UTF-16. Paths in some encodings incompatible with the current system code page, won't work correctly with ANSI APIs. PHP till now only uses the ANSI Windows APIs. For example, on a system with the current code page 1252, the paths in cp1252 are supported and transparently converted to UTF-16 by the ANSI functions. Once one wants to handle a filepath encoded with cp932 on that particular system, an ANSI or a POSIX compatible function used in PHP will produce an erroneous result. When trying to convert that cp932 path to UTF-8 and passing to the ANSI functions, an ANSI function would likely interpret the UTF-8 string as some string in the current code page and create a filepath that represents every single byte of the UTF-8 string. These behaviors are not only broken but also disregard the documented INI settings. This patch solves the issies with the multibyte paths on Windows by intelligently enforcing the usage of the Unicode aware APIs. For functions expect Unicode (fe CreateFileW, FindFirstFileW, etc.), arguments will be converted to UTF-16 wide chars. For functions returning Unicode aware data (fe GetCurrentDirectoryW, etc.), resulting wide string is converted back to char's depending on the current PHP charset settings, either to the current ANSI codepage (this is the behavior prior to this patch) or to UTF-8 (the default behavior). In a particular case, users might have to explicitly set internal_encoding or default_charset, if filenames in ANSI codepage are necessary. Current tests show no regressions and witness that this will be an exotic case, the current default UTF-8 encoding is compatible with any supported system. The dependency libraries are long switching to Unicode APIs, so some tests were also added for extensions not directly related to streams. At large, the patch brings over 150 related tests into the core. Those target and was run on various environments with European, Asian, etc. codepages. General PHP frameworks was tested and showed no regressions. The impact on the current C code base is low, the most places affected are the Windows only places in the three files tsrm_win32.c, zend_virtual_cwd.c and plain_wrapper.c. The actual implementation of the most of the wide char supporting functionality is in win32/ioutil.* and win32/codepage.*, several low level functionsare extended in place to avoid reimplementation for now. No performance impact was sighted. As previously mentioned, the ANSI APIs used prior the patch perform Unicode conversions internally. Using the Unicode APIs directly while doing custom conversions just retains the status quo. The ways to optimize it are open (fe. by implementing caching for the strings converted to wide variants). The long path implementation is user transparent. If a path exceeds the length of _MAX_PATH, it'll be automatically prefixed with \\?\. The MAXPATHLEN is set to 2048 bytes. Appreciation to Pierre Joye, Matt Ficken, @algo13 and others for tips, ideas and testing. Thanks.
* | simplify expressionJoe Watkins2016-04-281-1/+1
| |
* | 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
| |
| * Fixed bug #69900 Too long timeout on pipesAnatol Belski2015-07-281-3/+3
| |
* | add overflow checkAnatol Belski2015-09-021-1/+5
| |
* | 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-301-4/+4
| | | | | | | | semantick changes).
* | no more winxp, but reallyAnatol Belski2015-04-041-4/+2
| |
* | fix conditionAnatol Belski2015-03-191-1/+1
| |
* | use portable fseekAnatol Belski2015-03-111-1/+1
| |
* | Avoid repeatable strlen() callsDmitry Stogov2015-03-051-10/+9
| |
* | Use zend_string* instead of char* for opened_patch handling. Avoid ↵Dmitry Stogov2015-03-041-31/+23
| | | | | | | | reallocations and improve string reuse.
* | 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
| | | |
| | * | Bump yearXinchen Hui2015-01-151-1/+1
| | | |
| * | | bump yearXinchen Hui2015-01-151-1/+1
| | | |
* | | | fix warningsMichael Wallner2015-01-301-0/+3
| |_|/ |/| |
* | | bump yearXinchen Hui2015-01-151-1/+1
| | |
* | | trailing whitespace removalStanislav Malyshev2015-01-101-35/+35
| | |
* | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-89/+89
| | |
* | | Merge branch 'PHP-5.6'Anatol Belski2014-12-011-4/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: add include for missing usleep proto C89 compat Added more useful warning messages Changed based on comments and make its behaviour equal to the Windows version Fix #53092 - dns_get_record does not return false on dns server failure Fix php cli (-S option) inconsistent port parsing Conflicts: main/streams/plain_wrapper.c
| * | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-011-4/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: add include for missing usleep proto C89 compat Added more useful warning messages Changed based on comments and make its behaviour equal to the Windows version Fix #53092 - dns_get_record does not return false on dns server failure Fix php cli (-S option) inconsistent port parsing
| | * add include for missing usleep protoAnatol Belski2014-12-011-0/+1
| | |
| | * C89 compatAnatol Belski2014-12-011-4/+1
| | |
* | | Merge branch 'PHP-5.6'Stanislav Malyshev2014-11-301-29/+16
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-5.6: Update NEWS fix typo Added test and review suggestion Fix bug #68335: rmdir doesnt work with file:// stream wrapper
| * | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-11-301-29/+16
| |\ \ | | |/ | | | | | | | | | | | | * PHP-5.5: Added test and review suggestion Fix bug #68335: rmdir doesnt work with file:// stream wrapper
| | * Added test and review suggestionmcq82014-11-301-34/+14
| | |
| | * Fix bug #68335: rmdir doesnt work with file:// stream wrappermcq82014-11-301-0/+7
| | |
* | | proper dllexportAnatol Belski2014-11-181-1/+1
| | |
* | | fix datatype mismatchesAnatol Belski2014-10-271-10/+14
| | |
* | | add include for usleep() protoAnatol Belski2014-10-231-0/+1
| | |
* | | Merge branch 'PHP-5.6'Anatol Belski2014-09-291-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.6: increase the polling period to not to break existing behaviours
| * | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-09-291-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.5: increase the polling period to not to break existing behaviours
| | * increase the polling period to not to break existing behavioursAnatol Belski2014-09-291-1/+1
| | |
* | | Merge branch 'PHP-5.6'Anatol Belski2014-09-291-0/+28
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: updated NEWS Fixed bug #51800 proc_open on Windows hangs forever Conflicts: main/streams/plain_wrapper.c
| * | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-09-291-0/+28
| |\ \ | | |/ | | | | | | | | | * PHP-5.5: Fixed bug #51800 proc_open on Windows hangs forever
| | * Fixed bug #51800 proc_open on Windows hangs foreverAnatol Belski2014-09-291-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This loop can block for some minutes, theoretically. Practially however, this is a 99% non issue for a normal use case. This is required because read() is synchronous. The PHP streams API wants to fill its internal buffers, therefore it might try to read some more data than user has demanded. Also, for a case where we want to read X bytes, but neither enough data nor EOF arrives, read() will block until it could fill the buffer. If a counterpart station runs slowly or delivers not all the data at once, read() would still be waiting. If we quit too early, we possibly could loose some data from the pipe. Thus it has to emulate the read() behaviour, but obviously not completely, just to some grade. Reading big data amount is for sure an issue on any platforms, it depends on the pipe buffer size, which is controlled by the system. On Windows, the buffer size seems to be way too small, which causes buffer congestion and a dead lock. It is essential to read the pipe descriptors simultaneously and possibly in the same order as the opposite writes them. Thus, this will work with smaller buffer data sizes passed through pipes. As MSDN states, anonymous pipes don't support asynchronous operations. Neither anonymous pipes do support select() as they are not SOCKETs but file descriptors. Consequently - bigger data sizes will need a better solution based on threads. However it is much more expencive. Maybe a better solution could be exporting a part of the internal doing as a userspace function which could perform some kind of lookahead operation on the pipe descriptor. This is just the first stone, depending on the user feedback we might go for further improvements in this area.
| | * Bump yearXinchen Hui2014-01-031-1/+1
| | |
* | | s/PHP 5/PHP 7/Johannes Schlüter2014-09-191-1/+1
| | |
* | | fix typeAnatol Belski2014-09-141-1/+1
| | |