curl_setopt() arg: using DIRECTORY_SEPARATOR rather then "/" to make windows tests...

diff --git a/ext/curl/tests/curl_multi_getcontent_basic3.phpt b/ext/curl/tests/curl_multi_getcontent_basic3.phpt
index 1434c58d02bebbb5b2fe7edb3078c1b41b2532e8..bf17ab6b606c03f391f9a49f23946c8061a6d4f4 100644 (file)
--- a/ext/curl/tests/curl_multi_getcontent_basic3.phpt
+++ b/ext/curl/tests/curl_multi_getcontent_basic3.phpt
@@ -17,7 +17,7 @@ if (!extension_loaded('curl')) print 'skip';
 
        //SET URL AND OTHER OPTIONS
        curl_setopt($ch1, CURLOPT_URL, "http://php.net/robots.txt");
-       curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__)."/curl_testdata2.txt");
+       curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata2.txt");
        curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true);
        curl_setopt($ch2, CURLOPT_RETURNTRANSFER, true);
        
@@ -55,5 +55,10 @@ Disallow: /source.php
 Disallow: /search.php
 Disallow: /mod.php
 Disallow: /manual/add-note.php
+
+Disallow: /harming/humans
+Disallow: /ignoring/human/orders
+Disallow: /harm/to/self
+
 CURL2
 

diff --git a/ext/curl/tests/curl_multi_getcontent_error1.phpt b/ext/curl/tests/curl_multi_getcontent_error1.phpt
index 88de0d7d34b9b236d9ba374c8fd277414d7b8f3d..2fb11b3d9716498f95d5fc54e192dccdc1455e31 100644 (file)
--- a/ext/curl/tests/curl_multi_getcontent_error1.phpt
+++ b/ext/curl/tests/curl_multi_getcontent_error1.phpt
@@ -16,8 +16,8 @@ if (!extension_loaded('curl')) print 'skip';
        $ch2=curl_init();
 
        //SET URL AND OTHER OPTIONS
-       curl_setopt($ch1, CURLOPT_URL, "file://".dirname(__FILE__)."/curl_testdata1.txt");
-       curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__)."/curl_testdata2.txt");
+       curl_setopt($ch1, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata1.txt");
+       curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata2.txt");
        curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true);
        curl_setopt($ch2, CURLOPT_RETURNTRANSFER, true);
        

diff --git a/ext/curl/tests/curl_multi_getcontent_error2.phpt b/ext/curl/tests/curl_multi_getcontent_error2.phpt
index ad837d8287ff84346f2d675ee4293409b2ff340e..0145d6a8face8345ff114174dfe03d0d9739de0d 100644 (file)
--- a/ext/curl/tests/curl_multi_getcontent_error2.phpt
+++ b/ext/curl/tests/curl_multi_getcontent_error2.phpt
@@ -16,8 +16,8 @@ if (!extension_loaded('curl')) print 'skip';
        $ch2=curl_init();
 
        //SET URL AND OTHER OPTIONS
-       curl_setopt($ch1, CURLOPT_URL, "file://".dirname(__FILE__)."/curl_testdata1.txt");
-       curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__)."/curl_testdata2.txt");
+       curl_setopt($ch1, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata1.txt");
+       curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata2.txt");
        curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true);
        curl_setopt($ch2, CURLOPT_RETURNTRANSFER, true);
        

diff --git a/ext/curl/tests/curl_multi_getcontent_error3.phpt b/ext/curl/tests/curl_multi_getcontent_error3.phpt
index 6ffc6b73609044d7febae7a00bd0d86dbfd20c6d..2ad14804ba35f512b1196fbff87ea52daf7c6b7e 100644 (file)
--- a/ext/curl/tests/curl_multi_getcontent_error3.phpt
+++ b/ext/curl/tests/curl_multi_getcontent_error3.phpt
@@ -16,8 +16,8 @@ if (!extension_loaded('curl')) print 'skip';
        $ch2=curl_init();
 
        //SET URL AND OTHER OPTIONS
-       curl_setopt($ch1, CURLOPT_URL, "file://".dirname(__FILE__)."/curl_testdata1.txt");
-       curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__)."/curl_testdata2.txt");
+       curl_setopt($ch1, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata1.txt");
+       curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata2.txt");
        curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true);
        curl_setopt($ch2, CURLOPT_RETURNTRANSFER, true);
        

diff --git a/ext/curl/tests/curl_multi_getcontent_error4.phpt b/ext/curl/tests/curl_multi_getcontent_error4.phpt
index 0315b50f9e8fb027129ad2021062b74ee185f662..105b8edce4a6af4dc4566ab315657e734177e6da 100644 (file)
--- a/ext/curl/tests/curl_multi_getcontent_error4.phpt
+++ b/ext/curl/tests/curl_multi_getcontent_error4.phpt
@@ -16,8 +16,8 @@ if (!extension_loaded('curl')) print 'skip';
        $ch2=curl_init();
 
        //SET URL AND OTHER OPTIONS
-       curl_setopt($ch1, CURLOPT_URL, "file://".dirname(__FILE__)."/curl_testdata1.txt");
-       curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__)."/curl_testdata2.txt");
+       curl_setopt($ch1, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata1.txt");
+       curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata2.txt");
        curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true);
        curl_setopt($ch2, CURLOPT_RETURNTRANSFER, true);