projects / bertos.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5726374)
Define 500 internal error page.
authorasterix <asterix@38d2e660-2303-0410-9eaa-f027e97ec537>
Fri, 30 Sep 2011 10:40:04 +0000 (10:40 +0000)
committerasterix <asterix@38d2e660-2303-0410-9eaa-f027e97ec537>
Fri, 30 Sep 2011 10:40:04 +0000 (10:40 +0000)
git-svn-id: https://src.develer.com/svnoss/bertos/trunk@5125 38d2e660-2303-0410-9eaa-f027e97ec537

bertos/hw/hw_http.c patch | blob | history
bertos/hw/hw_http.h patch | blob | history
boards/sam3x-ek/hw/hw_http.c patch | blob | history
boards/sam3x-ek/hw/hw_http.h patch | blob | history

diff --git a/bertos/hw/hw_http.c b/bertos/hw/hw_http.c
index 7d9ba7b3181956ae72062e709c3cabd70e4eaacb..3e9eb90e8c91b0ea7cb13d05661f78aaeed7e7af 100644 (file)
--- a/bertos/hw/hw_http.c
+++ b/bertos/hw/hw_http.c
@@ -40,7 +40,7 @@
 const char http_file_not_found[] = "\
 <!DOCTYPE html PUBLIC \"-//IETF//DTD HTML 2.0//EN\"> \
 <html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=ISO-8859-1\"> \
-<title>404 Not Found</title></head><body><img src=\"bertos_logo_jpg.jpg\"><h1>404 Not Found</h1>\
+<title>404 Not Found</title></head><body><img src=\"bertos_logo_jpg\"><h1>404 Not Found</h1>\
 <p>The requested URL was not found on this server.</p><hr>\
 <address>BeRTOS simple HTTP server</address></body></html>";
 
@@ -49,8 +49,17 @@ const size_t http_file_not_found_len = sizeof(http_file_not_found);
 const char http_sd_not_present[] = " \
 <!DOCTYPE html PUBLIC \"-//IETF//DTD HTML 2.0//EN\">  \
 <html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=ISO-8859-1\">  \
-<title>BeRTOS simple HTTP Server</title></head><body><img src=\"bertos_logo_jpg.jpg\"> \
+<title>BeRTOS simple HTTP Server</title></head><body><img src=\"bertos_logo_jpg\"> \
 <h1>BeRTOS simple HTTP Server</h1><p>Simple Http server, the site's pages are stored on SD card, check it if is present.</p><hr>\
 <a href=\"http://www.bertos.org\">www.BeRTOS.org</a></body></html> \
 ";
 const size_t http_sd_not_present_len = sizeof(http_sd_not_present);
+
+const char http_server_error[] = " \
+<!DOCTYPE html PUBLIC \"-//IETF//DTD HTML 2.0//EN\"> \
+<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=ISO-8859-1\"> \
+<title>404 Not Found</title></head><body><img src=\"bertos_logo_jpg\"><h1>500 Internal Server error</h1>\
+<p>The internal server error was occur while processing the requested page.</p><hr>\
+<address>BeRTOS simple HTTP server</address></body></html>";
+
+const size_t http_server_error_len = sizeof(http_server_error_len);
diff --git a/bertos/hw/hw_http.h b/bertos/hw/hw_http.h
index 88ec1bf74396b1e236f3708faadd46dd661bb153..4ca9eb78fd9c5a801ec958bb3265ae4270dd9a18 100644 (file)
--- a/bertos/hw/hw_http.h
+++ b/bertos/hw/hw_http.h
@@ -46,4 +46,7 @@ extern const size_t http_file_not_found_len;
 extern const char http_sd_not_present[];
 extern const size_t http_sd_not_present_len;
 
+extern const char http_server_error[];
+extern const size_t http_server_error_len;
+
 #endif /*  HW_HTTP_H */
diff --git a/boards/sam3x-ek/hw/hw_http.c b/boards/sam3x-ek/hw/hw_http.c
index 7d9ba7b3181956ae72062e709c3cabd70e4eaacb..3e9eb90e8c91b0ea7cb13d05661f78aaeed7e7af 100644 (file)
--- a/boards/sam3x-ek/hw/hw_http.c
+++ b/boards/sam3x-ek/hw/hw_http.c
@@ -40,7 +40,7 @@
 const char http_file_not_found[] = "\
 <!DOCTYPE html PUBLIC \"-//IETF//DTD HTML 2.0//EN\"> \
 <html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=ISO-8859-1\"> \
-<title>404 Not Found</title></head><body><img src=\"bertos_logo_jpg.jpg\"><h1>404 Not Found</h1>\
+<title>404 Not Found</title></head><body><img src=\"bertos_logo_jpg\"><h1>404 Not Found</h1>\
 <p>The requested URL was not found on this server.</p><hr>\
 <address>BeRTOS simple HTTP server</address></body></html>";
 
@@ -49,8 +49,17 @@ const size_t http_file_not_found_len = sizeof(http_file_not_found);
 const char http_sd_not_present[] = " \
 <!DOCTYPE html PUBLIC \"-//IETF//DTD HTML 2.0//EN\">  \
 <html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=ISO-8859-1\">  \
-<title>BeRTOS simple HTTP Server</title></head><body><img src=\"bertos_logo_jpg.jpg\"> \
+<title>BeRTOS simple HTTP Server</title></head><body><img src=\"bertos_logo_jpg\"> \
 <h1>BeRTOS simple HTTP Server</h1><p>Simple Http server, the site's pages are stored on SD card, check it if is present.</p><hr>\
 <a href=\"http://www.bertos.org\">www.BeRTOS.org</a></body></html> \
 ";
 const size_t http_sd_not_present_len = sizeof(http_sd_not_present);
+
+const char http_server_error[] = " \
+<!DOCTYPE html PUBLIC \"-//IETF//DTD HTML 2.0//EN\"> \
+<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=ISO-8859-1\"> \
+<title>404 Not Found</title></head><body><img src=\"bertos_logo_jpg\"><h1>500 Internal Server error</h1>\
+<p>The internal server error was occur while processing the requested page.</p><hr>\
+<address>BeRTOS simple HTTP server</address></body></html>";
+
+const size_t http_server_error_len = sizeof(http_server_error_len);
diff --git a/boards/sam3x-ek/hw/hw_http.h b/boards/sam3x-ek/hw/hw_http.h
index 88ec1bf74396b1e236f3708faadd46dd661bb153..4ca9eb78fd9c5a801ec958bb3265ae4270dd9a18 100644 (file)
--- a/boards/sam3x-ek/hw/hw_http.h
+++ b/boards/sam3x-ek/hw/hw_http.h
@@ -46,4 +46,7 @@ extern const size_t http_file_not_found_len;
 extern const char http_sd_not_present[];
 extern const size_t http_sd_not_present_len;
 
+extern const char http_server_error[];
+extern const size_t http_server_error_len;
+
 #endif /*  HW_HTTP_H */
A free, realtime operating system for embedded devices - http://bertos.org/