summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2012-12-19 16:13:48 +0100
committerJohannes Schlüter <johannes@php.net>2012-12-19 16:13:48 +0100
commit13adcc108d882e792b765fbfc4849eb7bd4e9863 (patch)
tree9c60e637d4c058b65edd1b5f2a662e2b7b61de0f
parentc31ce8a12502fc7db84a05c36c493f4f5a84a044 (diff)
downloadphp-git-PHP-5.3.20.tar.gz
-rw-r--r--NEWS4
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 90108abfe9..5f6ef19763 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-06 Dec 2012, PHP 5.3.20RC1
+20 Dec 2012, PHP 5.3.20
- Zend Engine:
. Fixed bug #63635 (Segfault in gc_collect_cycles). (Dmitry)
@@ -19,7 +19,7 @@ PHP NEWS
. Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy)
- Date:
- . Fixed bug #63435 (Datetime::format('u') sometimes wrong by 1 microsecon).
+ . Fixed bug #63435 (Datetime::format('u') sometimes wrong by 1 microsecond).
(Remi)
- Fileinfo:
diff --git a/configure.in b/configure.in
index af47adf097..1eb8362f14 100644
--- a/configure.in
+++ b/configure.in
@@ -42,7 +42,7 @@ AC_CONFIG_HEADER(main/php_config.h)
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=3
PHP_RELEASE_VERSION=20
-PHP_EXTRA_VERSION="RC1"
+PHP_EXTRA_VERSION=""
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 95a16bb2dd..dd551e94c1 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 3
#define PHP_RELEASE_VERSION 20
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.3.20RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.3.20"
#define PHP_VERSION_ID 50320