Add. Allow set NULL values explicitly.

Author: moteus

src/l52util.c

@@ -156,3 +156,11 @@ int64_t lutil_optint64(lua_State *L, int idx, int64_t v){
 void lutil_pushnvalues(lua_State *L, int n){
   for(;n;--n) lua_pushvalue(L, -n);
 }
+
+int lutil_is_null(lua_State *L, int i){
+  return lua_islightuserdata(L, i) && 0 == lua_touserdata(L, i);
+}
+
+void lutil_push_null(lua_State *L){
+  lua_pushlightuserdata(L, (void*)0);
+}

src/l52util.h

@@ -88,4 +88,8 @@ int64_t lutil_optint64(lua_State *L, int idx, int64_t v);
 
 void lutil_pushnvalues(lua_State *L, int n);
 
+int lutil_is_null(lua_State *L, int i);
+
+void lutil_push_null(lua_State *L);
+
 #endif

src/lceasy.c

@@ -344,16 +344,22 @@ static int lcurl_opt_set_off_(lua_State *L, int opt){
 
 static int lcurl_opt_set_string_(lua_State *L, int opt, int store){
   lcurl_easy_t *p = lcurl_geteasy(L);
-  CURLcode code;
+  CURLcode code; const char *value;
 
-  luaL_argcheck(L, lua_type(L, 2) == LUA_TSTRING, 2, "string expected");
+  luaL_argcheck(L, lua_type(L, 2) == LUA_TSTRING || lutil_is_null(L, 2), 2, "string expected");
 
-  code = curl_easy_setopt(p->curl, opt, lua_tostring(L, 2));
+  value = lua_tostring(L, 2);
+  code = curl_easy_setopt(p->curl, opt, value);
   if(code != CURLE_OK){
     return lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_EASY, code);
   }
 
-  if(store)lcurl_storage_preserve_iv(L, p->storage, opt, 2);
+  if(store){
+    if(value)
+      lcurl_storage_preserve_iv(L, p->storage, opt, 2);
+    else
+      lcurl_storage_remove_i(L, p->storage, opt);
+  }
 
   lua_settop(L, 1);
   return 1;
@@ -365,7 +371,7 @@ static int lcurl_opt_set_slist_(lua_State *L, int opt, int list_no){
   CURLcode code;
   int ref = p->lists[list_no];
 
-  luaL_argcheck(L, list || lua_istable(L, 2), 2, "array expected");
+  luaL_argcheck(L, list || lua_istable(L, 2) || lutil_is_null(L, 2), 2, "array expected");
 
   if(ref != LUA_NOREF){
     struct curl_slist *tmp = lcurl_storage_remove_slist(L, p->storage, ref);

src/lcurl.c

@@ -270,6 +270,9 @@ static int luaopen_lcurl_(lua_State *L, const struct luaL_Reg *func){
 
   lcurl_util_set_const(L, lcurl_flags);
 
+  lutil_push_null(L);
+  lua_setfield(L, -2, "null");
+
   return 1;
 }
 

test/test_easy.lua

@@ -35,6 +35,8 @@ local POST_URL = "http://127.0.0.1:7090/post"
 local weak_ptr, gc_collect, is_curl_ge, read_file, stream, Stream, dump_request =
   utils.import('weak_ptr', 'gc_collect', 'is_curl_ge', 'read_file', 'stream', 'Stream', 'dump_request')
 
+local null = curl.null
+
 local ENABLE = true
 
 local _ENV = TEST_CASE'curl error'           if ENABLE then
@@ -1060,4 +1062,53 @@ end
 
 end
 
+local _ENV = TEST_CASE'set_null'             if ENABLE then
+
+local c
+
+function teardown()
+  if c then c:close() end
+  c = nil
+end
+
+function test_string()
+  c = curl.easy()
+  c:setopt_accept_encoding('gzip')
+  local body, headers = assert_string(dump_request(c))
+  assert_match("Accept%-Encoding:%s*gzip", headers)
+
+  c:setopt_accept_encoding(null)
+  body, headers = assert_string(dump_request(c))
+  assert_not_match("Accept%-Encoding:%s*gzip", headers)
+end
+
+function test_string_via_table()
+  c = curl.easy()
+  c:setopt_accept_encoding('gzip')
+  local body, headers = assert_string(dump_request(c))
+  assert_match("Accept%-Encoding:%s*gzip", headers)
+
+  c:setopt{ accept_encoding = null }
+  body, headers = assert_string(dump_request(c))
+  assert_not_match("Accept%-Encoding:%s*gzip", headers)
+end
+
+function test_slist()
+  c = curl.easy()
+  c:setopt_httpheader({'X-Custom: value'})
+  c:setopt_httpheader(null)
+  local body, headers = assert_string(dump_request(c))
+  assert_not_match("X%-Custom:%s*value\r\n", headers)
+end
+
+function test_slist_via_table()
+  c = curl.easy()
+  c:setopt_httpheader({'X-Custom: value'})
+  c:setopt{httpheader = null}
+  local body, headers = assert_string(dump_request(c))
+  assert_not_match("X%-Custom:%s*value\r\n", headers)
+end
+
+end
+
 RUN()