com php-src: 5.6.12 next: NEWS configure.in main/php_version .h
| From: | Ferenc Kovacs | Date: | Wed, 24 Jun 2015 22:21:45 +0000 |
| Subject: | com php-src: 5.6.12 next: NEWS configure.in main/php_version .h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87518@lists.php.net to get a copy of this message | ||
Commit: 1efe5b115788080b5d086fafd342322cee874eb5
Author: Ferenc Kovacs <tyrael@php.net> Thu, 25 Jun 2015 00:21:45 +0200
Parents: ca82114f21dd5d79708adf3e95b91b51342d93f7
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1efe5b115788080b5d086fafd342322cee874eb5
Log:
5.6.12 next
Changed paths:
M NEWS
M configure.in
M main/php_version.h
Diff:
diff --git a/NEWS b/NEWS
index 8dbb1ea..3f4e5fa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? Jul 2015, PHP 5.6.11
+?? Jul 2015, PHP 5.6.12
+
+09 Jul 2015, PHP 5.6.11
- Core:
. Fixed bug #69768 (escapeshell*() doesn't cater to !). (cmb)
diff --git a/configure.in b/configure.in
index 6c6b07a..eb9f50e 100644
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=6
-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 f1e3e0f..d649fa3 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 5
#define PHP_MINOR_VERSION 6
-#define PHP_RELEASE_VERSION 11
+#define PHP_RELEASE_VERSION 12
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.6.11-dev"
-#define PHP_VERSION_ID 50611
+#define PHP_VERSION "5.6.12-dev"
+#define PHP_VERSION_ID 50612