X-Git-Url: http://nitlanguage.org

diff --git a/lib/curl/curl_c.nit b/lib/curl/curl_c.nit
index 5ac43c4..287dbce 100644
--- a/lib/curl/curl_c.nit
+++ b/lib/curl/curl_c.nit
@@ -17,11 +17,7 @@
 # Binding of C libCurl which allow us to interact with network.
 module curl_c is pkgconfig("libcurl")
 
-import pipeline
-
 in "C header" `{
-	#include <stdio.h>
-	#include <stdlib.h>
 	#include <curl/curl.h>
 
 	typedef enum {
@@ -44,6 +40,10 @@ in "C header" `{
 `}
 
 in "C body" `{
+	#include <stdio.h>
+	#include <stdlib.h>
+	#include <string.h>
+
 	// Callbacks method for Header, Body, Stream.
 	size_t nit_curl_callback_func(void *buffer, size_t size, size_t count, CURLCallbackDatas *datas){
 		if(datas->type == CURLcallbackTypeHeader){
@@ -74,7 +74,7 @@ in "C body" `{
 `}
 
 # CURL Extern Type, reproduce CURL low level behaviors
-extern CCurl `{ CURL * `}
+extern class CCurl `{ CURL * `}
 	# Constructor, CURL low level initializer
 	new easy_init `{ return curl_easy_init(); `}
 	# Check for correct initialization
@@ -202,18 +202,18 @@ extern CCurl `{ CURL * `}
 		CURLcode e;
 		switch(cbtype){
 			case CURLcallbackTypeHeader:
-				e = curl_easy_setopt( recv, CURLOPT_HEADERFUNCTION, &nit_curl_callback_func);
+				e = curl_easy_setopt( recv, CURLOPT_HEADERFUNCTION, (curl_write_callback)&nit_curl_callback_func);
 				if(e != CURLE_OK) return e;
 				e = curl_easy_setopt( recv, CURLOPT_WRITEHEADER, d);
 			break;
 			case CURLcallbackTypeBody:
 			case CURLcallbackTypeStream:
-				e = curl_easy_setopt( recv, CURLOPT_WRITEFUNCTION, &nit_curl_callback_func);
+				e = curl_easy_setopt( recv, CURLOPT_WRITEFUNCTION, (curl_write_callback)&nit_curl_callback_func);
 				if(e != CURLE_OK) return e;
 				e = curl_easy_setopt( recv, CURLOPT_WRITEDATA, d);
 			break;
 			case CURLcallbackTypeRead:
-				e = curl_easy_setopt( recv, CURLOPT_READFUNCTION, &nit_curl_callback_read_func);
+				e = curl_easy_setopt( recv, CURLOPT_READFUNCTION, (curl_write_callback)&nit_curl_callback_read_func);
 			default:
 			break;
 		}
@@ -231,7 +231,7 @@ extern CCurl `{ CURL * `}
 end
 
 # FILE Extern type, reproduce basic FILE I/O
-extern OFile `{ FILE* `}
+extern class OFile `{ FILE* `}
 	# Open / Create a file from given name
 	new open(str: NativeString) `{ return fopen(str, "wb"); `}
 	# Check for File validity
@@ -262,7 +262,7 @@ interface CCurlCallbacks
 end
 
 # Extern Type to reproduce Enum of available Callback type
-extern CURLCallbackType `{ CURLcallbackType `}
+extern class CURLCallbackType `{ CURLcallbackType `}
 	new header `{ return CURLcallbackTypeHeader; `}
 	new body `{ return CURLcallbackTypeBody; `}
 	new stream `{ return CURLcallbackTypeStream; `}
@@ -271,7 +271,7 @@ extern CURLCallbackType `{ CURLcallbackType `}
 end
 
 # CURL Code binding and helpers
-extern CURLCode `{ CURLcode `}
+extern class CURLCode `{ CURLcode `}
 	new unknown_option `{ return CURLE_UNKNOWN_OPTION; `}
 	new unsupported_protocol `{ return CURLE_UNSUPPORTED_PROTOCOL; `}
 	new ok `{ return CURLE_OK; `}
@@ -288,7 +288,7 @@ extern CURLCode `{ CURLcode `}
 end
 
 # Extern Type of the Linked list type of CURL
-extern CURLSList `{ struct curl_slist * `}
+extern class CURLSList `{ struct curl_slist * `}
 	# Empty constructor which allow us to avoid the use of Nit NULLABLE type
 	private new `{ return NULL; `}
 	# Constructor allow us to get list instancied by appending an element inside.
@@ -336,7 +336,11 @@ redef class Collection[E]
 			print "Collection item must be strings."
 		end
 		var primList = new CURLSList.with_str(self.first)
-		for s in self.skip_head(1) do primList.append(s)
+		var is_first = true
+		for s in self do
+			if not is_first then primList.append(s)
+			is_first = false
+		end
 		return primList
 	end
 end
@@ -363,13 +367,13 @@ class CURLInfoResponseString
 end
 
 # Reproduce Enum of available CURL SList information, used for CCurl.easy_getinfo
-extern CURLInfoSList `{ CURLINFO `}
+extern class CURLInfoSList `{ CURLINFO `}
 	new ssl_engines `{ return CURLINFO_SSL_ENGINES; `}
 	new cookielist `{ return CURLINFO_COOKIELIST; `}
 end
 
 # Reproduce Enum of available CURL Long information, used for CCurl.easy_getinfo
-extern CURLInfoLong `{ CURLINFO `}
+extern class CURLInfoLong `{ CURLINFO `}
 	new response_code `{ return CURLINFO_RESPONSE_CODE; `}
 	new header_size `{ return CURLINFO_HEADER_SIZE; `}
 	new http_connectcode `{ return CURLINFO_HTTP_CONNECTCODE; `}
@@ -391,7 +395,7 @@ extern CURLInfoLong `{ CURLINFO `}
 end
 
 # Reproduce Enum of available CURL Double information, used for CCurl.easy_getinfo
-extern CURLInfoDouble `{ CURLINFO `}
+extern class CURLInfoDouble `{ CURLINFO `}
 	new total_time `{ return CURLINFO_TOTAL_TIME; `}
 	new namelookup_time `{ return CURLINFO_NAMELOOKUP_TIME; `}
 	new connect_time `{ return CURLINFO_CONNECT_TIME; `}
@@ -408,7 +412,7 @@ extern CURLInfoDouble `{ CURLINFO `}
 end
 
 # Reproduce Enum of available CURL Chars information, used for CCurl.easy_getinfo
-extern CURLInfoChars `{ CURLINFO `}
+extern class CURLInfoChars `{ CURLINFO `}
 	new content_type `{ return CURLINFO_CONTENT_TYPE; `}
 	new effective_url `{ return CURLINFO_EFFECTIVE_URL; `}
 	new redirect_url `{ return CURLINFO_REDIRECT_URL; `}
@@ -420,7 +424,7 @@ extern CURLInfoChars `{ CURLINFO `}
 end
 
 # Reproduce Enum of HTTP Status Code
-extern CURLStatusCode `{ int `}
+extern class CURLStatusCode `{ int `}
 	new proceed `{ return 100; `}
 	new switching_protocols `{ return 101; `}
 	new ok `{ return 200; `}
@@ -462,206 +466,298 @@ extern CURLStatusCode `{ int `}
 end
 
 # Reproduce Enum of CURL Options usable, used for CCurl.easy_setopt
-extern CURLOption `{ CURLoption `}
+extern class CURLOption `{ CURLoption `}
+
+	# Behavior options
+
+	# Display verbose information.
+	new verbose `{ return CURLOPT_VERBOSE; `}
+	# Include the header in the body output.
+	new header `{ return CURLOPT_HEADER; `}
+	# Shut off the progress meter.
+	new no_progress `{ return CURLOPT_NOPROGRESS; `}
+	# Do not install signal handlers.
+	new	no_signal `{ return CURLOPT_NOSIGNAL; `}
+	# Transfer multiple files according to a file name pattern.
+	new	wild_card_match `{ return CURLOPT_WILDCARDMATCH; `}
+
+	# Callback Options
+
+	# Callback for writing data.
 	new write_function `{ return CURLOPT_WRITEFUNCTION; `}
+	# Data pointer to pass to the write callback.
 	new write_data `{ return CURLOPT_WRITEDATA; `}
-#	new	`{ return CURLOPT_FILE; `}
-	new url `{ return CURLOPT_URL; `}
-#	new	`{ return CURLOPT_PORT; `}
-#	new	`{ return CURLOPT_PROXY; `}
-#	new	`{ return CURLOPT_USERPWD; `}
-#	new	`{ return CURLOPT_PROXYUSERPWD; `}
-#	new	`{ return CURLOPT_RANGE; `}
-#	new	`{ return CURLOPT_INFILE; `}
-#	new	`{ return CURLOPT_ERRORBUFFER; `}
-#	new	`{ return CURLOPT_WRITEFUNCTION; `}
+
 #	new	`{ return CURLOPT_READFUNCTION; `}
-#	new	`{ return CURLOPT_TIMEOUT; `}
-#	new	`{ return CURLOPT_INFILESIZE; `}
-	new postfields `{ return CURLOPT_POSTFIELDS; `}
-#	new	`{ return CURLOPT_REFERER; `}
-#	new	`{ return CURLOPT_FTPPORT; `}
-#	new	`{ return CURLOPT_USERAGENT; `}
-#	new	`{ return CURLOPT_LOW_SPEED_LIMIT; `}
-#	new	`{ return CURLOPT_LOW_SPEED_TIME; `}
-#	new	`{ return CURLOPT_RESUME_FROM; `}
-#	new	`{ return CURLOPT_COOKIE; `}
-	new httpheader `{ return CURLOPT_HTTPHEADER; `}
-#	new	`{ return CURLOPT_HTTPPOST; `}
-#	new	`{ return CURLOPT_SSLCERT; `}
-#	new	`{ return CURLOPT_KEYPASSWD; `}
-#	new	`{ return CURLOPT_CRLF; `}
-#	new	`{ return CURLOPT_QUOTE; `}
-#	new	`{ return CURLOPT_WRITEHEADER; `}
-#	new	`{ return CURLOPT_COOKIEFILE; `}
-#	new	`{ return CURLOPT_SSLVERSION; `}
-#	new	`{ return CURLOPT_TIMECONDITION; `}
-#	new	`{ return CURLOPT_TIMEVALUE; `}
-#	new	`{ return CURLOPT_CUSTOMREQUEST; `}
-#	new	`{ return CURLOPT_STDERR; `}
-#	new	`{ return CURLOPT_POSTQUOTE; `}
-#	new	`{ return CURLOPT_WRITEINFO; `} /* DEPRECATED, do not use! */
-	new verbose `{ return CURLOPT_VERBOSE; `}			# talk a lot
-	new header `{ return CURLOPT_HEADER; `}			 # throw the header out too
-	new no_progress `{ return CURLOPT_NOPROGRESS; `}	 # shut off the progress meter
-	new no_body `{ return CURLOPT_NOBODY; `}			 # use HEAD to get http document
-	new fail_on_error `{ return CURLOPT_FAILONERROR; `}	# no output on http error codes >= 300
-	new upload `{ return CURLOPT_UPLOAD; `}			 # this is an upload
-	new post `{ return CURLOPT_POST; `}				 # HTTP POST method
-	new dir_list_only `{ return CURLOPT_DIRLISTONLY; `}	# bare names when listing directories
-	new append `{ return CURLOPT_APPEND; `}			 # Append instead of overwrite on upload!
-#	new	`{ return CURLOPT_NETRC; `}
-	new follow_location `{ return CURLOPT_FOLLOWLOCATION; `}	# use Location: Luke!
-	new transfert_text `{ return CURLOPT_TRANSFERTEXT; `} # transfer data in text/ASCII format
-	new put `{ return CURLOPT_PUT; `}					# HTTP PUT */
+#	new `{ return CURLOPT_READDATA; `}
+#	new	`{ return CURLOPT_IOCTLFUNCTION; `}
+#	new	`{ return CURLOPT_IOCTLDATA; `}
+#	new	`{ return CURLOPT_SEEKFUNCTION; `}
+#	new	`{ return CURLOPT_SEEKDATA; `}
+#	new	`{ return CURLOPT_SOCKOPTFUNCTION; `}
+#	new	`{ return CURLOPT_SOCKOPTDATA; `}
+#	new	`{ return CURLOPT_OPENSOCKETFUNCTION; `}
+#	new	`{ return CURLOPT_OPENSOCKETDATA; `}
+#	new	`{ return CURLOPT_CLOSESOCKETFUNCTION; `}
+#	new	`{ return CURLOPT_CLOSESOCKETDATA; `}
 #	new	`{ return CURLOPT_PROGRESSFUNCTION; `}
 #	new	`{ return CURLOPT_PROGRESSDATA; `}
-#	new	`{ return CURLOPT_AUTOREFERER; `}
-#	new	`{ return CURLOPT_PROXYPORT; `}
-#	new	`{ return CURLOPT_POSTFIELDSIZE; `}
-#	new	`{ return CURLOPT_HTTPPROXYTUNNEL; `}
-#	new	`{ return CURLOPT_INTERFACE; `}
-#	new	`{ return CURLOPT_KRBLEVEL; `}
-#	new	`{ return CURLOPT_SSL_VERIFYPEER; `}
-#	new	`{ return CURLOPT_CAINFO; `}
-#	new	`{ return CURLOPT_MAXREDIRS; `}
-#	new	`{ return CURLOPT_FILETIME; `}
-#	new	`{ return CURLOPT_TELNETOPTIONS; `}
-#	new	`{ return CURLOPT_MAXCONNECTS; `}
-#	new	`{ return CURLOPT_CLOSEPOLICY; `} /* DEPRECATED, do not use! */
-#	new	`{ return CURLOPT_FRESH_CONNECT; `}
-#	new	`{ return CURLOPT_FORBID_REUSE; `}
-#	new	`{ return CURLOPT_RANDOM_FILE; `}
-#	new	`{ return CURLOPT_EGDSOCKET; `}
-#	new	`{ return CURLOPT_CONNECTTIMEOUT; `}
 #	new	`{ return CURLOPT_HEADERFUNCTION; `}
-#	new	`{ return CURLOPT_HTTPGET; `}
-#	new	`{ return CURLOPT_SSL_VERIFYHOST; `}
-#	new	`{ return CURLOPT_COOKIEJAR; `}
-#	new	`{ return CURLOPT_SSL_CIPHER_LIST; `}
-#	new	`{ return CURLOPT_HTTP_VERSION; `}
-#	new	`{ return CURLOPT_FTP_USE_EPSV; `}
-#	new	`{ return CURLOPT_SSLCERTTYPE; `}
-#	new	`{ return CURLOPT_SSLKEY; `}
-#	new	`{ return CURLOPT_SSLKEYTYPE; `}
-#	new	`{ return CURLOPT_SSLENGINE; `}
-#	new	`{ return CURLOPT_SSLENGINE_DEFAULT; `}
-#	new	`{ return CURLOPT_DNS_USE_GLOBAL_CACHE; `} /* DEPRECATED, do not use! */
-#	new	`{ return CURLOPT_DNS_CACHE_TIMEOUT; `}
-#	new	`{ return CURLOPT_PREQUOTE; `}
 #	new	`{ return CURLOPT_DEBUGFUNCTION; `}
 #	new	`{ return CURLOPT_DEBUGDATA; `}
-#	new	`{ return CURLOPT_COOKIESESSION; `}
-#	new	`{ return CURLOPT_CAPATH; `}
-#	new	`{ return CURLOPT_BUFFERSIZE; `}
-#	new	`{ return CURLOPT_NOSIGNAL; `}
-#	new	`{ return CURLOPT_SHARE; `}
-#	new	`{ return CURLOPT_PROXYTYPE; `}
-#	new	`{ return CURLOPT_ACCEPT_ENCODING; `}
-#	new	`{ return CURLOPT_PRIVATE; `}
-#	new	`{ return CURLOPT_HTTP200ALIASES; `}
-#	new	`{ return CURLOPT_UNRESTRICTED_AUTH; `}
-#	new	`{ return CURLOPT_FTP_USE_EPRT; `}
-#	new	`{ return CURLOPT_HTTPAUTH; `}
 #	new	`{ return CURLOPT_SSL_CTX_FUNCTION; `}
 #	new	`{ return CURLOPT_SSL_CTX_DATA; `}
-#	new	`{ return CURLOPT_FTP_CREATE_MISSING_DIRS; `}
-#	new	`{ return CURLOPT_PROXYAUTH; `}
-#	new	`{ return CURLOPT_FTP_RESPONSE_TIMEOUT; `}
-#	new	`{ return CURLOPT_IPRESOLVE; `}
-#	new	`{ return CURLOPT_MAXFILESIZE; `}
-#	new	`{ return CURLOPT_INFILESIZE_LARGE; `}
-#	new	`{ return CURLOPT_RESUME_FROM_LARGE; `}
-#	new	`{ return CURLOPT_MAXFILESIZE_LARGE; `}
-#	new	`{ return CURLOPT_NETRC_FILE; `}
-#	new	`{ return CURLOPT_USE_SSL; `}
-#	new	`{ return CURLOPT_POSTFIELDSIZE_LARGE; `}
-#	new	`{ return CURLOPT_TCP_NODELAY; `}
-#	new	`{ return CURLOPT_FTPSSLAUTH; `}
-#	new	`{ return CURLOPT_IOCTLFUNCTION; `}
-#	new	`{ return CURLOPT_IOCTLDATA; `}
-#	new	`{ return CURLOPT_FTP_ACCOUNT; `}
-#	new	`{ return CURLOPT_COOKIELIST; `}
-#	new	`{ return CURLOPT_IGNORE_CONTENT_LENGTH; `}
-#	new	`{ return CURLOPT_FTP_SKIP_PASV_IP; `}
-#	new	`{ return CURLOPT_FTP_FILEMETHOD; `}
-#	new	`{ return CURLOPT_LOCALPORT; `}
-#	new	`{ return CURLOPT_LOCALPORTRANGE; `}
-#	new	`{ return CURLOPT_CONNECT_ONLY; `}
-#	new	`{ return CURLOPT_CONV_FROM_NETWORK_FUNCTION; `}
 #	new	`{ return CURLOPT_CONV_TO_NETWORK_FUNCTION; `}
+#	new	`{ return CURLOPT_CONV_FROM_NETWORK_FUNCTION; `}
 #	new	`{ return CURLOPT_CONV_FROM_UTF8_FUNCTION; `}
-#	new	`{ return CURLOPT_MAX_SEND_SPEED_LARGE; `}
-#	new	`{ return CURLOPT_MAX_RECV_SPEED_LARGE; `}
-#	new	`{ return CURLOPT_FTP_ALTERNATIVE_TO_USER; `}
-#	new	`{ return CURLOPT_SOCKOPTFUNCTION; `}
-#	new	`{ return CURLOPT_SOCKOPTDATA; `}
-#	new	`{ return CURLOPT_SSL_SESSIONID_CACHE; `}
-#	new	`{ return CURLOPT_SSH_AUTH_TYPES; `}
-#	new	`{ return CURLOPT_SSH_PUBLIC_KEYFILE; `}
-#	new	`{ return CURLOPT_SSH_PRIVATE_KEYFILE; `}
-#	new	`{ return CURLOPT_FTP_SSL_CCC; `}
-#	new	`{ return CURLOPT_TIMEOUT_MS; `}
-#	new	`{ return CURLOPT_CONNECTTIMEOUT_MS; `}
-#	new	`{ return CURLOPT_HTTP_TRANSFER_DECODING; `}
-#	new	`{ return CURLOPT_HTTP_CONTENT_DECODING; `}
-#	new	`{ return CURLOPT_NEW_FILE_PERMS; `}
-#	new	`{ return CURLOPT_NEW_DIRECTORY_PERMS; `}
-#	new	`{ return CURLOPT_POSTREDIR; `}
-#	new	`{ return CURLOPT_SSH_HOST_PUBLIC_KEY_MD5; `}
-#	new	`{ return CURLOPT_OPENSOCKETFUNCTION; `}
-#	new	`{ return CURLOPT_OPENSOCKETDATA; `}
-#	new	`{ return CURLOPT_COPYPOSTFIELDS; `}
-#	new	`{ return CURLOPT_PROXY_TRANSFER_MODE; `}
-#	new	`{ return CURLOPT_SEEKFUNCTION; `}
-#	new	`{ return CURLOPT_SEEKDATA; `}
-#	new	`{ return CURLOPT_CRLFILE; `}
-#	new	`{ return CURLOPT_ISSUERCERT; `}
+#	new	`{ return CURLOPT_INTERLEAVEFUNCTION; `}
+#	new	`{ return CURLOPT_INTERLEAVEDATA; `}
+#	new	`{ return CURLOPT_CHUNK_BGN_FUNCTION; `}
+#	new	`{ return CURLOPT_CHUNK_END_FUNCTION; `}
+#	new	`{ return CURLOPT_CHUNK_DATA; `}
+#	new	`{ return CURLOPT_FNMATCH_FUNCTION; `}
+#	new	`{ return CURLOPT_FNMATCH_DATA; `}
+
+	# Error Options
+
+#	new	`{ return CURLOPT_ERRORBUFFER; `}
+#	new	`{ return CURLOPT_STDERR; `}
+
+	# Fail on HTTP 4xx errors.
+	new fail_on_error `{ return CURLOPT_FAILONERROR; `}
+
+	# Networkd Options
+
+	# URL to work on.
+	new url `{ return CURLOPT_URL; `}
+
+#	new	`{ return CURLOPT_PROTOCOLS; `}
+#	new	`{ return CURLOPT_REDIR_PROTOCOLS; `}
+#	new	`{ return CURLOPT_PROXY; `}
+#	new	`{ return CURLOPT_PROXYPORT; `}
+#	new	`{ return CURLOPT_PROXYTYPE; `}
+#	new	`{ return CURLOPT_NOPROXY; `}
+#	new	`{ return CURLOPT_HTTPPROXYTUNNEL; `}
+#	new	`{ return CURLOPT_SOCKS5_GSSAPI_SERVICE; `}
+#	new	`{ return CURLOPT_SOCKS5_GSSAPI_NEC; `}
+#	new	`{ return CURLOPT_INTERFACE; `}
+#	new	`{ return CURLOPT_LOCALPORT; `}
+#	new	`{ return CURLOPT_LOCALPORTRANGE; `}
+#	new	`{ return CURLOPT_DNS_CACHE_TIMEOUT; `}
+#	new	`{ return CURLOPT_DNS_USE_GLOBAL_CACHE; `} /* DEPRECATED, do not use! */
+#	new	`{ return CURLOPT_BUFFERSIZE; `}
+#	new	`{ return CURLOPT_PORT; `}
+#	new	`{ return CURLOPT_TCP_NODELAY; `}
 #	new	`{ return CURLOPT_ADDRESS_SCOPE; `}
-#	new	`{ return CURLOPT_CERTINFO; `}
+#	new	`{ return CURLOPT_TCP_KEEPALIVE; `}
+#	new	`{ return CURLOPT_TCP_KEEPIDLE; `}
+#	new	`{ return CURLOPT_TCP_KEEPINTVL; `}
+
+	# Names and Passwords Options
+
+#	new	`{ return CURLOPT_NETRC; `}
+#	new	`{ return CURLOPT_NETRC_FILE; `}
+#	new	`{ return CURLOPT_USERPWD; `}
+#	new	`{ return CURLOPT_PROXYUSERPWD; `}
+
 	new	username `{ return CURLOPT_USERNAME; `}
 	new	password `{ return CURLOPT_PASSWORD; `}
+
 #	new	`{ return CURLOPT_PROXYUSERNAME; `}
 #	new	`{ return CURLOPT_PROXYPASSWORD; `}
-#	new	`{ return CURLOPT_NOPROXY; `}
-#	new	`{ return CURLOPT_TFTP_BLKSIZE; `}
-#	new	`{ return CURLOPT_SOCKS5_GSSAPI_SERVICE; `}
-#	new	`{ return CURLOPT_SOCKS5_GSSAPI_NEC; `}
-#	new	`{ return CURLOPT_PROTOCOLS; `}
-#	new	`{ return CURLOPT_REDIR_PROTOCOLS; `}
-#	new	`{ return CURLOPT_SSH_KNOWNHOSTS; `}
-#	new	`{ return CURLOPT_SSH_KEYFUNCTION; `}
-#	new	`{ return CURLOPT_SSH_KEYDATA; `}
+#	new	`{ return CURLOPT_HTTPAUTH; `}
+#	new	`{ return CURLOPT_TLSAUTH_USERNAME; `}
+#	new	`{ return CURLOPT_TLSAUTH_PASSWORD; `}
+#	new	`{ return CURLOPT_PROXYAUTH; `}
+
+	# HTTP Options
+
+#	new	`{ return CURLOPT_AUTOREFERER; `}
+
+	# Accept-Encoding and automatic decompressing data.
+	new	accept_encoding `{ return CURLOPT_ACCEPT_ENCODING; `}
+	# Request Transfer-Encoding.
+	new	transfert_encoding `{ return CURLOPT_TRANSFER_ENCODING; `}
+	# Follow HTTP redirects.
+	new follow_location `{ return CURLOPT_FOLLOWLOCATION; `}
+
+#	new	`{ return CURLOPT_UNRESTRICTED_AUTH; `}
+#	new	`{ return CURLOPT_MAXREDIRS; `}
+#	new	`{ return CURLOPT_POSTREDIR; `}
+
+	# Issue a HTTP PUT request.
+	new put `{ return CURLOPT_PUT; `}
+	# Issue a HTTP POS request.
+	new post `{ return CURLOPT_POST; `}
+	# Send a POST with this data.
+	new postfields `{ return CURLOPT_POSTFIELDS; `}
+
+#	new	`{ return CURLOPT_POSTFIELDSIZE; `}
+#	new	`{ return CURLOPT_POSTFIELDSIZE_LARGE; `}
+#	new	`{ return CURLOPT_COPYPOSTFIELDS; `}
+#	new	`{ return CURLOPT_HTTPPOST; `}
+#	new	`{ return CURLOPT_REFERER; `}
+
+	# User-Agent: header.
+	new user_agent	`{ return CURLOPT_USERAGENT; `}
+	# Custom HTTP headers.
+	new httpheader `{ return CURLOPT_HTTPHEADER; `}
+
+#	new	`{ return CURLOPT_HTTP200ALIASES; `}
+#	new	`{ return CURLOPT_COOKIE; `}
+#	new	`{ return CURLOPT_COOKIEFILE; `}
+#	new	`{ return CURLOPT_COOKIEJAR; `}
+#	new	`{ return CURLOPT_COOKIESESSION; `}
+#	new	`{ return CURLOPT_COOKIELIST; `}
+
+	# Issue a HTTP GET request.
+	new	get `{ return CURLOPT_HTTPGET; `}
+
+	# HTTP version to use.
+	new http_version `{ return CURLOPT_HTTP_VERSION; `}
+
+#	new	`{ return CURLOPT_IGNORE_CONTENT_LENGTH; `}
+#	new	`{ return CURLOPT_HTTP_CONTENT_DECODING; `}
+#	new	`{ return CURLOPT_HTTP_TRANSFER_DECODING; `}
+
+	# SMTP Options
+
+	# Address of the sender.
 	new	mail_from `{ return CURLOPT_MAIL_FROM; `}
+	# Address of the recipients.
 	new	mail_rcpt `{ return CURLOPT_MAIL_RCPT; `}
+
+#	new	`{ return CURLOPT_MAIL_AUTH; `}
+
+	# TFTP Options
+
+#	new	`{ return CURLOPT_TFTP_BLKSIZE; `}
+
+	# FTP Options
+
+#	new	`{ return CURLOPT_FTPPORT; `}
+#	new	`{ return CURLOPT_QUOTE; `}
+#	new	`{ return CURLOPT_POSTQUOTE; `}
+#	new	`{ return CURLOPT_PREQUOTE; `}
+
+	# List only.
+	new dir_list_only `{ return CURLOPT_DIRLISTONLY; `}
+	# Append to remote file.
+	new append `{ return CURLOPT_APPEND; `}
+
+#	new	`{ return CURLOPT_FTP_USE_EPRT; `}
+#	new	`{ return CURLOPT_FTP_USE_EPSV; `}
 #	new	`{ return CURLOPT_FTP_USE_PRET; `}
+#	new	`{ return CURLOPT_FTP_CREATE_MISSING_DIRS; `}
+#	new	`{ return CURLOPT_FTP_RESPONSE_TIMEOUT; `}
+#	new	`{ return CURLOPT_FTP_ALTERNATIVE_TO_USER; `}
+#	new	`{ return CURLOPT_FTP_SKIP_PASV_IP; `}
+#	new	`{ return CURLOPT_FTPSSLAUTH; `}
+#	new	`{ return CURLOPT_FTP_SSL_CCC; `}
+#	new	`{ return CURLOPT_FTP_ACCOUNT; `}
+#	new	`{ return CURLOPT_FTP_FILEMETHOD; `}
+
+	# RTSP Options
+
 #	new	`{ return CURLOPT_RTSP_REQUEST; `}
 #	new	`{ return CURLOPT_RTSP_SESSION_ID; `}
 #	new	`{ return CURLOPT_RTSP_STREAM_URI; `}
 #	new	`{ return CURLOPT_RTSP_TRANSPORT; `}
 #	new	`{ return CURLOPT_RTSP_CLIENT_CSEQ; `}
 #	new	`{ return CURLOPT_RTSP_SERVER_CSEQ; `}
-#	new	`{ return CURLOPT_INTERLEAVEDATA; `}
-#	new	`{ return CURLOPT_INTERLEAVEFUNCTION; `}
-#	new	`{ return CURLOPT_WILDCARDMATCH; `}
-#	new	`{ return CURLOPT_CHUNK_BGN_FUNCTION; `}
-#	new	`{ return CURLOPT_CHUNK_END_FUNCTION; `}
-#	new	`{ return CURLOPT_FNMATCH_FUNCTION; `}
-#	new	`{ return CURLOPT_CHUNK_DATA; `}
-#	new	`{ return CURLOPT_FNMATCH_DATA; `}
+
+	# Protocol Options
+
+	# Transfer data in text/ASCII format.
+	new transfert_text `{ return CURLOPT_TRANSFERTEXT; `}
+
+#	new	`{ return CURLOPT_PROXY_TRANSFER_MODE; `}
+#	new	`{ return CURLOPT_CRLF; `}
+#	new	`{ return CURLOPT_RANGE; `}
+#	new	`{ return CURLOPT_RESUME_FROM; `}
+#	new	`{ return CURLOPT_RESUME_FROM_LARGE; `}
+
+	# Issue a custom request/method.
+	new	custom_request `{ return CURLOPT_CUSTOMREQUEST; `}
+
+#	new	`{ return CURLOPT_FILETIME; `}
+
+	# Do not get the body contents.
+	new no_body `{ return CURLOPT_NOBODY; `}
+
+#	new	`{ return CURLOPT_INFILESIZE; `}
+#	new	`{ return CURLOPT_INFILESIZE_LARGE; `}
+
+	# Upload data.
+	new upload `{ return CURLOPT_UPLOAD; `}
+
+#	new	`{ return CURLOPT_MAXFILESIZE; `}
+#	new	`{ return CURLOPT_MAXFILESIZE_LARGE; `}
+#	new	`{ return CURLOPT_TIMECONDITION; `}
+#	new	`{ return CURLOPT_TIMEVALUE; `}
+
+	# Connection Options
+
+#	new	`{ return CURLOPT_TIMEOUT; `}
+#	new	`{ return CURLOPT_TIMEOUT_MS; `}
+#	new	`{ return CURLOPT_LOW_SPEED_LIMIT; `}
+#	new	`{ return CURLOPT_LOW_SPEED_TIME; `}
+#	new	`{ return CURLOPT_MAX_SEND_SPEED_LARGE; `}
+#	new	`{ return CURLOPT_MAX_RECV_SPEED_LARGE; `}
+#	new	`{ return CURLOPT_MAXCONNECTS; `}
+#	new	`{ return CURLOPT_FRESH_CONNECT; `}
+#	new	`{ return CURLOPT_FORBID_REUSE; `}
+#	new	`{ return CURLOPT_CONNECTTIMEOUT; `}
+#	new	`{ return CURLOPT_CONNECTTIMEOUT_MS; `}
+#	new	`{ return CURLOPT_IPRESOLVE; `}
+#	new	`{ return CURLOPT_CONNECT_ONLY; `}
+#	new	`{ return CURLOPT_USE_SSL; `}
 #	new	`{ return CURLOPT_RESOLVE; `}
-#	new	`{ return CURLOPT_TLSAUTH_USERNAME; `}
-#	new	`{ return CURLOPT_TLSAUTH_PASSWORD; `}
-#	new	`{ return CURLOPT_TLSAUTH_TYPE; `}
-#	new	`{ return CURLOPT_TRANSFER_ENCODING; `}
-#	new	`{ return CURLOPT_CLOSESOCKETFUNCTION; `}
-#	new	`{ return CURLOPT_CLOSESOCKETDATA; `}
-#	new	`{ return CURLOPT_GSSAPI_DELEGATION; `}
-#	new	`{ return CURLOPT_DNS_SERVERS; `}
 #	new	`{ return CURLOPT_ACCEPTTIMEOUT_MS; `}
-#	new	`{ return CURLOPT_TCP_KEEPALIVE; `}
-#	new	`{ return CURLOPT_TCP_KEEPIDLE; `}
-#	new	`{ return CURLOPT_TCP_KEEPINTVL; `}
+
+	# SSL and Security Options
+
+#	new	`{ return CURLOPT_SSLCERT; `}
+#	new	`{ return CURLOPT_SSLCERTTYPE; `}
+#	new	`{ return CURLOPT_SSLKEY; `}
+#	new	`{ return CURLOPT_SSLKEYTYPE; `}
+#	new	`{ return CURLOPT_KEYPASSWD; `}
+#	new	`{ return CURLOPT_SSLENGINE; `}
+#	new	`{ return CURLOPT_SSLENGINE_DEFAULT; `}
+#	new	`{ return CURLOPT_SSLVERSION; `}
+#	new	`{ return CURLOPT_SSL_VERIFYPEER; `}
+#	new	`{ return CURLOPT_CAINFO; `}
+#	new	`{ return CURLOPT_ISSUERCERT; `}
+#	new	`{ return CURLOPT_CAPATH; `}
+#	new	`{ return CURLOPT_CRLFILE; `}
+#	new	`{ return CURLOPT_SSL_VERIFYHOST; `}
+#	new	`{ return CURLOPT_CERTINFO; `}
+#	new	`{ return CURLOPT_RANDOM_FILE; `}
+#	new	`{ return CURLOPT_EGDSOCKET; `}
+#	new	`{ return CURLOPT_SSL_CIPHER_LIST; `}
+#	new	`{ return CURLOPT_SSL_SESSIONID_CACHE; `}
 #	new	`{ return CURLOPT_SSL_OPTIONS; `}
-#	new	`{ return CURLOPT_MAIL_AUTH; `}
+#	new	`{ return CURLOPT_KRBLEVEL; `}
+#	new	`{ return CURLOPT_GSSAPI_DELEGATION; `}
+
+	# SSH Options
+
+#	new	`{ return CURLOPT_SSH_AUTH_TYPES; `}
+#	new	`{ return CURLOPT_SSH_HOST_PUBLIC_KEY_MD5; `}
+#	new	`{ return CURLOPT_SSH_PUBLIC_KEYFILE; `}
+#	new	`{ return CURLOPT_SSH_PRIVATE_KEYFILE; `}
+#	new	`{ return CURLOPT_SSH_KNOWNHOSTS; `}
+#	new	`{ return CURLOPT_SSH_KEYFUNCTION; `}
+#	new	`{ return CURLOPT_SSH_KEYDATA; `}
+
+	# Other Options
+
+#	new	`{ return CURLOPT_PRIVATE; `}
+#	new	`{ return CURLOPT_SHARE; `}
+#	new	`{ return CURLOPT_NEW_FILE_PERMS; `}
+#	new	`{ return CURLOPT_NEW_DIRECTORY_PERMS; `}
+
+	# TELNET Options
+
+#	new	`{ return CURLOPT_TELNETOPTIONS; `}
 end