com php-src: PHP 5.3.26 this will be: NEWS configure.in main/php_version.h
| From: | Johannes Schlüter | Date: | Thu, 25 Apr 2013 16:02:53 +0000 |
| Subject: | com php-src: PHP 5.3.26 this will be: NEWS configure.in main/php_version.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72024@lists.php.net to get a copy of this message | ||
Commit: 63434524f82f8686e16bb6ebed10ad206987481f
Author: Johannes Schlüter <johannes@php.net> Thu, 25 Apr 2013 18:02:53 +0200
Parents: 671ef9fda7ec5876e5c1da2d98e296fb7e7620c9
Branches: PHP-5.3 PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=63434524f82f8686e16bb6ebed10ad206987481f
Log:
PHP 5.3.26 this will be
Changed paths:
M NEWS
M configure.in
M main/php_version.h
Diff:
diff --git a/NEWS b/NEWS
index f7e6d5b..5ea0f5a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,11 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ??? 2013, PHP 5.3.26
+
?? ??? 2013, PHP 5.3.25
+### ADD ENTRIES ABOVE FOR 5.3.26. 5.3.25 NEWS WILL BE UPDATED BY RM ON MERGE ###
+
- Core:
. Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap:
segfault). (Laruence)
diff --git a/configure.in b/configure.in
index f4cbab3..bfbc219 100644
--- a/configure.in
+++ b/configure.in
@@ -41,7 +41,7 @@ AC_CONFIG_HEADER(main/php_config.h)
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=3
-PHP_RELEASE_VERSION=25
+PHP_RELEASE_VERSION=26
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 8ac4945..eeaffa3 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 3
-#define PHP_RELEASE_VERSION 25
+#define PHP_RELEASE_VERSION 26
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.3.25-dev"
-#define PHP_VERSION_ID 50325
+#define PHP_VERSION "5.3..26-dev"
+#define PHP_VERSION_ID 50326