From 805934fef05d51649c98cd8dc6ee24c40458a47e Mon Sep 17 00:00:00 2001
From: Julien Pauli <jpauli@php.net>
Date: Wed, 18 Sep 2013 10:26:37 +0200
Subject: PHP-5.5.4

---
 NEWS               | 27 +--------------------------
 configure.in       |  4 ++--
 main/php_version.h |  8 ++++----
 3 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/NEWS b/NEWS
index 37db7e6c40..3a9326e5a8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,31 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2013, PHP 5.5.5
-
-- CLI server:
-  . Fixed bug #65633 (built-in server treat some http headers as
-    case-sensitive). (Adam)
-
-- Datetime:
-  . Fixed bug #65502 (DateTimeImmutable::createFromFormat returns DateTime).
-    (Boro Sitnikovski)
-  . Fixed bug #65548 (Comparison for DateTimeImmutable doesn't work).
-    (Boro Sitnikovski)
-
-- GD
-  . Ensure that the defined interpolation method is used with the generic
-    scaling methods. (Pierre)
-
-- OPcache:
-  . Fixed bug #65665 (Exception not properly caught when opcache enabled).
-    (Laruence)
-  . Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var). (Dmitry)
-
-- SPL:
-  . Fix bug #64782 (SplFileObject constructor make $context optional / give it
-    a default value). (Nikita)
-
-?? ??? 2013, PHP 5.5.4
+18 Sep 2013, PHP 5.5.4
 
 - Core:
   . Fixed bug #60598 (cli/apache sapi segfault on objects manipulation).
diff --git a/configure.in b/configure.in
index 40130626cb..f8f6a48135 100644
--- a/configure.in
+++ b/configure.in
@@ -119,8 +119,8 @@ int zend_sprintf(char *buffer, const char *format, ...);
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=5
-PHP_RELEASE_VERSION=5
-PHP_EXTRA_VERSION="-dev"
+PHP_RELEASE_VERSION=4
+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 d9ea4aab3c..e2334663d5 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 5
-#define PHP_RELEASE_VERSION 5
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.5-dev"
-#define PHP_VERSION_ID 50505
+#define PHP_RELEASE_VERSION 4
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.5.4"
+#define PHP_VERSION_ID 50504
-- 
cgit v1.2.1