From a856d8cc4f18ebd63c112a55f3de20602e7d12a3 Mon Sep 17 00:00:00 2001
From: Julien Pauli <jpauli@php.net>
Date: Wed, 15 Oct 2014 14:05:56 +0200
Subject: 5.5.18

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

diff --git a/NEWS b/NEWS
index 1801274a81..adbe3cde73 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-02 Oct 2014, PHP 5.5.18RC1
+16 Oct 2014, PHP 5.5.18
 
 - Core:
   . Fixed bug #67985 (Incorrect last used array index copied to new array after
@@ -10,6 +10,15 @@ PHP                                                                        NEWS
   . Fixed bug #67633 (A foreach on an array returned from a function not doing
     copy-on-write). (Nikita)
   . Fixed bug #51800 (proc_open on Windows hangs forever). (Anatol)
+  . Fixed bug #68044 (Integer overflow in unserialize() (32-bits only)).
+    (CVE-2014-3669) (Stas)
+
+- cURL:
+  . Fixed bug #68089 (NULL byte injection - cURL lib). (Stas)
+
+- EXIF:
+  . Fixed bug #68113 (Heap corruption in exif_thumbnail()). (CVE-2014-3670)
+    (Stas)
 
 - FPM:
   . Fixed bug #65641 (PHP-FPM incorrectly defines the SCRIPT_NAME variable
@@ -24,6 +33,10 @@ PHP                                                                        NEWS
 - Session:
   . Fixed bug #67972 (SessionHandler Invalid memory read create_sid()). (Adam)
 
+- XMLRPC:
+  . Fixed bug #68027 (Global buffer overflow in mkgmtime() function). 
+    (CVE-2014-3668) (Stas)
+
 18 Sep 2014, PHP 5.5.17
 
 - Core:
diff --git a/configure.in b/configure.in
index 5e8d3d5517..fe4c6654fa 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=5
 PHP_RELEASE_VERSION=18
-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 b68d21d636..db525fc69c 100644
--- 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 18
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.5.18RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.5.18"
 #define PHP_VERSION_ID 50518
-- 
cgit v1.2.1