com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/curl/test s/curl_file_upload.phpt

Commit: 89798f57d4a6552b08efeee24bf54079b072c771 Author: Stanislav Malyshev <stas@php.net> Sun, 11 May 2014 22:44:30 -0700 Parents: 997be125eb0228c5b1b6dd278f617791e71192c6 c507c9f01b10d7d991e38af55d22fad122dfbdf8 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=89798f57d4a6552b08efeee24bf54079b072c771 Log: Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: improve CURL tests to allow testing without separate server Changed paths: MM ext/curl/tests/curl_file_upload.phpt Diff: diff --cc ext/curl/tests/curl_file_upload.phpt index d3168e5,b06dedb..3a5a78f --- a/ext/curl/tests/curl_file_upload.phpt +++ b/ext/curl/tests/curl_file_upload.phpt @@@ -1,14 -1,7 +1,8 @@@ --TEST-- CURL file uploading ++--INI-- --SKIPIF-- - <?php - if (!extension_loaded("curl")) { - exit("skip curl extension not loaded"); - } - if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) { - exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined"); - } - ?> + <?php include 'skipif.inc'; ?> --FILE-- <?php @@@ -48,6 -42,6 +43,7 @@@ var_dump($file->getPostFilename()) curl_setopt($ch, CURLOPT_POSTFIELDS, array("file" => $file)); var_dump(curl_exec($ch)); ++curl_setopt($ch, CURLOPT_SAFE_UPLOAD, 0); $params = array('file' => '@' . __DIR__ . '/curl_testdata1.txt'); curl_setopt($ch, CURLOPT_POSTFIELDS, $params); var_dump(curl_exec($ch));