Commit Graph
54 Commits
Author SHA1 Message Date
Marcos 7b25c727fe Make authenticated username available to scripts. (#100)
See node_info.lua for usage example.
2017-07-02 21:44:26 -05:00
Marcos a2ebdee334 Trivial typos in http/counter.html (#99)
* Handle "nil", add more info

* Split up subnet mask, move unit to the end.

* typos
2017-07-02 21:37:40 -05:00
Marcos 2bdb2d458c Improve node info.lua (#95)
* Handle "nil", add more info

* Split up subnet mask, move unit to the end.
2017-07-01 22:19:38 -05:00
Marcos 7cdbe0ffd0 Move init.lua code into 3 smaller files. Consolidate server configuration. (#94)
* Move server initialization out of init.lua and into new httpserver-init.lua

* Use wildcard for finding server files to upload.

* Break init.lua up into 3 files. Move all configuration to httpserver.conf.

New files are:
* httpserver-compile.lua
* httpserver-wifi.lua
* httpserver-init.lua
2017-07-01 22:01:45 -05:00
Marcos adde150009 Overhaul garage door example (#93)
* script for controlling garage that is aware of door states

* Overhaul garage door example

Hardware now calls for reed relay in order to be able to tell the state
of the switch. This way, we can have distinct open/close operations
that error if the door is already in that state. Allows for potential
better integration with home automation systems.

* Prepare for push to GitHub

* Restore defaults

* Make HTTP auth realm match zeroconf networking name
2017-07-01 15:18:11 -05:00
Marcos a96ebc6196 Merge pull request #92 from HHHartmann/LoadTestPageload
Add stresstest reload page
2017-06-01 21:45:44 -05:00
Marcos 59665a1a87 Merge pull request #86 from HHHartmann/WrongParameter
httpserver-header.lc requires the file extension not the MIME type
2017-05-31 22:02:02 -05:00
Marcos 737477c725 Merge pull request #90 from HHHartmann/BugFixErrorpage
use correct code for erropage instead of failing
2017-05-31 21:47:42 -05:00
Marcos a09b4b4758 Merge pull request #91 from HHHartmann/BetterLoggingAndMoreCloseConnections
Improve logging and cleanup when ConnectionThread failes
2017-05-31 21:43:23 -05:00
Marcos b6b3fec539 Merge pull request #89 from HHHartmann/FilterInvalidRequest
filter invalid requests
2017-05-29 22:41:01 -05:00
Marcos 593f82fc0a Merge pull request #88 from HHHartmann/WrongParameter2
Call to log had wrong parameters
2017-05-29 22:40:23 -05:00
Marcos 578454b254 Merge pull request #87 from HHHartmann/ErrorWithHeader
use httpserver-header.lua in httpserver-error.lua implementation
2017-05-29 22:39:47 -05:00
Marcos 42f9b17e8a Merge pull request #85 from HHHartmann/apNulError
fix nodeinfo_lua for AP more.
2017-05-29 22:37:51 -05:00
Marcos 90cb4e47aa Merge pull request #79 from stephanMettler/master
Update httpserver.lua
2017-03-03 08:08:28 -05:00
Marcos d27251c698 Merge pull request #76 from marcoskirsch/dev
Merge pull request #75 from marcoskirsch/master
2017-01-27 22:01:14 -06:00
Marcos 189e4a5c56 Merge pull request #75 from marcoskirsch/master
Merge master to dev
2017-01-27 21:59:05 -06:00
Marcos 1a5f7507be Merge branch 'dev' into master 2017-01-27 21:58:50 -06:00
Marcos dbeaf452bd Merge pull request #74 from ATAMAH/dev
Upload form for nodemcu-httpserver
2017-01-27 21:52:03 -06:00
Marcos d74b26be7d Merge pull request #69 from ffedoroff/patch-1
line shorter
2016-12-17 21:41:16 -06:00
Marcos 241de797b0 Merge pull request #70 from computerlyrik/uploader-configuration
modularize nodemcu-command, add start_baud parameter
2016-12-17 21:40:42 -06:00
Marcos c2aeffc130 Merge pull request #62 from bhollosi/dev
typo fix at Cache-Control header, new http response code: 500
2016-05-26 19:38:38 -05:00
Marcos 989b4c1d36 Merge pull request #60 from marcoskirsch/master
http-server
2016-05-04 16:10:31 -05:00
Marcos 9bd12123b0 Merge pull request #54 from devyte/master
httpserver-connection: implement fragmentation logic
2016-02-21 20:32:18 -06:00
Marcos c37560ad5f Merge pull request #55 from marcelstoer/patch-1
Fix NodeMCU docs link
2016-02-21 15:31:00 -06:00
Marcos c218c4f5a8 Merge pull request #50 from TriAnMan/fix-memory-leak
Fix a memory leak when the connection is dropped by the client side
2016-02-15 09:10:44 -06:00
Marcos dc816cc258 Merge pull request #48 from lluki/master
matching of mime type in http request header that contain a charset a…
2016-02-15 09:09:53 -06:00
Marcos 8715123904 Merge pull request #45 from IntelliDust/master
Added handling of watchdog for serving bigger files
2015-12-05 11:44:32 -06:00
Marcos 3eecd76908 Merge pull request #43 from pjsg/master
Fix the problem with the more modern SDK only allowing one outstanding connection:send
2015-11-29 10:16:11 -06:00
Marcos 067ffdf3e5 Merge pull request #39 from dimsumlabs/master
Fixed syntax error on line 92
2015-10-03 21:54:34 -05:00
Marcos cf0d777632 Merge pull request #38 from hazarkarabay/master
File extension parsing, gzip detection and init.lua fix
2015-10-03 21:53:55 -05:00
Marcos 792c0814a5 Merge pull request #31 from pospanet/master
Full WiFi configuration done by code based on WiFi mode
2015-09-04 09:52:03 -05:00
Marcos 031dad0f80 Merge pull request #34 from simcop2387/master
Implement support for more arbitrary HTTP methods.
2015-09-04 09:50:56 -05:00
Marcos af57939e0d Merge pull request #33 from hazarkarabay/gzip-variant
Use gzipped file if exists
2015-08-29 19:21:43 -05:00
Marcos 1d3cdaf1a7 Merge pull request #29 from borromeotlhs/patch-8
Update node_info.lua
2015-07-20 15:42:30 -05:00
Marcos 8acc6aa8ca Fix title link 2015-07-20 10:01:49 -05:00
Marcos cbcc7f22a0 Delete b64.py
File was renamed
2015-07-19 18:23:48 -05:00
Marcos cac1a8146a Delete b64.lua
File was renamed
2015-07-19 13:36:34 -05:00
Marcos e61f3c7556 Merge pull request #27 from samdieck/master
Added basic auth. Added static settings file
2015-07-19 09:20:25 -05:00
Marcos 350c868063 Merge pull request #28 from borromeotlhs/patch-7
Update args.lua
2015-07-19 09:19:05 -05:00
Marcos cac11d9a1a Merge pull request #26 from borromeotlhs/patch-6
Update file_list.lua
2015-07-17 17:07:54 -05:00
Marcos a86f2d6384 Merge pull request #23 from geekscape/master
Correct check wifi.sta.getip() so that Wi-Fi station connection works.
2015-05-16 07:10:47 -05:00
Marcos e25b9c5ac0 Merge pull request #22 from borromeotlhs/patch-5
Update init.lua
2015-05-06 17:28:06 -05:00
Marcos 94c56a02b9 Merge pull request #21 from borromeotlhs/patch-4
Fix improper syntax in list
2015-05-06 17:27:33 -05:00
Marcos 970906a89a Merge pull request #18 from borromeotlhs/patch-1
De-duplicate wifi.sta.getip() call
2015-05-02 07:28:46 -05:00
Marcos f728775618 Merge pull request #19 from borromeotlhs/patch-2
Remove unnecessary if statements
2015-05-02 07:26:27 -05:00
Marcos 3e592adfcd Merge pull request #20 from borromeotlhs/patch-3
create a maintainable way to add HTTP Status codez
2015-05-02 07:25:46 -05:00
Marcos 7a1a60f383 Merge pull request #17 from pastukhov/master
Add xml mime type
2015-04-21 09:14:53 -05:00
Marcos 3390d6f6e9 Added note about .gz support 2015-04-03 08:27:44 -05:00
Marcos 2162192d26 Merge pull request #14 from pastukhov/master
Add ability to serve gz compressed files. It should end with .gz
2015-04-03 08:25:59 -05:00
Marcos 4989410f7b Update init.lua 2015-03-22 22:33:25 -05:00
Marcos 34d2e1ef55 Delete test.lua
No need to track this in the published repository, it's for local tests.
2015-02-22 16:27:30 -06:00
Marcos 524730d4e5 Merge pull request #1 from samdieck/master
Makefile for uploading server files using luatool.py
2015-02-17 22:02:36 -06:00
Marcos 94c90c39ab Delete escape.py
experimental file was not needed
2015-02-14 21:50:16 -06:00
Marcos 49d8dc8d43 Initial commit 2015-02-02 18:44:41 -06:00