Merge branch 'PHP-7.0' into PHP-7.1

Author: nikic

ext/soap/tests/bug71610.phpt

@@ -1,10 +1,13 @@
 --TEST--
 SOAP Bug #71610 - Type Confusion Vulnerability - SOAP / make_http_soap_request()
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+if (getenv("SKIP_ONLINE_TESTS")) die("skip online test");
+?>
 --FILE--
 <?php
-$exploit = unserialize('O:10:"SoapClient":3:{s:3:"uri";s:1:"a";s:8:"location";s:19:"http://testuri.org/";s:8:"_cookies";a:1:{s:8:"manhluat";a:3:{i:0;s:0:"";i:1;N;i:2;N;}}}}');
+$exploit = unserialize('O:10:"SoapClient":3:{s:3:"uri";s:1:"a";s:8:"location";s:19:"http://example.org/";s:8:"_cookies";a:1:{s:8:"manhluat";a:3:{i:0;s:0:"";i:1;N;i:2;N;}}}}');
 try {
 $exploit->blahblah();
 } catch(SoapFault $e) {