kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update for new cURL info/option/error code values

Browse Source
This commit is contained in:
Joshua Granick
2017-11-07 20:50:08 -08:00
parent 4e758515ef
commit 9353d7e42f
5 changed files with 117 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -24,3 +24,4 @@ legacy/ndll/*/lime*
legacy/ndll/*/liblime*
legacy/project/all_objs
legacy/project/obj
.vscode/settings.json

11
lime/net/curl/CURLCode.hx
View File

@@ -11,7 +11,7 @@ package lime.net.curl;
var COULDNT_RESOLVE_PROXY = 5;
var COULDNT_RESOLVE_HOST = 6;
var COULDNT_CONNECT = 7;
var FTP_WEIRD_SERVER_REPLY = 8;
var WEIRD_SERVER_REPLY = 8;
var REMOTE_ACCESS_DENIED = 9;
var FTP_ACCEPT_FAILED = 10;
var FTP_WEIRD_PASS_REPLY = 11;
@@ -19,7 +19,7 @@ package lime.net.curl;
var FTP_WEIRD_PASV_REPLY = 13;
var FTP_WEIRD_227_FORMAT = 14;
var FTP_CANT_GET_HOST = 15;
//var OBSOLETE16 = 16;
var HTTP2 = 16;
var FTP_COULDNT_SET_TYPE = 17;
var PARTIAL_FILE = 18;
var FTP_COULDNT_RETR_FILE = 19;
@@ -44,7 +44,7 @@ package lime.net.curl;
var LDAP_CANNOT_BIND = 38;
var LDAP_SEARCH_FAILED = 39;
//var OBSOLETE40 = 40;
var FUNCTION_NOT_FOUND = 41;
//var FUNCTION_NOT_FOUND = 41;
var ABORTED_BY_CALLBACK = 42;
var BAD_FUNCTION_ARGUMENT = 43;
//var OBSOLETE44 = 44;
@@ -93,6 +93,9 @@ package lime.net.curl;
var FTP_BAD_FILE_LIST = 87;
var CHUNK_FAILED = 88;
var NO_CONNECTION_AVAILABLE = 89;
//var LAST = 90;
var SSL_PINNEDPUBKEYNOTMATCH = 90;
var SSL_INVALIDCERTSTATUS = 91;
var HTTP2_STREAM = 92;
//var LAST = 93;
}

13
lime/net/curl/CURLInfo.hx
View File

@@ -11,15 +11,21 @@ package lime.net.curl;
var CONNECT_TIME = 0x300000 + 5;
var PRETRANSFER_TIME = 0x300000 + 6;
var SIZE_UPLOAD = 0x300000 + 7;
var SIZE_UPLOAD_T = 0x600000 + 7;
var SIZE_DOWNLOAD = 0x300000 + 8;
var SIZE_DOWNLOAD_T = 0x600000 + 8;
var SPEED_DOWNLOAD = 0x300000 + 9;
var SPEED_DOWNLOAD_T = 0x600000 + 9;
var SPEED_UPLOAD = 0x300000 + 10;
var SPEED_UPLOAD_T = 0x600000 + 10;
var HEADER_SIZE = 0x200000 + 11;
var REQUEST_SIZE = 0x200000 + 12;
var SSL_VERIFYRESULT = 0x200000 + 13;
var FILETIME = 0x200000 + 14;
var CONTENT_LENGTH_DOWNLOAD = 0x300000 + 15;
var CONTENT_LENGTH_DOWNLOAD_T = 0x600000 + 15;
var CONTENT_LENGTH_UPLOAD = 0x300000 + 16;
var CONTENT_LENGTH_UPLOAD_T = 0x300000 + 16;
var STARTTRANSFER_TIME = 0x300000 + 17;
var CONTENT_TYPE = 0x100000 + 18;
var REDIRECT_TIME = 0x300000 + 19;
@@ -47,6 +53,11 @@ package lime.net.curl;
var LOCAL_IP = 0x100000 + 41;
var LOCAL_PORT = 0x200000 + 42;
var TLS_SESSION = 0x400000 + 43;
//var LASTONE = 43;
var ACTIVESOCKET = 0x500000 + 44;
var TLS_SSL_PTR = 0x400000 + 45;
var HTTP_VERSION = 0x200000 + 46;
var PROXY_SSL_VERIFYRESULT = 0x200000 + 47;
var PROTOCOL = 0x200000 + 48;
var SCHEME = 0x100000 + 49;
}

46
lime/net/curl/CURLOption.hx
View File

@@ -215,6 +215,50 @@ package lime.net.curl;
var DNS_LOCAL_IP4 = 10222;
var DNS_LOCAL_IP6 = 10223;
var LOGIN_OPTIONS = 10224;
//var LASTENTRY = 225;
var SSL_ENABLE_NPN = 225;
var SSL_ENABLE_ALPN = 226;
var EXPECT_100_TIMEOUT_MS = 227;
var PROXYHEADER = 10228;
var HEADEROPT = 229;
var PINNEDPUBLICKEY = 10230;
var UNIX_SOCKET_PATH = 10231;
var SSL_VERIFYSTATUS = 232;
var SSL_FALSESTART = 233;
var PATH_AS_IS = 234;
var PROXY_SERVICE_NAME = 10235;
var SERVICE_NAME = 10236;
var PIPEWAIT = 237;
var DEFAULT_PROTOCOL = 10238;
var STREAM_WEIGHT = 239;
var STREAM_DEPENDS = 10240;
var STREAM_DEPENDS_E = 10241;
var TFTP_NO_OPTIONS = 242;
var CONNECT_TO = 243;
var TCP_FASTOPEN = 244;
var KEEP_SENDING_ON_ERROR = 245;
var PROXY_CAINFO = 10246;
var PROXY_CAPATH = 10247;
var PROXY_SSL_VERIFYPEER = 248;
var PROXY_SSL_VERIFYHOST = 249;
var PROXY_SSLVERSION = 250;
var PROXY_TLSAUTH_USERNAME = 10251;
var PROXY_TLSAUTH_PASSWORD = 10252;
var PROXY_TLSAUTH_TYPE = 10253;
var PROXY_SSLCERT = 10254;
var PROXY_SSLCERTTYPE = 10255;
var PROXY_SSLKEY = 10256;
var PROXY_SSLKEYTYPE = 10257;
var PROXY_KEYPASSWD = 10258;
var PROXY_SSL_CIPHER_LIST = 10259;
var PROXY_CRLFILE = 10260;
var PROXY_SSL_OPTIONS = 261;
var PRE_PROXY = 10262;
var PROXY_PINNEDPUBLICKEY = 10263;
var ABSTRACT_UNIX_SOCKET = 10264;
var SUPPRESS_CONNECT_HEADERS = 265;
var REQUEST_TARGET = 10266;
var SOCKS5_AUTH = 267;
var SSH_COMPRESSION = 268;
var MIMEPOST = 10269;
}

52
project/src/net/curl/CURLBindings.cpp
View File

@@ -174,6 +174,7 @@ namespace lime {
case CURLINFO_LOCAL_IP:
case CURLINFO_FTP_ENTRY_PATH:
case CURLINFO_RTSP_SESSION_ID:
case CURLINFO_SCHEME:
char stringValue;
code = curl_easy_getinfo (handle, type, &stringValue);
@@ -198,6 +199,15 @@ namespace lime {
case CURLINFO_RTSP_CLIENT_CSEQ:
case CURLINFO_RTSP_SERVER_CSEQ:
case CURLINFO_RTSP_CSEQ_RECV:
case CURLINFO_HTTP_VERSION:
case CURLINFO_PROXY_SSL_VERIFYRESULT:
case CURLINFO_PROTOCOL:
case CURLINFO_SIZE_UPLOAD_T: // TODO: These should be larger
case CURLINFO_SIZE_DOWNLOAD_T:
case CURLINFO_SPEED_DOWNLOAD_T:
case CURLINFO_SPEED_UPLOAD_T:
case CURLINFO_CONTENT_LENGTH_DOWNLOAD_T:
case CURLINFO_CONTENT_LENGTH_UPLOAD_T:
long intValue;
code = curl_easy_getinfo (handle, type, &intValue);
@@ -227,6 +237,8 @@ namespace lime {
case CURLINFO_COOKIELIST:
case CURLINFO_CERTINFO:
case CURLINFO_TLS_SESSION:
case CURLINFO_TLS_SSL_PTR:
case CURLINFO_ACTIVESOCKET:
// TODO
@@ -450,6 +462,15 @@ namespace lime {
//case CURLOPT_SSL_ENABLE_NPN:
case CURLOPT_SSL_VERIFYPEER:
case CURLOPT_SSL_SESSIONID_CACHE:
case CURLOPT_TCP_FASTOPEN:
case CURLOPT_KEEP_SENDING_ON_ERROR:
case CURLOPT_PATH_AS_IS:
case CURLOPT_SSL_VERIFYSTATUS:
case CURLOPT_SSL_FALSESTART:
case CURLOPT_PIPEWAIT:
case CURLOPT_TFTP_NO_OPTIONS:
case CURLOPT_SUPPRESS_CONNECT_HEADERS:
case CURLOPT_SSH_COMPRESSION:
code = curl_easy_setopt (curl, type, val_bool (parameter));
break;
@@ -510,6 +531,12 @@ namespace lime {
case CURLOPT_SSH_AUTH_TYPES:
case CURLOPT_NEW_FILE_PERMS:
case CURLOPT_NEW_DIRECTORY_PERMS:
case CURLOPT_STREAM_WEIGHT:
case CURLOPT_PROXY_SSL_VERIFYPEER:
case CURLOPT_PROXY_SSL_VERIFYHOST:
case CURLOPT_PROXY_SSLVERSION:
case CURLOPT_PROXY_SSL_OPTIONS:
case CURLOPT_SOCKS5_AUTH:
code = curl_easy_setopt (curl, type, val_int (parameter));
break;
@@ -581,6 +608,27 @@ namespace lime {
case CURLOPT_SSH_PUBLIC_KEYFILE:
case CURLOPT_SSH_PRIVATE_KEYFILE:
case CURLOPT_SSH_KNOWNHOSTS:
case CURLOPT_PINNEDPUBLICKEY:
case CURLOPT_UNIX_SOCKET_PATH:
case CURLOPT_PROXY_SERVICE_NAME:
case CURLOPT_SERVICE_NAME:
case CURLOPT_DEFAULT_PROTOCOL:
case CURLOPT_PROXY_CAINFO:
case CURLOPT_PROXY_CAPATH:
case CURLOPT_PROXY_TLSAUTH_USERNAME:
case CURLOPT_PROXY_TLSAUTH_PASSWORD:
case CURLOPT_PROXY_TLSAUTH_TYPE:
case CURLOPT_PROXY_SSLCERT:
case CURLOPT_PROXY_SSLCERTTYPE:
case CURLOPT_PROXY_SSLKEY:
case CURLOPT_PROXY_SSLKEYTYPE:
case CURLOPT_PROXY_KEYPASSWD:
case CURLOPT_PROXY_SSL_CIPHER_LIST:
case CURLOPT_PROXY_CRLFILE:
case CURLOPT_PRE_PROXY:
case CURLOPT_PROXY_PINNEDPUBLICKEY:
case CURLOPT_ABSTRACT_UNIX_SOCKET:
case CURLOPT_REQUEST_TARGET:
code = curl_easy_setopt (curl, type, val_string (parameter));
break;
@@ -625,6 +673,10 @@ namespace lime {
case CURLOPT_PRIVATE:
case CURLOPT_SHARE:
case CURLOPT_TELNETOPTIONS:
case CURLOPT_STREAM_DEPENDS:
case CURLOPT_STREAM_DEPENDS_E:
case CURLOPT_CONNECT_TO:
case CURLOPT_MIMEPOST:
//todo
break;