Commit:    3548b2e2c5bbe361c3c95a4df563e81f33da4b7e
Author:    Stanislav Malyshev <s...@php.net>         Tue, 14 Aug 2012 21:26:05 
-0700
Parents:   1fc35147349d06983a3bf49af0f91f3077dc1512
Branches:  PHP-5.4.6

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=3548b2e2c5bbe361c3c95a4df563e81f33da4b7e

Log:
5.4.6

Changed paths:
  M  NEWS
  M  configure.in
  M  main/php_version.h


Diff:
diff --git a/NEWS b/NEWS
index 7740dee..2c8a06f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-02 Aug 2012, PHP 5.4.6 RC1
+16 Aug 2012, PHP 5.4.6
 
 - CLI Server:
   . Implemented FR #62700 (have the console output 'Listening on 
diff --git a/configure.in b/configure.in
index b52fbf5..c119869 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=6
-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 06a924e..8fd49ec 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 6
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.4.6RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.4.6"
 #define PHP_VERSION_ID 50405


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to