Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3: http-stream test requires network connectivity
php · Feb 21, 2013 · c16d6be · c16d6be
2 parents 9a44a98 + bc55a8e
commit c16d6be
Showing 1 changed file with 1 addition and 0 deletions.
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--