From b9e77f3ee6d3bf72dfcbb0793a9d6cb0dfa9d552 Mon Sep 17 00:00:00 2001 From: Alexey Melnichuk Date: Mon, 8 Sep 2014 08:16:54 +0000 Subject: [PATCH 1/4] Fix. SSL_ENABLE_XXX added in 7.36.0 --- src/lcopteasy.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lcopteasy.h b/src/lcopteasy.h index 366da42..b9a1d3e 100644 --- a/src/lcopteasy.h +++ b/src/lcopteasy.h @@ -228,7 +228,7 @@ OPT_ENTRY( sslkey, SSLKEY, STR, LCURL_STORE_ST OPT_ENTRY( sslkeytype, SSLKEYTYPE, STR, LCURL_STORE_STRING, "PEM" ) OPT_ENTRY( sslversion, SSLVERSION, LNG, 0, CURL_SSLVERSION_DEFAULT ) OPT_ENTRY( ssl_cipher_list, SSL_CIPHER_LIST, STR, LCURL_STORE_STRING, LCURL_DEFAULT_VALUE ) -#if LCURL_CURL_VER_GE(7,33,0) +#if LCURL_CURL_VER_GE(7,36,0) OPT_ENTRY( ssl_enable_alpn, SSL_ENABLE_ALPN, LNG, 0, 1 ) OPT_ENTRY( ssl_enable_npn, SSL_ENABLE_NPN, LNG, 0, 1 ) #endif From 52834c0e019a636be0fac9c4589925b5b53cd293 Mon Sep 17 00:00:00 2001 From: Alexey Melnichuk Date: Mon, 8 Sep 2014 13:09:08 +0400 Subject: [PATCH 2/4] Change. Use httpbin.org to test --- test/test_easy.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/test_easy.lua b/test/test_easy.lua index 964b80a..56bf9a2 100644 --- a/test/test_easy.lua +++ b/test/test_easy.lua @@ -8,7 +8,10 @@ local scurl = require "lcurl.safe" local json = require "dkjson" local path = require "path" local upath = require "path".new('/') -local url = "http://example.com" + +local SIZE = 128 +local url = "http://httpbin.org/bytes/" .. SIZE + local fname = "./test.download" print("------------------------------------") From b575ca74c9cb09aea759831cbb6329507546bcdd Mon Sep 17 00:00:00 2001 From: Alexey Melnichuk Date: Mon, 8 Sep 2014 13:09:50 +0400 Subject: [PATCH 3/4] Revert "Change. Use httpbin.org to test" This reverts commit 52834c0e019a636be0fac9c4589925b5b53cd293. --- test/test_easy.lua | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test/test_easy.lua b/test/test_easy.lua index 56bf9a2..964b80a 100644 --- a/test/test_easy.lua +++ b/test/test_easy.lua @@ -8,10 +8,7 @@ local scurl = require "lcurl.safe" local json = require "dkjson" local path = require "path" local upath = require "path".new('/') - -local SIZE = 128 -local url = "http://httpbin.org/bytes/" .. SIZE - +local url = "http://example.com" local fname = "./test.download" print("------------------------------------") From ab815645edd98651e326649ef56b991c9c5aa86c Mon Sep 17 00:00:00 2001 From: Alexey Melnichuk Date: Mon, 8 Sep 2014 13:28:47 +0400 Subject: [PATCH 4/4] Add. Note about test fail. [ci skip] --- test/test_easy.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/test_easy.lua b/test/test_easy.lua index 964b80a..0f38c18 100644 --- a/test/test_easy.lua +++ b/test/test_easy.lua @@ -555,6 +555,15 @@ function test_abort_06() end function test_pause() + +-- Note. +-- OS version : Linux Mint 17 (x86_64) +-- cURL version : libcurl/7.35.0 OpenSSL/1.0.1f zlib/1.2.8 libidn/1.28 librtmp/2.3 +-- version_info("host"): x86_64-pc-linux-gnu +-- +-- c:perform() returns curl.E_READ_ERROR after readfunction return curl.READFUNC_PAUSE +-- + local counter = 0 assert_equal(c, c:setopt_readfunction(function() if counter == 0 then