Merge branch 'actboy168:master' into master

Author: fesily

extension/script/common/net.lua

@@ -1,3 +1,4 @@
+local platform = require "bee.platform"
 local socket = require "bee.socket"
 local epoll = require "bee.epoll"
 local fs = require "bee.filesystem"
@@ -66,7 +67,7 @@ function stream:write(data)
     if self._writebuf == "" then
         fd_set_write(self)
     end
-    self._writebuf = self._writebuf .. data
+    self._writebuf = self._writebuf..data
 end
 
 function stream:is_closed()
@@ -151,7 +152,7 @@ function connect:write(data)
     if data == "" then
         return
     end
-    self._writebuf = self._writebuf .. data
+    self._writebuf = self._writebuf..data
 end
 
 function connect:is_closed()
@@ -176,15 +177,15 @@ function m.listen(protocol, address, port)
             fs.remove(address)
         end
     end
-	do
+    if platform.os ~= "windows" then
         -- set SO_REUSEADDR so we can bind again to the same address
         -- after a quick restart:
-		local ok, err = fd:option("reuseaddr", 1)
-		if not ok then
-			fd:close()
-			return nil, err
-		end
-	end
+        local ok, err = fd:option("reuseaddr", 1)
+        if not ok then
+            fd:close()
+            return nil, err
+        end
+    end
     do
         local ok, err = fd:bind(address, port)
         if not ok then
@@ -206,7 +207,7 @@ function m.listen(protocol, address, port)
         shutdown_r = false,
         shutdown_w = true,
     }
-    epfd:event_add(fd, EPOLLIN, function()
+    epfd:event_add(fd, EPOLLIN, function ()
         local new_fd, err = fd:accept()
         if new_fd == nil then
             s:close()
@@ -223,7 +224,7 @@ function m.listen(protocol, address, port)
                 shutdown_w = false,
             }, stream_mt)
             if on_event(s, "accepted", new_s) then
-                epfd:event_add(new_fd, new_s._flags, function(event)
+                epfd:event_add(new_fd, new_s._flags, function (event)
                     update_stream(new_s, event)
                 end)
             else
@@ -257,7 +258,7 @@ function m.connect(protocol, address, port)
         shutdown_r = false,
         shutdown_w = false,
     }
-    epfd:event_add(fd, EPOLLOUT, function()
+    epfd:event_add(fd, EPOLLOUT, function ()
         local ok, err = fd:status()
         if ok then
             on_event(s, "connected")
@@ -272,7 +273,7 @@ function m.connect(protocol, address, port)
             else
                 s._flags = EPOLLIN
             end
-            epfd:event_mod(s._fd, s._flags, function(event)
+            epfd:event_mod(s._fd, s._flags, function (event)
                 update_stream(s, event)
             end)
         else
@@ -307,4 +308,3 @@ function m.update(timeout)
 end
 
 return m
-