archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.3'

Browse source 
* PHP-7.3:
  Make php_plain_files_wrapper to be writable (workaround for swoole)
This commit is contained in:
Dmitry Stogov 2018-10-24 11:50:18 +03:00
commit d1e14e2cc0
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/standard/php_fopen_wrappers.h
View file

@ -26,6 +26,6 @@ php_stream *php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, const char *pat
extern PHPAPI const php_stream_wrapper php_stream_http_wrapper; extern PHPAPI const php_stream_wrapper php_stream_http_wrapper;
extern PHPAPI const php_stream_wrapper php_stream_ftp_wrapper; extern PHPAPI const php_stream_wrapper php_stream_ftp_wrapper;
extern PHPAPI const php_stream_wrapper php_stream_php_wrapper; extern PHPAPI const php_stream_wrapper php_stream_php_wrapper;
extern PHPAPI const php_stream_wrapper php_plain_files_wrapper; extern PHPAPI /*const*/ php_stream_wrapper php_plain_files_wrapper;
#endif #endif

2
main/streams/php_stream_plain_wrapper.h
View file

@ -20,7 +20,7 @@
/* operations for a plain file; use the php_stream_fopen_XXX funcs below */ /* operations for a plain file; use the php_stream_fopen_XXX funcs below */
PHPAPI extern php_stream_ops php_stream_stdio_ops; PHPAPI extern php_stream_ops php_stream_stdio_ops;
PHPAPI extern const php_stream_wrapper php_plain_files_wrapper; PHPAPI extern /*const*/ php_stream_wrapper php_plain_files_wrapper;
BEGIN_EXTERN_C() BEGIN_EXTERN_C()

3
main/streams/plain_wrapper.c
View file

@ -1453,7 +1453,8 @@ static const php_stream_wrapper_ops php_plain_files_wrapper_ops = {
php_plain_files_metadata php_plain_files_metadata
}; };
PHPAPI const php_stream_wrapper php_plain_files_wrapper = { /* TODO: We have to make php_plain_files_wrapper writable to support SWOOLE */
PHPAPI /*const*/ php_stream_wrapper php_plain_files_wrapper = {
&php_plain_files_wrapper_ops, &php_plain_files_wrapper_ops,
NULL, NULL,
0 0