Fixed workaround for bug #48034 on Windows (Crash when script is 8192 (8KB) bytes long)

This commit is contained in:
Dmitry Stogov 2012-01-17 09:30:12 +00:00
parent 877f97cde1
commit 9025d6219d

View File

@ -93,7 +93,7 @@
#include "SAPI.h"
#include "rfc1867.h"
#if HAVE_MMAP
#if HAVE_MMAP || defined(PHP_WIN32)
# if HAVE_UNISTD_H
# include <unistd.h>
# if defined(_SC_PAGESIZE)
@ -1303,7 +1303,7 @@ PHPAPI int php_stream_open_for_zend_ex(const char *filename, zend_file_handle *h
php_stream *stream = php_stream_open_wrapper((char *)filename, "rb", mode, &handle->opened_path);
if (stream) {
#if HAVE_MMAP
#if HAVE_MMAP || defined(PHP_WIN32)
size_t page_size = REAL_PAGE_SIZE;
#endif
@ -1317,7 +1317,7 @@ PHPAPI int php_stream_open_for_zend_ex(const char *filename, zend_file_handle *h
memset(&handle->handle.stream.mmap, 0, sizeof(handle->handle.stream.mmap));
len = php_zend_stream_fsizer(stream TSRMLS_CC);
if (len != 0
#if HAVE_MMAP
#if HAVE_MMAP || defined(PHP_WIN32)
&& ((len - 1) % page_size) <= page_size - ZEND_MMAP_AHEAD
#endif
&& php_stream_mmap_possible(stream)