From 866e3bddcd947b3c7e530e97479245f4db2e42de Mon Sep 17 00:00:00 2001
From: Rasmus Lerdorf <rasmus@php.net>
Date: Sun, 26 Jul 2009 02:25:17 +0000
Subject: [PATCH] Fix 2 more curl tests in PHP 6

---
 ext/curl/tests/curl_basic_016.phpt       | 38 ++++++++++++------------
 ext/curl/tests/curl_setopt_basic001.phpt |  5 +---
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/ext/curl/tests/curl_basic_016.phpt b/ext/curl/tests/curl_basic_016.phpt
index 5e38615597..bfeae8eaab 100644
--- a/ext/curl/tests/curl_basic_016.phpt
+++ b/ext/curl/tests/curl_basic_016.phpt
@@ -15,43 +15,43 @@ Jean-Marc Fontaine <jmf@durcommefaire.net>
 array(20) {
   [%u|b%"url"]=>
   string(0) ""
-  ["content_type"]=>
+  [u"content_type"]=>
   NULL
-  ["http_code"]=>
+  [u"http_code"]=>
   int(0)
-  ["header_size"]=>
+  [u"header_size"]=>
   int(0)
-  ["request_size"]=>
+  [u"request_size"]=>
   int(0)
-  ["filetime"]=>
+  [u"filetime"]=>
   int(0)
-  ["ssl_verify_result"]=>
+  [u"ssl_verify_result"]=>
   int(0)
-  ["redirect_count"]=>
+  [u"redirect_count"]=>
   int(0)
-  ["total_time"]=>
+  [u"total_time"]=>
   float(0)
-  ["namelookup_time"]=>
+  [u"namelookup_time"]=>
   float(0)
-  ["connect_time"]=>
+  [u"connect_time"]=>
   float(0)
-  ["pretransfer_time"]=>
+  [u"pretransfer_time"]=>
   float(0)
-  ["size_upload"]=>
+  [u"size_upload"]=>
   float(0)
-  ["size_download"]=>
+  [u"size_download"]=>
   float(0)
-  ["speed_download"]=>
+  [u"speed_download"]=>
   float(0)
-  ["speed_upload"]=>
+  [u"speed_upload"]=>
   float(0)
-  ["download_content_length"]=>
+  [u"download_content_length"]=>
   float(0)
-  ["upload_content_length"]=>
+  [u"upload_content_length"]=>
   float(%f)
-  ["starttransfer_time"]=>
+  [u"starttransfer_time"]=>
   float(%f)
-  ["redirect_time"]=>
+  [u"redirect_time"]=>
   float(0)
 }
 ===DONE===
diff --git a/ext/curl/tests/curl_setopt_basic001.phpt b/ext/curl/tests/curl_setopt_basic001.phpt
index 4167c0532a..dd961e823b 100644
--- a/ext/curl/tests/curl_setopt_basic001.phpt
+++ b/ext/curl/tests/curl_setopt_basic001.phpt
@@ -27,9 +27,6 @@ curl_close($ch);
 var_dump( $curl_content );
 ?>
 --EXPECTF--
-PHP Warning:  Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
+PHP Warning:  Directive 'safe_mode' is no longer supported in PHP 6 and greater in Unknown on line 0
 *** Testing curl_setopt with CURLOPT_FOLLOWLOCATION in safemode
-
-Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when in safe_mode or an open_basedir is set in %s on line %d
 bool(false)
-
-- 
2.40.0