diff options
-rw-r--r-- | tests/data/Makefile.inc | 4 | ||||
-rw-r--r-- | tests/data/test1438 | 58 | ||||
-rw-r--r-- | tests/data/test1439 | 58 | ||||
-rw-r--r-- | tests/data/test1535 | 50 | ||||
-rw-r--r-- | tests/data/test1536 | 50 | ||||
-rw-r--r-- | tests/libtest/Makefile.inc | 10 | ||||
-rw-r--r-- | tests/libtest/lib1535.c | 128 | ||||
-rw-r--r-- | tests/libtest/lib1536.c | 128 |
8 files changed, 483 insertions, 3 deletions
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index b8b18e5d0..a2c4fd25f 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -150,7 +150,7 @@ test1408 test1409 test1410 test1411 test1412 test1413 test1414 test1415 \ test1416 test1417 test1418 test1419 test1420 test1421 test1422 test1423 \ test1424 \ test1428 test1429 test1430 test1431 test1432 test1433 test1434 test1435 \ -test1436 test1437 \ +test1436 test1437 test1438 test1439 \ \ test1500 test1501 test1502 test1503 test1504 test1505 test1506 test1507 \ test1508 test1509 test1510 test1511 test1512 test1513 test1514 test1515 \ @@ -159,7 +159,7 @@ test1516 test1517 \ test1520 \ \ test1525 test1526 test1527 test1528 test1529 test1530 test1531 test1532 \ -test1533 test1534 \ +test1533 test1534 test1535 test1536 \ \ test1600 test1601 test1602 test1603 test1604 test1605 \ \ diff --git a/tests/data/test1438 b/tests/data/test1438 new file mode 100644 index 000000000..8aaedb71e --- /dev/null +++ b/tests/data/test1438 @@ -0,0 +1,58 @@ +<testcase> +<info> +<keywords> +protocol +--write-out +</keywords> +</info> +# Server-side +<reply> +<data nocheck="yes"> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 9 +Connection: close +Content-Type: text/plain + +testdata +</data> + +</reply> + +# Client-side +<client> +<server> +http +</server> + +<name> +Check if %{scheme} returns HTTP +</name> +<command> +http://%HOSTIP:%HTTPPORT/1438 --write-out '%{scheme}' +</command> +</client> + +# Verify data +<verify> +<stdout nonewline="yes"> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 9 +Connection: close +Content-Type: text/plain + +testdata +HTTP +</stdout> +<protocol> +GET /1438 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +<strip> +^User-Agent:.* +</strip> +</verify> +</testcase> diff --git a/tests/data/test1439 b/tests/data/test1439 new file mode 100644 index 000000000..cb906adbc --- /dev/null +++ b/tests/data/test1439 @@ -0,0 +1,58 @@ +<testcase> +<info> +<keywords> +HTTP +--write-out +</keywords> +</info> +# Server-side +<reply> +<data nocheck="yes"> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 9 +Connection: close +Content-Type: text/plain + +testdata +</data> + +</reply> + +# Client-side +<client> +<server> +http +</server> + +<name> +Check if %{scheme} returns HTTP +</name> +<command> +http://%HOSTIP:%HTTPPORT/1439 --write-out '%{http_version}' +</command> +</client> + +# Verify data +<verify> +<stdout nonewline="yes"> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 9 +Connection: close +Content-Type: text/plain + +testdata +1.1 +</stdout> +<protocol> +GET /1439 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +<strip> +^User-Agent:.* +</strip> +</verify> +</testcase> diff --git a/tests/data/test1535 b/tests/data/test1535 new file mode 100644 index 000000000..226190d05 --- /dev/null +++ b/tests/data/test1535 @@ -0,0 +1,50 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +</keywords> +</info> + +# +# Server-side +<reply> +<data nocheck="yes"> +HTTP/1.0 200 OK swsclose +Last-Modified: Thu, 01 Jan 1970 00:00:30 GMT +Content-Length: 0 + +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> +# tool is what to use instead of 'curl' +<tool> +lib1535 +</tool> +<name> +Test CURLINFO_RESPONSE_CODE CURLINFO_PROTOCOL +</name> +<command> +http://%HOSTIP:%HTTPPORT/1535 +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<protocol> +GET /1535 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +<errorcode> +0 +</errorcode> +</verify> +</testcase> diff --git a/tests/data/test1536 b/tests/data/test1536 new file mode 100644 index 000000000..a6e5a66cb --- /dev/null +++ b/tests/data/test1536 @@ -0,0 +1,50 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +</keywords> +</info> + +# +# Server-side +<reply> +<data nocheck="yes"> +HTTP/1.0 200 OK swsclose +Last-Modified: Thu, 01 Jan 1970 00:00:30 GMT +Content-Length: 0 + +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> +# tool is what to use instead of 'curl' +<tool> +lib1536 +</tool> +<name> +Test CURLINFO_RESPONSE_CODE CURLINFO_SCHEME +</name> +<command> +http://%HOSTIP:%HTTPPORT/1536 +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<protocol> +GET /1536 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +<errorcode> +0 +</errorcode> +</verify> +</testcase> diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc index c1dc2f585..66628aae1 100644 --- a/tests/libtest/Makefile.inc +++ b/tests/libtest/Makefile.inc @@ -24,7 +24,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \ lib1509 lib1510 lib1511 lib1512 lib1513 lib1514 lib1515 lib1517 \ lib1520 \ lib1525 lib1526 lib1527 lib1528 lib1529 lib1530 lib1531 lib1532 lib1533 \ - lib1534 \ + lib1534 lib1535 lib1536 \ lib1900 \ lib2033 @@ -404,6 +404,14 @@ lib1534_SOURCES = lib1534.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib1534_LDADD = $(TESTUTIL_LIBS) lib1534_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1534 +lib1535_SOURCES = lib1535.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib1535_LDADD = $(TESTUTIL_LIBS) +lib1535_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1535 + +lib1536_SOURCES = lib1536.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib1536_LDADD = $(TESTUTIL_LIBS) +lib1536_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1536 + lib1900_SOURCES = lib1900.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib1900_LDADD = $(TESTUTIL_LIBS) lib1900_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/tests/libtest/lib1535.c b/tests/libtest/lib1535.c new file mode 100644 index 000000000..32519f206 --- /dev/null +++ b/tests/libtest/lib1535.c @@ -0,0 +1,128 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at https://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ +#include "test.h" + +#include "memdebug.h" + +/* Test CURLINFO_PROTOCOL */ + +int test(char *URL) +{ + CURL *curl, *dupe = NULL; + long protocol; + int res = CURLE_OK; + + global_init(CURL_GLOBAL_ALL); + + easy_init(curl); + + /* Test that protocol is properly initialized on curl_easy_init. + */ + + res = curl_easy_getinfo(curl, CURLINFO_PROTOCOL, &protocol); + if(res) { + fprintf(stderr, "%s:%d curl_easy_getinfo() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + if(protocol != 0) { + fprintf(stderr, "%s:%d protocol init failed; expected 0 but is %ld\n", + __FILE__, __LINE__, protocol); + res = CURLE_FAILED_INIT; + goto test_cleanup; + } + + easy_setopt(curl, CURLOPT_URL, URL); + + res = curl_easy_perform(curl); + if(res) { + fprintf(stderr, "%s:%d curl_easy_perform() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + + /* Test that a protocol is properly set after receiving an HTTP resource. + */ + + res = curl_easy_getinfo(curl, CURLINFO_PROTOCOL, &protocol); + if(res) { + fprintf(stderr, "%s:%d curl_easy_getinfo() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + if(protocol != CURLPROTO_HTTP) { + fprintf(stderr, "%s:%d protocol of http resource is incorrect; " + "expected %ld but is %ld\n", + __FILE__, __LINE__, CURLPROTO_HTTP, protocol); + res = CURLE_HTTP_RETURNED_ERROR; + goto test_cleanup; + } + + /* Test that a protocol is properly initialized on curl_easy_duphandle. + */ + + dupe = curl_easy_duphandle(curl); + if(!dupe) { + fprintf(stderr, "%s:%d curl_easy_duphandle() failed\n", + __FILE__, __LINE__); + res = CURLE_FAILED_INIT; + goto test_cleanup; + } + + res = curl_easy_getinfo(dupe, CURLINFO_PROTOCOL, &protocol); + if(res) { + fprintf(stderr, "%s:%d curl_easy_getinfo() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + if(protocol != 0) { + fprintf(stderr, "%s:%d protocol init failed; expected 0 but is %ld\n", + __FILE__, __LINE__, protocol); + res = CURLE_FAILED_INIT; + goto test_cleanup; + } + + + /* Test that a protocol is properly initialized on curl_easy_reset. + */ + + curl_easy_reset(curl); + + res = curl_easy_getinfo(curl, CURLINFO_PROTOCOL, &protocol); + if(res) { + fprintf(stderr, "%s:%d curl_easy_getinfo() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + if(protocol != 0) { + fprintf(stderr, "%s:%d protocol init failed; expected 0 but is %ld\n", + __FILE__, __LINE__, protocol); + res = CURLE_FAILED_INIT; + goto test_cleanup; + } + +test_cleanup: + curl_easy_cleanup(curl); + curl_easy_cleanup(dupe); + curl_global_cleanup(); + return res; +} diff --git a/tests/libtest/lib1536.c b/tests/libtest/lib1536.c new file mode 100644 index 000000000..96725c751 --- /dev/null +++ b/tests/libtest/lib1536.c @@ -0,0 +1,128 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at https://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ +#include "test.h" + +#include "memdebug.h" + +/* Test CURLINFO_SCHEME */ + +int test(char *URL) +{ + CURL *curl, *dupe = NULL; + char *scheme; + int res = CURLE_OK; + + global_init(CURL_GLOBAL_ALL); + + easy_init(curl); + + /* Test that scheme is properly initialized on curl_easy_init. + */ + + res = curl_easy_getinfo(curl, CURLINFO_SCHEME, &scheme); + if(res) { + fprintf(stderr, "%s:%d curl_easy_getinfo() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + if(scheme != NULL) { + fprintf(stderr, "%s:%d scheme init failed; expected NULL\n", + __FILE__, __LINE__); + res = CURLE_FAILED_INIT; + goto test_cleanup; + } + + easy_setopt(curl, CURLOPT_URL, URL); + + res = curl_easy_perform(curl); + if(res) { + fprintf(stderr, "%s:%d curl_easy_perform() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + + /* Test that a scheme is properly set after receiving an HTTP resource. + */ + + res = curl_easy_getinfo(curl, CURLINFO_SCHEME, &scheme); + if(res) { + fprintf(stderr, "%s:%d curl_easy_getinfo() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + if(memcmp(scheme, "HTTP", 5) != 0) { + fprintf(stderr, "%s:%d scheme of http resource is incorrect; " + "expected 'HTTP' but is %s\n", + __FILE__, __LINE__, CURLPROTO_HTTP, (scheme == NULL ? "NULL" : "invalid")); + res = CURLE_HTTP_RETURNED_ERROR; + goto test_cleanup; + } + + /* Test that a scheme is properly initialized on curl_easy_duphandle. + */ + + dupe = curl_easy_duphandle(curl); + if(!dupe) { + fprintf(stderr, "%s:%d curl_easy_duphandle() failed\n", + __FILE__, __LINE__); + res = CURLE_FAILED_INIT; + goto test_cleanup; + } + + res = curl_easy_getinfo(dupe, CURLINFO_SCHEME, &scheme); + if(res) { + fprintf(stderr, "%s:%d curl_easy_getinfo() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + if(scheme != 0) { + fprintf(stderr, "%s:%d scheme init failed; expected NULL\n", + __FILE__, __LINE__); + res = CURLE_FAILED_INIT; + goto test_cleanup; + } + + + /* Test that a scheme is properly initialized on curl_easy_reset. + */ + + curl_easy_reset(curl); + + res = curl_easy_getinfo(curl, CURLINFO_SCHEME, &scheme); + if(res) { + fprintf(stderr, "%s:%d curl_easy_getinfo() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + if(scheme != 0) { + fprintf(stderr, "%s:%d scheme init failed; expected NULL\n", + __FILE__, __LINE__); + res = CURLE_FAILED_INIT; + goto test_cleanup; + } + +test_cleanup: + curl_easy_cleanup(curl); + curl_easy_cleanup(dupe); + curl_global_cleanup(); + return res; +} |