From 58c3bdc1a4617aa16fc0f5e2be0655b3ff1e8809 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 23 May 2001 15:00:48 +0000
Subject: [PATCH] new test case file format

---
 tests/data/command1.txt              |  1 -
 tests/data/command10.txt             |  3 --
 tests/data/command100.txt            |  1 -
 tests/data/command101.txt            |  3 --
 tests/data/command102.txt            |  1 -
 tests/data/command103.txt            |  4 ---
 tests/data/command104.txt            |  1 -
 tests/data/command105.txt            |  2 --
 tests/data/command106.txt            |  2 --
 tests/data/command107.txt            |  1 -
 tests/data/command108.txt            |  1 -
 tests/data/command109.txt            |  1 -
 tests/data/command11.txt             |  3 --
 tests/data/command110.txt            |  1 -
 tests/data/command111.txt            |  1 -
 tests/data/command112.txt            |  1 -
 tests/data/command113.txt            |  2 --
 tests/data/command114.txt            |  2 --
 tests/data/command115.txt            |  2 --
 tests/data/command116.txt            |  2 --
 tests/data/command117.txt            |  3 --
 tests/data/command118.txt            |  3 --
 tests/data/command119.txt            |  3 --
 tests/data/command12.txt             |  3 --
 tests/data/command120.txt            |  3 --
 tests/data/command121.txt            |  1 -
 tests/data/command122.txt            |  1 -
 tests/data/command123.txt            |  1 -
 tests/data/command13.txt             |  3 --
 tests/data/command14.txt             |  3 --
 tests/data/command15.txt             |  4 ---
 tests/data/command16.txt             |  1 -
 tests/data/command17.txt             |  1 -
 tests/data/command18.txt             |  1 -
 tests/data/command19.txt             |  1 -
 tests/data/command2.txt              |  1 -
 tests/data/command20.txt             |  1 -
 tests/data/command200.txt            |  2 --
 tests/data/command201.txt            |  2 --
 tests/data/command21.txt             |  1 -
 tests/data/command22.txt             |  2 --
 tests/data/command23.txt             |  1 -
 tests/data/command24.txt             |  2 --
 tests/data/command25.txt             |  4 ---
 tests/data/command26.txt             |  4 ---
 tests/data/command27.txt             |  1 -
 tests/data/command28.txt             |  1 -
 tests/data/command29.txt             |  1 -
 tests/data/command3.txt              |  1 -
 tests/data/command30.txt             |  1 -
 tests/data/command300.txt            |  1 -
 tests/data/command31.txt             |  2 --
 tests/data/command32.txt             |  2 --
 tests/data/command33.txt             |  3 --
 tests/data/command34.txt             |  1 -
 tests/data/command35.txt             |  1 -
 tests/data/command36.txt             |  1 -
 tests/data/command37.txt             |  1 -
 tests/data/command38.txt             |  1 -
 tests/data/command39.txt             |  3 --
 tests/data/command4.txt              |  1 -
 tests/data/command40.txt             |  3 --
 tests/data/command400.txt            |  1 -
 tests/data/command41.txt             |  2 --
 tests/data/command5.txt              |  1 -
 tests/data/command6.txt              |  2 --
 tests/data/command7.txt              |  1 -
 tests/data/command8.txt              |  1 -
 tests/data/command9.txt              |  2 --
 tests/data/error111.txt              |  1 -
 tests/data/error113.txt              |  1 -
 tests/data/error114.txt              |  1 -
 tests/data/error115.txt              |  1 -
 tests/data/error116.txt              |  1 -
 tests/data/error117.txt              |  1 -
 tests/data/error118.txt              |  1 -
 tests/data/error119.txt              |  1 -
 tests/data/error19.txt               |  1 -
 tests/data/error20.txt               |  1 -
 tests/data/error201.txt              |  1 -
 tests/data/error21.txt               |  1 -
 tests/data/error23.txt               |  1 -
 tests/data/error24.txt               |  1 -
 tests/data/error25.txt               |  1 -
 tests/data/error30.txt               |  1 -
 tests/data/error36.txt               |  1 -
 tests/data/extra33.txt               | 15 ----------
 tests/data/ftpd113.txt               |  1 -
 tests/data/ftpd114.txt               |  1 -
 tests/data/ftpd115.txt               |  1 -
 tests/data/ftpd116.txt               |  1 -
 tests/data/ftpd117.txt               |  1 -
 tests/data/ftpd118.txt               |  1 -
 tests/data/name1.txt                 |  1 -
 tests/data/name10.txt                |  1 -
 tests/data/name100.txt               |  1 -
 tests/data/name101.txt               |  1 -
 tests/data/name102.txt               |  1 -
 tests/data/name103.txt               |  1 -
 tests/data/name104.txt               |  1 -
 tests/data/name105.txt               |  1 -
 tests/data/name106.txt               |  1 -
 tests/data/name107.txt               |  1 -
 tests/data/name108.txt               |  1 -
 tests/data/name109.txt               |  1 -
 tests/data/name11.txt                |  1 -
 tests/data/name110.txt               |  1 -
 tests/data/name111.txt               |  1 -
 tests/data/name112.txt               |  1 -
 tests/data/name113.txt               |  1 -
 tests/data/name114.txt               |  1 -
 tests/data/name115.txt               |  1 -
 tests/data/name116.txt               |  1 -
 tests/data/name117.txt               |  1 -
 tests/data/name118.txt               |  1 -
 tests/data/name119.txt               |  1 -
 tests/data/name12.txt                |  1 -
 tests/data/name120.txt               |  1 -
 tests/data/name121.txt               |  1 -
 tests/data/name122.txt               |  1 -
 tests/data/name123.txt               |  1 -
 tests/data/name13.txt                |  1 -
 tests/data/name14.txt                |  1 -
 tests/data/name15.txt                |  1 -
 tests/data/name16.txt                |  1 -
 tests/data/name17.txt                |  1 -
 tests/data/name18.txt                |  1 -
 tests/data/name19.txt                |  1 -
 tests/data/name2.txt                 |  1 -
 tests/data/name20.txt                |  1 -
 tests/data/name200.txt               |  1 -
 tests/data/name201.txt               |  1 -
 tests/data/name21.txt                |  1 -
 tests/data/name22.txt                |  1 -
 tests/data/name23.txt                |  1 -
 tests/data/name24.txt                |  1 -
 tests/data/name25.txt                |  1 -
 tests/data/name26.txt                |  1 -
 tests/data/name27.txt                |  1 -
 tests/data/name28.txt                |  1 -
 tests/data/name29.txt                |  1 -
 tests/data/name3.txt                 |  1 -
 tests/data/name30.txt                |  1 -
 tests/data/name300.txt               |  1 -
 tests/data/name31.txt                |  1 -
 tests/data/name32.txt                |  1 -
 tests/data/name33.txt                |  1 -
 tests/data/name34.txt                |  1 -
 tests/data/name35.txt                |  1 -
 tests/data/name36.txt                |  1 -
 tests/data/name37.txt                |  1 -
 tests/data/name38.txt                |  1 -
 tests/data/name39.txt                |  1 -
 tests/data/name4.txt                 |  1 -
 tests/data/name40.txt                |  1 -
 tests/data/name400.txt               |  1 -
 tests/data/name41.txt                |  1 -
 tests/data/name5.txt                 |  1 -
 tests/data/name6.txt                 |  1 -
 tests/data/name7.txt                 |  1 -
 tests/data/name8.txt                 |  1 -
 tests/data/name9.txt                 |  1 -
 tests/data/prot1.txt                 |  6 ----
 tests/data/prot10.txt                |  9 ------
 tests/data/prot100.txt               |  6 ----
 tests/data/prot101.txt               |  6 ----
 tests/data/prot102.txt               |  6 ----
 tests/data/prot103.txt               |  7 -----
 tests/data/prot104.txt               |  7 -----
 tests/data/prot105.txt               |  6 ----
 tests/data/prot106.txt               |  7 -----
 tests/data/prot107.txt               |  6 ----
 tests/data/prot108.txt               |  7 -----
 tests/data/prot109.txt               |  6 ----
 tests/data/prot11.txt                | 10 -------
 tests/data/prot110.txt               |  8 -----
 tests/data/prot112.txt               |  6 ----
 tests/data/prot12.txt                |  6 ----
 tests/data/prot120.txt               |  7 -----
 tests/data/prot121.txt               |  8 -----
 tests/data/prot122.txt               |  6 ----
 tests/data/prot123.txt               |  5 ----
 tests/data/prot13.txt                |  5 ----
 tests/data/prot14.txt                |  6 ----
 tests/data/prot15.txt                |  5 ----
 tests/data/prot16.txt                |  6 ----
 tests/data/prot17.txt                |  6 ----
 tests/data/prot18.txt                | 15 ----------
 tests/data/prot2.txt                 |  6 ----
 tests/data/prot22.txt                |  6 ----
 tests/data/prot26.txt                |  6 ----
 tests/data/prot27.txt                | 15 ----------
 tests/data/prot28.txt                |  5 ----
 tests/data/prot29.txt                |  7 -----
 tests/data/prot3.txt                 |  9 ------
 tests/data/prot30.txt                |  6 ----
 tests/data/prot300.txt               |  6 ----
 tests/data/prot31.txt                | 16 ----------
 tests/data/prot32.txt                | 13 --------
 tests/data/prot33.txt                | 18 ------------
 tests/data/prot34.txt                |  6 ----
 tests/data/prot35.txt                |  6 ----
 tests/data/prot37.txt                |  7 -----
 tests/data/prot38.txt                | 11 -------
 tests/data/prot39.txt                | 14 ---------
 tests/data/prot4.txt                 |  6 ----
 tests/data/prot40.txt                |  6 ----
 tests/data/prot400.txt               |  6 ----
 tests/data/prot41.txt                |  8 -----
 tests/data/prot5.txt                 |  5 ----
 tests/data/prot6.txt                 |  6 ----
 tests/data/prot7.txt                 |  5 ----
 tests/data/prot8.txt                 |  6 ----
 tests/data/prot9.txt                 | 23 ---------------
 tests/data/reply1.txt                | 12 --------
 tests/data/reply10.txt               |  5 ----
 tests/data/reply101.txt              | 11 -------
 tests/data/reply102.txt              |  6 ----
 tests/data/reply103.txt              |  6 ----
 tests/data/reply104.txt              |  1 -
 tests/data/reply105.txt              |  6 ----
 tests/data/reply106.txt              |  6 ----
 tests/data/reply11.txt               |  7 -----
 tests/data/reply110.txt              |  2 --
 tests/data/reply110001.txt           | 11 -------
 tests/data/reply110002.txt           |  5 ----
 tests/data/reply12.txt               | 15 ----------
 tests/data/reply120.txt              |  6 ----
 tests/data/reply121.txt              |  6 ----
 tests/data/reply122.txt              |  1 -
 tests/data/reply1220001.txt          |  0
 tests/data/reply123.txt              |  0
 tests/data/reply13.txt               |  5 ----
 tests/data/reply14.txt               |  4 ---
 tests/data/reply15.txt               |  6 ----
 tests/data/reply16.txt               |  7 -----
 tests/data/reply17.txt               |  4 ---
 tests/data/reply2.txt                |  7 -----
 tests/data/reply200.txt              |  5 ----
 tests/data/reply22.txt               |  4 ---
 tests/data/reply24.txt               |  5 ----
 tests/data/reply25.txt               |  7 -----
 tests/data/reply26.txt               |  6 ----
 tests/data/reply28.txt               |  5 ----
 tests/data/reply29.txt               |  9 ------
 tests/data/reply3.txt                |  8 -----
 tests/data/reply30.txt               |  7 -----
 tests/data/reply31.txt               |  7 -----
 tests/data/reply310001.txt           | 10 -------
 tests/data/reply310002.txt           |  5 ----
 tests/data/reply32.txt               |  8 -----
 tests/data/reply320001.txt           | 10 -------
 tests/data/reply320002.txt           |  5 ----
 tests/data/reply33.txt               |  7 -----
 tests/data/reply34.txt               | 13 --------
 tests/data/reply340001.txt           |  6 ----
 tests/data/reply35.txt               |  4 ---
 tests/data/reply36.txt               |  8 -----
 tests/data/reply37.txt               |  3 --
 tests/data/reply38.txt               |  4 ---
 tests/data/reply380001.txt           |  6 ----
 tests/data/reply39.txt               |  7 -----
 tests/data/reply390001.txt           | 12 --------
 tests/data/reply390002.txt           |  6 ----
 tests/data/reply4.txt                |  7 -----
 tests/data/reply40.txt               |  8 -----
 tests/data/reply41.txt               |  7 -----
 tests/data/reply5.txt                |  7 -----
 tests/data/reply6.txt                |  7 -----
 tests/data/reply7.txt                |  9 ------
 tests/data/reply8.txt                |  6 ----
 tests/data/reply9.txt                |  5 ----
 tests/data/stdin17.txt               | 11 -------
 tests/data/stdout107.txt             |  0
 tests/data/stdout108.txt             |  0
 tests/data/stdout109.txt             |  0
 tests/data/stdout110.txt             |  2 --
 tests/data/stdout112.txt             |  0
 tests/data/stdout15.txt              |  7 -----
 tests/data/stdout18.txt              | 23 ---------------
 tests/data/stdout27.txt              | 16 ----------
 tests/data/test1                     | 44 ++++++++++++++++++++++++++++
 tests/data/{reply400.txt => test100} | 33 +++++++++++++++++++++
 tests/data/test2                     | 42 ++++++++++++++++++++++++++
 tests/data/test3                     | 42 ++++++++++++++++++++++++++
 tests/data/test300                   | 38 ++++++++++++++++++++++++
 tests/data/test4                     | 39 ++++++++++++++++++++++++
 tests/data/{reply100.txt => test400} | 33 +++++++++++++++++++++
 tests/data/upload107.txt             |  6 ----
 tests/data/upload108.txt             |  6 ----
 tests/data/upload109.txt             |  6 ----
 tests/data/upload112.txt             |  1 -
 292 files changed, 271 insertions(+), 1085 deletions(-)
 delete mode 100644 tests/data/command1.txt
 delete mode 100644 tests/data/command10.txt
 delete mode 100644 tests/data/command100.txt
 delete mode 100644 tests/data/command101.txt
 delete mode 100644 tests/data/command102.txt
 delete mode 100644 tests/data/command103.txt
 delete mode 100644 tests/data/command104.txt
 delete mode 100644 tests/data/command105.txt
 delete mode 100644 tests/data/command106.txt
 delete mode 100644 tests/data/command107.txt
 delete mode 100644 tests/data/command108.txt
 delete mode 100644 tests/data/command109.txt
 delete mode 100644 tests/data/command11.txt
 delete mode 100644 tests/data/command110.txt
 delete mode 100644 tests/data/command111.txt
 delete mode 100644 tests/data/command112.txt
 delete mode 100644 tests/data/command113.txt
 delete mode 100644 tests/data/command114.txt
 delete mode 100644 tests/data/command115.txt
 delete mode 100644 tests/data/command116.txt
 delete mode 100644 tests/data/command117.txt
 delete mode 100644 tests/data/command118.txt
 delete mode 100644 tests/data/command119.txt
 delete mode 100644 tests/data/command12.txt
 delete mode 100644 tests/data/command120.txt
 delete mode 100644 tests/data/command121.txt
 delete mode 100644 tests/data/command122.txt
 delete mode 100644 tests/data/command123.txt
 delete mode 100644 tests/data/command13.txt
 delete mode 100644 tests/data/command14.txt
 delete mode 100644 tests/data/command15.txt
 delete mode 100644 tests/data/command16.txt
 delete mode 100644 tests/data/command17.txt
 delete mode 100644 tests/data/command18.txt
 delete mode 100644 tests/data/command19.txt
 delete mode 100644 tests/data/command2.txt
 delete mode 100644 tests/data/command20.txt
 delete mode 100644 tests/data/command200.txt
 delete mode 100644 tests/data/command201.txt
 delete mode 100644 tests/data/command21.txt
 delete mode 100644 tests/data/command22.txt
 delete mode 100644 tests/data/command23.txt
 delete mode 100644 tests/data/command24.txt
 delete mode 100644 tests/data/command25.txt
 delete mode 100644 tests/data/command26.txt
 delete mode 100644 tests/data/command27.txt
 delete mode 100644 tests/data/command28.txt
 delete mode 100644 tests/data/command29.txt
 delete mode 100644 tests/data/command3.txt
 delete mode 100644 tests/data/command30.txt
 delete mode 100644 tests/data/command300.txt
 delete mode 100644 tests/data/command31.txt
 delete mode 100644 tests/data/command32.txt
 delete mode 100644 tests/data/command33.txt
 delete mode 100644 tests/data/command34.txt
 delete mode 100644 tests/data/command35.txt
 delete mode 100644 tests/data/command36.txt
 delete mode 100644 tests/data/command37.txt
 delete mode 100644 tests/data/command38.txt
 delete mode 100644 tests/data/command39.txt
 delete mode 100644 tests/data/command4.txt
 delete mode 100644 tests/data/command40.txt
 delete mode 100644 tests/data/command400.txt
 delete mode 100644 tests/data/command41.txt
 delete mode 100644 tests/data/command5.txt
 delete mode 100644 tests/data/command6.txt
 delete mode 100644 tests/data/command7.txt
 delete mode 100644 tests/data/command8.txt
 delete mode 100644 tests/data/command9.txt
 delete mode 100644 tests/data/error111.txt
 delete mode 100644 tests/data/error113.txt
 delete mode 100644 tests/data/error114.txt
 delete mode 100644 tests/data/error115.txt
 delete mode 100644 tests/data/error116.txt
 delete mode 100644 tests/data/error117.txt
 delete mode 100644 tests/data/error118.txt
 delete mode 100644 tests/data/error119.txt
 delete mode 100644 tests/data/error19.txt
 delete mode 100644 tests/data/error20.txt
 delete mode 100644 tests/data/error201.txt
 delete mode 100644 tests/data/error21.txt
 delete mode 100644 tests/data/error23.txt
 delete mode 100644 tests/data/error24.txt
 delete mode 100644 tests/data/error25.txt
 delete mode 100644 tests/data/error30.txt
 delete mode 100644 tests/data/error36.txt
 delete mode 100644 tests/data/extra33.txt
 delete mode 100644 tests/data/ftpd113.txt
 delete mode 100644 tests/data/ftpd114.txt
 delete mode 100644 tests/data/ftpd115.txt
 delete mode 100644 tests/data/ftpd116.txt
 delete mode 100644 tests/data/ftpd117.txt
 delete mode 100644 tests/data/ftpd118.txt
 delete mode 100644 tests/data/name1.txt
 delete mode 100644 tests/data/name10.txt
 delete mode 100644 tests/data/name100.txt
 delete mode 100644 tests/data/name101.txt
 delete mode 100644 tests/data/name102.txt
 delete mode 100644 tests/data/name103.txt
 delete mode 100644 tests/data/name104.txt
 delete mode 100644 tests/data/name105.txt
 delete mode 100644 tests/data/name106.txt
 delete mode 100644 tests/data/name107.txt
 delete mode 100644 tests/data/name108.txt
 delete mode 100644 tests/data/name109.txt
 delete mode 100644 tests/data/name11.txt
 delete mode 100644 tests/data/name110.txt
 delete mode 100644 tests/data/name111.txt
 delete mode 100644 tests/data/name112.txt
 delete mode 100644 tests/data/name113.txt
 delete mode 100644 tests/data/name114.txt
 delete mode 100644 tests/data/name115.txt
 delete mode 100644 tests/data/name116.txt
 delete mode 100644 tests/data/name117.txt
 delete mode 100644 tests/data/name118.txt
 delete mode 100644 tests/data/name119.txt
 delete mode 100644 tests/data/name12.txt
 delete mode 100644 tests/data/name120.txt
 delete mode 100644 tests/data/name121.txt
 delete mode 100644 tests/data/name122.txt
 delete mode 100644 tests/data/name123.txt
 delete mode 100644 tests/data/name13.txt
 delete mode 100644 tests/data/name14.txt
 delete mode 100644 tests/data/name15.txt
 delete mode 100644 tests/data/name16.txt
 delete mode 100644 tests/data/name17.txt
 delete mode 100644 tests/data/name18.txt
 delete mode 100644 tests/data/name19.txt
 delete mode 100644 tests/data/name2.txt
 delete mode 100644 tests/data/name20.txt
 delete mode 100644 tests/data/name200.txt
 delete mode 100644 tests/data/name201.txt
 delete mode 100644 tests/data/name21.txt
 delete mode 100644 tests/data/name22.txt
 delete mode 100644 tests/data/name23.txt
 delete mode 100644 tests/data/name24.txt
 delete mode 100644 tests/data/name25.txt
 delete mode 100644 tests/data/name26.txt
 delete mode 100644 tests/data/name27.txt
 delete mode 100644 tests/data/name28.txt
 delete mode 100644 tests/data/name29.txt
 delete mode 100644 tests/data/name3.txt
 delete mode 100644 tests/data/name30.txt
 delete mode 100644 tests/data/name300.txt
 delete mode 100644 tests/data/name31.txt
 delete mode 100644 tests/data/name32.txt
 delete mode 100644 tests/data/name33.txt
 delete mode 100644 tests/data/name34.txt
 delete mode 100644 tests/data/name35.txt
 delete mode 100644 tests/data/name36.txt
 delete mode 100644 tests/data/name37.txt
 delete mode 100644 tests/data/name38.txt
 delete mode 100644 tests/data/name39.txt
 delete mode 100644 tests/data/name4.txt
 delete mode 100644 tests/data/name40.txt
 delete mode 100644 tests/data/name400.txt
 delete mode 100644 tests/data/name41.txt
 delete mode 100644 tests/data/name5.txt
 delete mode 100644 tests/data/name6.txt
 delete mode 100644 tests/data/name7.txt
 delete mode 100644 tests/data/name8.txt
 delete mode 100644 tests/data/name9.txt
 delete mode 100644 tests/data/prot1.txt
 delete mode 100644 tests/data/prot10.txt
 delete mode 100644 tests/data/prot100.txt
 delete mode 100644 tests/data/prot101.txt
 delete mode 100644 tests/data/prot102.txt
 delete mode 100644 tests/data/prot103.txt
 delete mode 100644 tests/data/prot104.txt
 delete mode 100644 tests/data/prot105.txt
 delete mode 100644 tests/data/prot106.txt
 delete mode 100644 tests/data/prot107.txt
 delete mode 100644 tests/data/prot108.txt
 delete mode 100644 tests/data/prot109.txt
 delete mode 100644 tests/data/prot11.txt
 delete mode 100644 tests/data/prot110.txt
 delete mode 100644 tests/data/prot112.txt
 delete mode 100644 tests/data/prot12.txt
 delete mode 100644 tests/data/prot120.txt
 delete mode 100644 tests/data/prot121.txt
 delete mode 100644 tests/data/prot122.txt
 delete mode 100644 tests/data/prot123.txt
 delete mode 100644 tests/data/prot13.txt
 delete mode 100644 tests/data/prot14.txt
 delete mode 100644 tests/data/prot15.txt
 delete mode 100644 tests/data/prot16.txt
 delete mode 100644 tests/data/prot17.txt
 delete mode 100644 tests/data/prot18.txt
 delete mode 100644 tests/data/prot2.txt
 delete mode 100644 tests/data/prot22.txt
 delete mode 100644 tests/data/prot26.txt
 delete mode 100644 tests/data/prot27.txt
 delete mode 100644 tests/data/prot28.txt
 delete mode 100644 tests/data/prot29.txt
 delete mode 100644 tests/data/prot3.txt
 delete mode 100644 tests/data/prot30.txt
 delete mode 100644 tests/data/prot300.txt
 delete mode 100644 tests/data/prot31.txt
 delete mode 100644 tests/data/prot32.txt
 delete mode 100644 tests/data/prot33.txt
 delete mode 100644 tests/data/prot34.txt
 delete mode 100644 tests/data/prot35.txt
 delete mode 100644 tests/data/prot37.txt
 delete mode 100644 tests/data/prot38.txt
 delete mode 100644 tests/data/prot39.txt
 delete mode 100644 tests/data/prot4.txt
 delete mode 100644 tests/data/prot40.txt
 delete mode 100644 tests/data/prot400.txt
 delete mode 100644 tests/data/prot41.txt
 delete mode 100644 tests/data/prot5.txt
 delete mode 100644 tests/data/prot6.txt
 delete mode 100644 tests/data/prot7.txt
 delete mode 100644 tests/data/prot8.txt
 delete mode 100644 tests/data/prot9.txt
 delete mode 100644 tests/data/reply1.txt
 delete mode 100644 tests/data/reply10.txt
 delete mode 100644 tests/data/reply101.txt
 delete mode 100644 tests/data/reply102.txt
 delete mode 100644 tests/data/reply103.txt
 delete mode 100644 tests/data/reply104.txt
 delete mode 100644 tests/data/reply105.txt
 delete mode 100644 tests/data/reply106.txt
 delete mode 100644 tests/data/reply11.txt
 delete mode 100644 tests/data/reply110.txt
 delete mode 100644 tests/data/reply110001.txt
 delete mode 100644 tests/data/reply110002.txt
 delete mode 100644 tests/data/reply12.txt
 delete mode 100644 tests/data/reply120.txt
 delete mode 100644 tests/data/reply121.txt
 delete mode 100644 tests/data/reply122.txt
 delete mode 100644 tests/data/reply1220001.txt
 delete mode 100644 tests/data/reply123.txt
 delete mode 100644 tests/data/reply13.txt
 delete mode 100644 tests/data/reply14.txt
 delete mode 100644 tests/data/reply15.txt
 delete mode 100644 tests/data/reply16.txt
 delete mode 100644 tests/data/reply17.txt
 delete mode 100644 tests/data/reply2.txt
 delete mode 100644 tests/data/reply200.txt
 delete mode 100644 tests/data/reply22.txt
 delete mode 100644 tests/data/reply24.txt
 delete mode 100644 tests/data/reply25.txt
 delete mode 100644 tests/data/reply26.txt
 delete mode 100644 tests/data/reply28.txt
 delete mode 100644 tests/data/reply29.txt
 delete mode 100644 tests/data/reply3.txt
 delete mode 100644 tests/data/reply30.txt
 delete mode 100644 tests/data/reply31.txt
 delete mode 100644 tests/data/reply310001.txt
 delete mode 100644 tests/data/reply310002.txt
 delete mode 100644 tests/data/reply32.txt
 delete mode 100644 tests/data/reply320001.txt
 delete mode 100644 tests/data/reply320002.txt
 delete mode 100644 tests/data/reply33.txt
 delete mode 100644 tests/data/reply34.txt
 delete mode 100644 tests/data/reply340001.txt
 delete mode 100644 tests/data/reply35.txt
 delete mode 100644 tests/data/reply36.txt
 delete mode 100644 tests/data/reply37.txt
 delete mode 100644 tests/data/reply38.txt
 delete mode 100644 tests/data/reply380001.txt
 delete mode 100644 tests/data/reply39.txt
 delete mode 100644 tests/data/reply390001.txt
 delete mode 100644 tests/data/reply390002.txt
 delete mode 100644 tests/data/reply4.txt
 delete mode 100644 tests/data/reply40.txt
 delete mode 100644 tests/data/reply41.txt
 delete mode 100644 tests/data/reply5.txt
 delete mode 100644 tests/data/reply6.txt
 delete mode 100644 tests/data/reply7.txt
 delete mode 100644 tests/data/reply8.txt
 delete mode 100644 tests/data/reply9.txt
 delete mode 100644 tests/data/stdin17.txt
 delete mode 100644 tests/data/stdout107.txt
 delete mode 100644 tests/data/stdout108.txt
 delete mode 100644 tests/data/stdout109.txt
 delete mode 100644 tests/data/stdout110.txt
 delete mode 100644 tests/data/stdout112.txt
 delete mode 100644 tests/data/stdout15.txt
 delete mode 100644 tests/data/stdout18.txt
 delete mode 100644 tests/data/stdout27.txt
 create mode 100644 tests/data/test1
 rename tests/data/{reply400.txt => test100} (61%)
 create mode 100644 tests/data/test2
 create mode 100644 tests/data/test3
 create mode 100644 tests/data/test300
 create mode 100644 tests/data/test4
 rename tests/data/{reply100.txt => test400} (61%)
 delete mode 100644 tests/data/upload107.txt
 delete mode 100644 tests/data/upload108.txt
 delete mode 100644 tests/data/upload109.txt
 delete mode 100644 tests/data/upload112.txt

diff --git a/tests/data/command1.txt b/tests/data/command1.txt
deleted file mode 100644
index 388089e4be..0000000000
--- a/tests/data/command1.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://%HOSTIP:%HOSTPORT/1
diff --git a/tests/data/command10.txt b/tests/data/command10.txt
deleted file mode 100644
index ed5a31241a..0000000000
--- a/tests/data/command10.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-http://%HOSTIP:%HOSTPORT/we/want/10 -T data/command10.txt
-
-
diff --git a/tests/data/command100.txt b/tests/data/command100.txt
deleted file mode 100644
index a3a4452cce..0000000000
--- a/tests/data/command100.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/
diff --git a/tests/data/command101.txt b/tests/data/command101.txt
deleted file mode 100644
index 83e26f27ff..0000000000
--- a/tests/data/command101.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/ -P %HOSTIP
-
-
diff --git a/tests/data/command102.txt b/tests/data/command102.txt
deleted file mode 100644
index f3e870e6ec..0000000000
--- a/tests/data/command102.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/102
diff --git a/tests/data/command103.txt b/tests/data/command103.txt
deleted file mode 100644
index 3f327fd9dd..0000000000
--- a/tests/data/command103.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/a/path/103 -P -
-
-
-
diff --git a/tests/data/command104.txt b/tests/data/command104.txt
deleted file mode 100644
index a217c69eba..0000000000
--- a/tests/data/command104.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/a/path/103 --head
diff --git a/tests/data/command105.txt b/tests/data/command105.txt
deleted file mode 100644
index 094bb54bb8..0000000000
--- a/tests/data/command105.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-ftp://userdude:passfellow@%HOSTIP:%FTPPORT/103 --use-ascii
-
diff --git a/tests/data/command106.txt b/tests/data/command106.txt
deleted file mode 100644
index 00abeb251d..0000000000
--- a/tests/data/command106.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-"ftp://%HOSTIP:%FTPPORT//path%20with%20%20spaces/and%20things2/106;type=A"
-
diff --git a/tests/data/command107.txt b/tests/data/command107.txt
deleted file mode 100644
index 11c82ad965..0000000000
--- a/tests/data/command107.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/107 -T data/reply106.txt
diff --git a/tests/data/command108.txt b/tests/data/command108.txt
deleted file mode 100644
index e3306f2675..0000000000
--- a/tests/data/command108.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/CWD/STOR/RETR/108 -T data/reply106.txt -P -
diff --git a/tests/data/command109.txt b/tests/data/command109.txt
deleted file mode 100644
index 118f2603bf..0000000000
--- a/tests/data/command109.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/109 -T data/reply106.txt --append
diff --git a/tests/data/command11.txt b/tests/data/command11.txt
deleted file mode 100644
index 69b1a92bd2..0000000000
--- a/tests/data/command11.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/11 -L
-
-
diff --git a/tests/data/command110.txt b/tests/data/command110.txt
deleted file mode 100644
index 90ea561a45..0000000000
--- a/tests/data/command110.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/110 -C 20
diff --git a/tests/data/command111.txt b/tests/data/command111.txt
deleted file mode 100644
index af0e8c2a53..0000000000
--- a/tests/data/command111.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/110 -C 2000
diff --git a/tests/data/command112.txt b/tests/data/command112.txt
deleted file mode 100644
index 53e5ca988c..0000000000
--- a/tests/data/command112.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/112 -T data/reply106.txt -C 40
diff --git a/tests/data/command113.txt b/tests/data/command113.txt
deleted file mode 100644
index e05b40f717..0000000000
--- a/tests/data/command113.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/113
-
diff --git a/tests/data/command114.txt b/tests/data/command114.txt
deleted file mode 100644
index e5d0a39759..0000000000
--- a/tests/data/command114.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/114
-
diff --git a/tests/data/command115.txt b/tests/data/command115.txt
deleted file mode 100644
index c5bf53cd4b..0000000000
--- a/tests/data/command115.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/115
-
diff --git a/tests/data/command116.txt b/tests/data/command116.txt
deleted file mode 100644
index 515420314c..0000000000
--- a/tests/data/command116.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/116 -P -
-
diff --git a/tests/data/command117.txt b/tests/data/command117.txt
deleted file mode 100644
index 8d9f56900b..0000000000
--- a/tests/data/command117.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/117
-
-
diff --git a/tests/data/command118.txt b/tests/data/command118.txt
deleted file mode 100644
index e4484f7f07..0000000000
--- a/tests/data/command118.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/118
-
-
diff --git a/tests/data/command119.txt b/tests/data/command119.txt
deleted file mode 100644
index a4bba0802b..0000000000
--- a/tests/data/command119.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/119 -P -
-
-
diff --git a/tests/data/command12.txt b/tests/data/command12.txt
deleted file mode 100644
index 4f22997e63..0000000000
--- a/tests/data/command12.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/12 -r 100-200
-
-
diff --git a/tests/data/command120.txt b/tests/data/command120.txt
deleted file mode 100644
index e35c13d68a..0000000000
--- a/tests/data/command120.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/106 -Q "-DELE file"
-
-
diff --git a/tests/data/command121.txt b/tests/data/command121.txt
deleted file mode 100644
index b2c6e0909b..0000000000
--- a/tests/data/command121.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/106 -Q "-DELE after_transfer" -Q "DELE before_transfer"
diff --git a/tests/data/command122.txt b/tests/data/command122.txt
deleted file mode 100644
index dc51f2e681..0000000000
--- a/tests/data/command122.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/122 -C 5
diff --git a/tests/data/command123.txt b/tests/data/command123.txt
deleted file mode 100644
index fedf82f06a..0000000000
--- a/tests/data/command123.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/107 -T data/reply106.txt -C 51
diff --git a/tests/data/command13.txt b/tests/data/command13.txt
deleted file mode 100644
index 97f66a583a..0000000000
--- a/tests/data/command13.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/13 -X DELETE
-
-
diff --git a/tests/data/command14.txt b/tests/data/command14.txt
deleted file mode 100644
index d383690fe3..0000000000
--- a/tests/data/command14.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/14 -i --head
-
-
diff --git a/tests/data/command15.txt b/tests/data/command15.txt
deleted file mode 100644
index c4a0378047..0000000000
--- a/tests/data/command15.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/15 --write-out '%{url_effective} %{http_code} %{size_download}\n'
-
-
-
diff --git a/tests/data/command16.txt b/tests/data/command16.txt
deleted file mode 100644
index f55d084ff6..0000000000
--- a/tests/data/command16.txt
+++ /dev/null
@@ -1 +0,0 @@
- -U fake@user:壯吸ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong -x %HOSTIP:%HOSTPORT http://we.want.that.site.com/2
diff --git a/tests/data/command17.txt b/tests/data/command17.txt
deleted file mode 100644
index 96e8d47f8a..0000000000
--- a/tests/data/command17.txt
+++ /dev/null
@@ -1 +0,0 @@
--K - %HOSTIP:%HOSTPORT/that.site.com/17
diff --git a/tests/data/command18.txt b/tests/data/command18.txt
deleted file mode 100644
index 1cbb3d3a43..0000000000
--- a/tests/data/command18.txt
+++ /dev/null
@@ -1 +0,0 @@
-'%HOSTIP:%HOSTPORT/{3,10,11}'
diff --git a/tests/data/command19.txt b/tests/data/command19.txt
deleted file mode 100644
index a6b8aa3758..0000000000
--- a/tests/data/command19.txt
+++ /dev/null
@@ -1 +0,0 @@
-%HOSTIP:60000
diff --git a/tests/data/command2.txt b/tests/data/command2.txt
deleted file mode 100644
index 2a0a9c0443..0000000000
--- a/tests/data/command2.txt
+++ /dev/null
@@ -1 +0,0 @@
- -u fake:user http://%HOSTIP:%HOSTPORT/2
diff --git a/tests/data/command20.txt b/tests/data/command20.txt
deleted file mode 100644
index 8ebc7bac8e..0000000000
--- a/tests/data/command20.txt
+++ /dev/null
@@ -1 +0,0 @@
-weeeeeeirdname
diff --git a/tests/data/command200.txt b/tests/data/command200.txt
deleted file mode 100644
index 8069c547d2..0000000000
--- a/tests/data/command200.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-file://data/reply200.txt
-
diff --git a/tests/data/command201.txt b/tests/data/command201.txt
deleted file mode 100644
index 4112fa2df1..0000000000
--- a/tests/data/command201.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-file://data/fooobar-reply201.txt
-
diff --git a/tests/data/command21.txt b/tests/data/command21.txt
deleted file mode 100644
index 2a33bd375e..0000000000
--- a/tests/data/command21.txt
+++ /dev/null
@@ -1 +0,0 @@
--I -X FOOO
diff --git a/tests/data/command22.txt b/tests/data/command22.txt
deleted file mode 100644
index 8fa2df8c5c..0000000000
--- a/tests/data/command22.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-%HOSTIP:%HOSTPORT/`perl -e 'print "a" x 10000;'`/17
-
diff --git a/tests/data/command23.txt b/tests/data/command23.txt
deleted file mode 100644
index babf125880..0000000000
--- a/tests/data/command23.txt
+++ /dev/null
@@ -1 +0,0 @@
-htfp://%HOSTIP:%HOSTPORT/none.htfml
diff --git a/tests/data/command24.txt b/tests/data/command24.txt
deleted file mode 100644
index 075f22244e..0000000000
--- a/tests/data/command24.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-http://%HOSTIP:%HOSTPORT/24 --fail
-
diff --git a/tests/data/command25.txt b/tests/data/command25.txt
deleted file mode 100644
index eeb344562a..0000000000
--- a/tests/data/command25.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/25 -L --max-redirs 5
-
-
-
diff --git a/tests/data/command26.txt b/tests/data/command26.txt
deleted file mode 100644
index 11c47f7a18..0000000000
--- a/tests/data/command26.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/26 -o - -o -
-
-
-
diff --git a/tests/data/command27.txt b/tests/data/command27.txt
deleted file mode 100644
index 21e2a9c978..0000000000
--- a/tests/data/command27.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/25 http://%HOSTIP:%HOSTPORT/want/24 http://%HOSTIP:%HOSTPORT/want/22
diff --git a/tests/data/command28.txt b/tests/data/command28.txt
deleted file mode 100644
index 74a7a6b851..0000000000
--- a/tests/data/command28.txt
+++ /dev/null
@@ -1 +0,0 @@
---globoff http://%HOSTIP:%HOSTPORT/wantit/{}[]/28
diff --git a/tests/data/command29.txt b/tests/data/command29.txt
deleted file mode 100644
index 4e2dc3c580..0000000000
--- a/tests/data/command29.txt
+++ /dev/null
@@ -1 +0,0 @@
--C 200 http://%HOSTIP:%HOSTPORT/29
diff --git a/tests/data/command3.txt b/tests/data/command3.txt
deleted file mode 100644
index 70fe96315b..0000000000
--- a/tests/data/command3.txt
+++ /dev/null
@@ -1 +0,0 @@
- -d "fooo=mooo&pooo=clue&doo=%20%20%20++++" -u "fake:-user" http://%HOSTIP:%HOSTPORT/3
diff --git a/tests/data/command30.txt b/tests/data/command30.txt
deleted file mode 100644
index c0140914b1..0000000000
--- a/tests/data/command30.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://%HOSTIP:%HOSTPORT/30
diff --git a/tests/data/command300.txt b/tests/data/command300.txt
deleted file mode 100644
index 7531ad7d7d..0000000000
--- a/tests/data/command300.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://%HOSTIP:%HTTPSPORT/300
diff --git a/tests/data/command31.txt b/tests/data/command31.txt
deleted file mode 100644
index dbffab3ebc..0000000000
--- a/tests/data/command31.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-http://%HOSTIP:%HOSTPORT/31 -d mooo=fooo -L
-
diff --git a/tests/data/command32.txt b/tests/data/command32.txt
deleted file mode 100644
index d7fb1ae14a..0000000000
--- a/tests/data/command32.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-http://%HOSTIP:%HOSTPORT/32 -d mooo=fooo -L
-
diff --git a/tests/data/command33.txt b/tests/data/command33.txt
deleted file mode 100644
index b56a0eaa32..0000000000
--- a/tests/data/command33.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-http://%HOSTIP:%HOSTPORT/33 -Tdata/extra33.txt -C 50
-
-
diff --git a/tests/data/command34.txt b/tests/data/command34.txt
deleted file mode 100644
index 50bcee1cbf..0000000000
--- a/tests/data/command34.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://%HOSTIP:%HOSTPORT/34
diff --git a/tests/data/command35.txt b/tests/data/command35.txt
deleted file mode 100644
index 5fd2c4ada7..0000000000
--- a/tests/data/command35.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/35 --include --head
diff --git a/tests/data/command36.txt b/tests/data/command36.txt
deleted file mode 100644
index 34379734fe..0000000000
--- a/tests/data/command36.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://%HOSTIP:%HOSTPORT/36
diff --git a/tests/data/command37.txt b/tests/data/command37.txt
deleted file mode 100644
index c37cf423de..0000000000
--- a/tests/data/command37.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://uUsSeErrr:pppasswrd@%HOSTIP:%HOSTPORT/37
diff --git a/tests/data/command38.txt b/tests/data/command38.txt
deleted file mode 100644
index 3841e975bc..0000000000
--- a/tests/data/command38.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://user:pwd@%HOSTIP:%HOSTPORT/38 -L
diff --git a/tests/data/command39.txt b/tests/data/command39.txt
deleted file mode 100644
index 7311566ee8..0000000000
--- a/tests/data/command39.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/39 -L -C 20
-
-
diff --git a/tests/data/command4.txt b/tests/data/command4.txt
deleted file mode 100644
index c94a43cf5c..0000000000
--- a/tests/data/command4.txt
+++ /dev/null
@@ -1 +0,0 @@
- -H "extra-header: here" -H "Accept: replaced" http://%HOSTIP:%HOSTPORT/4
diff --git a/tests/data/command40.txt b/tests/data/command40.txt
deleted file mode 100644
index e2b781c972..0000000000
--- a/tests/data/command40.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/40
-
-
diff --git a/tests/data/command400.txt b/tests/data/command400.txt
deleted file mode 100644
index 9ff4b69924..0000000000
--- a/tests/data/command400.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftps://%HOSTIP:%FTPSPORT/
diff --git a/tests/data/command41.txt b/tests/data/command41.txt
deleted file mode 100644
index 79136e5833..0000000000
--- a/tests/data/command41.txt
+++ /dev/null
@@ -1,2 +0,0 @@
- -U proxy:pppp -u site:moooo -x %HOSTIP:%HOSTPORT http://weeird.site.com/YES/boo/2
-
diff --git a/tests/data/command5.txt b/tests/data/command5.txt
deleted file mode 100644
index f0fb2677d7..0000000000
--- a/tests/data/command5.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://%HOSTIP:%HOSTPORT/we/want/that/page/5 -x %HOSTIP:%HOSTPORT
diff --git a/tests/data/command6.txt b/tests/data/command6.txt
deleted file mode 100644
index a0b979842d..0000000000
--- a/tests/data/command6.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-http://%HOSTIP:%HOSTPORT/we/want/that/page/6 -b "name=contents;name2=content2"
-
diff --git a/tests/data/command7.txt b/tests/data/command7.txt
deleted file mode 100644
index 0f7f85e7b5..0000000000
--- a/tests/data/command7.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://%HOSTIP:%HOSTPORT/we/want/7 -b none -D log/heads7.txt
diff --git a/tests/data/command8.txt b/tests/data/command8.txt
deleted file mode 100644
index b7437cf2a1..0000000000
--- a/tests/data/command8.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://%HOSTIP:%HOSTPORT/we/want/8 -b log/heads7.txt
diff --git a/tests/data/command9.txt b/tests/data/command9.txt
deleted file mode 100644
index b0846bb2f8..0000000000
--- a/tests/data/command9.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-http://%HOSTIP:%HOSTPORT/we/want/9 -F name=daniel -F tool=curl -F file=@data/command9.txt
-
diff --git a/tests/data/error111.txt b/tests/data/error111.txt
deleted file mode 100644
index 7facc89938..0000000000
--- a/tests/data/error111.txt
+++ /dev/null
@@ -1 +0,0 @@
-36
diff --git a/tests/data/error113.txt b/tests/data/error113.txt
deleted file mode 100644
index 48082f72f0..0000000000
--- a/tests/data/error113.txt
+++ /dev/null
@@ -1 +0,0 @@
-12
diff --git a/tests/data/error114.txt b/tests/data/error114.txt
deleted file mode 100644
index b4de394767..0000000000
--- a/tests/data/error114.txt
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/tests/data/error115.txt b/tests/data/error115.txt
deleted file mode 100644
index b1bd38b62a..0000000000
--- a/tests/data/error115.txt
+++ /dev/null
@@ -1 +0,0 @@
-13
diff --git a/tests/data/error116.txt b/tests/data/error116.txt
deleted file mode 100644
index 64bb6b746d..0000000000
--- a/tests/data/error116.txt
+++ /dev/null
@@ -1 +0,0 @@
-30
diff --git a/tests/data/error117.txt b/tests/data/error117.txt
deleted file mode 100644
index 98d9bcb75a..0000000000
--- a/tests/data/error117.txt
+++ /dev/null
@@ -1 +0,0 @@
-17
diff --git a/tests/data/error118.txt b/tests/data/error118.txt
deleted file mode 100644
index d6b24041cf..0000000000
--- a/tests/data/error118.txt
+++ /dev/null
@@ -1 +0,0 @@
-19
diff --git a/tests/data/error119.txt b/tests/data/error119.txt
deleted file mode 100644
index d6b24041cf..0000000000
--- a/tests/data/error119.txt
+++ /dev/null
@@ -1 +0,0 @@
-19
diff --git a/tests/data/error19.txt b/tests/data/error19.txt
deleted file mode 100644
index 7f8f011eb7..0000000000
--- a/tests/data/error19.txt
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/tests/data/error20.txt b/tests/data/error20.txt
deleted file mode 100644
index 1e8b314962..0000000000
--- a/tests/data/error20.txt
+++ /dev/null
@@ -1 +0,0 @@
-6
diff --git a/tests/data/error201.txt b/tests/data/error201.txt
deleted file mode 100644
index 81b5c5d06c..0000000000
--- a/tests/data/error201.txt
+++ /dev/null
@@ -1 +0,0 @@
-37
diff --git a/tests/data/error21.txt b/tests/data/error21.txt
deleted file mode 100644
index 0cfbf08886..0000000000
--- a/tests/data/error21.txt
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/data/error23.txt b/tests/data/error23.txt
deleted file mode 100644
index d00491fd7e..0000000000
--- a/tests/data/error23.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/data/error24.txt b/tests/data/error24.txt
deleted file mode 100644
index 2bd5a0a98a..0000000000
--- a/tests/data/error24.txt
+++ /dev/null
@@ -1 +0,0 @@
-22
diff --git a/tests/data/error25.txt b/tests/data/error25.txt
deleted file mode 100644
index abac1ea7b7..0000000000
--- a/tests/data/error25.txt
+++ /dev/null
@@ -1 +0,0 @@
-47
diff --git a/tests/data/error30.txt b/tests/data/error30.txt
deleted file mode 100644
index 3c032078a4..0000000000
--- a/tests/data/error30.txt
+++ /dev/null
@@ -1 +0,0 @@
-18
diff --git a/tests/data/error36.txt b/tests/data/error36.txt
deleted file mode 100644
index 6f4247a625..0000000000
--- a/tests/data/error36.txt
+++ /dev/null
@@ -1 +0,0 @@
-26
diff --git a/tests/data/extra33.txt b/tests/data/extra33.txt
deleted file mode 100644
index ca4205b2a9..0000000000
--- a/tests/data/extra33.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
diff --git a/tests/data/ftpd113.txt b/tests/data/ftpd113.txt
deleted file mode 100644
index fae041d821..0000000000
--- a/tests/data/ftpd113.txt
+++ /dev/null
@@ -1 +0,0 @@
-REPLY USER 314 bluah you fewl!
diff --git a/tests/data/ftpd114.txt b/tests/data/ftpd114.txt
deleted file mode 100644
index ce23059aaa..0000000000
--- a/tests/data/ftpd114.txt
+++ /dev/null
@@ -1 +0,0 @@
-REPLY PASS 314 bluah you fewl!
diff --git a/tests/data/ftpd115.txt b/tests/data/ftpd115.txt
deleted file mode 100644
index b8034dd5b4..0000000000
--- a/tests/data/ftpd115.txt
+++ /dev/null
@@ -1 +0,0 @@
-REPLY PASV 314 bluah you fewl!
diff --git a/tests/data/ftpd116.txt b/tests/data/ftpd116.txt
deleted file mode 100644
index 83d10d5fa6..0000000000
--- a/tests/data/ftpd116.txt
+++ /dev/null
@@ -1 +0,0 @@
-REPLY PORT 314 bluah you fewl!
diff --git a/tests/data/ftpd117.txt b/tests/data/ftpd117.txt
deleted file mode 100644
index 28bca4f9fc..0000000000
--- a/tests/data/ftpd117.txt
+++ /dev/null
@@ -1 +0,0 @@
-REPLY TYPE 314 bluah you fewl!
diff --git a/tests/data/ftpd118.txt b/tests/data/ftpd118.txt
deleted file mode 100644
index 422e871c88..0000000000
--- a/tests/data/ftpd118.txt
+++ /dev/null
@@ -1 +0,0 @@
-REPLY RETR 314 bluah you fewl!
diff --git a/tests/data/name1.txt b/tests/data/name1.txt
deleted file mode 100644
index c3cde869bb..0000000000
--- a/tests/data/name1.txt
+++ /dev/null
@@ -1 +0,0 @@
-simple HTTP GET
diff --git a/tests/data/name10.txt b/tests/data/name10.txt
deleted file mode 100644
index f4ffc31ee2..0000000000
--- a/tests/data/name10.txt
+++ /dev/null
@@ -1 +0,0 @@
-simple HTTP PUT from file
diff --git a/tests/data/name100.txt b/tests/data/name100.txt
deleted file mode 100644
index 148cedd734..0000000000
--- a/tests/data/name100.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP dir list PASV
diff --git a/tests/data/name101.txt b/tests/data/name101.txt
deleted file mode 100644
index 13ccd9bb07..0000000000
--- a/tests/data/name101.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP dir list, PORT with specified IP
diff --git a/tests/data/name102.txt b/tests/data/name102.txt
deleted file mode 100644
index 87c1fe763c..0000000000
--- a/tests/data/name102.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP RETR PASV
diff --git a/tests/data/name103.txt b/tests/data/name103.txt
deleted file mode 100644
index b6dff0fb4f..0000000000
--- a/tests/data/name103.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP RETR PORT with CWD
diff --git a/tests/data/name104.txt b/tests/data/name104.txt
deleted file mode 100644
index 898b1c5649..0000000000
--- a/tests/data/name104.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP --head to get file size only
diff --git a/tests/data/name105.txt b/tests/data/name105.txt
deleted file mode 100644
index c8d5cc6ebd..0000000000
--- a/tests/data/name105.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP user+password in URL and ASCII transfer
diff --git a/tests/data/name106.txt b/tests/data/name106.txt
deleted file mode 100644
index c7da9f30a7..0000000000
--- a/tests/data/name106.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP GET with type=A style ASCII URL using %20 codes
diff --git a/tests/data/name107.txt b/tests/data/name107.txt
deleted file mode 100644
index 7a04a0d7d8..0000000000
--- a/tests/data/name107.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP PASV upload file
diff --git a/tests/data/name108.txt b/tests/data/name108.txt
deleted file mode 100644
index 48f75b5f7a..0000000000
--- a/tests/data/name108.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP PORT upload with CWD
diff --git a/tests/data/name109.txt b/tests/data/name109.txt
deleted file mode 100644
index 10fd5b955f..0000000000
--- a/tests/data/name109.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP PASV upload append
diff --git a/tests/data/name11.txt b/tests/data/name11.txt
deleted file mode 100644
index fa15490583..0000000000
--- a/tests/data/name11.txt
+++ /dev/null
@@ -1 +0,0 @@
-simple HTTP Location: following
diff --git a/tests/data/name110.txt b/tests/data/name110.txt
deleted file mode 100644
index 7761f4b1c8..0000000000
--- a/tests/data/name110.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP download resume with set limit
diff --git a/tests/data/name111.txt b/tests/data/name111.txt
deleted file mode 100644
index 4ef5452b2f..0000000000
--- a/tests/data/name111.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP download resume beyond file size
diff --git a/tests/data/name112.txt b/tests/data/name112.txt
deleted file mode 100644
index 1d310a8483..0000000000
--- a/tests/data/name112.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP PASV upload resume
diff --git a/tests/data/name113.txt b/tests/data/name113.txt
deleted file mode 100644
index 69ed5a8f48..0000000000
--- a/tests/data/name113.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP download, failed login
diff --git a/tests/data/name114.txt b/tests/data/name114.txt
deleted file mode 100644
index 71b8f97ccd..0000000000
--- a/tests/data/name114.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP download, failed PASS
diff --git a/tests/data/name115.txt b/tests/data/name115.txt
deleted file mode 100644
index d65a8a3935..0000000000
--- a/tests/data/name115.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP download, failed PASV
diff --git a/tests/data/name116.txt b/tests/data/name116.txt
deleted file mode 100644
index 7bf987bb97..0000000000
--- a/tests/data/name116.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP download, failed PORT
diff --git a/tests/data/name117.txt b/tests/data/name117.txt
deleted file mode 100644
index 1ef7cf9b0c..0000000000
--- a/tests/data/name117.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP download, failed TYPE
diff --git a/tests/data/name118.txt b/tests/data/name118.txt
deleted file mode 100644
index 3540f40d00..0000000000
--- a/tests/data/name118.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP download, failed RETR
diff --git a/tests/data/name119.txt b/tests/data/name119.txt
deleted file mode 100644
index 55bc99b516..0000000000
--- a/tests/data/name119.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP download, failed RETR with PORT
diff --git a/tests/data/name12.txt b/tests/data/name12.txt
deleted file mode 100644
index c4268d3066..0000000000
--- a/tests/data/name12.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP range support
diff --git a/tests/data/name120.txt b/tests/data/name120.txt
deleted file mode 100644
index 83b565d002..0000000000
--- a/tests/data/name120.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp download with post-quote delete operation
diff --git a/tests/data/name121.txt b/tests/data/name121.txt
deleted file mode 100644
index ae17f9d44c..0000000000
--- a/tests/data/name121.txt
+++ /dev/null
@@ -1 +0,0 @@
-ftp download with post- and pre-transfer delete operations
diff --git a/tests/data/name122.txt b/tests/data/name122.txt
deleted file mode 100644
index d7bc58f0a9..0000000000
--- a/tests/data/name122.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP download resume with whole file already downloaded
diff --git a/tests/data/name123.txt b/tests/data/name123.txt
deleted file mode 100644
index c198dd71f6..0000000000
--- a/tests/data/name123.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP upload resume with whole file already uploaded
diff --git a/tests/data/name13.txt b/tests/data/name13.txt
deleted file mode 100644
index 9c36e43b5f..0000000000
--- a/tests/data/name13.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP custom request 'DELETE'
\ No newline at end of file
diff --git a/tests/data/name14.txt b/tests/data/name14.txt
deleted file mode 100644
index 12bbf972d8..0000000000
--- a/tests/data/name14.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP HEAD with Connection: close
diff --git a/tests/data/name15.txt b/tests/data/name15.txt
deleted file mode 100644
index a14aa7d318..0000000000
--- a/tests/data/name15.txt
+++ /dev/null
@@ -1 +0,0 @@
---write-out test
diff --git a/tests/data/name16.txt b/tests/data/name16.txt
deleted file mode 100644
index e00da9d4a8..0000000000
--- a/tests/data/name16.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP with proxy athorization
diff --git a/tests/data/name17.txt b/tests/data/name17.txt
deleted file mode 100644
index f9f4ec3086..0000000000
--- a/tests/data/name17.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP with config file on stdin
diff --git a/tests/data/name18.txt b/tests/data/name18.txt
deleted file mode 100644
index ef15d086b6..0000000000
--- a/tests/data/name18.txt
+++ /dev/null
@@ -1 +0,0 @@
-multiple requests using {} in URL
diff --git a/tests/data/name19.txt b/tests/data/name19.txt
deleted file mode 100644
index d98a99dd55..0000000000
--- a/tests/data/name19.txt
+++ /dev/null
@@ -1 +0,0 @@
-connect to non-listening socket
diff --git a/tests/data/name2.txt b/tests/data/name2.txt
deleted file mode 100644
index 670500639e..0000000000
--- a/tests/data/name2.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP GET with user and password
diff --git a/tests/data/name20.txt b/tests/data/name20.txt
deleted file mode 100644
index 33b75044b9..0000000000
--- a/tests/data/name20.txt
+++ /dev/null
@@ -1 +0,0 @@
-connect to non-existing host name
diff --git a/tests/data/name200.txt b/tests/data/name200.txt
deleted file mode 100644
index 0defc8cd00..0000000000
--- a/tests/data/name200.txt
+++ /dev/null
@@ -1 +0,0 @@
-file:// with relative path
diff --git a/tests/data/name201.txt b/tests/data/name201.txt
deleted file mode 100644
index fd357f5759..0000000000
--- a/tests/data/name201.txt
+++ /dev/null
@@ -1 +0,0 @@
-file:// with non-existing file
diff --git a/tests/data/name21.txt b/tests/data/name21.txt
deleted file mode 100644
index 301b2b5526..0000000000
--- a/tests/data/name21.txt
+++ /dev/null
@@ -1 +0,0 @@
-use curl with multiple request methods
diff --git a/tests/data/name22.txt b/tests/data/name22.txt
deleted file mode 100644
index 85f06d97dc..0000000000
--- a/tests/data/name22.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP with URL > 10000 bytes
diff --git a/tests/data/name23.txt b/tests/data/name23.txt
deleted file mode 100644
index c44ad8502e..0000000000
--- a/tests/data/name23.txt
+++ /dev/null
@@ -1 +0,0 @@
-bad protocol://
diff --git a/tests/data/name24.txt b/tests/data/name24.txt
deleted file mode 100644
index b55014ef92..0000000000
--- a/tests/data/name24.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP GET fail silently on HTTP error return
diff --git a/tests/data/name25.txt b/tests/data/name25.txt
deleted file mode 100644
index b02c8e7e51..0000000000
--- a/tests/data/name25.txt
+++ /dev/null
@@ -1 +0,0 @@
-looping HTTP Location: following with --max-redirs, no persistance
diff --git a/tests/data/name26.txt b/tests/data/name26.txt
deleted file mode 100644
index 4c300b2483..0000000000
--- a/tests/data/name26.txt
+++ /dev/null
@@ -1 +0,0 @@
-specify more -o than URLs
diff --git a/tests/data/name27.txt b/tests/data/name27.txt
deleted file mode 100644
index 90a851fe9d..0000000000
--- a/tests/data/name27.txt
+++ /dev/null
@@ -1 +0,0 @@
-getting three URLs in one command line (to stdout)
diff --git a/tests/data/name28.txt b/tests/data/name28.txt
deleted file mode 100644
index 07ea09c0e1..0000000000
--- a/tests/data/name28.txt
+++ /dev/null
@@ -1 +0,0 @@
---globoff with {][} in URL
diff --git a/tests/data/name29.txt b/tests/data/name29.txt
deleted file mode 100644
index 10084f4b0e..0000000000
--- a/tests/data/name29.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP download resume with Content-Length validity
diff --git a/tests/data/name3.txt b/tests/data/name3.txt
deleted file mode 100644
index 581a4267a5..0000000000
--- a/tests/data/name3.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP POST with user and password
diff --git a/tests/data/name30.txt b/tests/data/name30.txt
deleted file mode 100644
index 4945ee2752..0000000000
--- a/tests/data/name30.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP GET uncomplete document
\ No newline at end of file
diff --git a/tests/data/name300.txt b/tests/data/name300.txt
deleted file mode 100644
index c6cddb2194..0000000000
--- a/tests/data/name300.txt
+++ /dev/null
@@ -1 +0,0 @@
-simple HTTPS GET
diff --git a/tests/data/name31.txt b/tests/data/name31.txt
deleted file mode 100644
index 7e3df9febc..0000000000
--- a/tests/data/name31.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP POST and follow Location: (error 301)
diff --git a/tests/data/name32.txt b/tests/data/name32.txt
deleted file mode 100644
index ba04e8fff5..0000000000
--- a/tests/data/name32.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP POST and follow Location: (error 303)
diff --git a/tests/data/name33.txt b/tests/data/name33.txt
deleted file mode 100644
index 5e6fcaddb9..0000000000
--- a/tests/data/name33.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP PUT resume
diff --git a/tests/data/name34.txt b/tests/data/name34.txt
deleted file mode 100644
index 0c91ed354a..0000000000
--- a/tests/data/name34.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP GET with chunked Transfer-Encoding
diff --git a/tests/data/name35.txt b/tests/data/name35.txt
deleted file mode 100644
index d6c399325f..0000000000
--- a/tests/data/name35.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP HEAD without Connection: close
diff --git a/tests/data/name36.txt b/tests/data/name36.txt
deleted file mode 100644
index 786f1ad8ae..0000000000
--- a/tests/data/name36.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP GET with badly formatted chunked Transfer-Encoding
diff --git a/tests/data/name37.txt b/tests/data/name37.txt
deleted file mode 100644
index fef9ec1716..0000000000
--- a/tests/data/name37.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP GET with name+password in the URL
diff --git a/tests/data/name38.txt b/tests/data/name38.txt
deleted file mode 100644
index 80a8b962e1..0000000000
--- a/tests/data/name38.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP GET with user+password in URL and Location: and --include
diff --git a/tests/data/name39.txt b/tests/data/name39.txt
deleted file mode 100644
index aae5ce653e..0000000000
--- a/tests/data/name39.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP GET with location following and -C
diff --git a/tests/data/name4.txt b/tests/data/name4.txt
deleted file mode 100644
index df748d3751..0000000000
--- a/tests/data/name4.txt
+++ /dev/null
@@ -1 +0,0 @@
-Replaced internal and added custom HTTP headers
diff --git a/tests/data/name40.txt b/tests/data/name40.txt
deleted file mode 100644
index 456ffc92d4..0000000000
--- a/tests/data/name40.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP GET returns content-length 0 on persitent connection
diff --git a/tests/data/name400.txt b/tests/data/name400.txt
deleted file mode 100644
index 148cedd734..0000000000
--- a/tests/data/name400.txt
+++ /dev/null
@@ -1 +0,0 @@
-FTP dir list PASV
diff --git a/tests/data/name41.txt b/tests/data/name41.txt
deleted file mode 100644
index affeb5dc46..0000000000
--- a/tests/data/name41.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP with proxy AND web page athorization
diff --git a/tests/data/name5.txt b/tests/data/name5.txt
deleted file mode 100644
index de72604102..0000000000
--- a/tests/data/name5.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP over proxy
diff --git a/tests/data/name6.txt b/tests/data/name6.txt
deleted file mode 100644
index 5cfcf87191..0000000000
--- a/tests/data/name6.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP with simple cookie send
diff --git a/tests/data/name7.txt b/tests/data/name7.txt
deleted file mode 100644
index 8dd34dee3b..0000000000
--- a/tests/data/name7.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP with cookie parser and header recording
diff --git a/tests/data/name8.txt b/tests/data/name8.txt
deleted file mode 100644
index d3571f4713..0000000000
--- a/tests/data/name8.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP with cookie parsing from header file, must follow test 7
diff --git a/tests/data/name9.txt b/tests/data/name9.txt
deleted file mode 100644
index 82d7b5899a..0000000000
--- a/tests/data/name9.txt
+++ /dev/null
@@ -1 +0,0 @@
-HTTP RFC1867-type formposting
diff --git a/tests/data/prot1.txt b/tests/data/prot1.txt
deleted file mode 100644
index d5f8c7dfdb..0000000000
--- a/tests/data/prot1.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /1 HTTP/1.1
-User-Agent: curl/7.4.2-pre3 (sparc-sun-solaris2.7) libcurl 7.4.2-pre3 (SSL 0.9.6)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot10.txt b/tests/data/prot10.txt
deleted file mode 100644
index 6bc00c241c..0000000000
--- a/tests/data/prot10.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-PUT /we/want/10 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-Content-Length: 60
-
-http://%HOSTIP:%HOSTPORT/we/want/10 -T data/command10.txt
-
-
diff --git a/tests/data/prot100.txt b/tests/data/prot100.txt
deleted file mode 100644
index 7cce3a214e..0000000000
--- a/tests/data/prot100.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-PASV
-TYPE A
-LIST
diff --git a/tests/data/prot101.txt b/tests/data/prot101.txt
deleted file mode 100644
index ad297aa15f..0000000000
--- a/tests/data/prot101.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-PORT 127,0,0,1,243,212
-TYPE A
-LIST
diff --git a/tests/data/prot102.txt b/tests/data/prot102.txt
deleted file mode 100644
index ddab1e2d2e..0000000000
--- a/tests/data/prot102.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-PASV
-TYPE I
-RETR 102
diff --git a/tests/data/prot103.txt b/tests/data/prot103.txt
deleted file mode 100644
index eddd6c2918..0000000000
--- a/tests/data/prot103.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-CWD a/path
-PORT 127,0,0,1,246,33
-TYPE I
-RETR 103
diff --git a/tests/data/prot104.txt b/tests/data/prot104.txt
deleted file mode 100644
index 265ea0dba4..0000000000
--- a/tests/data/prot104.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-CWD a/path
-MDTM 103
-TYPE I
-SIZE 103
diff --git a/tests/data/prot105.txt b/tests/data/prot105.txt
deleted file mode 100644
index 273dd64051..0000000000
--- a/tests/data/prot105.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-USER userdude
-PASS passfellow
-PWD
-PASV
-TYPE A
-RETR 103
diff --git a/tests/data/prot106.txt b/tests/data/prot106.txt
deleted file mode 100644
index cd8b81a11b..0000000000
--- a/tests/data/prot106.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-CWD /path with  spaces/and things2
-PASV
-TYPE A
-RETR 106
diff --git a/tests/data/prot107.txt b/tests/data/prot107.txt
deleted file mode 100644
index 23b32cfd3e..0000000000
--- a/tests/data/prot107.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-PASV
-TYPE I
-STOR 107
diff --git a/tests/data/prot108.txt b/tests/data/prot108.txt
deleted file mode 100644
index 7828bca864..0000000000
--- a/tests/data/prot108.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-CWD CWD/STOR/RETR
-PORT 127,0,0,1,5,109
-TYPE I
-STOR 108
diff --git a/tests/data/prot109.txt b/tests/data/prot109.txt
deleted file mode 100644
index abe7d0c537..0000000000
--- a/tests/data/prot109.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-PASV
-TYPE I
-APPE 109
diff --git a/tests/data/prot11.txt b/tests/data/prot11.txt
deleted file mode 100644
index b40ac52689..0000000000
--- a/tests/data/prot11.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-GET /want/11 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
-GET /want/data/110002.txt?coolsite=yes HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot110.txt b/tests/data/prot110.txt
deleted file mode 100644
index b1fcf470a0..0000000000
--- a/tests/data/prot110.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-PASV
-TYPE I
-SIZE 110
-REST 20
-RETR 110
diff --git a/tests/data/prot112.txt b/tests/data/prot112.txt
deleted file mode 100644
index 3c75c013a3..0000000000
--- a/tests/data/prot112.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-PASV
-TYPE I
-APPE 112
diff --git a/tests/data/prot12.txt b/tests/data/prot12.txt
deleted file mode 100644
index cc15876314..0000000000
--- a/tests/data/prot12.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /want/12 HTTP/1.1
-Range: bytes=100-200
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot120.txt b/tests/data/prot120.txt
deleted file mode 100644
index 6f5a0d2c81..0000000000
--- a/tests/data/prot120.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-PASV
-TYPE I
-RETR 106
-DELE file
diff --git a/tests/data/prot121.txt b/tests/data/prot121.txt
deleted file mode 100644
index bc0a25f2d3..0000000000
--- a/tests/data/prot121.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-DELE before_transfer
-PASV
-TYPE I
-RETR 106
-DELE after_transfer
diff --git a/tests/data/prot122.txt b/tests/data/prot122.txt
deleted file mode 100644
index b74f26b4ba..0000000000
--- a/tests/data/prot122.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-PASV
-TYPE I
-SIZE 122
diff --git a/tests/data/prot123.txt b/tests/data/prot123.txt
deleted file mode 100644
index 7673491d47..0000000000
--- a/tests/data/prot123.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-PASV
-TYPE I
diff --git a/tests/data/prot13.txt b/tests/data/prot13.txt
deleted file mode 100644
index 7de050931c..0000000000
--- a/tests/data/prot13.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-DELETE /want/13 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot14.txt b/tests/data/prot14.txt
deleted file mode 100644
index f503270fc8..0000000000
--- a/tests/data/prot14.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-HEAD /want/14 HTTP/1.1
-User-Agent: curl/7.4.2-pre4 (sparc-sun-solaris2.7) libcurl 7.4.2-pre4
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot15.txt b/tests/data/prot15.txt
deleted file mode 100644
index 0c79de8b00..0000000000
--- a/tests/data/prot15.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-GET /want/15 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot16.txt b/tests/data/prot16.txt
deleted file mode 100644
index 5858e5874d..0000000000
--- a/tests/data/prot16.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET http://we.want.that.site.com/2 HTTP/1.1
-Proxy-authorization: Basic ZmFrZUB1c2VyOqenp2xvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb28=
-Host: we.want.that.site.com
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot17.txt b/tests/data/prot17.txt
deleted file mode 100644
index 1b945e2430..0000000000
--- a/tests/data/prot17.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-MOOO /that.site.com/17 HTTP/1.1
-User-Agent: agent007 license to drill
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot18.txt b/tests/data/prot18.txt
deleted file mode 100644
index fd0e3e2fef..0000000000
--- a/tests/data/prot18.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-GET /3 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
-GET /10 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
-GET /11 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot2.txt b/tests/data/prot2.txt
deleted file mode 100644
index 23074c4166..0000000000
--- a/tests/data/prot2.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /2 HTTP/1.1
-Authorization: Basic ZmFrZTp1c2Vy
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot22.txt b/tests/data/prot22.txt
deleted file mode 100644
index 12082ba96d..0000000000
--- a/tests/data/prot22.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/17 HTTP/1.1
-User-Agent: curl/7.4.2 (sparc-sun-solaris2.7) libcurl 7.4.2 (SSL 0.9.6)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot26.txt b/tests/data/prot26.txt
deleted file mode 100644
index be38e7dd78..0000000000
--- a/tests/data/prot26.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /want/26 HTTP/1.1
-User-Agent: curl/7.6-pre1 (sparc-sun-solaris2.7) libcurl 7.5.2 (SSL 0.9.6) (krb4 enabled)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot27.txt b/tests/data/prot27.txt
deleted file mode 100644
index 682127e29b..0000000000
--- a/tests/data/prot27.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-GET /want/25 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
-GET /want/24 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
-GET /want/22 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot28.txt b/tests/data/prot28.txt
deleted file mode 100644
index 29b9adaaf6..0000000000
--- a/tests/data/prot28.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-GET /wantit/{}[]/28 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot29.txt b/tests/data/prot29.txt
deleted file mode 100644
index d111df4ddf..0000000000
--- a/tests/data/prot29.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /29 HTTP/1.1
-Range: bytes=200-
-User-Agent: curl/7.6 (i686-pc-linux-gnu) libcurl 7.6 (SSL 0.9.5) (ipv6 enabled)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot3.txt b/tests/data/prot3.txt
deleted file mode 100644
index c4b232eefb..0000000000
--- a/tests/data/prot3.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-POST /3 HTTP/1.1
-Authorization: Basic ZmFrZTotdXNlcg==
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-Content-Length: 37
-Content-Type: application/x-www-form-urlencoded
-
-fooo=mooo&pooo=clue&doo=%20%20%20++++
diff --git a/tests/data/prot30.txt b/tests/data/prot30.txt
deleted file mode 100644
index c244a65203..0000000000
--- a/tests/data/prot30.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /30 HTTP/1.1
-User-Agent: curl/7.6 (i686-pc-linux-gnu) libcurl 7.6 (SSL 0.9.5) (ipv6 enabled)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot300.txt b/tests/data/prot300.txt
deleted file mode 100644
index b5e6dc1bfc..0000000000
--- a/tests/data/prot300.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /300 HTTP/1.1
-User-Agent: curl/7.7 (i686-pc-linux-gnu) libcurl 7.7.1 (SSL 0.9.5) (ipv6 enabled)
-Host: 127.0.0.1:8433
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot31.txt b/tests/data/prot31.txt
deleted file mode 100644
index 094c9f3f57..0000000000
--- a/tests/data/prot31.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-POST /31 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-Content-Length: 9
-Content-Type: application/x-www-form-urlencoded
-
-mooo=fooo
-POST /moo/moo/moo/310002 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-Content-Length: 9
-Content-Type: application/x-www-form-urlencoded
-
-mooo=fooo
diff --git a/tests/data/prot32.txt b/tests/data/prot32.txt
deleted file mode 100644
index e8efcce0e4..0000000000
--- a/tests/data/prot32.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-POST /32 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-Content-Length: 9
-Content-Type: application/x-www-form-urlencoded
-
-mooo=fooo
-GET /moo/moo/moo/320002 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot33.txt b/tests/data/prot33.txt
deleted file mode 100644
index 5463f27076..0000000000
--- a/tests/data/prot33.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-PUT /33 HTTP/1.1
-Content-Range: bytes 50-149/150
-User-Agent: curl/7.6 (sparc-sun-solaris2.7) libcurl 7.6-pre4 (SSL 0.9.6) (krb4 enabled)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-Content-Length: 100
-
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
-012345678
diff --git a/tests/data/prot34.txt b/tests/data/prot34.txt
deleted file mode 100644
index cbc25212fc..0000000000
--- a/tests/data/prot34.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /34 HTTP/1.1
-User-Agent: curl/7.7-alpha2 (sparc-sun-solaris2.7) libcurl 7.7-alpha2 (SSL 0.9.6) (krb4 enabled)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot35.txt b/tests/data/prot35.txt
deleted file mode 100644
index 5a6f32ccbb..0000000000
--- a/tests/data/prot35.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-HEAD /want/35 HTTP/1.1
-User-Agent: curl/7.7-alpha2 (sparc-sun-solaris2.7) libcurl 7.7-alpha2 (SSL 0.9.6) (krb4 enabled)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot37.txt b/tests/data/prot37.txt
deleted file mode 100644
index 59a06d214e..0000000000
--- a/tests/data/prot37.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-GET /37 HTTP/1.1
-Authorization: Basic dVVzU2VFcnJyOnBwcGFzc3dyZA==
-User-Agent: curl/7.7-beta1 (i686-pc-linux-gnu) libcurl 7.7-beta1 (SSL 0.9.5)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot38.txt b/tests/data/prot38.txt
deleted file mode 100644
index aa661355eb..0000000000
--- a/tests/data/prot38.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-GET /38 HTTP/1.1
-Authorization: Basic dXNlcjpwd2Q=
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
-GET /ffffooooooooooooooooooooooooooooooooooooooooooooooooooo/37?fake HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot39.txt b/tests/data/prot39.txt
deleted file mode 100644
index 93640677d6..0000000000
--- a/tests/data/prot39.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-GET /want/39 HTTP/1.1
-Range: bytes=20-
-User-Agent: curl/7.7-beta4 (sparc-sun-solaris2.7) libcurl 7.7-beta4 (SSL 0.9.6) (krb4 enabled)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
-GET /want/data/390002.txt?coolsite=yes HTTP/1.1
-Range: bytes=20-
-User-Agent: curl/7.7-beta4 (sparc-sun-solaris2.7) libcurl 7.7-beta4 (SSL 0.9.6) (krb4 enabled)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot4.txt b/tests/data/prot4.txt
deleted file mode 100644
index a651bbef7c..0000000000
--- a/tests/data/prot4.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /4 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-extra-header: here
-Accept: replaced
-
diff --git a/tests/data/prot40.txt b/tests/data/prot40.txt
deleted file mode 100644
index 65ef8ee3aa..0000000000
--- a/tests/data/prot40.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /want/40 HTTP/1.1
-User-Agent: curl/7.7.2 (sparc-sun-solaris2.7) libcurl 7.7.2 (OpenSSL 0.9.6a) (krb4 enabled)
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot400.txt b/tests/data/prot400.txt
deleted file mode 100644
index 7cce3a214e..0000000000
--- a/tests/data/prot400.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-USER anonymous
-PASS curl_by_daniel@haxx.se
-PWD
-PASV
-TYPE A
-LIST
diff --git a/tests/data/prot41.txt b/tests/data/prot41.txt
deleted file mode 100644
index 2a2e7b4443..0000000000
--- a/tests/data/prot41.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-GET http://weeird.site.com/YES/boo/2 HTTP/1.1
-Proxy-authorization: Basic cHJveHk6cHBwcA==
-Authorization: Basic c2l0ZTptb29vbw==
-User-Agent: curl/7.7.2 (sparc-sun-solaris2.7) libcurl 7.7.2 (OpenSSL 0.9.6a) (krb4 enabled)
-Host: weeird.site.com
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot5.txt b/tests/data/prot5.txt
deleted file mode 100644
index dd5b3e6a68..0000000000
--- a/tests/data/prot5.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-GET http://127.0.0.1:8999/we/want/that/page/5 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot6.txt b/tests/data/prot6.txt
deleted file mode 100644
index 809c337d4c..0000000000
--- a/tests/data/prot6.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /we/want/that/page/6 HTTP/1.1
-Cookie: name=contents;name2=content2
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot7.txt b/tests/data/prot7.txt
deleted file mode 100644
index 3d0b9eee2f..0000000000
--- a/tests/data/prot7.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-GET /we/want/7 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-
diff --git a/tests/data/prot8.txt b/tests/data/prot8.txt
deleted file mode 100644
index 0ace2ad54c..0000000000
--- a/tests/data/prot8.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /we/want/8 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-Cookie: foobar=name; partmatch=present
-
diff --git a/tests/data/prot9.txt b/tests/data/prot9.txt
deleted file mode 100644
index 2614b71ab3..0000000000
--- a/tests/data/prot9.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-POST /we/want/9 HTTP/1.1
-Host: 127.0.0.1:8999
-Pragma: no-cache
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-Content-Length: 446
-Content-Type: multipart/form-data; boundary=curluczemxkcWWsxptLlAImrFQHwQ3W
-
---curluczemxkcWWsxptLlAImrFQHwQ3W
-Content-Disposition: form-data; name="name"
-
-daniel
---curluczemxkcWWsxptLlAImrFQHwQ3W
-Content-Disposition: form-data; name="tool"
-
-curl
---curluczemxkcWWsxptLlAImrFQHwQ3W
-Content-Disposition: form-data; name="file"; filename="data/command9.txt"
-Content-Type: text/plain
-
-http://%HOSTIP:%HOSTPORT/we/want/9 -F name=daniel -F tool=curl -F file=@data/command9.txt
-
-
---curluczemxkcWWsxptLlAImrFQHwQ3W--
diff --git a/tests/data/reply1.txt b/tests/data/reply1.txt
deleted file mode 100644
index 65221c000d..0000000000
--- a/tests/data/reply1.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-ETag: "21025-dc7-39462498"
-Accept-Ranges: bytes
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-Funny-head: yesyes
-
-<foo>
diff --git a/tests/data/reply10.txt b/tests/data/reply10.txt
deleted file mode 100644
index a36ffa4a58..0000000000
--- a/tests/data/reply10.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.0 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-
-blablabla
diff --git a/tests/data/reply101.txt b/tests/data/reply101.txt
deleted file mode 100644
index 1baaf9385e..0000000000
--- a/tests/data/reply101.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-total 20
-drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
-drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
-drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT
--r--r--r--   1 0        1             35 Jul 16  1996 README
-lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin
-dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev
-drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
-dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
-drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
-dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
diff --git a/tests/data/reply102.txt b/tests/data/reply102.txt
deleted file mode 100644
index 0cfa203ddc..0000000000
--- a/tests/data/reply102.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-data
-    to
-      see
-that FTP
-works
-  so does it?
diff --git a/tests/data/reply103.txt b/tests/data/reply103.txt
deleted file mode 100644
index 0cfa203ddc..0000000000
--- a/tests/data/reply103.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-data
-    to
-      see
-that FTP
-works
-  so does it?
diff --git a/tests/data/reply104.txt b/tests/data/reply104.txt
deleted file mode 100644
index 9ac4637a2d..0000000000
--- a/tests/data/reply104.txt
+++ /dev/null
@@ -1 +0,0 @@
-Content-Length: 51
diff --git a/tests/data/reply105.txt b/tests/data/reply105.txt
deleted file mode 100644
index 0cfa203ddc..0000000000
--- a/tests/data/reply105.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-data
-    to
-      see
-that FTP
-works
-  so does it?
diff --git a/tests/data/reply106.txt b/tests/data/reply106.txt
deleted file mode 100644
index 0cfa203ddc..0000000000
--- a/tests/data/reply106.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-data
-    to
-      see
-that FTP
-works
-  so does it?
diff --git a/tests/data/reply11.txt b/tests/data/reply11.txt
deleted file mode 100644
index 5973e7320f..0000000000
--- a/tests/data/reply11.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 301 This is a weirdo text message
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Location: data/110002.txt?coolsite=yes
-Connection: close
-
-This server reply is for testing a simple Location: following
diff --git a/tests/data/reply110.txt b/tests/data/reply110.txt
deleted file mode 100644
index 9b1c181c7d..0000000000
--- a/tests/data/reply110.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-expected to be a file without the first part
-but we emulate that
diff --git a/tests/data/reply110001.txt b/tests/data/reply110001.txt
deleted file mode 100644
index 79bd045033..0000000000
--- a/tests/data/reply110001.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-HTTP/1.1 301 This is a weirdo text message
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Location: data/110002.txt?coolsite=yes
-Connection: close
-
-HTTP/1.1 200 Followed here fine
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-
-If this is received, the location following worked
diff --git a/tests/data/reply110002.txt b/tests/data/reply110002.txt
deleted file mode 100644
index 280a45bfa2..0000000000
--- a/tests/data/reply110002.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 Followed here fine
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-
-If this is received, the location following worked
diff --git a/tests/data/reply12.txt b/tests/data/reply12.txt
deleted file mode 100644
index 3cc88a191c..0000000000
--- a/tests/data/reply12.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-HTTP/1.1 206 Partial Content
-Date: Mon, 13 Nov 2000 13:41:09 GMT
-Server: Apache/1.3.11 (Unix) PHP/3.0.14
-Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-ETag: "21025-dc7-39462498"
-Accept-Ranges: bytes
-Content-Length: 101
-Content-Range: bytes 100-200/3527
-Connection: close
-Content-Type: text/html
-
-ink="#ffffff" vlink="#cccccc">
-<table width=100% cellspacing=0 cellpadding=0 border=0>
- <tr>
-  <td co
\ No newline at end of file
diff --git a/tests/data/reply120.txt b/tests/data/reply120.txt
deleted file mode 100644
index 0cfa203ddc..0000000000
--- a/tests/data/reply120.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-data
-    to
-      see
-that FTP
-works
-  so does it?
diff --git a/tests/data/reply121.txt b/tests/data/reply121.txt
deleted file mode 100644
index 0cfa203ddc..0000000000
--- a/tests/data/reply121.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-data
-    to
-      see
-that FTP
-works
-  so does it?
diff --git a/tests/data/reply122.txt b/tests/data/reply122.txt
deleted file mode 100644
index 01d5cf2255..0000000000
--- a/tests/data/reply122.txt
+++ /dev/null
@@ -1 +0,0 @@
-MOOO
diff --git a/tests/data/reply1220001.txt b/tests/data/reply1220001.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/data/reply123.txt b/tests/data/reply123.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/data/reply13.txt b/tests/data/reply13.txt
deleted file mode 100644
index 5a7e385ab8..0000000000
--- a/tests/data/reply13.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 Read you
-Deleted: suppose we got a header like this! ;-)
-
-blabla custom request result
-
diff --git a/tests/data/reply14.txt b/tests/data/reply14.txt
deleted file mode 100644
index 4caf40793d..0000000000
--- a/tests/data/reply14.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HTTP/1.1 200 OK
-Server: thebest/1.0
-Connection: close
-
diff --git a/tests/data/reply15.txt b/tests/data/reply15.txt
deleted file mode 100644
index 334b21446d..0000000000
--- a/tests/data/reply15.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.4 200 OK
-Fake: yes
-Fake: yes
-Fake: yes
-
-Repeated nonsense-headers
diff --git a/tests/data/reply16.txt b/tests/data/reply16.txt
deleted file mode 100644
index 57d8bf96ac..0000000000
--- a/tests/data/reply16.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Type: text/html
-Funny-head: yesyes
-
-
diff --git a/tests/data/reply17.txt b/tests/data/reply17.txt
deleted file mode 100644
index 4632d16123..0000000000
--- a/tests/data/reply17.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HTTP/1.1 200 OK
-Funny-head: yesyes
-
-This is the proof it works
diff --git a/tests/data/reply2.txt b/tests/data/reply2.txt
deleted file mode 100644
index 57d8bf96ac..0000000000
--- a/tests/data/reply2.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Type: text/html
-Funny-head: yesyes
-
-
diff --git a/tests/data/reply200.txt b/tests/data/reply200.txt
deleted file mode 100644
index 40ab200694..0000000000
--- a/tests/data/reply200.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-foo
-   bar
-bar
-   foo
-moo
diff --git a/tests/data/reply22.txt b/tests/data/reply22.txt
deleted file mode 100644
index 4632d16123..0000000000
--- a/tests/data/reply22.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HTTP/1.1 200 OK
-Funny-head: yesyes
-
-This is the proof it works
diff --git a/tests/data/reply24.txt b/tests/data/reply24.txt
deleted file mode 100644
index 250e4eed50..0000000000
--- a/tests/data/reply24.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.0 404 BAD BOY
-Content-Type: text/html
-
-This silly page doesn't reaaaaaly exist so you should not get it.
-
diff --git a/tests/data/reply25.txt b/tests/data/reply25.txt
deleted file mode 100644
index 6a816bf4b8..0000000000
--- a/tests/data/reply25.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 301 This is a weirdo text message
-Server: test-server/fake
-Location: data/reply/25
-Content-Length: 32
-Connection: close
-
-Redirect to the same URL again!
diff --git a/tests/data/reply26.txt b/tests/data/reply26.txt
deleted file mode 100644
index f065ac3746..0000000000
--- a/tests/data/reply26.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.1 301 This is a weirdo text message
-Server: test-server/fake
-Location: data/reply/25
-Connection: close
-
-Redirect to the same URL again!
diff --git a/tests/data/reply28.txt b/tests/data/reply28.txt
deleted file mode 100644
index a732a0d225..0000000000
--- a/tests/data/reply28.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Server: fake
-
-{}[] in the URL is not legal
-
diff --git a/tests/data/reply29.txt b/tests/data/reply29.txt
deleted file mode 100644
index dd35000af6..0000000000
--- a/tests/data/reply29.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-HTTP/1.1 200 OK
-Server: fake
-Content-Range: bytes 200-3526/3527
-Content-Length: 84
-
-
-The Content-Range header's contents above aren't really genuine for this
-content.
-
diff --git a/tests/data/reply3.txt b/tests/data/reply3.txt
deleted file mode 100644
index 95ae56276a..0000000000
--- a/tests/data/reply3.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-HTTP/1.0 200 OK
-Server: test-server/fake
-Content-Type: text/html
-Content-Length: 0
-
-this is data even though Content-Length is set to zero
-
-
diff --git a/tests/data/reply30.txt b/tests/data/reply30.txt
deleted file mode 100644
index abe711d938..0000000000
--- a/tests/data/reply30.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 200 OK
-Server: fake
-Content-Length: 8400
-
-This file is a lot smaller than 8400 and thus curl should return an error
-for this.
-
diff --git a/tests/data/reply31.txt b/tests/data/reply31.txt
deleted file mode 100644
index 50e03a4e76..0000000000
--- a/tests/data/reply31.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 301 Moved Permanently
-Server: fake
-Location: /moo/moo/moo/310002
-Connection: close
-
-No contents
-
diff --git a/tests/data/reply310001.txt b/tests/data/reply310001.txt
deleted file mode 100644
index 6e17b66b1a..0000000000
--- a/tests/data/reply310001.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-HTTP/1.1 301 Moved Permanently
-Server: fake
-Location: /moo/moo/moo/310002
-Connection: close
-
-HTTP/1.1 200 Followed here fine
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-
-If this is received, the location following worked
diff --git a/tests/data/reply310002.txt b/tests/data/reply310002.txt
deleted file mode 100644
index 280a45bfa2..0000000000
--- a/tests/data/reply310002.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 Followed here fine
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-
-If this is received, the location following worked
diff --git a/tests/data/reply32.txt b/tests/data/reply32.txt
deleted file mode 100644
index 9e5e693d30..0000000000
--- a/tests/data/reply32.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-HTTP/1.1 303 See Other
-Server: fake
-Location: /moo/moo/moo/320002
-Connection: close
-
-This Location should be fetched with a GET!
-
-
diff --git a/tests/data/reply320001.txt b/tests/data/reply320001.txt
deleted file mode 100644
index d4605292ee..0000000000
--- a/tests/data/reply320001.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-HTTP/1.1 303 See Other
-Server: fake
-Location: /moo/moo/moo/320002
-Connection: close
-
-HTTP/1.1 200 Followed here fine
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-
-If this is received, the location following worked
diff --git a/tests/data/reply320002.txt b/tests/data/reply320002.txt
deleted file mode 100644
index 280a45bfa2..0000000000
--- a/tests/data/reply320002.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 Followed here fine
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-
-If this is received, the location following worked
diff --git a/tests/data/reply33.txt b/tests/data/reply33.txt
deleted file mode 100644
index 8f8cf85224..0000000000
--- a/tests/data/reply33.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 303 See Other
-Server: fake
-Location: /moo/moo/moo/320002
-
-This Location should be fetched with a GET!
-
-
diff --git a/tests/data/reply34.txt b/tests/data/reply34.txt
deleted file mode 100644
index faed9ca0bb..0000000000
--- a/tests/data/reply34.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-HTTP/1.1 200 funky chunky!
-Server: fakeit/1.0
-Transfer-Encoding: chunked
-Connection: mooo
-
-40
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-30
-bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-20;heresatest=moooo
-cccccccccccccccccccccccccccccccc
-0
-muuu
diff --git a/tests/data/reply340001.txt b/tests/data/reply340001.txt
deleted file mode 100644
index 5cac3ca900..0000000000
--- a/tests/data/reply340001.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.1 200 funky chunky!
-Server: fakeit/1.0
-Transfer-Encoding: chunked
-Connection: mooo
-
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccccc
\ No newline at end of file
diff --git a/tests/data/reply35.txt b/tests/data/reply35.txt
deleted file mode 100644
index 0aff134b00..0000000000
--- a/tests/data/reply35.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HTTP/1.1 200 OK
-Server: thebest/1.0
-Silly-but-last-header: funny
-
diff --git a/tests/data/reply36.txt b/tests/data/reply36.txt
deleted file mode 100644
index c5269e9874..0000000000
--- a/tests/data/reply36.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-HTTP/1.1 200 funky chunky!
-Server: fakeit/1.0
-Transfer-Encoding: chunked
-
-40
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ILLEGAL
-bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
diff --git a/tests/data/reply37.txt b/tests/data/reply37.txt
deleted file mode 100644
index 5ddff95322..0000000000
--- a/tests/data/reply37.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-HTTP/1.0 200 OK
-
-no headers!
diff --git a/tests/data/reply38.txt b/tests/data/reply38.txt
deleted file mode 100644
index b07b91dae6..0000000000
--- a/tests/data/reply38.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HTTP/1.0 301 OK
-Location: http://127.0.0.1:8999/ffffooooooooooooooooooooooooooooooooooooooooooooooooooo/37?fake
-
-blah
diff --git a/tests/data/reply380001.txt b/tests/data/reply380001.txt
deleted file mode 100644
index 1431eb8ddb..0000000000
--- a/tests/data/reply380001.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.0 301 OK
-Location: http://127.0.0.1:8999/ffffooooooooooooooooooooooooooooooooooooooooooooooooooo/37?fake
-
-HTTP/1.0 200 OK
-
-no headers!
diff --git a/tests/data/reply39.txt b/tests/data/reply39.txt
deleted file mode 100644
index 735612329e..0000000000
--- a/tests/data/reply39.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 301 This is a weirdo text message
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Location: data/390002.txt?coolsite=yes
-Connection: close
-
-This server reply is for testing a simple Location: following
diff --git a/tests/data/reply390001.txt b/tests/data/reply390001.txt
deleted file mode 100644
index efb86c6647..0000000000
--- a/tests/data/reply390001.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-HTTP/1.1 301 This is a weirdo text message
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Location: data/390002.txt?coolsite=yes
-Connection: close
-
-HTTP/1.1 200 Followed here fine
-Server: test-server/fake
-Content-Range: bytes 20-71/91
-Content-Length: 51
-
-If this is received, the location following worked
diff --git a/tests/data/reply390002.txt b/tests/data/reply390002.txt
deleted file mode 100644
index 3d506c1936..0000000000
--- a/tests/data/reply390002.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.1 200 Followed here fine
-Server: test-server/fake
-Content-Range: bytes 20-71/91
-Content-Length: 51
-
-If this is received, the location following worked
diff --git a/tests/data/reply4.txt b/tests/data/reply4.txt
deleted file mode 100644
index 57d8bf96ac..0000000000
--- a/tests/data/reply4.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Type: text/html
-Funny-head: yesyes
-
-
diff --git a/tests/data/reply40.txt b/tests/data/reply40.txt
deleted file mode 100644
index 8c298ffa8a..0000000000
--- a/tests/data/reply40.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-HTTP/1.1 100 Continue weirdo message
-Server: heeee heeee
-
-HTTP/1.1 200 This is a weirdo text message
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Content-Length: 0
-
-*** This should not be received ***
diff --git a/tests/data/reply41.txt b/tests/data/reply41.txt
deleted file mode 100644
index 57d8bf96ac..0000000000
--- a/tests/data/reply41.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Type: text/html
-Funny-head: yesyes
-
-
diff --git a/tests/data/reply5.txt b/tests/data/reply5.txt
deleted file mode 100644
index 57d8bf96ac..0000000000
--- a/tests/data/reply5.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Type: text/html
-Funny-head: yesyes
-
-
diff --git a/tests/data/reply6.txt b/tests/data/reply6.txt
deleted file mode 100644
index 57d8bf96ac..0000000000
--- a/tests/data/reply6.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Type: text/html
-Funny-head: yesyes
-
-
diff --git a/tests/data/reply7.txt b/tests/data/reply7.txt
deleted file mode 100644
index 9b0a2a9bc7..0000000000
--- a/tests/data/reply7.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Type: text/html
-Funny-head: yesyes
-Set-Cookie: foobar=name; domain=127.0.0.1; path=/;
-Set-Cookie: mismatch=this; domain=127.0.0.1; path="/silly/";
-Set-Cookie: partmatch=present; domain=.0.0.1; path=/;
-
diff --git a/tests/data/reply8.txt b/tests/data/reply8.txt
deleted file mode 100644
index 177ca0994f..0000000000
--- a/tests/data/reply8.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-
-
-
diff --git a/tests/data/reply9.txt b/tests/data/reply9.txt
deleted file mode 100644
index 7cf888e06d..0000000000
--- a/tests/data/reply9.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-
-blablabla
diff --git a/tests/data/stdin17.txt b/tests/data/stdin17.txt
deleted file mode 100644
index bd2ebe61b6..0000000000
--- a/tests/data/stdin17.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Use a silly request without '--':
-request MOOO
-#
-# Set the user-agent using a short-option:
-# (NOTE: the agent string is stripped in the test program why this
-# will never be compared in the end)
--A "agent007 license to drill\t"
-#
-# long option *with* '--':
---max-time 180
diff --git a/tests/data/stdout107.txt b/tests/data/stdout107.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/data/stdout108.txt b/tests/data/stdout108.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/data/stdout109.txt b/tests/data/stdout109.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/data/stdout110.txt b/tests/data/stdout110.txt
deleted file mode 100644
index ce14288d32..0000000000
--- a/tests/data/stdout110.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-e without the first part
-but we emulate that
diff --git a/tests/data/stdout112.txt b/tests/data/stdout112.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/data/stdout15.txt b/tests/data/stdout15.txt
deleted file mode 100644
index 788824df9a..0000000000
--- a/tests/data/stdout15.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP/1.4 200 OK
-Fake: yes
-Fake: yes
-Fake: yes
-
-Repeated nonsense-headers
-http://127.0.0.1:8999/want/15 200 26
diff --git a/tests/data/stdout18.txt b/tests/data/stdout18.txt
deleted file mode 100644
index c297d716ba..0000000000
--- a/tests/data/stdout18.txt
+++ /dev/null
@@ -1,23 +0,0 @@
---_curl_--127.0.0.1:8999/3
-HTTP/1.0 200 OK
-Server: test-server/fake
-Content-Type: text/html
-Content-Length: 0
-
-this is data even though Content-Length is set to zero
-
-
---_curl_--127.0.0.1:8999/10
-HTTP/1.0 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-
-blablabla
---_curl_--127.0.0.1:8999/11
-HTTP/1.1 301 This is a weirdo text message
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Location: data/110002.txt?coolsite=yes
-Connection: close
-
-This server reply is for testing a simple Location: following
diff --git a/tests/data/stdout27.txt b/tests/data/stdout27.txt
deleted file mode 100644
index fcc189c5c1..0000000000
--- a/tests/data/stdout27.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-HTTP/1.1 301 This is a weirdo text message
-Server: test-server/fake
-Location: data/reply/25
-Content-Length: 32
-Connection: close
-
-Redirect to the same URL again!
-HTTP/1.0 404 BAD BOY
-Content-Type: text/html
-
-This silly page doesn't reaaaaaly exist so you should not get it.
-
-HTTP/1.1 200 OK
-Funny-head: yesyes
-
-This is the proof it works
diff --git a/tests/data/test1 b/tests/data/test1
new file mode 100644
index 0000000000..3a6f90b282
--- /dev/null
+++ b/tests/data/test1
@@ -0,0 +1,44 @@
+#
+# Server-side
+<reply name="1">
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Accept-Ranges: bytes
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Funny-head: yesyes
+
+<foo>
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+ <name>
+simple HTTP GET
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/1
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /1 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/tests/data/reply400.txt b/tests/data/test100
similarity index 61%
rename from tests/data/reply400.txt
rename to tests/data/test100
index 1baaf9385e..3f81d6bdb8 100644
--- a/tests/data/reply400.txt
+++ b/tests/data/test100
@@ -1,3 +1,7 @@
+#
+# Server-side
+<reply name="1">
+<data>
 total 20
 drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
 drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
@@ -9,3 +13,32 @@ drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
 dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
 drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
 dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+ <name>
+FTP dir list PASV
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+filter off really nothing
+</strip>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+PASV
+TYPE A
+LIST
+</protocol>
+</verify>
diff --git a/tests/data/test2 b/tests/data/test2
new file mode 100644
index 0000000000..d8c72d0742
--- /dev/null
+++ b/tests/data/test2
@@ -0,0 +1,42 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Type: text/html
+Funny-head: yesyes
+
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+ <name>
+HTTP GET with user and password
+ </name>
+ <command>
+ -u fake:user http://%HOSTIP:%HOSTPORT/2
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /2 HTTP/1.1
+Authorization: Basic ZmFrZTp1c2Vy
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+<data>
+[insert full protocol verifiction dump here]
+</data>
+</verify>
diff --git a/tests/data/test3 b/tests/data/test3
new file mode 100644
index 0000000000..eec48a5fcb
--- /dev/null
+++ b/tests/data/test3
@@ -0,0 +1,42 @@
+#
+# Server-side
+<reply name="1">
+<data>
+HTTP/1.0 200 OK
+Server: test-server/fake
+Content-Type: text/html
+Content-Length: 0
+
+this is data even though Content-Length is set to zero
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+ <name>
+HTTP POST with user and password
+ </name>
+ <command>
+ -d "fooo=mooo&pooo=clue&doo=%20%20%20++++" -u "fake:-user" http://%HOSTIP:%HOSTPORT/3
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+POST /3 HTTP/1.1
+Authorization: Basic ZmFrZTotdXNlcg==
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Content-Length: 37
+Content-Type: application/x-www-form-urlencoded
+
+fooo=mooo&pooo=clue&doo=%20%20%20++++
+</protocol>
+</verify>
diff --git a/tests/data/test300 b/tests/data/test300
new file mode 100644
index 0000000000..619063278e
--- /dev/null
+++ b/tests/data/test300
@@ -0,0 +1,38 @@
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 7
+
+MooMoo
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+ <name>
+simple HTTPS GET
+ </name>
+ <command>
+https://%HOSTIP:%HTTPSPORT/300
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /300 HTTP/1.1
+Host: 127.0.0.1:8433
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+</verify>
diff --git a/tests/data/test4 b/tests/data/test4
new file mode 100644
index 0000000000..9ca90c9a11
--- /dev/null
+++ b/tests/data/test4
@@ -0,0 +1,39 @@
+#
+# Server-side
+<reply name="1">
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Type: text/html
+Funny-head: yesyes
+
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+ <name>
+Replaced internal and added custom HTTP headers
+ </name>
+ <command>
+ -H "extra-header: here" -H "Accept: replaced" http://%HOSTIP:%HOSTPORT/4
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /4 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+extra-header: here
+Accept: replaced
+
+</protocol>
+</verify>
diff --git a/tests/data/reply100.txt b/tests/data/test400
similarity index 61%
rename from tests/data/reply100.txt
rename to tests/data/test400
index 1baaf9385e..1159ee8596 100644
--- a/tests/data/reply100.txt
+++ b/tests/data/test400
@@ -1,3 +1,7 @@
+#
+# Server-side
+<reply name="1">
+<data>
 total 20
 drwxr-xr-x   8 98       98           512 Oct 22 13:06 .
 drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..
@@ -9,3 +13,32 @@ drwxrwxrwx   2 98       98           512 May 29 16:04 download.html
 dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc
 drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub
 dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+ <name>
+FTPS dir list PASV
+ </name>
+ <command>
+ftps://%HOSTIP:%FTPSPORT/
+</command>
+</test>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+filter off really nothing
+</strip>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+PASV
+TYPE A
+LIST
+</protocol>
+</verify>
diff --git a/tests/data/upload107.txt b/tests/data/upload107.txt
deleted file mode 100644
index 0cfa203ddc..0000000000
--- a/tests/data/upload107.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-data
-    to
-      see
-that FTP
-works
-  so does it?
diff --git a/tests/data/upload108.txt b/tests/data/upload108.txt
deleted file mode 100644
index 0cfa203ddc..0000000000
--- a/tests/data/upload108.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-data
-    to
-      see
-that FTP
-works
-  so does it?
diff --git a/tests/data/upload109.txt b/tests/data/upload109.txt
deleted file mode 100644
index 0cfa203ddc..0000000000
--- a/tests/data/upload109.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-data
-    to
-      see
-that FTP
-works
-  so does it?
diff --git a/tests/data/upload112.txt b/tests/data/upload112.txt
deleted file mode 100644
index 741e7b4409..0000000000
--- a/tests/data/upload112.txt
+++ /dev/null
@@ -1 +0,0 @@
-o does it?
-- 
GitLab