summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSara Golemon <pollita@php.net>2013-02-21 03:21:49 -0800
committerSara Golemon <pollita@php.net>2013-02-21 03:21:49 -0800
commitc16d6befd429a2e55c266b6e8df7fe2f93f68c91 (patch)
treec0b6cc0b373cb4410deb75277b98699d8c0ffef5
parent9a44a9806c7c7a8c1fc691210335d0691a4597be (diff)
parentbc55a8eb9f1cf5e77b96a4eb2a1920ba0037e128 (diff)
downloadphp-git-c16d6befd429a2e55c266b6e8df7fe2f93f68c91.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: http-stream test requires network connectivity
-rw-r--r--ext/standard/tests/network/http-stream.phpt1
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/standard/tests/network/http-stream.phpt b/ext/standard/tests/network/http-stream.phpt
index 6ee035a241..99245f709e 100644
--- 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--