From 3f08fc0466a2acd38763b23f85e06eb02950c6ea Mon Sep 17 00:00:00 2001
From: Julien Pauli <jpauli@php.net>
Date: Wed, 30 Sep 2015 13:01:11 +0200
Subject: [PATCH 1/2] 5.5.31 now

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

diff --git a/NEWS b/NEWS
index fbe94ee7eec9f..d5b5016763487 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ** PHP 5.5 is in security-only mode , please do not commit to this branch **
 
-?? ??? 2015, PHP 5.5.30
+?? ??? 2015, PHP 5.5.31
+
+01 Oct 2015, PHP 5.5.30
 
 - Phar:
   . Fixed bug #69720 (Null pointer dereference in phar_get_fp_offset()). (Stas)
diff --git a/configure.in b/configure.in
index b8675ad5af558..6dcfdf4e3ff03 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=30
+PHP_RELEASE_VERSION=31
 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 2128d749ccf1a..02dab199175d5 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 30
+#define PHP_RELEASE_VERSION 31
 #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.30-dev"
-#define PHP_VERSION_ID 50530
+#define PHP_VERSION "5.5.31-dev"
+#define PHP_VERSION_ID 50531

From d7fb43e30d662c7fff999521ebf15ddbb192c7ca Mon Sep 17 00:00:00 2001
From: Julien Pauli <jpauli@php.net>
Date: Wed, 30 Sep 2015 13:18:16 +0200
Subject: [PATCH 2/2] Fixed test

---
 ext/phar/tests/bug70433.phpt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/phar/tests/bug70433.phpt b/ext/phar/tests/bug70433.phpt
index cbebb34c374b9..cc8f4384638d0 100644
--- a/ext/phar/tests/bug70433.phpt
+++ b/ext/phar/tests/bug70433.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar - bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar") || !extension_loaded("zlib")) die("skip"); ?>
 --FILE--
 <?php
 $phar = new PharData(__DIR__."/bug70433.zip");