5.5.11 final

php · Apr 1, 2014 · 8f155ea · 8f155ea
1 parent c11d5ae
commit 8f155ea
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/NEWS b/NEWS
@@ -1,6 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-20 Mar 2014, PHP 5.5.11RC1
+03 Apr 2014, PHP 5.5.11
 
 - Core:
   . Allow zero length comparison in substr_compare() (Tjerk)
@@ -18,6 +18,10 @@ PHP                                                                        NEWS
   . Added clear_env configuration directive to disable clearenv() call.
   (Github PR# 598, Paul Annesley)
 
+- Fileinfo:
+  . Fixed bug #66946 (fileinfo: extensive backtracking in awk rule regular
+    expression). (CVE-2013-7345) (Remi)
+
 - GD:
   . Fixed bug #66714 (imageconvolution breakage). (Brad Daily)
   . Fixed bug #66869 (Invalid 2nd argument crashes imageaffinematrixget) (Pierre)

diff --git 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=5
 PHP_RELEASE_VERSION=11
-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
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 5
 #define PHP_RELEASE_VERSION 11
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.5.11RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.5.11"
 #define PHP_VERSION_ID 50511