Merge branch 'PHP-5.4' into PHP-5.5

sgolemon · sgolemon · commit ead2e1708d37 · 2013-02-21T03:22:09.000-08:00
* PHP-5.4:
  http-stream test requires network connectivity
diff --git a/ext/standard/tests/network/http-stream.phpt b/ext/standard/tests/network/http-stream.phpt
@@ -3,6 +3,7 @@ http-stream test
 --SKIPIF--
 <?php
 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");
 ?>
 --INI--
