Merge branch 'master' of https://github.com/moteus/lua-lcurl

Author: moteus

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

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