dmitry Thu, 15 Sep 2011 11:30:17 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=316812
Log:
Fixed bug #50982 (incorrect assumption of PAGE_SIZE size)
Bug: https://bugs.php.net/50982 (Assigned) incorrect assumption of PAGE_SIZE
size
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/Zend/zend_stream.c
U php/php-src/branches/PHP_5_3/main/main.c
U php/php-src/branches/PHP_5_4/Zend/zend_stream.c
U php/php-src/branches/PHP_5_4/main/main.c
U php/php-src/trunk/Zend/zend_stream.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2011-09-15 10:59:39 UTC (rev 316811)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-09-15 11:30:17 UTC (rev 316812)
@@ -16,6 +16,7 @@
. Fixed bug #55366: keys lost when using substr_replace an array. (Arpad)
. Fixed bug #55273 (base64_decode() with strict rejects whitespace after
pad). (Ilia)
+ . Fixed bug #50982 (incorrect assumption of PAGE_SIZE size). (Dmitry)
- Curl:
. Fixed bug #54798 (Segfault when CURLOPT_STDERR file pointer is closed
Modified: php/php-src/branches/PHP_5_3/Zend/zend_stream.c
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/zend_stream.c 2011-09-15 10:59:39 UTC (rev 316811)
+++ php/php-src/branches/PHP_5_3/Zend/zend_stream.c 2011-09-15 11:30:17 UTC (rev 316812)
@@ -27,11 +27,25 @@
#include <sys/types.h>
#include <sys/stat.h>
-#if HAVE_SYS_MMAN_H
-# include <sys/mman.h>
-# ifndef PAGE_SIZE
-# define PAGE_SIZE 4096
+#if HAVE_MMAP
+# if HAVE_UNISTD_H
+# include <unistd.h>
+# if defined(_SC_PAGESIZE)
+# define REAL_PAGE_SIZE sysconf(_SC_PAGESIZE);
+# elif defined(_SC_PAGE_SIZE)
+# define REAL_PAGE_SIZE sysconf(_SC_PAGE_SIZE);
+# endif
# endif
+# if HAVE_SYS_MMAN_H
+# include <sys/mman.h>
+# endif
+# ifndef REAL_PAGE_SIZE
+# ifdef PAGE_SIZE
+# define REAL_PAGE_SIZE PAGE_SIZE
+# else
+# define REAL_PAGE_SIZE 4096
+# endif
+# endif
#endif
ZEND_DLIMPORT int isatty(int fd);
@@ -215,9 +229,11 @@
if (old_type == ZEND_HANDLE_FP && !file_handle->handle.stream.isatty && size) {
#if HAVE_MMAP
+ size_t page_size = REAL_PAGE_SIZE;
+
if (file_handle->handle.fp &&
size != 0 &&
- ((size - 1) % PAGE_SIZE) <= PAGE_SIZE - ZEND_MMAP_AHEAD) {
+ ((size - 1) % page_size) <= page_size - ZEND_MMAP_AHEAD) {
/* *buf[size] is zeroed automatically by the kernel */
*buf = mmap(0, size + ZEND_MMAP_AHEAD, PROT_READ, MAP_PRIVATE, fileno(file_handle->handle.fp), 0);
if (*buf != MAP_FAILED) {
Modified: php/php-src/branches/PHP_5_3/main/main.c
===================================================================
--- php/php-src/branches/PHP_5_3/main/main.c 2011-09-15 10:59:39 UTC (rev 316811)
+++ php/php-src/branches/PHP_5_3/main/main.c 2011-09-15 11:30:17 UTC (rev 316812)
@@ -92,15 +92,26 @@
#include "SAPI.h"
#include "rfc1867.h"
-#if HAVE_SYS_MMAN_H
-# include <sys/mman.h>
-# ifndef PAGE_SIZE
-# define PAGE_SIZE 4096
+#if HAVE_MMAP
+# if HAVE_UNISTD_H
+# include <unistd.h>
+# if defined(_SC_PAGESIZE)
+# define REAL_PAGE_SIZE sysconf(_SC_PAGESIZE);
+# elif defined(_SC_PAGE_SIZE)
+# define REAL_PAGE_SIZE sysconf(_SC_PAGE_SIZE);
+# endif
# endif
+# if HAVE_SYS_MMAN_H
+# include <sys/mman.h>
+# endif
+# ifndef REAL_PAGE_SIZE
+# ifdef PAGE_SIZE
+# define REAL_PAGE_SIZE PAGE_SIZE
+# else
+# define REAL_PAGE_SIZE 4096
+# endif
+# endif
#endif
-#ifdef PHP_WIN32
-# define PAGE_SIZE 4096
-#endif
/* }}} */
PHPAPI int (*php_register_internal_extensions_func)(TSRMLS_D) = php_register_internal_extensions;
@@ -1201,6 +1212,10 @@
php_stream *stream = php_stream_open_wrapper((char *)filename, "rb", mode, &handle->opened_path);
if (stream) {
+#if HAVE_MMAP
+ size_t page_size = REAL_PAGE_SIZE;
+#endif
+
handle->filename = (char*)filename;
handle->free_filename = 0;
handle->handle.stream.handle = stream;
@@ -1211,7 +1226,9 @@
memset(&handle->handle.stream.mmap, 0, sizeof(handle->handle.stream.mmap));
len = php_zend_stream_fsizer(stream TSRMLS_CC);
if (len != 0
- && ((len - 1) % PAGE_SIZE) <= PAGE_SIZE - ZEND_MMAP_AHEAD
+#if HAVE_MMAP
+ && ((len - 1) % page_size) <= page_size - ZEND_MMAP_AHEAD
+#endif
&& php_stream_mmap_possible(stream)
&& (p = php_stream_mmap_range(stream, 0, len, PHP_STREAM_MAP_MODE_SHARED_READONLY, &mapped_len)) != NULL) {
handle->handle.stream.closer = php_zend_stream_mmap_closer;
Modified: php/php-src/branches/PHP_5_4/Zend/zend_stream.c
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_stream.c 2011-09-15 10:59:39 UTC (rev 316811)
+++ php/php-src/branches/PHP_5_4/Zend/zend_stream.c 2011-09-15 11:30:17 UTC (rev 316812)
@@ -27,11 +27,25 @@
#include <sys/types.h>
#include <sys/stat.h>
-#if HAVE_SYS_MMAN_H
-# include <sys/mman.h>
-# ifndef PAGE_SIZE
-# define PAGE_SIZE 4096
+#if HAVE_MMAP
+# if HAVE_UNISTD_H
+# include <unistd.h>
+# if defined(_SC_PAGESIZE)
+# define REAL_PAGE_SIZE sysconf(_SC_PAGESIZE);
+# elif defined(_SC_PAGE_SIZE)
+# define REAL_PAGE_SIZE sysconf(_SC_PAGE_SIZE);
+# endif
# endif
+# if HAVE_SYS_MMAN_H
+# include <sys/mman.h>
+# endif
+# ifndef REAL_PAGE_SIZE
+# ifdef PAGE_SIZE
+# define REAL_PAGE_SIZE PAGE_SIZE
+# else
+# define REAL_PAGE_SIZE 4096
+# endif
+# endif
#endif
ZEND_DLIMPORT int isatty(int fd);
@@ -215,9 +229,11 @@
if (old_type == ZEND_HANDLE_FP && !file_handle->handle.stream.isatty && size) {
#if HAVE_MMAP
+ size_t page_size = REAL_PAGE_SIZE;
+
if (file_handle->handle.fp &&
size != 0 &&
- ((size - 1) % PAGE_SIZE) <= PAGE_SIZE - ZEND_MMAP_AHEAD) {
+ ((size - 1) % page_size) <= page_size - ZEND_MMAP_AHEAD) {
/* *buf[size] is zeroed automatically by the kernel */
*buf = mmap(0, size + ZEND_MMAP_AHEAD, PROT_READ, MAP_PRIVATE, fileno(file_handle->handle.fp), 0);
if (*buf != MAP_FAILED) {
Modified: php/php-src/branches/PHP_5_4/main/main.c
===================================================================
--- php/php-src/branches/PHP_5_4/main/main.c 2011-09-15 10:59:39 UTC (rev 316811)
+++ php/php-src/branches/PHP_5_4/main/main.c 2011-09-15 11:30:17 UTC (rev 316812)
@@ -93,15 +93,26 @@
#include "SAPI.h"
#include "rfc1867.h"
-#if HAVE_SYS_MMAN_H
-# include <sys/mman.h>
-# ifndef PAGE_SIZE
-# define PAGE_SIZE 4096
+#if HAVE_MMAP
+# if HAVE_UNISTD_H
+# include <unistd.h>
+# if defined(_SC_PAGESIZE)
+# define REAL_PAGE_SIZE sysconf(_SC_PAGESIZE);
+# elif defined(_SC_PAGE_SIZE)
+# define REAL_PAGE_SIZE sysconf(_SC_PAGE_SIZE);
+# endif
# endif
+# if HAVE_SYS_MMAN_H
+# include <sys/mman.h>
+# endif
+# ifndef REAL_PAGE_SIZE
+# ifdef PAGE_SIZE
+# define REAL_PAGE_SIZE PAGE_SIZE
+# else
+# define REAL_PAGE_SIZE 4096
+# endif
+# endif
#endif
-#ifdef PHP_WIN32
-# define PAGE_SIZE 4096
-#endif
/* }}} */
PHPAPI int (*php_register_internal_extensions_func)(TSRMLS_D) = php_register_internal_extensions;
@@ -1234,6 +1245,10 @@
php_stream *stream = php_stream_open_wrapper((char *)filename, "rb", mode, &handle->opened_path);
if (stream) {
+#if HAVE_MMAP
+ size_t page_size = REAL_PAGE_SIZE;
+#endif
+
handle->filename = (char*)filename;
handle->free_filename = 0;
handle->handle.stream.handle = stream;
@@ -1244,7 +1259,9 @@
memset(&handle->handle.stream.mmap, 0, sizeof(handle->handle.stream.mmap));
len = php_zend_stream_fsizer(stream TSRMLS_CC);
if (len != 0
- && ((len - 1) % PAGE_SIZE) <= PAGE_SIZE - ZEND_MMAP_AHEAD
+#if HAVE_MMAP
+ && ((len - 1) % page_size) <= page_size - ZEND_MMAP_AHEAD
+#endif
&& php_stream_mmap_possible(stream)
&& (p = php_stream_mmap_range(stream, 0, len, PHP_STREAM_MAP_MODE_SHARED_READONLY, &mapped_len)) != NULL) {
handle->handle.stream.closer = php_zend_stream_mmap_closer;
Modified: php/php-src/trunk/Zend/zend_stream.c
===================================================================
--- php/php-src/trunk/Zend/zend_stream.c 2011-09-15 10:59:39 UTC (rev 316811)
+++ php/php-src/trunk/Zend/zend_stream.c 2011-09-15 11:30:17 UTC (rev 316812)
@@ -27,11 +27,25 @@
#include <sys/types.h>
#include <sys/stat.h>
-#if HAVE_SYS_MMAN_H
-# include <sys/mman.h>
-# ifndef PAGE_SIZE
-# define PAGE_SIZE 4096
+#if HAVE_MMAP
+# if HAVE_UNISTD_H
+# include <unistd.h>
+# if defined(_SC_PAGESIZE)
+# define REAL_PAGE_SIZE sysconf(_SC_PAGESIZE);
+# elif defined(_SC_PAGE_SIZE)
+# define REAL_PAGE_SIZE sysconf(_SC_PAGE_SIZE);
+# endif
# endif
+# if HAVE_SYS_MMAN_H
+# include <sys/mman.h>
+# endif
+# ifndef REAL_PAGE_SIZE
+# ifdef PAGE_SIZE
+# define REAL_PAGE_SIZE PAGE_SIZE
+# else
+# define REAL_PAGE_SIZE 4096
+# endif
+# endif
#endif
ZEND_DLIMPORT int isatty(int fd);
@@ -215,9 +229,11 @@
if (old_type == ZEND_HANDLE_FP && !file_handle->handle.stream.isatty && size) {
#if HAVE_MMAP
+ size_t page_size = REAL_PAGE_SIZE;
+
if (file_handle->handle.fp &&
size != 0 &&
- ((size - 1) % PAGE_SIZE) <= PAGE_SIZE - ZEND_MMAP_AHEAD) {
+ ((size - 1) % page_size) <= page_size - ZEND_MMAP_AHEAD) {
/* *buf[size] is zeroed automatically by the kernel */
*buf = mmap(0, size + ZEND_MMAP_AHEAD, PROT_READ, MAP_PRIVATE, fileno(file_handle->handle.fp), 0);
if (*buf != MAP_FAILED) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
