edink Mon Jun 5 22:23:39 2006 UTC
Modified files:
/php-src/main/streams plain_wrapper.c
Log:
MFB
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/plain_wrapper.c?r1=1.65&r2=1.66&diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.65
php-src/main/streams/plain_wrapper.c:1.66
--- php-src/main/streams/plain_wrapper.c:1.65 Tue May 16 13:05:23 2006
+++ php-src/main/streams/plain_wrapper.c Mon Jun 5 22:23:39 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: plain_wrapper.c,v 1.65 2006/05/16 13:05:23 tony2001 Exp $ */
+/* $Id: plain_wrapper.c,v 1.66 2006/06/05 22:23:39 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 */
@@ -963,7 +963,7 @@
if ((p = strstr(url, "://")) != NULL) {
url = p + 3;
}
-
+
if (!(options & STREAM_DISABLE_OPEN_BASEDIR)) {
if (php_check_open_basedir(url TSRMLS_CC)) {
return 0;
@@ -1221,7 +1221,7 @@
if (((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) &&
php_check_open_basedir(trypath TSRMLS_CC)) {
return NULL;
}
-
+
return php_stream_fopen_rel(trypath, mode, opened_path,
options);
}
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
