php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 10:16:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

Browse Source
This commit is contained in:
Xinchen Hui
2013-04-03 10:11:33 +08:00
parent d7f709a032 c51e32860a
commit 37b20a1bc2
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/streams/streams.c
+7 -8
View File
@@ -1494,7 +1494,7 @@ PHPAPI int _php_stream_copy_to_stream_ex(php_stream *src, php_stream *dest, size
char buf[CHUNK_SIZE];
size_t readchunk;
size_t haveread = 0;
size_t didread;
size_t didread, didwrite, towrite;
size_t dummy;
php_stream_statbuf ssbuf;
@@ -1529,16 +1529,16 @@ PHPAPI int _php_stream_copy_to_stream_ex(php_stream *src, php_stream *dest, size
p = php_stream_mmap_range(src, php_stream_tell(src), maxlen, PHP_STREAM_MAP_MODE_SHARED_READONLY, &mapped);
if (p) {
mapped = php_stream_write(dest, p, mapped);
didwrite = php_stream_write(dest, p, mapped);
php_stream_mmap_unmap_ex(src, mapped);
*len = mapped;
*len = didwrite;
/* we've got at least 1 byte to read.
* less than 1 is an error */
if (mapped > 0) {
/* we've got at least 1 byte to read
* less than 1 is an error
* AND read bytes match written */
if (mapped > 0 && mapped == didwrite) {
return SUCCESS;
}
return FAILURE;
@@ -1556,7 +1556,6 @@ PHPAPI int _php_stream_copy_to_stream_ex(php_stream *src, php_stream *dest, size
if (didread) {
/* extra paranoid */
size_t didwrite, towrite;
char *writeptr;
towrite = didread;