cvs: php-src(PHP_5_2) /main/streams streams.c
| From: | Jani Taskinen | Date: | Wed, 08 Aug 2007 07:01:49 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /main/streams streams.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-45772@lists.php.net to get a copy of this message | ||
jani Wed Aug 8 07:01:49 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main/streams streams.c
Log:
MFH: This is what we get for not doing MFH..or MFB..a mess
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.17&r2=1.82.2.6.2.18&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.17 php-src/main/streams/streams.c:1.82.2.6.2.18
--- php-src/main/streams/streams.c:1.82.2.6.2.17 Wed Aug 8 02:16:41 2007
+++ php-src/main/streams/streams.c Wed Aug 8 07:01:49 2007
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.82.2.6.2.17 2007/08/08 02:16:41 iliaa Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.18 2007/08/08 07:01:49 jani Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1313,11 +1313,11 @@
p = php_stream_mmap_range(src, php_stream_tell(src), maxlen, PHP_STREAM_MAP_MODE_SHARED_READONLY,
&mapped);
if (p) {
- size_t written = php_stream_write(dest, p, mapped);
+ mapped = php_stream_write(dest, p, mapped);
php_stream_mmap_unmap(src);
- return written;
+ return mapped;
}
}