Lua-cURL/Lua-cURLv3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add. CAINFO, CAPATH and CERTINFO options and SSLVERSION_XXX constants.

Browse Source
This commit is contained in:
Alexey Melnichuk 2014-08-28 17:05:00 +05:00
parent 4510730e37
commit ad9116ede5
3 changed files with 52 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lceasy.c
View File

@ -685,6 +685,7 @@ static const struct luaL_Reg lcurl_easy_methods[] = {
static const lcurl_const_t lcurl_easy_opt[] = {
#define OPT_ENTRY(L, N, T, S) { "OPT_"#N, CURLOPT_##N },
#define FLG_ENTRY(N) { #N, CURL_##N },
#include "lcopteasy.h"
OPT_ENTRY(postfields, POSTFIELDS, TTT, 0)
OPT_ENTRY(httppost, HTTPPOST, TTT, 0)
@ -694,6 +695,7 @@ static const lcurl_const_t lcurl_easy_opt[] = {
OPT_ENTRY(headerfunction, HEADERFUNCTION, TTT, 0)
OPT_ENTRY(progressfunction, PROGRESSFUNCTION, TTT, 0)
#undef OPT_ENTRY
#undef FLG_ENTRY
#define OPT_ENTRY(L, N, T, S) { "INFO_"#N, CURLINFO_##N },
#include "lcinfoeasy.h"

38
src/lcopteasy.h
View File

@ -16,6 +16,16 @@
# endif
#endif
#ifndef OPT_ENTRY
# define OPT_ENTRY(a,b,c,d)
# define OPT_ENTRY_IS_NULL
#endif
#ifndef FLG_ENTRY
# define FLG_ENTRY(a)
# define FLG_ENTRY_IS_NULL
#endif
OPT_ENTRY( verbose, VERBOSE, LNG, 0 )
OPT_ENTRY( header, HEADER, LNG, 0 )
OPT_ENTRY( noprogress, NOPROGRESS, LNG, 0 )
@ -180,6 +190,10 @@ OPT_ENTRY( new_directory_perms, NEW_DIRECTORY_PERMS, LNG, 0)
OPT_ENTRY( telnetoptions, TELNETOPTIONS, LST, 0)
OPT_ENTRY(cainfo, CAINFO, STR, LCURL_STORE_STRING )
OPT_ENTRY(capath, CAPATH, STR, LCURL_STORE_STRING )
OPT_ENTRY(certinfo, CERTINFO, LNG, 0 )
OPT_ENTRY(sslcert, SSLCERT, STR, LCURL_STORE_STRING )
OPT_ENTRY(sslcerttype, SSLCERTTYPE, STR, LCURL_STORE_STRING )
OPT_ENTRY(sslengine, SSLENGINE, STR, LCURL_STORE_STRING )
@ -190,9 +204,33 @@ OPT_ENTRY(sslversion, SSLVERSION, LNG, 0 )
OPT_ENTRY(ssl_cipher_list, SSL_CIPHER_LIST, STR, LCURL_STORE_STRING )
// OPT_ENTRY(ssl_ctx_data, SSL_CTX_DATA, 0 ) //! @todo
// OPT_ENTRY(ssl_ctx_function, SSL_CTX_FUNCTION, 0 ) //! @todo
#if LCURL_CURL_VER_GE(7,33,0)
OPT_ENTRY(ssl_enable_alpn, SSL_ENABLE_ALPN, LNG, 0 )
OPT_ENTRY(ssl_enable_npn, SSL_ENABLE_NPN, LNG, 0 )
#endif
#if LCURL_CURL_VER_GE(7,25,0)
OPT_ENTRY(ssl_options, SSL_OPTIONS, LNG, 0 )
#endif
OPT_ENTRY(ssl_sessionid_cache, SSL_SESSIONID_CACHE, LNG, 0 )
OPT_ENTRY(ssl_verifyhost, SSL_VERIFYHOST, LNG, 0 )
OPT_ENTRY(ssl_verifypeer, SSL_VERIFYPEER, LNG, 0 )
FLG_ENTRY( SSLVERSION_DEFAULT )
FLG_ENTRY( SSLVERSION_TLSv1 )
FLG_ENTRY( SSLVERSION_SSLv2 )
FLG_ENTRY( SSLVERSION_SSLv3 )
#if LCURL_CURL_VER_GE(7,34,0)
FLG_ENTRY( SSLVERSION_TLSv1_0 )
FLG_ENTRY( SSLVERSION_TLSv1_1 )
FLG_ENTRY( SSLVERSION_TLSv1_2 )
#endif
#ifdef OPT_ENTRY_IS_NULL
# undef OPT_ENTRY
#endif
#ifdef FLG_ENTRY_IS_NULL
# undef FLG_ENTRY
#endif

17
src/lcoptshare.h
View File

@ -1,17 +1,24 @@
#ifndef OPT_ENTRY
# define OPT_ENTRY(a,b,c,d)
# define OPT_ENTRY_IS_NULL
#endif
#ifndef FLG_ENTRY
# define FLG_ENTRY(a)
# define FLG_ENTRY_IS_NULL
#endif
OPT_ENTRY(share, SHARE, LNG, 0 )
OPT_ENTRY(unshare, UNSHARE, LNG, 0 )
FLG_ENTRY(LOCK_DATA_COOKIE)
FLG_ENTRY(LOCK_DATA_DNS)
FLG_ENTRY(LOCK_DATA_SSL_SESSION)
FLG_ENTRY( LOCK_DATA_COOKIE )
FLG_ENTRY( LOCK_DATA_DNS )
FLG_ENTRY( LOCK_DATA_SSL_SESSION )
#undef OPT_ENTRY
#undef FLG_ENTRY
#ifdef OPT_ENTRY_IS_NULL
# undef OPT_ENTRY
#endif
#ifdef FLG_ENTRY_IS_NULL
# undef FLG_ENTRY
#endif