fix version

Split requested size as expected by CreateFileMapping.
Thus fixing ext\opcache\tests\log_verbosity_bug.phpt fails on 64-bit. (cherry picked from commit 6a854e2740)
2026-11-12 19:50:50 +00:00 · 2017-06-20 17:03:11 +02:00 · 2017-06-20 16:26:38 +02:00 · 2017-06-20 14:25:24 +02:00
4 changed files with 7 additions and 5 deletions
@@ -1,6 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2017 PHP 7.0.21
+22 Jun 2017 PHP 7.0.21RC1

 - Core:
  . Fixed bug #74738 (Multiple [PATH=] and [HOST=] sections not properly
@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 PHP_MAJOR_VERSION=7
 PHP_MINOR_VERSION=0
 PHP_RELEASE_VERSION=21
-PHP_EXTRA_VERSION="-dev"
+PHP_EXTRA_VERSION="RC1"
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`

@@ -211,8 +211,10 @@ static int create_segments(size_t requested_size, zend_shared_segment ***shared_
 	*/
 #if defined(_WIN64)
 	void *vista_mapping_base_set[] = { (void *) 0x0000100000000000, (void *) 0x0000200000000000, (void *) 0x0000300000000000, (void *) 0x0000700000000000, 0 };
+	DWORD size_high = (requested_size >> 32), size_low = (requested_size & 0xffffffff);
 #else
 	void *vista_mapping_base_set[] = { (void *) 0x20000000, (void *) 0x21000000, (void *) 0x30000000, (void *) 0x31000000, (void *) 0x50000000, 0 };
+	DWORD size_high = 0, size_low = requested_size;
 #endif
 	void **wanted_mapping_base = default_mapping_base_set;

@@ -265,7 +267,7 @@ static int create_segments(size_t requested_size, zend_shared_segment ***shared_
 	shared_segment = (zend_shared_segment *)((char *)(*shared_segments_p) + sizeof(void *));
 	(*shared_segments_p)[0] = shared_segment;

-	memfile	= CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, requested_size,
+	memfile	= CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, size_high, size_low,
 								create_name_with_username(ACCEL_FILEMAP_NAME));
 	if (memfile == NULL) {
 		err = GetLastError();
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 7
 #define PHP_MINOR_VERSION 0
 #define PHP_RELEASE_VERSION 21
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "7.0.21-dev"
+#define PHP_EXTRA_VERSION "RC1"
+#define PHP_VERSION "7.0.21RC1"
 #define PHP_VERSION_ID 70021
Author	SHA1	Message	Date
Anatol Belski	25ccae2b9e	fix version	2017-06-20 17:03:11 +02:00
Anatol Belski	b9e2520142	Split requested size as expected by CreateFileMapping. Thus fixing ext\opcache\tests\log_verbosity_bug.phpt fails on 64-bit. (cherry picked from commit `6a854e2740`)	2017-06-20 16:26:38 +02:00
Anatol Belski	d37583f95a	set versions	2017-06-20 14:25:24 +02:00