Disabling ipv6 support in resolver, and some clean up

Former-commit-id: 6825d47c6a34992f8ab116f20ac94b21f5ba10f2

kong.yml

@@ -66,7 +66,7 @@ nginx: |
   }
 
   http {
-    resolver {{dns_resolver}};
+    resolver {{dns_resolver}} ipv6=off;
     charset UTF-8;
 
     access_log logs/access.log;

kong/dao/cassandra/factory.lua

@@ -20,35 +20,12 @@ local KeyAuthCredentials = require "kong.dao.cassandra.keyauth_credentials"
 
 local CassandraFactory = Object:extend()
 
-local LOCALHOST = "localhost"
-local LOCALHOST_IP = "127.0.0.1"
-
--- Converts every occurence of "localhost" to "127.0.0.1"
--- @param host can either be a string or an array of hosts
-local function normalize_localhost(host)
-  if type(host) == "table" then
-    for i, v in ipairs(host) do
-      if v == LOCALHOST then
-        host[i] = LOCALHOST_IP
-      end
-    end
-  elseif host == LOCALHOST then
-    host = LOCALHOST_IP
-  end
-  return host
-end
-
 -- Instanciate a Cassandra DAO.
 -- @param properties Cassandra properties
 function CassandraFactory:new(properties)
   self.type = "cassandra"
   self._properties = properties
 
-  -- Convert localhost to 127.0.0.1
-  -- This is because nginx doesn't resolve the /etc/hosts file but /etc/resolv.conf
-  -- And it may cause errors like "host not found" for "localhost"
-  self._properties.hosts = normalize_localhost(self._properties.hosts)
-
   self.apis = Apis(properties)
   self.consumers = Consumers(properties)
   self.plugins_configurations = PluginsConfigurations(properties)

kong/plugins/httplog/log.lua

@@ -10,14 +10,9 @@ local _M = {}
 -- @return `payload` http payload
 local function generate_post_payload(method, parsed_url, message)
   local body = cjson.encode(message);
-  local payload = string.format([[
-%s %s HTTP/1.1
-Host: %s
-Connection: Keep-Alive
-Content-Type: application/json
-Content-Length: %s
-
-%s]], method:upper(), parsed_url.path, parsed_url.host, string.len(body), body)
+  local payload = string.format(
+    "%s %s HTTP/1.1\r\nHost: %s\r\nConnection: Keep-Alive\r\nContent-Type: application/json\r\nContent-Length: %s\r\n\r\n%s", 
+    method:upper(), parsed_url.path, parsed_url.host, string.len(body), body)
   return payload
 end
 
@@ -77,4 +72,4 @@ function _M.execute(conf)
   end
 end
 
-return _M
+return _M

spec/spec_helpers.lua

@@ -107,10 +107,7 @@ function _M.start_http_server(port, ...)
     function(port)
       local socket = require "socket"
       local server = assert(socket.bind("*", port))
-      local client, err = server:accept()
-      if not err then
-        client:settimeout(3)
-      end
+      local client = server:accept()
 
       local lines = {}
       local line

spec/unit/statics_spec.lua

@@ -106,7 +106,7 @@ nginx: |
   }
 
   http {
-    resolver {{dns_resolver}};
+    resolver {{dns_resolver}} ipv6=off;
     charset UTF-8;
 
     access_log logs/access.log;