From 0a568867c0ee0eec283ce282f707e7a1338dcc44 Mon Sep 17 00:00:00 2001
From: Marc Hoersken <info@marc-hoersken.de>
Date: Sat, 1 Feb 2014 14:03:55 +0100
Subject: [PATCH] HTTP tests: use CRLF as header seperator according to RFC
 2616

Updates the test suite to handle binary-mode header output.
---
 tests/data/test1334 | 34 ++++++++++++++--------------
 tests/data/test1336 | 38 +++++++++++++++----------------
 tests/data/test1338 | 34 ++++++++++++++--------------
 tests/data/test1340 | 38 +++++++++++++++----------------
 tests/data/test1342 | 48 ++++++++++++++++++++--------------------
 tests/data/test1344 | 54 ++++++++++++++++++++++-----------------------
 tests/data/test1364 | 34 ++++++++++++++--------------
 tests/data/test1366 | 38 +++++++++++++++----------------
 tests/data/test1368 | 34 ++++++++++++++--------------
 tests/data/test1370 | 38 +++++++++++++++----------------
 tests/data/test1372 | 48 ++++++++++++++++++++--------------------
 tests/data/test1374 | 54 ++++++++++++++++++++++-----------------------
 tests/data/test1387 | 36 +++++++++++++++---------------
 tests/data/test1389 | 36 +++++++++++++++---------------
 tests/data/test1391 | 36 +++++++++++++++---------------
 15 files changed, 300 insertions(+), 300 deletions(-)

diff --git a/tests/data/test1334 b/tests/data/test1334
index 93c939fd5..59116e388 100644
--- a/tests/data/test1334
+++ b/tests/data/test1334
@@ -9,13 +9,13 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-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
-
+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
+
 12345
 </data>
 </reply>
@@ -55,21 +55,21 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/1334" mode="text">
+<file1 name="log/1334">
 12345
 </file1>
 
-<file2 name="log/heads1334" mode="text">
-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
-
+<file2 name="log/heads1334">
+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
+
 </file2>
 
-<file3 name="log/stdout1334" mode="text">
+<file3 name="log/stdout1334">
 </file3>
 
 </verify>
diff --git a/tests/data/test1336 b/tests/data/test1336
index 9e8aca368..ebe562b6a 100644
--- a/tests/data/test1336
+++ b/tests/data/test1336
@@ -9,14 +9,14 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-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=name1336; charset=funny; option=strange
-
+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=name1336; charset=funny; option=strange
+
 12345
 </data>
 </reply>
@@ -59,22 +59,22 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/1336" mode="text">
+<file1 name="log/1336">
 12345
 </file1>
 
-<file2 name="log/heads1336" mode="text">
-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=name1336; charset=funny; option=strange
-
+<file2 name="log/heads1336">
+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=name1336; charset=funny; option=strange
+
 </file2>
 
-<file3 name="log/stdout1336" mode="text">
+<file3 name="log/stdout1336">
 </file3>
 
 </verify>
diff --git a/tests/data/test1338 b/tests/data/test1338
index 8a1b3955a..d96f80467 100644
--- a/tests/data/test1338
+++ b/tests/data/test1338
@@ -10,13 +10,13 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-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
-
+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
+
 12345
 </data>
 </reply>
@@ -56,21 +56,21 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/1338" mode="text">
+<file1 name="log/1338">
 12345
 </file1>
 
-<file2 name="log/heads1338" mode="text">
-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
-
+<file2 name="log/heads1338">
+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
+
 </file2>
 
-<file3 name="log/stdout1338" mode="text">
+<file3 name="log/stdout1338">
 </file3>
 
 </verify>
diff --git a/tests/data/test1340 b/tests/data/test1340
index ad26bba5b..a1ca73f79 100644
--- a/tests/data/test1340
+++ b/tests/data/test1340
@@ -10,14 +10,14 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-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=name1340; charset=funny; option=strange
-
+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=name1340; charset=funny; option=strange
+
 12345
 </data>
 </reply>
@@ -57,22 +57,22 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/name1340" mode="text">
+<file1 name="log/name1340">
 12345
 </file1>
 
-<file2 name="log/heads1340" mode="text">
-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=name1340; charset=funny; option=strange
-
+<file2 name="log/heads1340">
+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=name1340; charset=funny; option=strange
+
 </file2>
 
-<file3 name="log/stdout1340" mode="text">
+<file3 name="log/stdout1340">
 curl: Saved to filename '%PWD/log/name1340'
 </file3>
 
diff --git a/tests/data/test1342 b/tests/data/test1342
index 7820663bf..1d7889d1e 100644
--- a/tests/data/test1342
+++ b/tests/data/test1342
@@ -9,13 +9,13 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-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
-
+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
+
 12345
 </data>
 </reply>
@@ -55,28 +55,28 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/1342" mode="text">
-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
-
+<file1 name="log/1342">
+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
+
 12345
 </file1>
 
-<file2 name="log/heads1342" mode="text">
-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
-
+<file2 name="log/heads1342">
+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
+
 </file2>
 
-<file3 name="log/stdout1342" mode="text">
+<file3 name="log/stdout1342">
 </file3>
 
 </verify>
diff --git a/tests/data/test1344 b/tests/data/test1344
index 145305d30..ac354f0dd 100644
--- a/tests/data/test1344
+++ b/tests/data/test1344
@@ -9,14 +9,14 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-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=name1344; charset=funny; option=strange
-
+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=name1344; charset=funny; option=strange
+
 12345
 </data>
 </reply>
@@ -59,30 +59,30 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/1344" mode="text">
-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=name1344; charset=funny; option=strange
-
+<file1 name="log/1344">
+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=name1344; charset=funny; option=strange
+
 12345
 </file1>
 
-<file2 name="log/heads1344" mode="text">
-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=name1344; charset=funny; option=strange
-
+<file2 name="log/heads1344">
+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=name1344; charset=funny; option=strange
+
 </file2>
 
-<file3 name="log/stdout1344" mode="text">
+<file3 name="log/stdout1344">
 </file3>
 
 </verify>
diff --git a/tests/data/test1364 b/tests/data/test1364
index f4f48ff67..e8c981d77 100644
--- a/tests/data/test1364
+++ b/tests/data/test1364
@@ -9,13 +9,13 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-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
-
+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
+
 12345
 </data>
 </reply>
@@ -50,21 +50,21 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1364" mode="text">
+<file1 name="log/outfile1364">
 12345
 </file1>
 
-<file2 name="log/heads1364" mode="text">
-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
-
+<file2 name="log/heads1364">
+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
+
 </file2>
 
-<file3 name="log/stdout1364" mode="text">
+<file3 name="log/stdout1364">
 </file3>
 
 </verify>
diff --git a/tests/data/test1366 b/tests/data/test1366
index 2a7d0598a..62e3b0c42 100644
--- a/tests/data/test1366
+++ b/tests/data/test1366
@@ -9,14 +9,14 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-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=name1366; charset=funny; option=strange
-
+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=name1366; charset=funny; option=strange
+
 12345
 </data>
 </reply>
@@ -51,22 +51,22 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1366" mode="text">
+<file1 name="log/outfile1366">
 12345
 </file1>
 
-<file2 name="log/heads1366" mode="text">
-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=name1366; charset=funny; option=strange
-
+<file2 name="log/heads1366">
+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=name1366; charset=funny; option=strange
+
 </file2>
 
-<file3 name="log/stdout1366" mode="text">
+<file3 name="log/stdout1366">
 </file3>
 
 </verify>
diff --git a/tests/data/test1368 b/tests/data/test1368
index 9dc9a5e16..6a926ab68 100644
--- a/tests/data/test1368
+++ b/tests/data/test1368
@@ -10,13 +10,13 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-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
-
+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
+
 12345
 </data>
 </reply>
@@ -51,21 +51,21 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1368" mode="text">
+<file1 name="log/outfile1368">
 12345
 </file1>
 
-<file2 name="log/heads1368" mode="text">
-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
-
+<file2 name="log/heads1368">
+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
+
 </file2>
 
-<file3 name="log/stdout1368" mode="text">
+<file3 name="log/stdout1368">
 </file3>
 
 </verify>
diff --git a/tests/data/test1370 b/tests/data/test1370
index 26b4b151b..d0abbdd68 100644
--- a/tests/data/test1370
+++ b/tests/data/test1370
@@ -10,14 +10,14 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-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=name1370; charset=funny; option=strange
-
+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=name1370; charset=funny; option=strange
+
 12345
 </data>
 </reply>
@@ -52,22 +52,22 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1370" mode="text">
+<file1 name="log/outfile1370">
 12345
 </file1>
 
-<file2 name="log/heads1370" mode="text">
-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=name1370; charset=funny; option=strange
-
+<file2 name="log/heads1370">
+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=name1370; charset=funny; option=strange
+
 </file2>
 
-<file3 name="log/stdout1370" mode="text">
+<file3 name="log/stdout1370">
 </file3>
 
 </verify>
diff --git a/tests/data/test1372 b/tests/data/test1372
index 9c617f8a5..a2b8ec961 100644
--- a/tests/data/test1372
+++ b/tests/data/test1372
@@ -9,13 +9,13 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-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
-
+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
+
 12345
 </data>
 </reply>
@@ -50,28 +50,28 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1372" mode="text">
-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
-
+<file1 name="log/outfile1372">
+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
+
 12345
 </file1>
 
-<file2 name="log/heads1372" mode="text">
-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
-
+<file2 name="log/heads1372">
+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
+
 </file2>
 
-<file3 name="log/stdout1372" mode="text">
+<file3 name="log/stdout1372">
 </file3>
 
 </verify>
diff --git a/tests/data/test1374 b/tests/data/test1374
index aef2b7d08..f8d9d0dd0 100644
--- a/tests/data/test1374
+++ b/tests/data/test1374
@@ -9,14 +9,14 @@ HTTP GET
 #
 <reply>
 <data nocheck="yes">
-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=name1374; charset=funny; option=strange
-
+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=name1374; charset=funny; option=strange
+
 12345
 </data>
 </reply>
@@ -51,30 +51,30 @@ Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1374" mode="text">
-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=name1374; charset=funny; option=strange
-
+<file1 name="log/outfile1374">
+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=name1374; charset=funny; option=strange
+
 12345
 </file1>
 
-<file2 name="log/heads1374" mode="text">
-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=name1374; charset=funny; option=strange
-
+<file2 name="log/heads1374">
+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=name1374; charset=funny; option=strange
+
 </file2>
 
-<file3 name="log/stdout1374" mode="text">
+<file3 name="log/stdout1374">
 </file3>
 
 </verify>
diff --git a/tests/data/test1387 b/tests/data/test1387
index 85ea948d3..2b6c3fcb9 100644
--- a/tests/data/test1387
+++ b/tests/data/test1387
@@ -10,14 +10,14 @@ RETR
 <reply>
 # file1387 contents...
 <data nocheck="yes">
-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=name1387; charset=funny; option=strange
-
+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=name1387; charset=funny; option=strange
+
 MOOOO
 </data>
 </reply>
@@ -53,14 +53,14 @@ QUIT
 </protocol>
 
 <file1 name="log/download1387">
-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=name1387; charset=funny; option=strange
-
+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=name1387; charset=funny; option=strange
+
 MOOOO
 </file1>
 
@@ -76,8 +76,8 @@ MOOOO
 250 CWD command successful.
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
-213 214
-150 Binary data connection for 1387 () (214 bytes).
+213 222
+150 Binary data connection for 1387 () (222 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
diff --git a/tests/data/test1389 b/tests/data/test1389
index 2357e314c..4aaacd82b 100644
--- a/tests/data/test1389
+++ b/tests/data/test1389
@@ -11,14 +11,14 @@ RETR
 <reply>
 # file1389 contents...
 <data nocheck="yes">
-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=name1389; charset=funny; option=strange
-
+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=name1389; charset=funny; option=strange
+
 MOOOO
 </data>
 </reply>
@@ -54,14 +54,14 @@ QUIT
 </protocol>
 
 <file1 name="log/download1389">
-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=name1389; charset=funny; option=strange
-
+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=name1389; charset=funny; option=strange
+
 MOOOO
 </file1>
 
@@ -77,8 +77,8 @@ MOOOO
 250 CWD command successful.
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
-213 214
-150 Binary data connection for 1389 () (214 bytes).
+213 222
+150 Binary data connection for 1389 () (222 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
diff --git a/tests/data/test1391 b/tests/data/test1391
index 911bb5f51..09c670a94 100644
--- a/tests/data/test1391
+++ b/tests/data/test1391
@@ -10,14 +10,14 @@ RETR
 <reply>
 # file1391 contents...
 <data nocheck="yes">
-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=name1391; charset=funny; option=strange
-
+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=name1391; charset=funny; option=strange
+
 MOOOO
 </data>
 </reply>
@@ -53,14 +53,14 @@ QUIT
 </protocol>
 
 <file1 name="log/download1391">
-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=name1391; charset=funny; option=strange
-
+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=name1391; charset=funny; option=strange
+
 MOOOO
 </file1>
 
@@ -76,8 +76,8 @@ MOOOO
 250 CWD command successful.
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
-213 214
-150 Binary data connection for 1391 () (214 bytes).
+213 222
+150 Binary data connection for 1391 () (222 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>