diff options
Diffstat (limited to 'ext/curl/tests')
66 files changed, 269 insertions, 608 deletions
diff --git a/ext/curl/tests/CONFLICTS b/ext/curl/tests/CONFLICTS new file mode 100644 index 0000000000..254defddb5 --- /dev/null +++ b/ext/curl/tests/CONFLICTS @@ -0,0 +1 @@ +server diff --git a/ext/curl/tests/bug27023.phpt b/ext/curl/tests/bug27023.phpt index c878ebac31..3d649b3f73 100644 --- a/ext/curl/tests/bug27023.phpt +++ b/ext/curl/tests/bug27023.phpt @@ -11,7 +11,7 @@ include 'server.inc'; $host = curl_cli_server_start(); $ch = curl_init(); curl_setopt($ch, CURLOPT_SAFE_UPLOAD, 1); -curl_setopt($ch, CURLOPT_URL, "{$host}/get.php?test=file"); +curl_setopt($ch, CURLOPT_URL, "{$host}/get.inc?test=file"); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); $file = curl_file_create(__DIR__ . '/curl_testdata1.txt'); diff --git a/ext/curl/tests/bug48203-win32.phpt b/ext/curl/tests/bug48203-win32.phpt deleted file mode 100644 index 686a38075b..0000000000 --- a/ext/curl/tests/bug48203-win32.phpt +++ /dev/null @@ -1,36 +0,0 @@ ---TEST-- -Bug #48203 (Crash when CURLOPT_STDERR is set to regular file) ---SKIPIF-- -<?php include 'skipif.inc'; ?> -<?php -if(substr(PHP_OS, 0, 3) != 'WIN' ) { - die('skip Windows only test'); -} -?> ---FILE-- -<?php -include 'server.inc'; -$fp = fopen(dirname(__FILE__) . '/bug48203.tmp', 'w'); - -$ch = curl_init(); - -curl_setopt($ch, CURLOPT_VERBOSE, 1); -curl_setopt($ch, CURLOPT_STDERR, $fp); -curl_setopt($ch, CURLOPT_URL, curl_cli_server_start()); - -fclose($fp); // <-- premature close of $fp caused a crash! - -curl_exec($ch); -curl_close($ch); - -echo "Ok\n"; - -?> ---CLEAN-- -<?php @unlink(dirname(__FILE__) . '/bug48203.tmp'); ?> ---EXPECTF-- -Warning: curl_exec(): CURLOPT_STDERR resource has gone away, resetting to stderr in %s on line %d -%A -Hello World! -Hello World!* Closing connection 0 -Ok diff --git a/ext/curl/tests/bug48203.phpt b/ext/curl/tests/bug48203.phpt index fc8b4091fc..185b75ed3d 100644 --- a/ext/curl/tests/bug48203.phpt +++ b/ext/curl/tests/bug48203.phpt @@ -2,15 +2,10 @@ Bug #48203 (Crash when CURLOPT_STDERR is set to regular file) --SKIPIF-- <?php include 'skipif.inc'; ?> -<?php -if(substr(PHP_OS, 0, 3) == 'WIN' ) { - die('skip now for Windows'); -} -?> --FILE-- <?php include 'server.inc'; -$fp = fopen(dirname(__FILE__) . '/bug48203.tmp', 'w'); +$fp = fopen(__DIR__ . '/bug48203.tmp', 'w'); $ch = curl_init(); @@ -27,8 +22,10 @@ echo "Ok\n"; ?> --CLEAN-- -<?php @unlink(dirname(__FILE__) . '/bug48203.tmp'); ?> +<?php @unlink(__DIR__ . '/bug48203.tmp'); ?> --EXPECTF-- -Warning: curl_exec(): CURLOPT_STDERR resource has gone away, resetting to stderr in %sbug48203.php on line %d +Warning: curl_exec(): CURLOPT_STDERR resource has gone away, resetting to stderr in %s on line %d %A +Hello World! +Hello World!* Closing connection 0 Ok diff --git a/ext/curl/tests/bug48203_multi.phpt b/ext/curl/tests/bug48203_multi.phpt index 5f9e2ba6b2..21eb1fb14f 100644 --- a/ext/curl/tests/bug48203_multi.phpt +++ b/ext/curl/tests/bug48203_multi.phpt @@ -8,7 +8,7 @@ include 'skipif.inc'; <?php include 'server.inc'; function checkForClosedFilePointer($target_url, $curl_option, $description) { - $fp = fopen(dirname(__FILE__) . '/bug48203.tmp', 'w'); + $fp = fopen(__DIR__ . '/bug48203.tmp', 'w'); $ch1 = curl_init(); $ch2 = curl_init(); @@ -65,7 +65,7 @@ foreach($options_to_check as $option) { ?> --CLEAN-- -<?php @unlink(dirname(__FILE__) . '/bug48203.tmp'); ?> +<?php @unlink(__DIR__ . '/bug48203.tmp'); ?> --EXPECTF-- Warning: curl_multi_exec(): CURLOPT_STDERR resource has gone away, resetting to stderr in %s on line %d diff --git a/ext/curl/tests/bug48207.phpt b/ext/curl/tests/bug48207.phpt index a3cd81544b..566b84b246 100644 --- a/ext/curl/tests/bug48207.phpt +++ b/ext/curl/tests/bug48207.phpt @@ -19,7 +19,7 @@ $host = curl_cli_server_start(); if(!empty($host)) { // Use the set Environment variable - $url = "$host/get.php?test=1"; + $url = "$host/get.inc?test=1"; } else { diff --git a/ext/curl/tests/bug54798-win32.phpt b/ext/curl/tests/bug54798-unix.phpt index 3abbfff94e..dc5aad7525 100644 --- a/ext/curl/tests/bug54798-win32.phpt +++ b/ext/curl/tests/bug54798-unix.phpt @@ -3,15 +3,15 @@ Bug #54798 (Segfault when CURLOPT_STDERR file pointer is closed before calling c --SKIPIF-- <?php include 'skipif.inc'; -if(substr(PHP_OS, 0, 3) != 'WIN' ) { - die('skip Windows only'); +if(substr(PHP_OS, 0, 3) == 'WIN' ) { + die('skip not for Windows'); } ?> --FILE-- <?php function checkForClosedFilePointer($host, $curl_option, $description) { - $fp = fopen(dirname(__FILE__) . '/bug54798.tmp', 'w+'); + $fp = fopen(__DIR__ . '/bug54798.tmp', 'w+'); $ch = curl_init(); @@ -54,14 +54,11 @@ foreach($options_to_check as $option) { ?> ===DONE=== --CLEAN-- -<?php @unlink(dirname(__FILE__) . '/bug54798.tmp'); ?> +<?php @unlink(__DIR__ . '/bug54798.tmp'); ?> --EXPECTF-- -%AOk for CURLOPT_STDERR - -%AOk for CURLOPT_WRITEHEADER - -%AHello World! -Hello World!Ok for CURLOPT_FILE - -%AOk for CURLOPT_INFILE +%a +%aOk for CURLOPT_STDERR +%aOk for CURLOPT_WRITEHEADER +%aOk for CURLOPT_FILE +%aOk for CURLOPT_INFILE ===DONE=== diff --git a/ext/curl/tests/bug54798.phpt b/ext/curl/tests/bug54798.phpt index c6040a68e2..d76674318a 100644 --- a/ext/curl/tests/bug54798.phpt +++ b/ext/curl/tests/bug54798.phpt @@ -3,15 +3,12 @@ Bug #54798 (Segfault when CURLOPT_STDERR file pointer is closed before calling c --SKIPIF-- <?php include 'skipif.inc'; -if(substr(PHP_OS, 0, 3) == 'WIN' ) { - die('skip not for Windows'); -} ?> --FILE-- <?php function checkForClosedFilePointer($host, $curl_option, $description) { - $fp = fopen(dirname(__FILE__) . '/bug54798.tmp', 'w+'); + $fp = fopen(__DIR__ . '/bug54798.tmp', 'w+'); $ch = curl_init(); @@ -54,11 +51,14 @@ foreach($options_to_check as $option) { ?> ===DONE=== --CLEAN-- -<?php @unlink(dirname(__FILE__) . '/bug54798.tmp'); ?> +<?php @unlink(__DIR__ . '/bug54798.tmp'); ?> --EXPECTF-- -%a -%aOk for CURLOPT_STDERR -%aOk for CURLOPT_WRITEHEADER -%aOk for CURLOPT_FILE -%aOk for CURLOPT_INFILE +%AOk for CURLOPT_STDERR + +%AOk for CURLOPT_WRITEHEADER + +%AHello World! +Hello World!Ok for CURLOPT_FILE + +%AOk for CURLOPT_INFILE ===DONE=== diff --git a/ext/curl/tests/bug54995.phpt b/ext/curl/tests/bug54995.phpt index 0a12055056..ea2b739762 100644 --- a/ext/curl/tests/bug54995.phpt +++ b/ext/curl/tests/bug54995.phpt @@ -13,7 +13,7 @@ if ($curl_version['version_number'] > 0x070a08) { include 'server.inc'; $host = curl_cli_server_start(); $ch = curl_init(); -curl_setopt($ch, CURLOPT_URL, "{$host}/get.php"); +curl_setopt($ch, CURLOPT_URL, "{$host}/get.inc"); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); var_dump(curl_getinfo($ch, CURLINFO_HTTP_CODE) == curl_getinfo($ch, CURLINFO_RESPONSE_CODE)); diff --git a/ext/curl/tests/bug55767.phpt b/ext/curl/tests/bug55767.phpt index 2b35e1bcea..2231c94bd4 100644 --- a/ext/curl/tests/bug55767.phpt +++ b/ext/curl/tests/bug55767.phpt @@ -18,7 +18,7 @@ include 'skipif.inc'; // start testing echo '*** Testing curl sending through GET an POST ***' . "\n"; - $url = "{$host}/get.php?test=getpost&get_param=Hello%20World"; + $url = "{$host}/get.inc?test=getpost&get_param=Hello%20World"; $ch = curl_init(); ob_start(); // start output buffering diff --git a/ext/curl/tests/bug61948-unix.phpt b/ext/curl/tests/bug61948-unix.phpt new file mode 100644 index 0000000000..78bb18ca1c --- /dev/null +++ b/ext/curl/tests/bug61948-unix.phpt @@ -0,0 +1,23 @@ +--TEST-- +Bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction) +--SKIPIF-- +<?php if (!extension_loaded("curl")) print "skip"; +if(substr(PHP_OS, 0, 3) == 'WIN' ) + die("skip Not Valid for Windows"); +?> +--INI-- +open_basedir="/tmp" +--FILE-- +<?php + $ch = curl_init(); + var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "")); + var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/tmp/foo")); + var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/xxx/bar")); + curl_close($ch); +?> +--EXPECTF-- +bool(true) +bool(true) + +Warning: curl_setopt(): open_basedir restriction in effect. File(/xxx/bar) is not within the allowed path(s): (/tmp) in %sbug61948-unix.php on line %d +bool(false) diff --git a/ext/curl/tests/bug61948-win32.phpt b/ext/curl/tests/bug61948-win32.phpt deleted file mode 100644 index 2194c68806..0000000000 --- a/ext/curl/tests/bug61948-win32.phpt +++ /dev/null @@ -1,32 +0,0 @@ ---TEST-- -Bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction) ---SKIPIF-- -<?php if (!extension_loaded("curl")) print "skip"; -if(substr(PHP_OS, 0, 3) != 'WIN' ) - die("skip Not Valid for Linux"); -?> ---FILE-- -<?php - $base_dir = dirname(__FILE__) . DIRECTORY_SEPARATOR . "bug61948"; - mkdir($base_dir . DIRECTORY_SEPARATOR . "foo", 0755, true); - - ini_set("open_basedir", $base_dir); - - $ch = curl_init(); - var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "")); - var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "$base_dir/foo")); - var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "c:/xxx/bar")); - curl_close($ch); -?> ---CLEAN-- -<?php - $base_dir = dirname(__FILE__) . DIRECTORY_SEPARATOR . "bug61948"; - rmdir("$base_dir/foo"); - rmdir($base_dir); -?> ---EXPECTF-- -%a -bool(true) - -Warning: curl_setopt(): open_basedir restriction in effect. File(c:/xxx/bar) is not within the allowed path(s): (%sbug61948) in %sbug61948-win32.php on line %d -bool(false) diff --git a/ext/curl/tests/bug61948.phpt b/ext/curl/tests/bug61948.phpt index 1df9d7b7b4..316fa4d0e7 100644 --- a/ext/curl/tests/bug61948.phpt +++ b/ext/curl/tests/bug61948.phpt @@ -1,23 +1,30 @@ --TEST-- Bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction) --SKIPIF-- -<?php if (!extension_loaded("curl")) print "skip"; -if(substr(PHP_OS, 0, 3) == 'WIN' ) - die("skip Not Valid for Windows"); +<?php if (!extension_loaded("curl")) print "skip curl extension not loaded"; ?> ---INI-- -open_basedir="/tmp" --FILE-- <?php + $base_dir = __DIR__ . DIRECTORY_SEPARATOR . "bug61948"; + mkdir($base_dir . DIRECTORY_SEPARATOR . "foo", 0755, true); + + ini_set("open_basedir", $base_dir); + $ch = curl_init(); var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "")); - var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/tmp/foo")); - var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/xxx/bar")); + var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "$base_dir/foo")); + var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "c:/xxx/bar")); curl_close($ch); ?> +--CLEAN-- +<?php + $base_dir = __DIR__ . DIRECTORY_SEPARATOR . "bug61948"; + rmdir("$base_dir/foo"); + rmdir($base_dir); +?> --EXPECTF-- -bool(true) +%a bool(true) -Warning: curl_setopt(): open_basedir restriction in effect. File(/xxx/bar) is not within the allowed path(s): (/tmp) in %sbug61948.php on line %d +Warning: curl_setopt(): open_basedir restriction in effect. File(c:/xxx/bar) is not within the allowed path(s): (%sbug61948) in %sbug61948.php on line %d bool(false) diff --git a/ext/curl/tests/bug66109.phpt b/ext/curl/tests/bug66109.phpt index c40d1e9667..4a4ae30698 100644 --- a/ext/curl/tests/bug66109.phpt +++ b/ext/curl/tests/bug66109.phpt @@ -7,7 +7,7 @@ Bug #66109 (Option CURLOPT_CUSTOMREQUEST can't be reset to default.) include 'server.inc'; $host = curl_cli_server_start(); $ch = curl_init(); -curl_setopt($ch, CURLOPT_URL, "{$host}/get.php?test=method"); +curl_setopt($ch, CURLOPT_URL, "{$host}/get.inc?test=method"); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE'); diff --git a/ext/curl/tests/bug67643.phpt b/ext/curl/tests/bug67643.phpt index ad59f2c12c..24cdb86a28 100644 --- a/ext/curl/tests/bug67643.phpt +++ b/ext/curl/tests/bug67643.phpt @@ -7,7 +7,7 @@ if (!extension_loaded('curl')) print 'skip'; --FILE-- <?php $ch = curl_init(); - curl_setopt($ch, CURLOPT_URL, 'file://'. dirname(__FILE__) . DIRECTORY_SEPARATOR .'curl_testdata1.txt'); + curl_setopt($ch, CURLOPT_URL, 'file://'. __DIR__ . DIRECTORY_SEPARATOR .'curl_testdata1.txt'); curl_setopt($ch, CURLOPT_RETURNTRANSFER, false); $mh = curl_multi_init(); diff --git a/ext/curl/tests/bug68937.phpt b/ext/curl/tests/bug68937.phpt index 8477285f63..4f2ed12e42 100644 --- a/ext/curl/tests/bug68937.phpt +++ b/ext/curl/tests/bug68937.phpt @@ -2,7 +2,6 @@ Bug # #68937 (Segfault in curl_multi_exec) --SKIPIF-- <?php -if (getenv("SKIP_ONLINE_TESTS")) die("skip online test"); include 'skipif.inc'; ?> --FILE-- @@ -11,7 +10,7 @@ include 'skipif.inc'; include 'server.inc'; $host = curl_cli_server_start(); -$url = "{$host}/get.php"; +$url = "{$host}/get.inc"; $ch = curl_init($url); curl_setopt_array($ch, array( diff --git a/ext/curl/tests/bug68937_2.phpt b/ext/curl/tests/bug68937_2.phpt index 8cd3db2544..8ebbc8eaa6 100644 --- a/ext/curl/tests/bug68937_2.phpt +++ b/ext/curl/tests/bug68937_2.phpt @@ -2,7 +2,6 @@ Bug # #68937 (Segfault in curl_multi_exec) --SKIPIF-- <?php -if (getenv("SKIP_ONLINE_TESTS")) die("skip online test"); include 'skipif.inc'; ?> --FILE-- @@ -10,7 +9,7 @@ include 'skipif.inc'; include 'server.inc'; $host = curl_cli_server_start(); -$url = "{$host}/get.php"; +$url = "{$host}/get.inc"; $ch = curl_init($url); curl_setopt_array($ch, array( diff --git a/ext/curl/tests/bug69316.phpt b/ext/curl/tests/bug69316.phpt index 16a655eef8..38ff8bb9b6 100644 --- a/ext/curl/tests/bug69316.phpt +++ b/ext/curl/tests/bug69316.phpt @@ -18,8 +18,8 @@ Bug #69316: Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEA include 'server.inc'; $host = curl_cli_server_start(); - $temp_file = dirname(__FILE__) . '/body.tmp'; - $url = "{$host}/get.php?test=getpost"; + $temp_file = __DIR__ . '/body.tmp'; + $url = "{$host}/get.inc?test=getpost"; $ch = curl_init(); $f_file = fopen($temp_file, "w") or die("failed to open file\n"); curl_setopt($ch, CURLOPT_BUFFERSIZE, 10); @@ -32,7 +32,7 @@ Bug #69316: Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEA ===DONE=== --CLEAN-- <?php -unlink(dirname(__FILE__) . '/body.tmp'); +unlink(__DIR__ . '/body.tmp'); ?> --EXPECTF-- Warning: curl_exec(): CURLOPT_FILE resource has gone away, resetting to default in %s on line %d diff --git a/ext/curl/tests/bug71523.phpt b/ext/curl/tests/bug71523.phpt index 84f1a17159..c7889eaca0 100644 --- a/ext/curl/tests/bug71523.phpt +++ b/ext/curl/tests/bug71523.phpt @@ -5,9 +5,6 @@ Bug #71523 (Copied handle with new option CURLOPT_HTTPHEADER crashes while curl_ if (!extension_loaded("curl")) { exit("skip curl extension not loaded"); } -if (getenv("SKIP_ONLINE_TESTS")) { - die("skip online test"); -} ?> --FILE-- <?php diff --git a/ext/curl/tests/bug72202.phpt b/ext/curl/tests/bug72202.phpt index 63138d9ba6..01564c0a58 100644 --- a/ext/curl/tests/bug72202.phpt +++ b/ext/curl/tests/bug72202.phpt @@ -5,9 +5,6 @@ Bug #72202 (curl_close doesn't close cURL handle) if (!extension_loaded("curl")) { exit("skip curl extension not loaded"); } -if (getenv("SKIP_ONLINE_TESTS")) { - die("skip online test"); -} ?> --FILE-- <?php diff --git a/ext/curl/tests/bug73147.phpt b/ext/curl/tests/bug73147.phpt index 118177d871..0c86269151 100644 --- a/ext/curl/tests/bug73147.phpt +++ b/ext/curl/tests/bug73147.phpt @@ -11,10 +11,13 @@ if (!extension_loaded("curl")) { $poc = 'a:1:{i:0;O:8:"CURLFile":1:{s:4:"name";R:1;}}'; try { -var_dump(unserialize($poc)); + var_dump(unserialize($poc)); } catch(Exception $e) { - echo $e->getMessage(); + echo $e->getMessage(); } ?> ---EXPECT-- -Unserialization of CURLFile instances is not allowed +--EXPECTF-- +Warning: Erroneous data format for unserializing 'CURLFile' in %s on line %d + +Notice: unserialize(): Error at offset 27 of 44 bytes in %s on line %d +bool(false) diff --git a/ext/curl/tests/bug77711.phpt b/ext/curl/tests/bug77711.phpt new file mode 100644 index 0000000000..148c26322a --- /dev/null +++ b/ext/curl/tests/bug77711.phpt @@ -0,0 +1,32 @@ +--TEST-- +FR #77711 (CURLFile should support UNICODE filenames) +--SKIPIF-- +<?php include 'skipif.inc'; ?> +--FILE-- +<?php +include 'server.inc'; +$host = curl_cli_server_start(); + +$ch = curl_init(); +curl_setopt($ch, CURLOPT_SAFE_UPLOAD, 1); +curl_setopt($ch, CURLOPT_URL, "{$host}/get.php?test=file"); +curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); + +$filename = __DIR__ . '/АБВ.txt'; +file_put_contents($filename, "Test."); +$file = curl_file_create($filename); +$params = array('file' => $file); +var_dump(curl_setopt($ch, CURLOPT_POSTFIELDS, $params)); + +var_dump(curl_exec($ch)); +curl_close($ch); +?> +===DONE=== +--EXPECTF-- +bool(true) +string(%d) "АБВ.txt|application/octet-stream" +===DONE=== +--CLEAN-- +<?php +@unlink(__DIR__ . '/АБВ.txt'); +?> diff --git a/ext/curl/tests/curl_CURLOPT_READDATA.phpt b/ext/curl/tests/curl_CURLOPT_READDATA.phpt index eebf4a0c03..1bf5493acd 100644 --- a/ext/curl/tests/curl_CURLOPT_READDATA.phpt +++ b/ext/curl/tests/curl_CURLOPT_READDATA.phpt @@ -11,7 +11,7 @@ Mattijs Hoitink mattijshoitink@gmail.com include 'server.inc'; $host = curl_cli_server_start(); // The URL to POST to -$url = $host . '/get.php?test=post'; +$url = $host . '/get.inc?test=post'; // Create a temporary file to read the data from $tempname = tempnam(sys_get_temp_dir(), 'CURL_DATA'); diff --git a/ext/curl/tests/curl_basic_001.phpt b/ext/curl/tests/curl_basic_001.phpt index 6ece95f95b..1d906c43ea 100644 --- a/ext/curl/tests/curl_basic_001.phpt +++ b/ext/curl/tests/curl_basic_001.phpt @@ -18,7 +18,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net> // start testing echo "*** Testing curl_exec() : basic functionality ***\n"; - $url = "{$host}/get.php?test=get"; + $url = "{$host}/get.inc?test=get"; $ch = curl_init(); ob_start(); // start output buffering diff --git a/ext/curl/tests/curl_basic_002.phpt b/ext/curl/tests/curl_basic_002.phpt index 1b388267b0..c067406caf 100644 --- a/ext/curl/tests/curl_basic_002.phpt +++ b/ext/curl/tests/curl_basic_002.phpt @@ -19,7 +19,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net> // start testing echo '*** Testing curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); ***' . "\n"; - $url = "{$host}/get.php?test=get"; + $url = "{$host}/get.inc?test=get"; $ch = curl_init(); ob_start(); // start output buffering diff --git a/ext/curl/tests/curl_basic_003.phpt b/ext/curl/tests/curl_basic_003.phpt index ce9216d535..57ac6063b9 100644 --- a/ext/curl/tests/curl_basic_003.phpt +++ b/ext/curl/tests/curl_basic_003.phpt @@ -19,7 +19,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net> // start testing echo '*** Testing curl sending through GET an POST ***' . "\n"; - $url = "{$host}/get.php?test=getpost&get_param=Hello%20World"; + $url = "{$host}/get.inc?test=getpost&get_param=Hello%20World"; $ch = curl_init(); ob_start(); // start output buffering diff --git a/ext/curl/tests/curl_basic_004.phpt b/ext/curl/tests/curl_basic_004.phpt index c25ec850f4..27842db1b0 100644 --- a/ext/curl/tests/curl_basic_004.phpt +++ b/ext/curl/tests/curl_basic_004.phpt @@ -19,7 +19,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net> // start testing echo '*** Testing curl setting referer ***' . "\n"; - $url = "{$host}/get.php?test=referer"; + $url = "{$host}/get.inc?test=referer"; $ch = curl_init(); ob_start(); // start output buffering diff --git a/ext/curl/tests/curl_basic_005.phpt b/ext/curl/tests/curl_basic_005.phpt index 3ec8906be8..6f9a4f98e1 100644 --- a/ext/curl/tests/curl_basic_005.phpt +++ b/ext/curl/tests/curl_basic_005.phpt @@ -19,7 +19,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net> // start testing echo '*** Testing curl with user agent ***' . "\n"; - $url = "{$host}/get.php?test=useragent"; + $url = "{$host}/get.inc?test=useragent"; $ch = curl_init(); ob_start(); // start output buffering diff --git a/ext/curl/tests/curl_basic_006.phpt b/ext/curl/tests/curl_basic_006.phpt index 03db778794..9ccc2c554b 100644 --- a/ext/curl/tests/curl_basic_006.phpt +++ b/ext/curl/tests/curl_basic_006.phpt @@ -19,7 +19,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net> // start testing echo '*** Testing curl_setopt($ch, CURLOPT_WRITEFUNCTION, <closure>); ***' . "\n"; - $url = "{$host}/get.php?test=get"; + $url = "{$host}/get.inc?test=get"; $ch = curl_init(); $alldata = ''; ob_start(); // start output buffering diff --git a/ext/curl/tests/curl_basic_011.phpt b/ext/curl/tests/curl_basic_011.phpt index cbbc1f59ed..e6412c36d9 100644 --- a/ext/curl/tests/curl_basic_011.phpt +++ b/ext/curl/tests/curl_basic_011.phpt @@ -18,7 +18,7 @@ TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com> // start testing echo '*** Testing curl with cookie ***' . "\n"; - $url = "{$host}/get.php?test=cookie"; + $url = "{$host}/get.inc?test=cookie"; $ch = curl_init(); ob_start(); // start output buffering diff --git a/ext/curl/tests/curl_basic_012.phpt b/ext/curl/tests/curl_basic_012.phpt index 6cc5d599e2..812fab789d 100644 --- a/ext/curl/tests/curl_basic_012.phpt +++ b/ext/curl/tests/curl_basic_012.phpt @@ -18,7 +18,7 @@ TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com> // start testing echo '*** Testing curl with HTTP/1.0 ***' . "\n"; - $url = "{$host}/get.php?test=httpversion"; + $url = "{$host}/get.inc?test=httpversion"; $ch = curl_init(); ob_start(); // start output buffering diff --git a/ext/curl/tests/curl_basic_013.phpt b/ext/curl/tests/curl_basic_013.phpt index 8aff6fc707..34ec249ad3 100644 --- a/ext/curl/tests/curl_basic_013.phpt +++ b/ext/curl/tests/curl_basic_013.phpt @@ -18,7 +18,7 @@ TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com> // start testing echo '*** Testing curl with HTTP/1.1 ***' . "\n"; - $url = "{$host}/get.php?test=httpversion"; + $url = "{$host}/get.inc?test=httpversion"; $ch = curl_init(); ob_start(); // start output buffering diff --git a/ext/curl/tests/curl_basic_017.phpt b/ext/curl/tests/curl_basic_017.phpt index 9f1bdaf636..9891039f9e 100644 --- a/ext/curl/tests/curl_basic_017.phpt +++ b/ext/curl/tests/curl_basic_017.phpt @@ -18,7 +18,7 @@ TestFest 2009 - AFUP - Thomas Rabaix <thomas.rabaix@gmail.com> // start testing echo "*** Testing curl_exec() : basic functionality ***\n"; - $url = "{$host}/get.php?test=get"; + $url = "{$host}/get.inc?test=get"; $chs = array( 0 => curl_init(), 1 => curl_init(), diff --git a/ext/curl/tests/curl_basic_018.phpt b/ext/curl/tests/curl_basic_018.phpt index 33db8db3b5..114cb59919 100644 --- a/ext/curl/tests/curl_basic_018.phpt +++ b/ext/curl/tests/curl_basic_018.phpt @@ -18,7 +18,7 @@ TestFest 2009 - AFUP - Thomas Rabaix <thomas.rabaix@gmail.com> // start testing echo "*** Testing curl_exec() : basic functionality ***\n"; - $url = "{$host}/get.php?test=get"; + $url = "{$host}/get.inc?test=get"; $chs = array( 0 => curl_init(), 1 => curl_init(), diff --git a/ext/curl/tests/curl_basic_019.phpt b/ext/curl/tests/curl_basic_019.phpt index fde4dccb3d..6f896b51e7 100644 --- a/ext/curl/tests/curl_basic_019.phpt +++ b/ext/curl/tests/curl_basic_019.phpt @@ -9,7 +9,7 @@ Jean-Marc Fontaine <jmf@durcommefaire.net> include 'server.inc'; $host = curl_cli_server_start(); - $url = "http://{$host}/get.php?test="; + $url = "http://{$host}/get.inc?test="; $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $url); diff --git a/ext/curl/tests/curl_basic_020.phpt b/ext/curl/tests/curl_basic_020.phpt index 99ac93d192..cf0b708d73 100644 --- a/ext/curl/tests/curl_basic_020.phpt +++ b/ext/curl/tests/curl_basic_020.phpt @@ -9,7 +9,7 @@ Jean-Marc Fontaine <jmf@durcommefaire.net> include 'server.inc'; $host = curl_cli_server_start(); - $url = "{$host}/get.php?test="; + $url = "{$host}/get.inc?test="; $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $url); curl_exec($ch); diff --git a/ext/curl/tests/curl_basic_021.phpt b/ext/curl/tests/curl_basic_021.phpt index 46d21cd81b..5166073525 100644 --- a/ext/curl/tests/curl_basic_021.phpt +++ b/ext/curl/tests/curl_basic_021.phpt @@ -8,7 +8,7 @@ Jean-Marc Fontaine <jmf@durcommefaire.net> <?php include 'server.inc'; $host = curl_cli_server_start(); - $url = "{$host}/get.php?test=contenttype"; + $url = "{$host}/get.inc?test=contenttype"; $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $url); diff --git a/ext/curl/tests/curl_basic_023.phpt b/ext/curl/tests/curl_basic_023.phpt index 05c1362dcb..06520207c1 100644 --- a/ext/curl/tests/curl_basic_023.phpt +++ b/ext/curl/tests/curl_basic_023.phpt @@ -17,7 +17,7 @@ var_dump(0 === curl_getinfo($ch, CURLINFO_HTTP_VERSION)); $host = curl_cli_server_start(); -$url = "{$host}/get.php?test="; +$url = "{$host}/get.inc?test="; curl_setopt($ch, CURLOPT_URL, $url); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_exec($ch); diff --git a/ext/curl/tests/curl_basic_024.phpt b/ext/curl/tests/curl_basic_024.phpt index 00c1bab5b3..cdd4b5c209 100644 --- a/ext/curl/tests/curl_basic_024.phpt +++ b/ext/curl/tests/curl_basic_024.phpt @@ -15,7 +15,7 @@ include 'server.inc'; $ch = curl_init(); $host = curl_cli_server_start(); -$url = "{$host}/get.php?test="; +$url = "{$host}/get.inc?test="; curl_setopt($ch, CURLOPT_URL, $url); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_exec($ch); diff --git a/ext/curl/tests/curl_copy_handle_basic_001.phpt b/ext/curl/tests/curl_copy_handle_basic_001.phpt index ba66d55286..3b5190d31f 100644 --- a/ext/curl/tests/curl_copy_handle_basic_001.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_001.phpt @@ -13,7 +13,7 @@ Rick Buitenman <rick@meritos.nl> echo '*** Testing curl copy handle with simple GET ***' . "\n"; - $url = "{$host}/get.php?test=getpost&get_param=Hello%20World"; + $url = "{$host}/get.inc?test=getpost&get_param=Hello%20World"; $ch = curl_init(); ob_start(); // start output buffering diff --git a/ext/curl/tests/curl_copy_handle_basic_002.phpt b/ext/curl/tests/curl_copy_handle_basic_002.phpt index 9542b804eb..e8ebcce325 100644 --- a/ext/curl/tests/curl_copy_handle_basic_002.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_002.phpt @@ -12,7 +12,7 @@ Rick Buitenman <rick@meritos.nl> echo '*** Testing curl copy handle with simple POST ***' . "\n"; - $url = "{$host}/get.php?test=getpost"; + $url = "{$host}/get.inc?test=getpost"; $ch = curl_init(); ob_start(); // start output buffering diff --git a/ext/curl/tests/curl_copy_handle_basic_004.phpt b/ext/curl/tests/curl_copy_handle_basic_004.phpt index ecef566f0b..c020c3088b 100644 --- a/ext/curl/tests/curl_copy_handle_basic_004.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_004.phpt @@ -13,7 +13,7 @@ Rick Buitenman <rick@meritos.nl> echo '*** Test curl_copy_handle() after exec() ***' . "\n"; - $url = "{$host}/get.php?test=getpost&get_param=Hello%20World"; + $url = "{$host}/get.inc?test=getpost&get_param=Hello%20World"; $ch = curl_init(); ob_start(); // start output buffering diff --git a/ext/curl/tests/curl_copy_handle_basic_005.phpt b/ext/curl/tests/curl_copy_handle_basic_005.phpt index e37c52f550..68df09c21c 100644 --- a/ext/curl/tests/curl_copy_handle_basic_005.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_005.phpt @@ -13,7 +13,7 @@ Rick Buitenman <rick@meritos.nl> echo '*** Test curl_copy_handle() after exec() with POST ***' . "\n"; - $url = "{$host}/get.php?test=getpost"; + $url = "{$host}/get.inc?test=getpost"; $ch = curl_init(); ob_start(); // start output buffering diff --git a/ext/curl/tests/curl_copy_handle_basic_006.phpt b/ext/curl/tests/curl_copy_handle_basic_006.phpt index 989ad56762..5d787bdf3c 100644 --- a/ext/curl/tests/curl_copy_handle_basic_006.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_006.phpt @@ -13,7 +13,7 @@ Rick Buitenman <rick@meritos.nl> echo '*** Testing curl copy handle with User Agent ***' . "\n"; - $url = "{$host}/get.php?test=useragent"; + $url = "{$host}/get.inc?test=useragent"; $ch = curl_init(); ob_start(); // start output buffering diff --git a/ext/curl/tests/curl_copy_handle_basic_007.phpt b/ext/curl/tests/curl_copy_handle_basic_007.phpt index 9d6dc2dc39..a48d40e270 100644 --- a/ext/curl/tests/curl_copy_handle_basic_007.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_007.phpt @@ -9,7 +9,7 @@ Test curl_copy_handle() with simple POST echo '*** Testing curl copy handle with simple POST using array as arguments ***' . "\n"; - $url = "{$host}/get.php?test=getpost"; + $url = "{$host}/get.inc?test=getpost"; $ch = curl_init(); ob_start(); // start output buffering diff --git a/ext/curl/tests/curl_copy_handle_basic_008.phpt b/ext/curl/tests/curl_copy_handle_basic_008.phpt index c48c76db22..ecb039b403 100644 --- a/ext/curl/tests/curl_copy_handle_basic_008.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_008.phpt @@ -7,7 +7,7 @@ Test curl_copy_handle() with CURLOPT_PROGRESSFUNCTION include 'server.inc'; $host = curl_cli_server_start(); - $url = "{$host}/get.php"; + $url = "{$host}/get.inc"; $ch = curl_init($url); curl_setopt($ch, CURLOPT_NOPROGRESS, 0); diff --git a/ext/curl/tests/curl_copy_handle_variation3.phpt b/ext/curl/tests/curl_copy_handle_variation3.phpt new file mode 100644 index 0000000000..18f35f71b1 --- /dev/null +++ b/ext/curl/tests/curl_copy_handle_variation3.phpt @@ -0,0 +1,38 @@ +--TEST-- +curl_copy_handle() allows to post CURLFile multiple times +--SKIPIF-- +<?php include 'skipif.inc'; ?> +--FILE-- +<?php +include 'server.inc'; +$host = curl_cli_server_start(); + +$ch1 = curl_init(); +curl_setopt($ch1, CURLOPT_SAFE_UPLOAD, 1); +curl_setopt($ch1, CURLOPT_URL, "{$host}/get.php?test=file"); +curl_setopt($ch1, CURLOPT_RETURNTRANSFER, 1); + +$filename = __DIR__ . '/АБВ.txt'; +file_put_contents($filename, "Test."); +$file = curl_file_create($filename); +$params = array('file' => $file); +var_dump(curl_setopt($ch1, CURLOPT_POSTFIELDS, $params)); + +$ch2 = curl_copy_handle($ch1); + +var_dump(curl_exec($ch1)); +curl_close($ch1); + +var_dump(curl_exec($ch2)); +curl_close($ch2); +?> +===DONE=== +--EXPECTF-- +bool(true) +string(%d) "АБВ.txt|application/octet-stream" +string(%d) "АБВ.txt|application/octet-stream" +===DONE=== +--CLEAN-- +<?php +@unlink(__DIR__ . '/АБВ.txt'); +?> diff --git a/ext/curl/tests/curl_file_deleted_before_curl_close.phpt b/ext/curl/tests/curl_file_deleted_before_curl_close.phpt index 5e806add08..92eba5e8c3 100644 --- a/ext/curl/tests/curl_file_deleted_before_curl_close.phpt +++ b/ext/curl/tests/curl_file_deleted_before_curl_close.phpt @@ -11,7 +11,7 @@ include 'server.inc'; $host = curl_cli_server_start(); $ch = curl_init($host); -$temp_file = dirname(__FILE__) . '/curl_file_deleted_before_curl_close.tmp'; +$temp_file = __DIR__ . '/curl_file_deleted_before_curl_close.tmp'; if (file_exists($temp_file)) { unlink($temp_file); // file should not exist before test } @@ -33,7 +33,7 @@ echo "Closed correctly\n"; ?> --CLEAN-- <?php -unlink(dirname(__FILE__) . '/curl_file_deleted_before_curl_close.tmp'); +unlink(__DIR__ . '/curl_file_deleted_before_curl_close.tmp'); ?> --EXPECT-- Closed correctly diff --git a/ext/curl/tests/curl_file_serialize.phpt b/ext/curl/tests/curl_file_serialize.phpt index e2f2d14fff..7748272b76 100644 --- a/ext/curl/tests/curl_file_serialize.phpt +++ b/ext/curl/tests/curl_file_serialize.phpt @@ -8,13 +8,12 @@ if (!extension_loaded("curl")) { ?> --FILE-- <?php -$data = 'a:2:{s:4:"file";O:8:"CURLFile":3:{s:4:"name";s:13:"testdata1.txt";s:4:"mime";s:0:"";s:8:"postname";s:0:"";}s:4:"data";s:3:"foo";}'; -var_dump(unserialize($data)); +$file = new CURLFile(__DIR__ . '/curl_testdata1.txt'); +var_dump(serialize($file)); ?> --EXPECTF-- -Fatal error: Uncaught Exception: Unserialization of CURLFile instances is not allowed in %s +Fatal error: Uncaught Exception: Serialization of 'CURLFile' is not allowed in %s:%d Stack trace: -#0 [internal function]: CURLFile->__wakeup() -#1 %s -#2 {main} +#0 %s(%d): serialize(Object(CURLFile)) +#1 {main} thrown in %s on line %d diff --git a/ext/curl/tests/curl_file_upload.phpt b/ext/curl/tests/curl_file_upload.phpt index 8d304c5f01..73a2f363fb 100644 --- a/ext/curl/tests/curl_file_upload.phpt +++ b/ext/curl/tests/curl_file_upload.phpt @@ -21,7 +21,7 @@ function testcurl($ch, $name, $mime = '', $postname = '') include 'server.inc'; $host = curl_cli_server_start(); $ch = curl_init(); -curl_setopt($ch, CURLOPT_URL, "{$host}/get.php?test=file"); +curl_setopt($ch, CURLOPT_URL, "{$host}/get.inc?test=file"); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); testcurl($ch, __DIR__ . '/curl_testdata1.txt'); @@ -52,7 +52,7 @@ $params = array('file' => '@' . __DIR__ . '/curl_testdata1.txt'); curl_setopt($ch, CURLOPT_POSTFIELDS, $params); var_dump(curl_exec($ch)); -curl_setopt($ch, CURLOPT_URL, "{$host}/get.php?test=post"); +curl_setopt($ch, CURLOPT_URL, "{$host}/get.inc?test=post"); $params = array('file' => '@' . __DIR__ . '/curl_testdata1.txt'); curl_setopt($ch, CURLOPT_POSTFIELDS, $params); var_dump(curl_exec($ch)); diff --git a/ext/curl/tests/curl_file_upload_stream.phpt b/ext/curl/tests/curl_file_upload_stream.phpt new file mode 100644 index 0000000000..03c85b4b82 --- /dev/null +++ b/ext/curl/tests/curl_file_upload_stream.phpt @@ -0,0 +1,28 @@ +--TEST-- +CURL file uploading from stream +--SKIPIF-- +<?php include 'skipif.inc'; ?> +<?php +if (curl_version()['version_number'] < 0x73800) die('skip requires curl >= 7.56.0'); +--FILE-- +<?php +include 'server.inc'; +$host = curl_cli_server_start(); + +$ch = curl_init(); +curl_setopt($ch, CURLOPT_SAFE_UPLOAD, 1); +curl_setopt($ch, CURLOPT_URL, "{$host}/get.inc?test=file"); +curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); + +$file = curl_file_create('data://text/plain;base64,SSBsb3ZlIFBIUAo=', 'text/plain', 'i-love-php'); +$params = array('file' => $file); +var_dump(curl_setopt($ch, CURLOPT_POSTFIELDS, $params)); + +var_dump(curl_exec($ch)); +curl_close($ch); +?> +===DONE=== +--EXPECT-- +bool(true) +string(21) "i-love-php|text/plain" +===DONE=== diff --git a/ext/curl/tests/curl_multi_getcontent_basic3.phpt b/ext/curl/tests/curl_multi_getcontent_basic3.phpt index 6e5e43b97a..f67196d7e7 100644 --- a/ext/curl/tests/curl_multi_getcontent_basic3.phpt +++ b/ext/curl/tests/curl_multi_getcontent_basic3.phpt @@ -16,8 +16,8 @@ Rein Velt (rein@velt.org) //SET URL AND OTHER OPTIONS include 'server.inc'; $host = curl_cli_server_start(); - curl_setopt($ch1, CURLOPT_URL, "{$host}/get.php?test=getpost&get_param=Hello%20World"); - curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata2.txt"); + curl_setopt($ch1, CURLOPT_URL, "{$host}/get.inc?test=getpost&get_param=Hello%20World"); + curl_setopt($ch2, CURLOPT_URL, "file://".__DIR__. 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_error1.phpt b/ext/curl/tests/curl_multi_getcontent_error1.phpt deleted file mode 100644 index 6e23a2902a..0000000000 --- a/ext/curl/tests/curl_multi_getcontent_error1.phpt +++ /dev/null @@ -1,51 +0,0 @@ ---TEST-- -Curl_multi_getcontent() error test ---CREDITS-- -Rein Velt (rein@velt.org) -#TestFest Utrecht 20090509 ---SKIPIF-- -<?php -if (!extension_loaded('curl')) print 'skip'; -?> ---FILE-- -<?php - //CURL_MULTI_GETCONTENT TEST - - //CREATE RESOURCES - $ch1=curl_init(); - $ch2=curl_init(); - - //SET URL AND OTHER OPTIONS - 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); - - //CREATE MULTIPLE CURL HANDLE - $mh=curl_multi_init(); - - //ADD THE 2 HANDLES - curl_multi_add_handle($mh,$ch1); - curl_multi_add_handle($mh,$ch2); - - //EXECUTE - $running=0; - do { - curl_multi_exec($mh,$running); - } while ($running>0); - - $results1=curl_multi_getcontent(); //no parameter - $results2=curl_multi_getcontent($ch2); - - //CLOSE - curl_multi_remove_handle($mh,$ch1); - curl_multi_remove_handle($mh,$ch2); - curl_multi_close($mh); - - echo $results1; - echo $results2; - -?> ---EXPECTF-- -Warning: curl_multi_getcontent() expects exactly 1 parameter, 0 given in %s on line %d -CURL2 diff --git a/ext/curl/tests/curl_multi_getcontent_error2.phpt b/ext/curl/tests/curl_multi_getcontent_error2.phpt deleted file mode 100644 index 1c8fa67663..0000000000 --- a/ext/curl/tests/curl_multi_getcontent_error2.phpt +++ /dev/null @@ -1,51 +0,0 @@ ---TEST-- -Curl_multi_getcontent() error test ---CREDITS-- -Rein Velt (rein@velt.org) -#TestFest Utrecht 20090509 ---SKIPIF-- -<?php -if (!extension_loaded('curl')) print 'skip'; -?> ---FILE-- -<?php - //CURL_MULTI_GETCONTENT TEST - - //CREATE RESOURCES - $ch1=curl_init(); - $ch2=curl_init(); - - //SET URL AND OTHER OPTIONS - 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); - - //CREATE MULTIPLE CURL HANDLE - $mh=curl_multi_init(); - - //ADD THE 2 HANDLES - curl_multi_add_handle($mh,$ch1); - curl_multi_add_handle($mh,$ch2); - - //EXECUTE - $running=0; - do { - curl_multi_exec($mh,$running); - } while ($running>0); - - $results1=curl_multi_getcontent($ch1,$ch2); //no parameter - $results2=curl_multi_getcontent($ch2); - - //CLOSE - curl_multi_remove_handle($mh,$ch1); - curl_multi_remove_handle($mh,$ch2); - curl_multi_close($mh); - - echo $results1; - echo $results2; - -?> ---EXPECTF-- -Warning: curl_multi_getcontent() expects exactly 1 parameter, 2 given in %s on line %d -CURL2 diff --git a/ext/curl/tests/curl_multi_getcontent_error3.phpt b/ext/curl/tests/curl_multi_getcontent_error3.phpt deleted file mode 100644 index 0de4d03727..0000000000 --- a/ext/curl/tests/curl_multi_getcontent_error3.phpt +++ /dev/null @@ -1,53 +0,0 @@ ---TEST-- -Curl_multi_getcontent() error test ---CREDITS-- -Rein Velt (rein@velt.org) -#TestFest Utrecht 20090509 ---SKIPIF-- -<?php -if (!extension_loaded('curl')) print 'skip'; -?> ---FILE-- -<?php - //CURL_MULTI_GETCONTENT TEST - - //CREATE RESOURCES - $ch1=curl_init(); - $ch2=curl_init(); - - //SET URL AND OTHER OPTIONS - 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); - - //CREATE MULTIPLE CURL HANDLE - $mh=curl_multi_init(); - - //ADD THE 2 HANDLES - curl_multi_add_handle($mh,$ch1); - curl_multi_add_handle($mh,$ch2); - - //EXECUTE - $running=0; - do { - curl_multi_exec($mh,$running); - } while ($running>0); - - $ch1="string"; - - $results1=curl_multi_getcontent($ch1); //incorrect parameter type - $results2=curl_multi_getcontent($ch2); - - //CLOSE - //curl_multi_remove_handle($mh,$ch1); - curl_multi_remove_handle($mh,$ch2); - curl_multi_close($mh); - - echo $results1; - echo $results2; - -?> ---EXPECTF-- -Warning: curl_multi_getcontent() expects parameter 1 to be resource, string given in %s on line %d -CURL2 diff --git a/ext/curl/tests/curl_multi_getcontent_error4.phpt b/ext/curl/tests/curl_multi_getcontent_error4.phpt deleted file mode 100644 index 292766700e..0000000000 --- a/ext/curl/tests/curl_multi_getcontent_error4.phpt +++ /dev/null @@ -1,66 +0,0 @@ ---TEST-- -Curl_multi_getcontent() error test with undefined handle ---CREDITS-- -Rein Velt (rein@velt.org) -#TestFest Utrecht 20090509 ---SKIPIF-- -<?php -if (!extension_loaded('curl')) print 'skip'; -?> ---FILE-- -<?php - //CURL_MULTI_GETCONTENT TEST - - //CREATE RESOURCES - //$ch1=undefined; - $ch2=curl_init(); - - //SET URL AND OTHER OPTIONS - 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); - - //CREATE MULTIPLE CURL HANDLE - $mh=curl_multi_init(); - - //ADD THE 2 HANDLES - curl_multi_add_handle($mh,$ch1); - curl_multi_add_handle($mh,$ch2); - - //EXECUTE - $running=0; - do { - curl_multi_exec($mh,$running); - } while ($running>0); - - - $results1=curl_multi_getcontent($ch1); //incorrect parameter type - $results2=curl_multi_getcontent($ch2); - - //CLOSE - //curl_multi_remove_handle($mh,$ch1); - curl_multi_remove_handle($mh,$ch2); - curl_multi_close($mh); - - echo $results1; - echo $results2; - -?> ---EXPECTF-- -Notice: Undefined variable: ch1 in %s on line %d - -Warning: curl_setopt() expects parameter 1 to be resource, null given in %s on line %d - -Notice: Undefined variable: ch1 in %s on line %d - -Warning: curl_setopt() expects parameter 1 to be resource, null given in %s on line %d - -Notice: Undefined variable: ch1 in %s on line %d - -Warning: curl_multi_add_handle() expects parameter 2 to be resource, null given in %s on line %d - -Notice: Undefined variable: ch1 in %s on line %d - -Warning: curl_multi_getcontent() expects parameter 1 to be resource, null given in %s on line %d -CURL2 diff --git a/ext/curl/tests/curl_multi_info_read.phpt b/ext/curl/tests/curl_multi_info_read.phpt index ef83822b4a..8a2d48918e 100644 --- a/ext/curl/tests/curl_multi_info_read.phpt +++ b/ext/curl/tests/curl_multi_info_read.phpt @@ -4,7 +4,6 @@ array curl_multi_info_read ( resource $mh [, int &$msgs_in_queue = NULL ] ); marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br --SKIPIF-- <?php -if (getenv("SKIP_ONLINE_TESTS")) { die('skip: online test'); } if (!extension_loaded('curl')) { print("skip"); } ?> --FILE-- diff --git a/ext/curl/tests/curl_multi_init_param.phpt b/ext/curl/tests/curl_multi_init_param.phpt deleted file mode 100644 index e7848976aa..0000000000 --- a/ext/curl/tests/curl_multi_init_param.phpt +++ /dev/null @@ -1,27 +0,0 @@ ---TEST-- -Test curl_multi_init() fail if any parameter is passed ---CREDITS-- -Paulo Eduardo <pauloelr [at] gmail [dot] com> -#testfest SP 2014 ---SKIPIF-- -<?php if (!extension_loaded("curl")) print "skip"; ?> ---FILE-- -<?php -/* Prototype : resource curl_multi_init(void) - * Description : Returns a new cURL multi handle - * Source code : ext/curl/multi.c - * Test documentation: http://wiki.php.net/qa/temp/ext/curl - */ - -// start testing - -//create the multiple cURL handle -$mh = curl_multi_init('test'); -var_dump($mh); - -?> -===DONE=== ---EXPECTF-- -Warning: curl_multi_init() expects exactly 0 parameters, %d given in %s on line %d -NULL -===DONE=== diff --git a/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.phpt b/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.phpt index 92c80d1732..32af88fb20 100644 --- a/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.phpt +++ b/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.phpt @@ -19,7 +19,7 @@ function custom_readfunction($oCurl, $hReadHandle, $iMaxOut) return $sData; } -$sFileBase = dirname(__FILE__).DIRECTORY_SEPARATOR.'curl_opt_CURLOPT_READFUNCTION'; +$sFileBase = __DIR__.DIRECTORY_SEPARATOR.'curl_opt_CURLOPT_READFUNCTION'; $sReadFile = $sFileBase.'_in.tmp'; $sWriteFile = $sFileBase.'_out.tmp'; $sWriteUrl = 'file://'.$sWriteFile; @@ -43,7 +43,7 @@ var_dump($sOutput); ===DONE=== --CLEAN-- <?php -$sFileBase = dirname(__FILE__).DIRECTORY_SEPARATOR.'curl_opt_CURLOPT_READFUNCTION'; +$sFileBase = __DIR__.DIRECTORY_SEPARATOR.'curl_opt_CURLOPT_READFUNCTION'; $sReadFile = $sFileBase.'_in.tmp'; $sWriteFile = $sFileBase.'_out.tmp'; unlink($sReadFile); diff --git a/ext/curl/tests/curl_setopt_array_basic.phpt b/ext/curl/tests/curl_setopt_array_basic.phpt index 0ad8fc7eee..b0b0b70b14 100644 --- a/ext/curl/tests/curl_setopt_array_basic.phpt +++ b/ext/curl/tests/curl_setopt_array_basic.phpt @@ -19,7 +19,7 @@ include 'server.inc'; $host = curl_cli_server_start(); if (!empty($host)) { // Use the set Environment variable - $url = "{$host}/get.php?test=get"; + $url = "{$host}/get.inc?test=get"; } else { // Create a temporary file for the test $tempname = tempnam(sys_get_temp_dir(), 'CURL_HANDLE'); diff --git a/ext/curl/tests/curl_version_basic_001.phpt b/ext/curl/tests/curl_version_basic_001.phpt new file mode 100644 index 0000000000..803e9f689d --- /dev/null +++ b/ext/curl/tests/curl_version_basic_001.phpt @@ -0,0 +1,31 @@ +--TEST-- +Test curl_version() basic functionality +--SKIPIF-- +<?php + if (!extension_loaded("curl")) { + exit("skip curl extension not loaded"); + } +?> +--FILE-- +<?php + $info_curl = curl_version(); + var_dump($info_curl["version_number"]); + var_dump($info_curl["age"]); + var_dump($info_curl["features"]); + var_dump($info_curl["ssl_version_number"]); + var_dump($info_curl["version"]); + var_dump($info_curl["host"]); + var_dump($info_curl["ssl_version"]); + var_dump($info_curl["libz_version"]); + var_dump(array_key_exists("protocols", $info_curl)); +?> +--EXPECTF-- +int(%i) +int(%i) +int(%i) +int(%i) +string(%i) "%s" +string(%i) "%s" +string(%i) "%s" +string(%i) "%s" +bool(true) diff --git a/ext/curl/tests/curl_version_error.phpt b/ext/curl/tests/curl_version_error.phpt deleted file mode 100644 index 39f99a0fad..0000000000 --- a/ext/curl/tests/curl_version_error.phpt +++ /dev/null @@ -1,28 +0,0 @@ ---TEST-- -Test curl_version() function : error conditions ---SKIPIF-- -<?php if (!extension_loaded("curl")) exit("skip curl extension not loaded"); ?> ---FILE-- -<?php - -/* Prototype : array curl_version ([ int $age ] ) - * Description: Returns information about the cURL version. - * Source code: ext/curl/interface.c -*/ - -echo "*** Testing curl_version() : error conditions ***\n"; - -echo "\n-- Testing curl_version() function with more than expected no. of arguments --\n"; -$extra_arg = 10; -var_dump( curl_version(1, $extra_arg) ); - -?> -===Done=== ---EXPECTF-- -*** Testing curl_version() : error conditions *** - --- Testing curl_version() function with more than expected no. of arguments -- - -Warning: curl_version() expects at most 1 parameter, 2 given in %s on line %d -NULL -===Done=== diff --git a/ext/curl/tests/curl_version_error_001.phpt b/ext/curl/tests/curl_version_error_001.phpt new file mode 100644 index 0000000000..2c56e0a928 --- /dev/null +++ b/ext/curl/tests/curl_version_error_001.phpt @@ -0,0 +1,17 @@ +--TEST-- +curl_version(): error conditions +--SKIPIF-- +<?php +if (!extension_loaded('curl')) die('skip curl extension not available'); +?> +--FILE-- +<?php +curl_version(CURLVERSION_NOW); +curl_version(0); +?> +===DONE=== +--EXPECTF-- +Deprecated: curl_version(): the $version parameter is deprecated in %s on line %d + +Warning: curl_version(): $version argument ignored in %s on line %d +===DONE=== diff --git a/ext/curl/tests/curl_version_variation1.phpt b/ext/curl/tests/curl_version_variation1.phpt deleted file mode 100644 index 3ffb248313..0000000000 --- a/ext/curl/tests/curl_version_variation1.phpt +++ /dev/null @@ -1,159 +0,0 @@ ---TEST-- -Test curl_version() function : usage variations - test values for $ascii argument ---SKIPIF-- -<?php if (!extension_loaded("curl")) exit("skip curl extension not loaded"); -if (PHP_INT_SIZE != 8) die('skip 64-bit only'); ?> ---FILE-- -<?php - -/* Prototype : array curl_version ([ int $age ] ) - * Description: Returns information about the cURL version. - * Source code: ext/curl/interface.c -*/ - -echo "*** Testing curl_version() function: with unexpected inputs for 'age' argument ***\n"; - -//get an unset variable -$unset_var = 'string_val'; -unset($unset_var); - -//defining a class -class sample { - public function __toString() { - return "sample object"; - } -} - -//getting the resource -$file_handle = fopen(__FILE__, "r"); - -// array with different values for $input -$inputs = array ( - - // integer values - 0, - 1, - 255, - 256, - PHP_INT_MAX, - -PHP_INT_MAX, - - // float values - 10.5, - -20.5, - 10.1234567e10, - - // array values - array(), - array(0), - array(1, 2), - - //string values - "ABC", - 'abc', - "2abc", - - // boolean values - true, - false, - TRUE, - FALSE, - - // null values - NULL, - null, - - // objects - new sample(), - - // resource - $file_handle, - - // undefined variable - @$undefined_var, - - // unset variable - @$unset_var -); - -// loop through with each element of the $inputs array to test curl_version() function -$count = 1; -foreach($inputs as $input) { - echo "-- Iteration $count --\n"; - var_dump( is_array(curl_version($input)) ); - $count ++; -} - -fclose($file_handle); //closing the file handle - -?> -===Done=== ---EXPECTF-- -*** Testing curl_version() function: with unexpected inputs for 'age' argument *** --- Iteration 1 -- -bool(true) --- Iteration 2 -- -bool(true) --- Iteration 3 -- -bool(true) --- Iteration 4 -- -bool(true) --- Iteration 5 -- -bool(true) --- Iteration 6 -- -bool(true) --- Iteration 7 -- -bool(true) --- Iteration 8 -- -bool(true) --- Iteration 9 -- -bool(true) --- Iteration 10 -- - -Warning: curl_version() expects parameter 1 to be int, array given in %s on line %d -bool(false) --- Iteration 11 -- - -Warning: curl_version() expects parameter 1 to be int, array given in %s on line %d -bool(false) --- Iteration 12 -- - -Warning: curl_version() expects parameter 1 to be int, array given in %s on line %d -bool(false) --- Iteration 13 -- - -Warning: curl_version() expects parameter 1 to be int, string given in %s on line %d -bool(false) --- Iteration 14 -- - -Warning: curl_version() expects parameter 1 to be int, string given in %s on line %d -bool(false) --- Iteration 15 -- - -Notice: A non well formed numeric value encountered in %s on line %d -bool(true) --- Iteration 16 -- -bool(true) --- Iteration 17 -- -bool(true) --- Iteration 18 -- -bool(true) --- Iteration 19 -- -bool(true) --- Iteration 20 -- -bool(true) --- Iteration 21 -- -bool(true) --- Iteration 22 -- - -Warning: curl_version() expects parameter 1 to be int, object given in %s on line %d -bool(false) --- Iteration 23 -- - -Warning: curl_version() expects parameter 1 to be int, resource given in %s on line %d -bool(false) --- Iteration 24 -- -bool(true) --- Iteration 25 -- -bool(true) -===Done=== diff --git a/ext/curl/tests/responder/get.php b/ext/curl/tests/responder/get.inc index f9269745f6..f9269745f6 100644 --- a/ext/curl/tests/responder/get.php +++ b/ext/curl/tests/responder/get.inc diff --git a/ext/curl/tests/server.inc b/ext/curl/tests/server.inc index b7c1570195..68a5bde8a8 100644 --- a/ext/curl/tests/server.inc +++ b/ext/curl/tests/server.inc @@ -11,7 +11,7 @@ function curl_cli_server_start() { $php_executable = getenv('TEST_PHP_EXECUTABLE'); $doc_root = __DIR__; - $router = "responder/get.php"; + $router = "responder/get.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { $descriptorspec = array( |