From 140a3a80df763b9444245a62f314f40de13d9408 Mon Sep 17 00:00:00 2001 From: Eyal Teutsch Date: Wed, 8 Dec 2010 14:16:17 +0000 Subject: curl_setopt() arg: using DIRECTORY_SEPARATOR rather then "/" to make windows tests pass too --- ext/curl/tests/curl_multi_getcontent_basic3.phpt | 7 ++++++- ext/curl/tests/curl_multi_getcontent_error1.phpt | 4 ++-- ext/curl/tests/curl_multi_getcontent_error2.phpt | 4 ++-- ext/curl/tests/curl_multi_getcontent_error3.phpt | 4 ++-- ext/curl/tests/curl_multi_getcontent_error4.phpt | 4 ++-- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ext/curl/tests/curl_multi_getcontent_basic3.phpt b/ext/curl/tests/curl_multi_getcontent_basic3.phpt index 1434c58d02..bf17ab6b60 100644 --- 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 88de0d7d34..2fb11b3d97 100644 --- 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 ad837d8287..0145d6a8fa 100644 --- 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 6ffc6b7360..2ad14804ba 100644 --- 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 0315b50f9e..105b8edce4 100644 --- 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); -- cgit v1.2.1