html, branding change and getting ready for pre-rel
This commit is contained in:
+3
-3
@@ -6,9 +6,9 @@
|
|||||||
<body>
|
<body>
|
||||||
<center>
|
<center>
|
||||||
<h1>Hello from Amethyst!</h1>
|
<h1>Hello from Amethyst!</h1>
|
||||||
<h2>This page confirms Amethyst can read files from your PC and serve them to your browser!</h2>
|
<h2>This page confirms Amethyst can read files from your PC or server and serve them to your browser!</h2>
|
||||||
<p>If you see this page and you're not the server owner, tell them they misconfigured something!</p>
|
<p>This is a test page, if you aren't the server owner, they might not have finished setting up their site, be patient. If this doesn't go away after a while, tell them they've made an oopsie</p>
|
||||||
<p>This server runs Amethyst Alpha Build 0048</p>
|
<p>This server runs Amethyst Pre-Rel Build 0053</p>
|
||||||
</center>
|
</center>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
+11
-11
@@ -61,7 +61,7 @@ except ImportError:
|
|||||||
)
|
)
|
||||||
# pass
|
# pass
|
||||||
|
|
||||||
AMETHYST_BUILD_NUMBER = "0052"
|
AMETHYST_BUILD_NUMBER = "0053"
|
||||||
AMETHYST_REPO = "https://git.novacow.ch/Nova/PyWebServer/"
|
AMETHYST_REPO = "https://git.novacow.ch/Nova/PyWebServer/"
|
||||||
|
|
||||||
|
|
||||||
@@ -373,18 +373,18 @@ class WebServer:
|
|||||||
)
|
)
|
||||||
|
|
||||||
self.http_404_html = (
|
self.http_404_html = (
|
||||||
"<html><head><title>HTTP 404 - PyWebServer</title></head>"
|
"<html><head><title>HTTP 404 - Amethyst</title></head>"
|
||||||
f"<body><center><h1>HTTP 404 - Not Found!</h1><p>Running PyWebServer/amethyst-build-{AMETHYST_BUILD_NUMBER}</p>"
|
f"<body><center><h1>HTTP 404 - Not Found!</h1><p>Running Amethyst/build-{AMETHYST_BUILD_NUMBER}</p>"
|
||||||
"</center></body></html>"
|
"</center></body></html>"
|
||||||
)
|
)
|
||||||
self.http_403_html = (
|
self.http_403_html = (
|
||||||
"<html><head><title>HTTP 403 - PyWebServer</title></head>"
|
"<html><head><title>HTTP 403 - Amethyst</title></head>"
|
||||||
f"<body><center><h1>HTTP 403 - Forbidden</h1><p>Running PyWebServer/amethyst-build-{AMETHYST_BUILD_NUMBER}</p>"
|
f"<body><center><h1>HTTP 403 - Forbidden</h1><p>Running Amethyst/build-{AMETHYST_BUILD_NUMBER}</p>"
|
||||||
"</center></body></html>"
|
"</center></body></html>"
|
||||||
)
|
)
|
||||||
self.http_405_html = (
|
self.http_405_html = (
|
||||||
"<html><head><title>HTTP 405 - PyWebServer</title></head>"
|
"<html><head><title>HTTP 405 - Amethyst</title></head>"
|
||||||
f"<body><center><h1>HTTP 405 - Method not allowed</h1><p>Running PyWebServer/amethyst-build-{AMETHYST_BUILD_NUMBER}</p>"
|
f"<body><center><h1>HTTP 405 - Method not allowed</h1><p>Running Amethyst/build-{AMETHYST_BUILD_NUMBER}</p>"
|
||||||
"</center></body></html>"
|
"</center></body></html>"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -565,7 +565,7 @@ class WebServer:
|
|||||||
status_message = messages.get(status_code)
|
status_message = messages.get(status_code)
|
||||||
headers = (
|
headers = (
|
||||||
f"HTTP/1.1 {status_code} {status_message}\r\n"
|
f"HTTP/1.1 {status_code} {status_message}\r\n"
|
||||||
f"Server: PyWebServer/amethyst-build-{AMETHYST_BUILD_NUMBER}\r\n"
|
f"Server: Amethyst/amethyst-build-{AMETHYST_BUILD_NUMBER}\r\n"
|
||||||
f"Content-Type: {content_type}\r\n"
|
f"Content-Type: {content_type}\r\n"
|
||||||
f"Content-Length: {len(binary_data)}\r\n"
|
f"Content-Length: {len(binary_data)}\r\n"
|
||||||
f"Connection: close\r\n\r\n"
|
f"Connection: close\r\n\r\n"
|
||||||
@@ -602,7 +602,7 @@ class WebServer:
|
|||||||
# Don't encode yet, if 302 status code we have to include location.
|
# Don't encode yet, if 302 status code we have to include location.
|
||||||
headers = (
|
headers = (
|
||||||
f"HTTP/1.1 {status_code} {status_message}\r\n"
|
f"HTTP/1.1 {status_code} {status_message}\r\n"
|
||||||
f"Server: PyWebServer/amethyst-build-{AMETHYST_BUILD_NUMBER}\r\n"
|
f"Server: Amethyst/build-{AMETHYST_BUILD_NUMBER}\r\n"
|
||||||
f"Content-Length: {len(body)}\r\n"
|
f"Content-Length: {len(body)}\r\n"
|
||||||
f"Connection: close\r\n\r\n"
|
f"Connection: close\r\n\r\n"
|
||||||
).encode()
|
).encode()
|
||||||
@@ -618,7 +618,7 @@ class WebServer:
|
|||||||
headers = (
|
headers = (
|
||||||
f"HTTP/1.1 {status_code} {status_message}\r\n"
|
f"HTTP/1.1 {status_code} {status_message}\r\n"
|
||||||
f"Location: {host}\r\n"
|
f"Location: {host}\r\n"
|
||||||
f"Server: PyWebServer/amethyst-build-{AMETHYST_BUILD_NUMBER}\r\n"
|
f"Server: Amethyst/build-{AMETHYST_BUILD_NUMBER}\r\n"
|
||||||
f"Content-Length: {len(body)}\r\n"
|
f"Content-Length: {len(body)}\r\n"
|
||||||
f"Connection: close\r\n\r\n"
|
f"Connection: close\r\n\r\n"
|
||||||
).encode()
|
).encode()
|
||||||
@@ -626,7 +626,7 @@ class WebServer:
|
|||||||
if status_code == 621:
|
if status_code == 621:
|
||||||
headers = (
|
headers = (
|
||||||
f"HTTP/1.1 {status_code} {status_message}\r\n"
|
f"HTTP/1.1 {status_code} {status_message}\r\n"
|
||||||
"Server: PyWebServer/amethyst-build-0621\r\n"
|
"Server: Amethyst/build-0621\r\n"
|
||||||
"Content-Length: 30\r\n"
|
"Content-Length: 30\r\n"
|
||||||
f"Connection: close\r\n\r\n"
|
f"Connection: close\r\n\r\n"
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user