From 46370d548b7803ca38901fe5839e18a3ab93aab5 Mon Sep 17 00:00:00 2001
From: Julien Pauli <jpauli@php.net>
Date: Wed, 2 Sep 2015 17:55:20 +0200
Subject: Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Merge branch 'PHP-5.6'
  bump version

Conflicts:
	configure.in
	main/php_version.h
---
 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