summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2012-12-05 18:55:05 +0100
committerJohannes Schlüter <johannes@php.net>2012-12-05 18:55:05 +0100
commit22fe268ad4c22ec55bc2c74db18b3cae8f8a6176 (patch)
tree707829dcbd5773fbbd8b49a0f1f0cc8a4aa77b0f
parent94cbd6374adcb3e2ac15303dd47a212953f93e98 (diff)
downloadphp-git-22fe268ad4c22ec55bc2c74db18b3cae8f8a6176.tar.gz
this will become PHP 5.3.21
-rw-r--r--NEWS4
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 8 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 348ab8f853..1ec60e3dfe 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,11 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ??? 2013, PHP 5.3.21
+
?? ??? 2012, PHP 5.3.20
+#### ADD NEWS TO 5.3.21 ONLY ####
+
- Zend Engine:
. Fixed bug #63635 (Segfault in gc_collect_cycles). (Dmitry)
. Fixed bug #63512 (parse_ini_file() with INI_SCANNER_RAW removes quotes
diff --git a/configure.in b/configure.in
index 66900b455c..72cdee53d9 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=20
+PHP_RELEASE_VERSION=21
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 331f30a051..f34c957567 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 20
+#define PHP_RELEASE_VERSION 21
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.3.20-dev"
-#define PHP_VERSION_ID 50320
+#define PHP_VERSION "5.3.21-dev"
+#define PHP_VERSION_ID 50321