summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2012-09-11 23:26:14 -0700
committerStanislav Malyshev <stas@php.net>2012-09-11 23:26:14 -0700
commit27b47d76856be7998417f67895f44918278e35de (patch)
tree28173cf1f0bfa25da7f0b3d4c1d9aaa96aeebfe7
parentd1b8eeb2d8dda8bc2697d0dcea9c129f6fc77b9a (diff)
downloadphp-git-PHP-5.4.7.tar.gz
-rw-r--r--NEWS6
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 7 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index a7dc00c77d..5fa2fb1928 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,11 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-30 Aug 2012, PHP 5.4.7 RC1
+13 Sep 2012, PHP 5.4.7
- Core:
. Fixed bug (segfault while build with zts and GOTO vm-kind). (Laruence)
+ . Fixed bug #62955 (Only one directive is loaded from "Per Directory Values"
+ Windows registry). (Felipe)
. Fixed bug #62844 (parse_url() does not recognize //). (Andrew Faulds).
. Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not
set). (Felipe)
@@ -24,7 +26,7 @@ PHP NEWS
- CURL:
. Fixed bug #62912 (CURLINFO_PRIMARY_* AND CURLINFO_LOCAL_* not exposed).
- (Pierrick)
+ (Pierrick)
. Fixed bug #62839 (curl_copy_handle segfault with CURLOPT_FILE). (Pierrick)
- DateTime:
diff --git a/configure.in b/configure.in
index 7a86bbc9ca..3b7ff03b68 100644
--- a/configure.in
+++ b/configure.in
@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=4
PHP_RELEASE_VERSION=7
-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 0bc1dcbcf9..30c2a50bee 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 4
#define PHP_RELEASE_VERSION 7
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.4.7RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.4.7"
#define PHP_VERSION_ID 50407