Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  http-stream test requires network connectivity
This commit is contained in:
Sara Golemon 2013-02-21 03:21:49 -08:00
commit c16d6befd4

View file

@ -3,6 +3,7 @@ http-stream test
--SKIPIF-- --SKIPIF--
<?php <?php
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
if (getenv("SKIP_ONLINE_TESTS")) die("skip online test");
if (!extension_loaded("dom")) die("skip dom extension is not present"); if (!extension_loaded("dom")) die("skip dom extension is not present");
?> ?>
--INI-- --INI--