diff --git a/src/main.c b/src/main.c
index d5a99f733..2655f6507 100644
--- a/src/main.c
+++ b/src/main.c
@@ -481,6 +481,7 @@ typedef enum {
struct OutStruct {
char *filename;
+ bool alloc_filename;
FILE *stream;
struct Configurable *config;
curl_off_t bytes; /* amount written so far */
@@ -4457,6 +4458,9 @@ static char *get_url_file_name(const char *url)
return fn;
}
+/*
+ * Copies a file name part and returns an ALLOCATED data buffer.
+ */
static char*
parse_filename(char *ptr, size_t len)
{
@@ -4525,6 +4529,26 @@ parse_filename(char *ptr, size_t len)
if(copy!=p)
memmove(copy, p, strlen(p)+1);
+ /* in case we built curl debug enabled, we allow an evironment variable
+ * named CURL_TESTDIR to prefix the given file name to put it into a
+ * specific directory
+ */
+#ifdef CURLDEBUG
+ {
+ char *tdir = curlx_getenv("CURL_TESTDIR");
+ if(tdir) {
+ char buffer[512]; /* suitably large */
+ snprintf(buffer, sizeof(buffer), "%s/%s", tdir, copy);
+ free(copy);
+ copy = strdup(buffer); /* clone the buffer, we don't use the libcurl
+ aprintf() or similar since we want to use the
+ same memory code as the "real" parse_filename
+ function */
+ curl_free(tdir);
+ }
+ }
+#endif
+
return copy;
}
@@ -4544,7 +4568,8 @@ header_callback(void *ptr, size_t size, size_t nmemb, void *stream)
(encoded filenames (*=) are not supported) */
for(;;) {
char *filename;
- char *semi;
+ char *eol; /* end of line, we can't easily search for the end of the
+ file name due to it sometimes being quoted or not */
while(*p && (p < end) && !ISALPHA(*p))
p++;
@@ -4558,15 +4583,16 @@ header_callback(void *ptr, size_t size, size_t nmemb, void *stream)
continue;
}
p+=9;
- semi = strchr(p, ';');
+ eol = strchr(p, '\n');
/* 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);
+ len = eol ? (eol - p) : (ssize_t)cb - (p - str);
filename = parse_filename(p, len);
if(filename) {
outs->filename = filename;
+ outs->alloc_filename = TRUE;
break;
}
}
@@ -4838,6 +4864,7 @@ operate(struct Configurable *config, int argc, argv_item_t argv[])
/* open file for output: */
if(strcmp(config->headerfile,"-")) {
heads.filename = config->headerfile;
+ heads.alloc_filename = FALSE;
}
else
heads.stream=stdout;
@@ -5008,6 +5035,7 @@ operate(struct Configurable *config, int argc, argv_item_t argv[])
}
outs.filename = outfile;
+ outs.alloc_filename = FALSE;
if(config->resume_from) {
outs.init = config->resume_from;
@@ -5752,6 +5780,8 @@ operate(struct Configurable *config, int argc, argv_item_t argv[])
warnf(config, "Error setting extended attributes: %s\n",
strerror(errno) );
}
+ if(outs.alloc_filename)
+ free(outs.filename);
rc = fclose(outs.stream);
if(!res && rc) {
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index b6e0ab8b5..76954a3ec 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -73,7 +73,7 @@ test1110 test1111 test1112 test1113 test1114 test1115 test1116 test1117 \
test1118 test1119 test1120 test1121 test1122 test1123 test1124 test1125 \
test1126 test1127 test1128 test1129 test1130 test1131 test1200 test1201 \
test1202 test1203 test1300 test1301 test1302 test1303 test1304 test1305 \
-test1306 test1307 test1308 test1309 test1310 \
+test1306 test1307 test1308 test1309 test1310 test1311 test1312 \
test2000 test2001 test2002 test2003 test2004
EXTRA_DIST = $(TESTCASES) DISABLED
diff --git a/tests/data/test1311 b/tests/data/test1311
new file mode 100644
index 000000000..e47647c38
--- /dev/null
+++ b/tests/data/test1311
@@ -0,0 +1,64 @@
+
+
+
+HTTP
+HTTP GET
+-J
+
+
+
+#
+
+
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1311; charset=funny; option=strange
+
+12345
+
+
+
+#
+# Client-side
+
+# this relies on the debug feature to allow us to set directory to store the
+# -J output in
+
+debug
+
+
+http
+
+
+HTTP GET with -J and Content-Disposition
+
+
+CURL_TESTDIR=%PWD/log
+
+
+http://%HOSTIP:%HTTPPORT/1311 -J -O
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+^User-Agent:.*
+
+
+GET /1311 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+
+
+12345
+
+
+
+
diff --git a/tests/data/test1312 b/tests/data/test1312
new file mode 100644
index 000000000..92144015a
--- /dev/null
+++ b/tests/data/test1312
@@ -0,0 +1,64 @@
+
+
+
+HTTP
+HTTP GET
+-J
+
+
+
+#
+
+
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: inline; filename="name1312;weird"
+
+12345
+
+
+
+#
+# Client-side
+
+# this relies on the debug feature to allow us to set directory to store the
+# -J output in
+
+debug
+
+
+http
+
+
+HTTP GET with -J, Content-Disposition and ; in filename
+
+
+CURL_TESTDIR=%PWD/log
+
+
+http://%HOSTIP:%HTTPPORT/1312 -J -O
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+^User-Agent:.*
+
+
+GET /1312 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+
+
+12345
+
+
+
+