diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-10-24 11:50:18 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-10-24 11:50:18 +0300 |
| commit | d1e14e2cc06fc1686b66fc219e4340ca476eeaf8 (patch) | |
| tree | 791cde2a72ec43ece2ef85b247ba577929b06b86 /main | |
| parent | c0446d55a2ea2abaaee5f5461f68ad8054aea56f (diff) | |
| parent | 770fe51bfd8994c3df819cbf04b7d76824b55e5c (diff) | |
| download | php-git-d1e14e2cc06fc1686b66fc219e4340ca476eeaf8.tar.gz | |
Merge branch 'PHP-7.3'
* PHP-7.3:
Make php_plain_files_wrapper to be writable (workaround for swoole)
Diffstat (limited to 'main')
| -rw-r--r-- | main/streams/php_stream_plain_wrapper.h | 2 | ||||
| -rw-r--r-- | main/streams/plain_wrapper.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/main/streams/php_stream_plain_wrapper.h b/main/streams/php_stream_plain_wrapper.h index 183a12d2a2..17c0e72082 100644 --- a/main/streams/php_stream_plain_wrapper.h +++ b/main/streams/php_stream_plain_wrapper.h @@ -20,7 +20,7 @@ /* operations for a plain file; use the php_stream_fopen_XXX funcs below */ 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() diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index b2fc00b226..fdfc7b4f63 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -1453,7 +1453,8 @@ static const php_stream_wrapper_ops php_plain_files_wrapper_ops = { 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, NULL, 0 |