modified: ../src/net/HttpServer.lua

src/core/FileStream.lua

@@ -4,6 +4,12 @@ local stream = require "stream"
 
 
 local FileStream = {}
+setmetatable(FileStream, {
+	__call = function(self, ...)
+		return FileStream.new(...);
+	end,
+});
+
 local FileStream_mt = {
 	__index = FileStream,
 }
@@ -148,4 +154,9 @@ function FileStream:WriteLine(line)
 	return status, err
 end
 
+FileStream.writeString = FileStream.WriteString;
+FileStream.writeLine = FileStream.WriteLine;
+FileStream.writeByte = FileStream.WriteByte;
+FileStream.writeBytes = FileStream.WriteBytes;
+
 return FileStream;

src/net/HttpServer.lua

@@ -38,6 +38,14 @@ end
 --[[
 	Instance Methods
 --]]
+HttpServer.HandleRequestFinished = function(self, request)
+	-- Once we're done with this single request
+	-- send it back aroud again in case there is
+	-- more to be processed.
+	local sock = request.DataStream.Socket:getNativeSocket();
+	self:OnAccept(sock);
+end
+
 HttpServer.HandlePreamblePending = function(self, sock)
   local socket = IOCPSocket:init(sock);
   local stream, err = IOCPNetStream:init(socket);
@@ -49,11 +57,6 @@ HttpServer.HandlePreamblePending = function(self, sock)
 		request.Url = URL.parse(request.Resource);
 		local response = WebResponse:OpenResponse(request.DataStream)
 		self.OnRequest(self.OnRequestParam, request, response);
-
-		-- Once we're done with this single request
-		-- send it back aroud again in case there is
-		-- more to be processed.
-		self:OnAccept(sock);
 	else
 		print("HandleSingleRequest, Dump stream: ", err)
 		socket:closeDown();

src/win32/apiset/ws2_32.lua

@@ -1332,34 +1332,34 @@ WSAResetEvent = Lib.WSAResetEvent,
     WSASend = Lib.WSASend,
 
 --[[
-WSASendDisconnect
-WSASendMsg
-WSASendTo
-WSASetBlockingHook
+WSASendDisconnect = Lib.
+WSASendMsg = Lib.
+WSASendTo = Lib.
+WSASetBlockingHook = Lib.
 --]]
 
     WSASetEvent = Lib.WSASetEvent,
 
 --[[
-WSASetLastError
-WSASetServiceA
-WSASetServiceW
+    WSASetLastError = Lib.WSASetLastError,
+    WSASetServiceA = Lib.WSASetServiceA,
+    WSASetServiceW = Lib.WSASetServiceW,
 --]]
 
     WSASocketA = Lib.WSASocketA,
 
 --[[
-WSASocketW
+    WSASocketW = Lib.WSASocketW,
 --]]
 
     WSAStartup = Lib.WSAStartup,
 
 --[[
-WSAStringToAddressA
-WSAStringToAddressW
-WSAUnadvertiseProvider
-WSAUnhookBlockingHook
-WSAWaitForMultipleEvents
+WSAStringToAddressA = Lib.
+WSAStringToAddressW = Lib.
+WSAUnadvertiseProvider = Lib.
+WSAUnhookBlockingHook = Lib.
+WSAWaitForMultipleEvents = Lib.
 --]]
 
 --[[

tests/comp_rest.lua

@@ -0,0 +1,82 @@
+
+local restops = require("restops");
+
+local Collections = require ("Collections");
+
+local FileStream = require ("FileStream");
+local NetStream = require ("NetStream");
+local SocketPool = require("SocketPool");
+
+local URL = require ("url");
+local HttpRequest = require ("HttpRequest");
+local HttpResponse = require("HttpResponse");
+local chunkiter = require ("HttpChunkIterator");
+
+local sout = FileStream.new(io.stdout)
+
+
+local GET = function(resource, showheaders, onfinish)
+--print("http_get: ", resource, showheaders, onfinish)
+	if not resource then
+		return onfinish(nil, "no resource specified");
+	end
+
+	local urlparts = URL.parse(resource, {port="80", path="/", scheme="http"});
+	local hostname = urlparts.host
+	local path = urlparts.path
+	local port = urlparts.port
+
+	-- Open up a stream to get the real content
+	local resourcestream, err = NetStream.Open(hostname, port);
+
+	if not resourcestream then
+		return onfinish(nil, err)
+	end
+
+	-- Send a proper http request to the service
+	if port and port ~= "80" then
+		hostname = hostname..':'..port
+	end
+
+	local headers = {
+		["Host"]		= hostname,
+		["Connection"]	= "close",
+	}
+	if urlparts.query then
+		path = path..'?'..urlparts.query
+	end
+
+	local request = HttpRequest.new("GET", path, headers, nil);
+	local success, err = request:Send(resourcestream);
+
+	if not success then
+		return onfinish(false, err)
+	end
+
+	local response, err = HttpResponse.Parse(resourcestream);
+
+	if response then
+		-- successful read of preamble
+		-- so print it out, and keep out of queue
+		if showheaders then
+			response:WritePreamble(sout);
+		end
+
+		for chunk, err in chunkiter.ReadChunks(response) do
+			-- do nothing
+			-- but read the chunks
+			io.write(chunk);
+		end
+		result = "OK";
+	else
+		result = err;
+	end
+
+	return onfinish(result);
+end
+
+OnMessage = function(msg)
+	if msg.Message == restops.GET then
+
+	end
+end