From 51fca4b77d05cde26cfa59f54bf79fd97973c79a Mon Sep 17 00:00:00 2001
From: Stanislav Malyshev <stas@php.net>
Date: Tue, 1 Sep 2015 13:12:16 -0700
Subject: bump version

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

diff --git a/NEWS b/NEWS
index 84e77405a9..29d7fcdccd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ??? ???? PHP 5.4.46
+
 03 Sep 2015 PHP 5.4.45
 
 - Core:
diff --git a/configure.in b/configure.in
index 2c12f5471d..926cca7eaa 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=4
-PHP_RELEASE_VERSION=45
+PHP_RELEASE_VERSION=46
 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 49c00afc70..e8b7632acb 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 4
-#define PHP_RELEASE_VERSION 45
+#define PHP_RELEASE_VERSION 46
 #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.4.45-dev"
-#define PHP_VERSION_ID 50445
+#define PHP_VERSION "5.4.46-dev"
+#define PHP_VERSION_ID 50446
-- 
cgit v1.2.1


From a12cef979db2466dd98d46cffd0a32c6eb2957c3 Mon Sep 17 00:00:00 2001
From: Matteo Beccati <mbeccati@php.net>
Date: Sat, 29 Aug 2015 10:48:53 +0200
Subject: Merge branch 'PHP-5.6'

* PHP-5.6:
  Added missing skipif for phar+zlib test
---
 ext/phar/tests/bug70019.phpt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ext/phar/tests/bug70019.phpt b/ext/phar/tests/bug70019.phpt
index d7976a180d..85bf1780aa 100644
--- a/ext/phar/tests/bug70019.phpt
+++ b/ext/phar/tests/bug70019.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #70019 Files extracted from archive may be placed outside of destination directory
+--SKIPIF--
+<?php if (!extension_loaded("phar") || !extension_loaded('zlib')) die("skip"); ?>
 --FILE--
 <?php
 $dir = __DIR__."/bug70019";
-- 
cgit v1.2.1