mirror of
https://github.com/php/php-src.git
synced 2025-08-21 01:45:16 +02:00
- Fix readonly mode to 'rb'
This commit is contained in:
parent
fd30dc5858
commit
672eae9c90
1 changed files with 4 additions and 4 deletions
|
@ -266,7 +266,7 @@ PHPAPI php_stream *_php_stream_memory_create(int mode STREAMS_DC TSRMLS_DC)
|
||||||
self->mode = mode;
|
self->mode = mode;
|
||||||
self->owner_ptr = NULL;
|
self->owner_ptr = NULL;
|
||||||
|
|
||||||
stream = php_stream_alloc(&php_stream_memory_ops, self, 0, mode & TEMP_STREAM_READONLY ? "r+b" : "w+b");
|
stream = php_stream_alloc(&php_stream_memory_ops, self, 0, mode & TEMP_STREAM_READONLY ? "rb" : "w+b");
|
||||||
stream->flags |= PHP_STREAM_FLAG_NO_BUFFER;
|
stream->flags |= PHP_STREAM_FLAG_NO_BUFFER;
|
||||||
return stream;
|
return stream;
|
||||||
}
|
}
|
||||||
|
@ -520,9 +520,9 @@ PHPAPI php_stream *_php_stream_temp_create(int mode, size_t max_memory_usage STR
|
||||||
self->smax = max_memory_usage;
|
self->smax = max_memory_usage;
|
||||||
self->mode = mode;
|
self->mode = mode;
|
||||||
self->meta = NULL;
|
self->meta = NULL;
|
||||||
stream = php_stream_alloc(&php_stream_temp_ops, self, 0, mode & TEMP_STREAM_READONLY ? "r+b" : "w+b");
|
stream = php_stream_alloc(&php_stream_temp_ops, self, 0, mode & TEMP_STREAM_READONLY ? "rb" : "w+b");
|
||||||
stream->flags |= PHP_STREAM_FLAG_NO_BUFFER;
|
stream->flags |= PHP_STREAM_FLAG_NO_BUFFER;
|
||||||
self->innerstream = php_stream_memory_create(mode);
|
self->innerstream = php_stream_memory_create_rel(mode);
|
||||||
((php_stream_memory_data*)self->innerstream->abstract)->owner_ptr = &self->innerstream;
|
((php_stream_memory_data*)self->innerstream->abstract)->owner_ptr = &self->innerstream;
|
||||||
|
|
||||||
return stream;
|
return stream;
|
||||||
|
@ -684,7 +684,7 @@ static php_stream * php_stream_url_wrap_rfc2397(php_stream_wrapper *wrapper, cha
|
||||||
stream->ops = &php_stream_rfc2397_ops;
|
stream->ops = &php_stream_rfc2397_ops;
|
||||||
ts = (php_stream_temp_data*)stream->abstract;
|
ts = (php_stream_temp_data*)stream->abstract;
|
||||||
assert(ts != NULL);
|
assert(ts != NULL);
|
||||||
ts->mode = mode && mode[0] == 'r' ? TEMP_STREAM_READONLY : 0;
|
ts->mode = mode && mode[0] == 'r' && mode[1] != '+' ? TEMP_STREAM_READONLY : 0;
|
||||||
ts->meta = meta;
|
ts->meta = meta;
|
||||||
}
|
}
|
||||||
efree(comma);
|
efree(comma);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue