godzil/nodemcu-httpserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pastukhov/nodemcu-httpserver

Browse Source 
Conflicts:
	Makefile
	http/node_info.lua
	httpserver-static.lua
This commit is contained in:
Artem Pastukhov
2015-04-02 16:02:39 +03:00
parent d198d1b433 2357415466
commit da17c3b346
3 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
http/node_info.lua
View File

@@ -1,5 +1,9 @@
local function sendHeader(connection)
<<<<<<< HEAD
connection:send("HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nCache-Control: private, no-store\r\n\r\n")
=======
connection:send("HTTP/1.0 200 OK\r\nContent-Type: text/html\rCache-Control: private, no-store\r\n\r\n")
>>>>>>> 2357415466bb24cba8ee33109146f6a6a2df0282
end
local function sendAttr(connection, attr, val)