From 0ec836440249d0ffc5350fa7744a54c384ccdc68 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Johannes=20Schl=C3=BCter?= <johannes@php.net>
Date: Wed, 2 Mar 2011 21:26:43 +0000
Subject: [PATCH] PHP 5.2.6RC2

---
 NEWS               | 6 +++---
 configure.in       | 2 +-
 main/php_version.h | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 928934c2e9..4abb541f5e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,13 +1,13 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2011, PHP 5.3.6
+03 Mar 2011, PHP 5.3.6RC2
 - Zend Engine:
   . Fixed bug #43512 (same parameter name can be used multiple times in
     method/function definition). (Felipe)
 
 - Exif extension:
-  . Fixed bug #54002 (crash on crafted tag, reported by Luca Carettoni). (Pierre)
-    (CVE-2011-0708)
+  . Fixed bug #54002 (crash on crafted tag, reported by Luca Carettoni).
+    (Pierre) (CVE-2011-0708)
 
 - OpenSSL extension:
   . Fixed bug #54060 (Memory leaks when openssl_encrypt). (Pierre)
diff --git a/configure.in b/configure.in
index 17a50c57d1..34f32f5548 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=6
-PHP_EXTRA_VERSION="RC2-dev"
+PHP_EXTRA_VERSION="RC2"
 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 4606d71814..813d637e9c 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 6
-#define PHP_EXTRA_VERSION "RC2-dev"
-#define PHP_VERSION "5.3.6RC2-dev"
+#define PHP_EXTRA_VERSION "RC2"
+#define PHP_VERSION "5.3.6RC2"
 #define PHP_VERSION_ID 50306
-- 
2.50.1