Added test case 556 that uses curl_easy_send() and curl_easy_recv()

diff --git a/CHANGES b/CHANGES
index b5bde4e4097026c029605d8c80459db1c6ac8f9a..9ccb753eda680c88fbce43630e670de1fcb00245 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,9 @@
                                   Changelog
 
 
+Daniel Stenberg (13 May 2008)
+- Added test case 556 that uses curl_easy_send() and curl_easy_recv()
+
 Daniel Stenberg (9 May 2008)
 - Introducing curl_easy_send() and curl_easy_recv(). They can be used to send
   and receive data over a connection previously setup with curl_easy_perform()

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index fe1f2b101c98c7799379ec03757c9004396ff315..a58ea7c24ea4696571b68fa9ef5217b9810bf9ef 100644 (file)
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -50,7 +50,8 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46           \
  test551 test552 test1016 test1017 test1018 test1019 test1020 test553      \
  test1021 test1022 test1023 test309 test616 test617 test618 test619        \
  test620 test621 test622 test623 test624 test625 test626 test627 test554   \
- test1024 test1025 test555 test1026 test1027 test1028 test1029 test1030
+ test1024 test1025 test555 test1026 test1027 test1028 test1029 test1030    \
+ test556
 
 filecheck:
        @mkdir test-place; \

diff --git a/tests/data/test556 b/tests/data/test556
new file mode 100644 (file)
index 0000000..998bdfb
--- /dev/null
+++ b/tests/data/test556
@@ -0,0 +1,50 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+</keywords>
+</info>
+
+<reply>
+<data>
+HTTP/1.1 200 OK
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+Content-Length: 6
+Connection: close
+
+-foo-
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+<tool>
+lib556
+</tool>
+ <name>
+send and recv HTTP
+ </name>
+ <command>
+http://%HOSTIP:%HTTPPORT
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /556 HTTP/1.2\r
+Host: ninja\r
+\r
+</protocol>
+</verify>
+</testcase>

diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index 47864eb303fbb4b9302e131abe6949903bddc7ab..ff4532c9c908c2dbee02438af0528526124996cf 100644 (file)
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -48,7 +48,7 @@ noinst_PROGRAMS = lib500 lib501 lib502 lib503 lib504 lib505 lib506    \
   lib507 lib508 lib510 lib511 lib512 lib513 lib514 lib515 lib516       \
   lib517 lib518 lib519 lib520 lib521 lib523 lib524 lib525 lib526 lib527        \
   lib529 lib530 lib532 lib533 lib536 lib537 lib540 lib541 lib542 lib543 \
-  lib544 lib545 lib547 lib548 lib549 lib552 lib553 lib554 lib555
+  lib544 lib545 lib547 lib548 lib549 lib552 lib553 lib554 lib555 lib556
 
 # Dependencies (may need to be overriden)
 LDADD = $(LIBDIR)/libcurl.la
@@ -151,3 +151,5 @@ lib552_SOURCES = lib552.c $(SUPPORTFILES)
 lib553_SOURCES = lib553.c $(SUPPORTFILES)
 
 lib554_SOURCES = lib554.c $(SUPPORTFILES)
+
+lib556_SOURCES = lib556.c $(SUPPORTFILES)

diff --git a/tests/libtest/lib556.c b/tests/libtest/lib556.c
new file mode 100644 (file)
index 0000000..12a1188
--- /dev/null
+++ b/tests/libtest/lib556.c
@@ -0,0 +1,67 @@
+/*****************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id$
+ */
+
+#include "test.h"
+
+int test(char *URL)
+{
+  CURLcode res;
+  CURL *curl;
+
+  if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
+    fprintf(stderr, "curl_global_init() failed\n");
+    return TEST_ERR_MAJOR_BAD;
+  }
+
+  if ((curl = curl_easy_init()) == NULL) {
+    fprintf(stderr, "curl_easy_init() failed\n");
+    curl_global_cleanup();
+    return TEST_ERR_MAJOR_BAD;
+  }
+
+  curl_easy_setopt(curl, CURLOPT_URL, URL);
+  curl_easy_setopt(curl, CURLOPT_CONNECT_ONLY, 1L);
+
+  res = curl_easy_perform(curl);
+
+  if(!res) {
+    /* we are connected, now get a HTTP document the raw way */
+    const char *request = "GET /556 HTTP/1.2\r\n"
+      "Host: ninja\r\n\r\n";
+    size_t iolen;
+    char buf[1024];
+
+    res = curl_easy_send(curl, request, strlen(request), &iolen);
+
+    if(!res) {
+      /* we assume that sending always work */
+      int total=0;
+
+      do {
+        /* busy-read like crazy */
+        res = curl_easy_recv(curl, buf, 1024, &iolen);
+
+        if(iolen)
+          /* send received stuff to stdout */
+          write(STDOUT_FILENO, buf, iolen);
+
+        total += iolen;
+
+      } while((res == CURLE_AGAIN) && (total < 20));
+    }
+  }
+
+
+  curl_easy_cleanup(curl);
+  curl_global_cleanup();
+
+  return (int)res;
+}
+