Modified: php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_basic3.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_basic3.phpt	2010-12-08 14:12:30 UTC (rev 306079)
+++ php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_basic3.phpt	2010-12-08 14:16:17 UTC (rev 306080)
@@ -17,7 +17,7 @@

 	//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: /search.php
 Disallow: /mod.php
 Disallow: /manual/add-note.php
+
+Disallow: /harming/humans
+Disallow: /ignoring/human/orders
+Disallow: /harm/to/self
+
 CURL2


Modified: php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error1.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error1.phpt	2010-12-08 14:12:30 UTC (rev 306079)
+++ php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error1.phpt	2010-12-08 14:16:17 UTC (rev 306080)
@@ -16,8 +16,8 @@
 	$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);


Modified: php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error2.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error2.phpt	2010-12-08 14:12:30 UTC (rev 306079)
+++ php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error2.phpt	2010-12-08 14:16:17 UTC (rev 306080)
@@ -16,8 +16,8 @@
 	$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);


Modified: php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error3.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error3.phpt	2010-12-08 14:12:30 UTC (rev 306079)
+++ php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error3.phpt	2010-12-08 14:16:17 UTC (rev 306080)
@@ -16,8 +16,8 @@
 	$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);


Modified: php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error4.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error4.phpt	2010-12-08 14:12:30 UTC (rev 306079)
+++ php/php-src/branches/PHP_5_2/ext/curl/tests/curl_multi_getcontent_error4.phpt	2010-12-08 14:16:17 UTC (rev 306080)
@@ -16,8 +16,8 @@
 	$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);


Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_basic3.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_basic3.phpt	2010-12-08 14:12:30 UTC (rev 306079)
+++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_basic3.phpt	2010-12-08 14:16:17 UTC (rev 306080)
@@ -17,7 +17,7 @@

 	//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);


Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_error1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_error1.phpt	2010-12-08 14:12:30 UTC (rev 306079)
+++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_error1.phpt	2010-12-08 14:16:17 UTC (rev 306080)
@@ -16,8 +16,8 @@
 	$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);


Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_error2.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_error2.phpt	2010-12-08 14:12:30 UTC (rev 306079)
+++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_error2.phpt	2010-12-08 14:16:17 UTC (rev 306080)
@@ -16,8 +16,8 @@
 	$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);


Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_error3.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_error3.phpt	2010-12-08 14:12:30 UTC (rev 306079)
+++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_error3.phpt	2010-12-08 14:16:17 UTC (rev 306080)
@@ -16,8 +16,8 @@
 	$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);


Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_error4.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_error4.phpt	2010-12-08 14:12:30 UTC (rev 306079)
+++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_error4.phpt	2010-12-08 14:16:17 UTC (rev 306080)
@@ -16,8 +16,8 @@
 	$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);


Modified: php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_basic3.phpt
===================================================================
--- php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_basic3.phpt	2010-12-08 14:12:30 UTC (rev 306079)
+++ php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_basic3.phpt	2010-12-08 14:16:17 UTC (rev 306080)
@@ -17,7 +17,7 @@

 	//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);


Modified: php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_error1.phpt
===================================================================
--- php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_error1.phpt	2010-12-08 14:12:30 UTC (rev 306079)
+++ php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_error1.phpt	2010-12-08 14:16:17 UTC (rev 306080)
@@ -16,8 +16,8 @@
 	$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);


Modified: php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_error2.phpt
===================================================================
--- php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_error2.phpt	2010-12-08 14:12:30 UTC (rev 306079)
+++ php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_error2.phpt	2010-12-08 14:16:17 UTC (rev 306080)
@@ -16,8 +16,8 @@
 	$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);


Modified: php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_error3.phpt
===================================================================
--- php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_error3.phpt	2010-12-08 14:12:30 UTC (rev 306079)
+++ php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_error3.phpt	2010-12-08 14:16:17 UTC (rev 306080)
@@ -16,8 +16,8 @@
 	$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);


Modified: php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_error4.phpt
===================================================================
--- php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_error4.phpt	2010-12-08 14:12:30 UTC (rev 306079)
+++ php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_error4.phpt	2010-12-08 14:16:17 UTC (rev 306080)
@@ -16,8 +16,8 @@
 	$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);