diff options
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | RELEASE-NOTES | 1 | ||||
| -rw-r--r-- | lib/md5.c | 16 | ||||
| -rw-r--r-- | src/main.c | 23 |
4 files changed, 34 insertions, 10 deletions
@@ -6,6 +6,10 @@ Changelog +Daniel Stenberg (19 Apr 2010) +- -J/--remote-header-name didn't strip trailing carriage returns or linefeeds + properly, so they could be used in the file name. + Daniel Stenberg (16 Apr 2010) - Jerome Vouillon made the GnuTLS SSL handshake phase non-blocking. diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 3117bf8b7..e496826f2 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -17,6 +17,7 @@ This release includes the following bugfixes: o detect GSS on ancient Linux distros o GnuTLS: EOF caused error when it wasn't o GnuTLS: SSL handshake phase is non-blocking + o -J/--remote-header-name strips CRLF This release includes the following known bugs: @@ -371,13 +371,15 @@ static void Decode (UINT4 *output, #endif /* USE_GNUTLS */ -const HMAC_params Curl_HMAC_MD5[1] = { - (HMAC_hinit_func) MD5_Init, /* Hash initialization function. */ - (HMAC_hupdate_func) MD5_Update, /* Hash update function. */ - (HMAC_hfinal_func) MD5_Final, /* Hash computation end function. */ - sizeof(MD5_CTX), /* Size of hash context structure. */ - 64, /* Maximum key length. */ - 16 /* Result size. */ +const HMAC_params Curl_HMAC_MD5[] = { + { + (HMAC_hinit_func) MD5_Init, /* Hash initialization function. */ + (HMAC_hupdate_func) MD5_Update, /* Hash update function. */ + (HMAC_hfinal_func) MD5_Final, /* Hash computation end function. */ + sizeof(MD5_CTX), /* Size of hash context structure. */ + 64, /* Maximum key length. */ + 16 /* Result size. */ + } }; diff --git a/src/main.c b/src/main.c index 0670b5f5c..b7e438b1e 100644 --- a/src/main.c +++ b/src/main.c @@ -4200,9 +4200,26 @@ parse_filename(char *ptr, size_t len) } } - q = strrchr(p, quote); - if (q) - *q = 0; + if(quote) { + /* if the file name started with a quote, then scan for the end quote and + stop there */ + q = strrchr(p, quote); + if (q) + *q = 0; + } + else + q = NULL; /* no start quote, so no end has been found */ + + if(!q) { + /* make sure the file name doesn't end in \r or \n */ + q = strchr(p, '\r'); + if(q) + *q = 0; + + q = strchr(p, '\n'); + if(q) + *q = 0; + } if (copy!=p) memmove(copy, p, strlen(p)+1); |