Skip to content

Commit fdf66bf

Browse files
committed
Merge remote-tracking branch 'origin/main' into 4.0.0-todo
2 parents 85254e5 + c5168df commit fdf66bf

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

README.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,13 @@ Or the following command to update an existing version:
9595
9696
circup update
9797
98+
Security
99+
========
100+
101+
The HTTP server implementation in this package is not robust and should only be deployed on trusted networks.
102+
For instance, there are trivial denial of service attacks against adafruit_httpserver.
103+
Pull requests that improve the server's security and robustness are of course welcome.
104+
98105
Contributing
99106
============
100107

docs/examples.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
Simple file serving
1+
Simple Test
22
-------------------
33

4-
Serving the content of index.html from the filesystem.
4+
Serving a simple static text message.
55

6-
.. literalinclude:: ../examples/httpserver_simple_serve.py
7-
:caption: examples/httpserver_simple_serve.py
6+
.. literalinclude:: ../examples/httpserver_simpletest.py
7+
:caption: examples/httpserver_simpletest.py
88
:linenos:
99

1010
If you want your code to do more than just serve web pages,

examples/httpserver_simple_serve.py renamed to examples/httpserver_simpletest.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@
2727
@server.route("/")
2828
def base(request: HTTPRequest):
2929
"""
30-
Serve the default index.html file.
30+
Serve a default static plain text message.
3131
"""
32-
with HTTPResponse(request, content_type=MIMEType.TYPE_HTML) as response:
33-
response.send_file("index.html")
32+
with HTTPResponse(request, content_type=MIMEType.TYPE_TXT) as response:
33+
message = "Hello from the CircuitPython HTTPServer!"
34+
response.send(message)
3435

3536

3637
print(f"Listening on http://{wifi.radio.ipv4_address}:80")

0 commit comments

Comments
 (0)