Merge branch 'stable'

Conflicts:
	test/box/bsdsocket.result
	test/box/bsdsocket.test

src/lua/bsdsocket.lua

@@ -852,6 +852,22 @@ local function getaddrinfo(host, port, timeout, opts)
     return internal.getaddrinfo(host, port, timeout, ga_opts)
 end
 
+local soname_mt = {
+    __tostring = function(si)
+        if si.host == nil and si.port == nil then
+            return ''
+        end
+        if si.host == nil then
+            return sprintf('%s:%s', '0', tostring(si.port))
+        end
+
+        if si.port == nil then
+            return sprintf('%s:%', tostring(si.host), 0)
+        end
+        return sprintf('%s:%s', tostring(si.host), tostring(si.port))
+    end
+}
+
 socket_methods.name = function(self)
     local aka = internal.name(self.fh)
     if aka == nil then
@@ -859,6 +875,7 @@ socket_methods.name = function(self)
         return nil
     end
     self._errno = nil
+    setmetatable(aka, soname_mt)
     return aka
 end
 
@@ -869,6 +886,7 @@ socket_methods.peer = function(self)
         return nil
     end
     self._errno = nil
+    setmetatable(peer, soname_mt)
     return peer
 end
 

test/box/bsdsocket.result

@@ -642,6 +642,14 @@ json.encode(sc:name())
 ---
 - '{"host":"0.0.0.0","family":"AF_INET","type":"SOCK_STREAM","protocol":"tcp","port":0}'
 ...
+sc:name()
+---
+- host: 0.0.0.0
+  family: AF_INET
+  type: SOCK_STREAM
+  protocol: tcp
+  port: 0
+...
 sc:nonblock(true)
 ---
 - true

test/box/bsdsocket.test.lua

@@ -205,6 +205,7 @@ json.encode(socket.getaddrinfo('ya.ru', '80',
 
 sc = socket('AF_INET', 'SOCK_STREAM', 'tcp')
 json.encode(sc:name())
+sc:name()
 sc:nonblock(true)
 sc:close()