Merge branch 'PHP-7.3'

dstogov · dstogov · commit d1e14e2cc06f · 2018-10-24T11:50:18.000+03:00
* PHP-7.3:
  Make php_plain_files_wrapper to be writable (workaround for swoole)
diff --git a/ext/standard/php_fopen_wrappers.h b/ext/standard/php_fopen_wrappers.h
@@ -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_ftp_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
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1453,7 +1453,8 @@ static const php_stream_wrapper_ops php_plain_files_wrapper_ops = {`
`1453`	`1453`	`php_plain_files_metadata`
`1454`	`1454`	`};`
`1455`	`1455`
`1456`		`-PHPAPI const php_stream_wrapper php_plain_files_wrapper = {`
	`1456`	`+/* TODO: We have to make php_plain_files_wrapper writable to support SWOOLE */`
	`1457`	`+PHPAPI /const/ php_stream_wrapper php_plain_files_wrapper = {`
`1457`	`1458`	`&php_plain_files_wrapper_ops,`
`1458`	`1459`	`NULL,`
`1459`	`1460`	`0`