From 9d152a77fd4b2c64db4631119103bbc13385945f Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 27 Oct 2005 12:05:36 +0000 Subject: Jaz Fresh pointed out that if you used "-r [number]" as was wrongly described in the man page, curl would send an invalid HTTP Range: header. The correct way would be to use "-r [number]-" or even "-r -[number]". Starting now, curl will warn if this is discovered, and automatically append a dash to the range before passing it to libcurl. --- src/main.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main.c b/src/main.c index 818b5baab..cd42b0d06 100644 --- a/src/main.c +++ b/src/main.c @@ -2097,8 +2097,24 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */ return err; break; case 'r': - /* byte range requested */ - GetStr(&config->range, nextarg); + /* Specifying a range WITHOUT A DASH will create an illegal HTTP range + (and won't actually be range by definition). The man page previously + claimed that to be a good way, why this code is added to work-around + it. */ + if(!strchr(nextarg, '-')) { + char buffer[32]; + curl_off_t off; + warnf(config, + "A specfied range MUST include at least one dash (-). " + "Appending one for you!\n"); + off = curlx_strtoofft(nextarg, NULL, 10); + snprintf(buffer, sizeof(buffer), CURL_FORMAT_OFF_T "-", off); + GetStr(&config->range, buffer); + } + else + /* byte range requested */ + GetStr(&config->range, nextarg); + break; case 'R': /* use remote file's time */ -- cgit v1.2.3