From c31ce8a12502fc7db84a05c36c493f4f5a84a044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= Date: Wed, 5 Dec 2012 18:50:59 +0100 Subject: [PATCH 1/2] PHP 5.3.20RC1 --- NEWS | 2 +- configure.in | 2 +- main/php_version.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 348ab8f8536f6..90108abfe9c3f 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 2012, PHP 5.3.20 +06 Dec 2012, PHP 5.3.20RC1 - Zend Engine: . Fixed bug #63635 (Segfault in gc_collect_cycles). (Dmitry) diff --git a/configure.in b/configure.in index 66900b455c204..af47adf097de3 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="-dev" +PHP_EXTRA_VERSION="RC1" 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 331f30a051de1..95a16bb2dd9d3 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 "-dev" -#define PHP_VERSION "5.3.20-dev" +#define PHP_EXTRA_VERSION "RC1" +#define PHP_VERSION "5.3.20RC1" #define PHP_VERSION_ID 50320 From 13adcc108d882e792b765fbfc4849eb7bd4e9863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= Date: Wed, 19 Dec 2012 16:13:48 +0100 Subject: [PATCH 2/2] PHP 5.3.20 --- NEWS | 4 ++-- configure.in | 2 +- main/php_version.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 90108abfe9c3f..5f6ef19763f20 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 af47adf097de3..1eb8362f14e01 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 95a16bb2dd9d3..dd551e94c1dd7 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