From 9839d3a953455e431960873272db1f9bb49b9637 Mon Sep 17 00:00:00 2001
From: Ferenc Kovacs <tyra3l@gmail.com>
Date: Wed, 25 Oct 2017 01:47:21 +0200
Subject: [PATCH 1/4] fix the travis build for PHP-5.6 using precise instead of
 trusty

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index c13009a983c..c78b4b7d062 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+dist: trusty
 language: c
 sudo: false
 addons:

From 787e3a1ee43ba3dd46bc42848f0918be631acb0b Mon Sep 17 00:00:00 2001
From: Ferenc Kovacs <tyra3l@gmail.com>
Date: Wed, 25 Oct 2017 01:51:48 +0200
Subject: [PATCH 2/4] fix the travis build for PHP-5.6 using precise instead of
 trusty

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c78b4b7d062..8e39fb4f2c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-dist: trusty
+dist: precise
 language: c
 sudo: false
 addons:

From ad7ed6fe211af3f6711f52100a026175c86c621b Mon Sep 17 00:00:00 2001
From: Rasmus Lerdorf <rasmus@php.net>
Date: Fri, 9 Jan 2015 17:24:48 -0800
Subject: [PATCH 3/4] These tests all assume that IPV6 is available.

---
 sapi/fpm/tests/003.phpt | 5 ++++-
 sapi/fpm/tests/004.phpt | 5 ++++-
 sapi/fpm/tests/005.phpt | 5 ++++-
 sapi/fpm/tests/006.phpt | 5 ++++-
 sapi/fpm/tests/007.phpt | 5 ++++-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/sapi/fpm/tests/003.phpt b/sapi/fpm/tests/003.phpt
index f928626eccf..a4c04ae9ce9 100644
--- a/sapi/fpm/tests/003.phpt
+++ b/sapi/fpm/tests/003.phpt
@@ -1,7 +1,10 @@
 --TEST--
 FPM: Test IPv6 support
 --SKIPIF--
-<?php include "skipif.inc"; ?>
+<?php include "skipif.inc";
+      @stream_socket_client('tcp://[::1]:0', $errno);
+      if ($errno != 111) die('skip IPv6 not supported.');
+?>
 --FILE--
 <?php
 
diff --git a/sapi/fpm/tests/004.phpt b/sapi/fpm/tests/004.phpt
index 2a4d666c64f..565819aed42 100644
--- a/sapi/fpm/tests/004.phpt
+++ b/sapi/fpm/tests/004.phpt
@@ -1,7 +1,10 @@
 --TEST--
 FPM: Test IPv4/IPv6 support
 --SKIPIF--
-<?php include "skipif.inc"; ?>
+<?php include "skipif.inc";
+      @stream_socket_client('tcp://[::1]:0', $errno);
+      if ($errno != 111) die('skip IPv6 not supported.');
+?>
 --FILE--
 <?php
 
diff --git a/sapi/fpm/tests/005.phpt b/sapi/fpm/tests/005.phpt
index c565c2a9ebd..6c8210ec8e7 100644
--- a/sapi/fpm/tests/005.phpt
+++ b/sapi/fpm/tests/005.phpt
@@ -1,7 +1,10 @@
 --TEST--
 FPM: Test IPv4 allowed clients
 --SKIPIF--
-<?php include "skipif.inc"; ?>
+<?php include "skipif.inc";
+      @stream_socket_client('tcp://[::1]:0', $errno);
+      if ($errno != 111) die('skip IPv6 not supported.');
+?>
 --FILE--
 <?php
 
diff --git a/sapi/fpm/tests/006.phpt b/sapi/fpm/tests/006.phpt
index a12ca253d21..e5520873359 100644
--- a/sapi/fpm/tests/006.phpt
+++ b/sapi/fpm/tests/006.phpt
@@ -1,7 +1,10 @@
 --TEST--
 FPM: Test IPv6 allowed clients (bug #68428)
 --SKIPIF--
-<?php include "skipif.inc"; ?>
+<?php include "skipif.inc";
+      @stream_socket_client('tcp://[::1]:0', $errno);
+      if ($errno != 111) die('skip IPv6 not supported.');
+?>
 --FILE--
 <?php
 
diff --git a/sapi/fpm/tests/007.phpt b/sapi/fpm/tests/007.phpt
index 0d817907cf0..6329af209ad 100644
--- a/sapi/fpm/tests/007.phpt
+++ b/sapi/fpm/tests/007.phpt
@@ -1,7 +1,10 @@
 --TEST--
 FPM: Test IPv6 all addresses and access_log (bug #68421)
 --SKIPIF--
-<?php include "skipif.inc"; ?>
+<?php include "skipif.inc";
+      @stream_socket_client('tcp://[::1]:0', $errno);
+      if ($errno != 111) die('skip IPv6 not supported.');
+?>
 --FILE--
 <?php
 

From b53fb886a473d934007bf24e39a2ecfc277bc4be Mon Sep 17 00:00:00 2001
From: Ferenc Kovacs <tyra3l@gmail.com>
Date: Wed, 25 Oct 2017 03:14:51 +0200
Subject: [PATCH 4/4] use trusty explicitly

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 49c8662ce50..5be74533a8a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-dist: precise
+dist: trusty
 language: c
 sudo: false
 addons: