romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 14:23:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

- curl the tool now deals with its command line options somewhat differently!

Browse source 
All boolean options (such as -O, -I, -v etc), both short and long versions,
  now always switch on/enable the option named. Using the same option multiple
  times thus make no difference. To switch off one of those options, you need
  to use the long version of the option and type --no-OPTION. Like to disable
  verbose mode you use --no-verbose!

- Added --remote-name-all to curl, which if used changes the default for all
  given URLs to be dealt with as if -O is used. So if you want to disable that
  for a specific URL after --remote-name-all has been used, you muse use -o -
  or --no-remote-name.
This commit is contained in:
Daniel Stenberg 2008-06-08 20:53:49 +00:00
parent d8bc4a0e9a
commit 5abfdc0140
7 changed files with 253 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/data/test256
View file

@ -29,7 +29,7 @@ http
HTTP resume request over proxy with auth without server supporting it
</name>
<command option="no-output">
-x http://%HOSTIP:%HTTPPORT http://%HOSTIP:%HTTPPORT/want/256 -C - -i -o log/fewl.txt -U daniel:stenberg
-x http://%HOSTIP:%HTTPPORT http://%HOSTIP:%HTTPPORT/want/256 -C - --no-include -o log/fewl.txt -U daniel:stenberg
</command>
<file name="log/fewl.txt">
This text is here to simulate a partly downloaded file to resume

2
tests/data/test38
View file

@ -28,7 +28,7 @@ http
HTTP resume request without server supporting it
</name>
<command option="no-output">
http://%HOSTIP:%HTTPPORT/want/38 -C - -i -o log/fewl.txt
http://%HOSTIP:%HTTPPORT/want/38 -C - --no-include -o log/fewl.txt
</command>
<file name="log/fewl.txt">
This text is here to simulate a partly downloaded file to resume

10
tests/runtests.pl
View file

@ -583,7 +583,7 @@ sub stopserver {
sub verifyhttp {
my ($proto, $ip, $port) = @_;
my $cmd = "$CURL -m$server_response_maxtime -o log/verifiedserver -ksvg \"$proto://$ip:$port/verifiedserver\" 2>log/verifyhttp";
my $cmd = "$CURL --max-time $server_response_maxtime --output log/verifiedserver --insecure --silent --verbose --globoff \"$proto://$ip:$port/verifiedserver\" 2>log/verifyhttp";
my $pid;
# verify if our/any server is running on this port
@ -636,9 +636,9 @@ sub verifyftp {
my $time=time();
my $extra;
if($proto eq "ftps") {
$extra = "-k --ftp-ssl-control ";
$extra = "--insecure --ftp-ssl-control ";
}
my $cmd="$CURL -m$server_response_maxtime --silent -vg $extra\"$proto://$ip:$port/verifiedserver\" 2>log/verifyftp";
my $cmd="$CURL --max-time $server_response_maxtime --silent --verbose --globoff $extra\"$proto://$ip:$port/verifiedserver\" 2>log/verifyftp";
# check if this is our server running on this port:
my @data=runclientoutput($cmd);
logmsg "RUN: $cmd\n" if($verbose);
@ -2008,8 +2008,8 @@ sub singletest {
my $cmdargs;
if(!$tool) {
# run curl, add -v for debug information output
$cmdargs ="$out --include -v --trace-time $cmd";
# run curl, add --verbose for debug information output
$cmdargs ="$out --include --verbose --trace-time $cmd";
}
else {
$cmdargs = " $cmd"; # $cmd is the command line for the test file