com php-src: prepare for next: NEWS configure.in main/php_ver sion.h
| From: | Anatol Belski | Date: | Tue, 30 Aug 2016 12:11:22 +0000 |
| Subject: | com php-src: prepare for next: NEWS configure.in main/php_ver sion.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94159@lists.php.net to get a copy of this message | ||
Commit: bc7460260bac9bbbed6fc9c3b529538710ace600
Author: Anatol Belski <ab@php.net> Tue, 30 Aug 2016 14:10:54 +0200
Parents: 2c12a5f0a87f1524bf7dae7ef0eca2878b7b9fdc
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bc7460260bac9bbbed6fc9c3b529538710ace600
Log:
prepare for next
Changed paths:
M NEWS
M configure.in
M main/php_version.h
Diff:
diff --git a/NEWS b/NEWS
index 4c21c43..8fd9f3c 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,12 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2016 PHP 7.0.11
+- Standard:
+ . Fixed bug #71882 (Negative ftruncate() on php://memory exhausts memory).
+ (cmb)
+
+15 Sep 2016 PHP 7.0.11
+
- Core:
. Fixed bug #72944 (Null pointer deref in zval_delref_p). (Dmitry)
. Fixed bug #72943 (assign_dim on string doesn't reset hval). (Laruence)
@@ -87,8 +93,6 @@ PHP NEWS
. Fixed bug #72278 (getimagesize returning FALSE on valid jpg). (cmb)
. Fixed bug #65550 (get_browser() incorrectly parses entries with "+" sign).
(cmb)
- . Fixed bug #71882 (Negative ftruncate() on php://memory exhausts memory).
- (cmb)
- Streams:
. Fixed bug #72853 (stream_set_blocking doesn't work). (Laruence)
diff --git a/configure.in b/configure.in
index 95bb947..7f60f4c 100644
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=7
PHP_MINOR_VERSION=0
-PHP_RELEASE_VERSION=11
+PHP_RELEASE_VERSION=12
PHP_EXTRA_VERSION="-dev"
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
diff --git a/main/php_version.h b/main/php_version.h
index 7a7a23b..2b2c7ab 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
/* edit configure.in to change version number */
#define PHP_MAJOR_VERSION 7
#define PHP_MINOR_VERSION 0
-#define PHP_RELEASE_VERSION 11
+#define PHP_RELEASE_VERSION 12
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "7.0.11-dev"
-#define PHP_VERSION_ID 70011
+#define PHP_VERSION "7.0.12-dev"
+#define PHP_VERSION_ID 70012