4 files changed, 98 insertions, 2 deletions
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 2d9aba889..46208a6ab 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -25,7 +25,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	\
  test158 test159 test511 test160 test161 test162 test163 test164	\
  test512 test165 test166 test167 test168 test169 test170 test171	\
  test172 test204 test205 test173 test174 test175 test176 test177	\
- test513
+ test513 test514
 
 # The following tests have been removed from the dist since they no longer
 # work. We need to fix the test suite's FTPS server first, then bring them
diff --git a/tests/data/test514 b/tests/data/test514
new file mode 100644
index 000000000..06fc66818
--- /dev/null
+++ b/tests/data/test514
@@ -0,0 +1,49 @@
+#
+# Server-side
+<reply>
+<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
+
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+<tool>
+lib514
+</tool>
+ <name>
+First set options to POST and then to make HEAD
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/514
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+HEAD /514 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: */*
+
+</protocol>
+</verify>
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index d659cca1b..688c7a4b2 100644
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -39,7 +39,7 @@ SUPPORTFILES = first.c test.h
 
 # These are all libcurl test programs
 noinst_PROGRAMS = lib500 lib501 lib502 lib503 lib504 lib505 lib506 lib507 \
-  lib508 lib509 lib510 lib511 lib512 lib513
+  lib508 lib509 lib510 lib511 lib512 lib513 lib514
 
 lib500_SOURCES = lib500.c $(SUPPORTFILES)
 lib500_LDADD = $(LIBDIR)/libcurl.la
@@ -96,3 +96,7 @@ lib512_DEPENDENCIES = $(LIBDIR)/libcurl.la
 lib513_SOURCES = lib513.c $(SUPPORTFILES)
 lib513_LDADD = $(LIBDIR)/libcurl.la
 lib513_DEPENDENCIES = $(LIBDIR)/libcurl.la
+
+lib514_SOURCES = lib514.c $(SUPPORTFILES)
+lib514_LDADD = $(LIBDIR)/libcurl.la
+lib514_DEPENDENCIES = $(LIBDIR)/libcurl.la
diff --git a/tests/libtest/lib514.c b/tests/libtest/lib514.c
new file mode 100644
index 000000000..7100fd8a5
--- /dev/null
+++ b/tests/libtest/lib514.c
@@ -0,0 +1,43 @@
+#include "test.h"
+
+int test(char *URL)
+{
+  CURL *curl;
+  CURLcode res=CURLE_OK;
+
+  curl = curl_easy_init();
+  if(curl) {
+    /* First set the URL that is about to receive our POST. */
+    curl_easy_setopt(curl, CURLOPT_URL, URL);
+
+    /* Based on a bug report by Niels van Tongeren on June 29, 2004:
+
+    A weird situation occurs when request 1 is a POST request and the request
+    2 is a HEAD request. For the POST request we set the CURLOPT_POSTFIELDS,
+    CURLOPT_POSTFIELDSIZE and CURLOPT_POST options. For the HEAD request we
+    set the CURLOPT_NOBODY option to '1'.
+
+    */
+
+    curl_easy_setopt(curl, CURLOPT_POSTFIELDS, "moo");
+    curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, 3);
+    curl_easy_setopt(curl, CURLOPT_POST, 1);
+
+    /* this is where transfer 1 would take place, but skip that and change
+       options right away instead */
+
+    curl_easy_setopt(curl, CURLOPT_NOBODY, 1);
+
+    curl_easy_setopt(curl, CURLOPT_VERBOSE, 1); /* show verbose for debug */
+    curl_easy_setopt(curl, CURLOPT_HEADER, 1); /* include header */
+
+    /* Now, we should be making a fine HEAD request */
+
+    /* Perform the request 2, res will get the return code */
+    res = curl_easy_perform(curl);
+
+    /* always cleanup */
+    curl_easy_cleanup(curl);
+  }
+  return (int)res;
+}