From: Julien Pauli <jpauli@php.net>
Date: Fri, 10 Jan 2014 09:01:30 +0000 (+0100)
Subject: 5.5.9-dev now
X-Git-Tag: php-5.6.0alpha1~42^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=277895717c57a514312a9257ce783d0936dc1c94;p=php

5.5.9-dev now
---

diff --git a/NEWS b/NEWS
index 9112e0828e..5979ab1e43 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,26 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2013, PHP 5.5.8
+?? ??? 2014, PHP 5.5.9
+
+- GD:
+  . Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop()).
+    (Laruence, Remi)
+
+- OPCache:
+  . Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style 
+    ^M as lineend). (Laruence)
+
+- Standard
+  . Fixed bug #66395 (basename function doesn't remove drive letter). (Anatol)
+
+- Sockets:
+  . Fixed bug #66381 (__ss_family was changed on AIX 5.3). (Felipe)
+
+- Zend Engine
+  . Fixed bug #66009 (Failed compilation of PHP extension with C++ std
+    library using VS 2012). (Anatol)
+
+09 Jan 2014, PHP 5.5.8
 
 - Core:
   . Disallowed JMP into a finally block. (Laruence)
@@ -29,8 +49,6 @@ PHP                                                                        NEWS
   . Fixed bug #66229 (128.0.0.0/16 isn't reserved any longer). (Adam)
 
 - GD:
-  . Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop()).
-    (Laruence, Remi)
   . Fixed bug #64405 (Use freetype-config for determining freetype2 dir(s)).
     (Adam)
     
@@ -42,9 +60,7 @@ PHP                                                                        NEWS
   . Fixed bug #65486 (mysqli_poll() is broken on win x64). (Anatol)
 
 - OPCache:
-  . Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style 
-    ^M as lineend). (Laruence)
-  . Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.
+  . Fixed revalidate_path=1 behavior to avoid caching of symlinks values.
     (Dmitry)
   . Fixed Issue #140: "opcache.enable_file_override" doesn't respect
     "opcache.revalidate_freq". (Dmitry).
@@ -56,11 +72,7 @@ PHP                                                                        NEWS
   . Fixed bug #66112 (Use after free condition in SOAP extension).
     (martin dot koegler at brz dot gv dot at)
 
-- Standard
-  . Fixed bug #66395 (basename function doesn't remove drive letter). (Anatol)
-
 - Sockets:
-  . Fixed bug #66381 (__ss_family was changed on AIX 5.3). (Felipe)
   . Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined). (Felipe)
 
 - XSL
@@ -70,10 +82,6 @@ PHP                                                                        NEWS
 - ZIP:
   . Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real). (Remi)
 
-- Zend Engine
-  . Fixed bug #66009 (Failed compilation of PHP extension with C++ std
-    library using VS 2012). (Anatol)
-
 12 Dec 2013, PHP 5.5.7
 
 - CLI server:
diff --git a/configure.in b/configure.in
index 18221517bc..1f4080f258 100644
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=5
-PHP_RELEASE_VERSION=8
+PHP_RELEASE_VERSION=9
 PHP_EXTRA_VERSION="-dev"
 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 8d30a367d3..784ef62e41 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 8
+#define PHP_RELEASE_VERSION 9
 #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.8-dev"
-#define PHP_VERSION_ID 50508
+#define PHP_VERSION "5.5.9-dev"
+#define PHP_VERSION_ID 50509