CHANGES    |   13 +++++++++++++
 src/main.c |   10 +++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/CHANGES b/CHANGES
index e28f187..9119423 100644
--- a/CHANGES
+++ b/CHANGES
@@ -26,6 +26,19 @@ Kamil Dudka (12 Aug 2010)
   
   original bug report at https://bugzilla.redhat.com/617757
 
+Daniel Stenberg (21 Jul 2010)
+- [Jeff Pohlmeyer brought this change]
+
+  remote-header-name: chop filename at next semicolon
+  
+  The --remote-header-name option for the command-line tool assumes that
+  everything beyond the filename= field is part of the filename, but that
+  might not always be the case, for example:
+  
+  Content-Disposition: attachment; filename=file.txt; modification-date=...
+  
+  This fix chops the filename off at the next semicolon, if there is one.
+
 Kamil Dudka (30 Jun 2010)
 - http_ntlm: add support for NSS
   
diff --git a/src/main.c b/src/main.c
index 7106bac..73be757 100644
--- a/src/main.c
+++ b/src/main.c
@@ -4234,6 +4234,7 @@ header_callback(void *ptr, size_t size, size_t nmemb, void *stream)
   const char* str = (char*)ptr;
   const size_t cb = size*nmemb;
   const char* end = (char*)ptr + cb;
+  size_t len;
 
   if (cb > 20 && curlx_strnequal(str, "Content-disposition:", 20)) {
     char *p = (char*)str + 20;
@@ -4242,6 +4243,7 @@ header_callback(void *ptr, size_t size, size_t nmemb, void *stream)
        (encoded filenames (*=) are not supported) */
     for(;;) {
       char *filename;
+      char *semi;
 
       while (*p && (p < end) && !ISALPHA(*p))
         p++;
@@ -4255,7 +4257,13 @@ header_callback(void *ptr, size_t size, size_t nmemb, void *stream)
         continue;
       }
       p+=9;
-      filename = parse_filename(p, cb - (p - str));
+      semi = strchr(p, ';');
+
+      /* this expression below typecasts 'cb' only to avoid
+         warning: signed and unsigned type in conditional expression
+      */
+      len = semi ? (semi - p) : (ssize_t)cb - (p - str);
+      filename = parse_filename(p, len);
       if (filename) {
         outs->filename = filename;
         break;