From: Hannes Magnusson <bjori@php.net>
Date: Wed, 7 Sep 2011 10:38:53 +0000 (+0000)
Subject: Sync tests between branches and fix the getcontent test
X-Git-Tag: php-5.5.0alpha1~1241
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6e2e54b70d29a2132bddc2ce8c3409b7623e562;p=php

Sync tests between branches and fix the getcontent test
---

diff --git a/ext/curl/tests/curl_basic_011.phpt b/ext/curl/tests/curl_basic_011.phpt
index 16e460e220..10c90b123a 100644
--- a/ext/curl/tests/curl_basic_011.phpt
+++ b/ext/curl/tests/curl_basic_011.phpt
@@ -35,4 +35,4 @@ TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com>
 *** Testing curl with cookie ***
 string(3) "bar"
 ===DONE===
-                     
+
diff --git a/ext/curl/tests/curl_basic_012.phpt b/ext/curl/tests/curl_basic_012.phpt
index 2cfa7b38ed..e4706fad46 100644
--- a/ext/curl/tests/curl_basic_012.phpt
+++ b/ext/curl/tests/curl_basic_012.phpt
@@ -3,7 +3,7 @@ Test curl_opt() function with CURLOPT_HTTP_VERSION/CURL_HTTP_VERSION_1_0
 --CREDITS--
 TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com>   
 --SKIPIF--
-<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?>
+<?php if (!extension_loaded("curl") || false === getenv(b'PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?>
 --FILE--
 <?php
 /* Prototype  : bool curl_setopt(resource ch, int option, mixed value)
@@ -35,3 +35,4 @@ TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com>
 *** Testing curl with HTTP/1.0 ***
 string(8) "HTTP/1.0"
 ===DONE===
+                     
\ No newline at end of file
diff --git a/ext/curl/tests/curl_basic_013.phpt b/ext/curl/tests/curl_basic_013.phpt
index bc396e11e7..c49d187be3 100644
--- a/ext/curl/tests/curl_basic_013.phpt
+++ b/ext/curl/tests/curl_basic_013.phpt
@@ -3,7 +3,7 @@ Test curl_opt() function with CURLOPT_HTTP_VERSION/CURL_HTTP_VERSION_1_1
 --CREDITS--
 TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com>      
 --SKIPIF--
-<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?>
+<?php if (!extension_loaded("curl") || false === getenv(b'PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?>
 --FILE--
 <?php
 /* Prototype  : bool curl_setopt(resource ch, int option, mixed value)
@@ -35,3 +35,4 @@ TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com>
 *** Testing curl with HTTP/1.1 ***
 string(8) "HTTP/1.1"
 ===DONE===
+                     
\ No newline at end of file
diff --git a/ext/curl/tests/curl_multi_getcontent_basic3.phpt b/ext/curl/tests/curl_multi_getcontent_basic3.phpt
index bf17ab6b60..0e448cd2e9 100644
--- a/ext/curl/tests/curl_multi_getcontent_basic3.phpt
+++ b/ext/curl/tests/curl_multi_getcontent_basic3.phpt
@@ -5,7 +5,7 @@ Rein Velt (rein@velt.org)
 #TestFest Utrecht 20090509
 --SKIPIF--
 <?php
-if (!extension_loaded('curl')) print 'skip';
+if (!extension_loaded('curl')) print 'skip need ext/curl';
 ?>
 --FILE--
 <?php
@@ -51,6 +51,7 @@ User-agent: *
 Disallow: /backend/
 Disallow: /distributions/
 Disallow: /stats/
+Disallow: /server-status/
 Disallow: /source.php
 Disallow: /search.php
 Disallow: /mod.php