5.5.26

Julien Pauli · Julien Pauli · commit 68dec50c30f5 · 2015-06-09T10:11:35.000+02:00
diff --git a/NEWS b/NEWS
@@ -1,6 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-28 May 2015, PHP 5.5.26RC1
+11 Jun 2015, PHP 5.5.26
 
 - Core:
   . Fixed bug #69566 (Conditional jump or move depends on uninitialised value
@@ -35,6 +35,10 @@ PHP                                                                        NEWS
   . Fixed bug #69549 (Memory leak with opcache.optimization_level=0xFFFFFFFF).
     (Laruence, Dmitry)
 
+- Sqlite3:
+  . Upgrade bundled sqlite to 3.8.10.2. (CVE-2015-3414, CVE-2015-3415,
+    CVE-2015-3416) (Kaplan)
+
 14 May 2015, PHP 5.5.25
 
 - Core:
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=26
-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 26
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.5.26RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.5.26"
 #define PHP_VERSION_ID 50526
