edink Mon Jun 5 22:19:36 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/main/streams plain_wrapper.c
Log:
Fixed bug #35886 (nlopes)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.75&r2=1.2027.2.547.2.76&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.75 php-src/NEWS:1.2027.2.547.2.76
--- php-src/NEWS:1.2027.2.547.2.75 Mon Jun 5 09:57:17 2006
+++ php-src/NEWS Mon Jun 5 22:19:36 2006
@@ -110,6 +110,8 @@
RFC3548 compliance). (Ilia)
- Fixed bug #36949 (invalid internal mysqli objects dtor). (Mike)
- Fixed bug #36630 (umask not reset at the end of the request). (Ilia)
+- Fixed bug #35886 (file_get_contents() fails with some
+ combinations of offset & maxlen). (Nuno)
- Fixed bug #35512 (Lack of read permission on main script results in
E_WARNING rather then E_ERROR). (Ilia)
- Fixed bug #34180 (--with-curlwrappers causes PHP to disregard some HTTP
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/plain_wrapper.c?r1=1.52.2.6.2.1&r2=1.52.2.6.2.2&diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.52.2.6.2.1
php-src/main/streams/plain_wrapper.c:1.52.2.6.2.2
--- php-src/main/streams/plain_wrapper.c:1.52.2.6.2.1 Tue May 16 13:05:02 2006
+++ php-src/main/streams/plain_wrapper.c Mon Jun 5 22:19:36 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: plain_wrapper.c,v 1.52.2.6.2.1 2006/05/16 13:05:02 tony2001 Exp $ */
+/* $Id: plain_wrapper.c,v 1.52.2.6.2.2 2006/06/05 22:19:36 edink Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -706,7 +706,7 @@
delta = range->offset -
loffs;
}
- data->last_mapped_addr =
MapViewOfFile(data->file_mapping, acc, 0, loffs, range->length);
+ data->last_mapped_addr =
MapViewOfFile(data->file_mapping, acc, 0, loffs, range->length + delta);
if (data->last_mapped_addr) {
/* give them back the
address of the start offset they requested */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
