diff --git a/examples/http_server/Makefile b/examples/http_server/Makefile
index 96e4817..42fdd33 100644
--- a/examples/http_server/Makefile
+++ b/examples/http_server/Makefile
@@ -1,7 +1,13 @@
PROGRAM=http_server
+#ESPBAUD=921600
+
EXTRA_CFLAGS=-DLWIP_HTTPD_CGI=1 -DLWIP_HTTPD_SSI=1 -I./fsdata
EXTRA_COMPONENTS=extras/httpd
include ../../common.mk
+
+html:
+ @echo "Generating fsdata.."
+ cd fsdata && ./makefsdata
diff --git a/examples/http_server/fsdata/fs/404.html b/examples/http_server/fsdata/fs/404.html
index 0bed7ca..8155203 100644
--- a/examples/http_server/fsdata/fs/404.html
+++ b/examples/http_server/fsdata/fs/404.html
@@ -6,7 +6,7 @@
-
+
HTTP Server
diff --git a/examples/http_server/fsdata/fs/about.html b/examples/http_server/fsdata/fs/about.html
index dd4e91a..1692485 100644
--- a/examples/http_server/fsdata/fs/about.html
+++ b/examples/http_server/fsdata/fs/about.html
@@ -6,7 +6,7 @@
-
+
HTTP Server
diff --git a/examples/http_server/fsdata/fs/css/style.css b/examples/http_server/fsdata/fs/css/style.css
index 1f29a83..b5b27d6 100644
--- a/examples/http_server/fsdata/fs/css/style.css
+++ b/examples/http_server/fsdata/fs/css/style.css
@@ -54,7 +54,7 @@ ul.navbar li a.active {
.onoffswitch-inner:after {
content: "OFF";
padding-right: 14px;
- background-color: #F1F5FA; color: #999999;
+ background-color: #FFFFFF; color: #999999;
text-align: right;
}
.onoffswitch-switch {
diff --git a/examples/http_server/fsdata/fs/img/favicon.png b/examples/http_server/fsdata/fs/img/favicon.png
new file mode 100644
index 0000000..126f24b
Binary files /dev/null and b/examples/http_server/fsdata/fs/img/favicon.png differ
diff --git a/examples/http_server/fsdata/fs/img/sics.gif b/examples/http_server/fsdata/fs/img/sics.gif
deleted file mode 100644
index 0a4fc7b..0000000
Binary files a/examples/http_server/fsdata/fs/img/sics.gif and /dev/null differ
diff --git a/examples/http_server/fsdata/fs/index.ssi b/examples/http_server/fsdata/fs/index.ssi
index 6ae0c73..eb9db29 100644
--- a/examples/http_server/fsdata/fs/index.ssi
+++ b/examples/http_server/fsdata/fs/index.ssi
@@ -6,7 +6,7 @@
-
+
HTTP Server
@@ -21,7 +21,7 @@
HTTP Server is up and running.
- This is an example HTTP server with CGI and SSI support. The switch below will allow you to test CGI handler and switch
+
This is an example HTTP server with CGI and SSI support. The switch below will allow you to test CGI handler and turn
the blue LED on or off.
diff --git a/examples/http_server/fsdata/fsdata.c b/examples/http_server/fsdata/fsdata.c
index c1974e1..e5d2f4f 100644
--- a/examples/http_server/fsdata/fsdata.c
+++ b/examples/http_server/fsdata/fsdata.c
@@ -4,12 +4,12 @@ static const unsigned char data_index_ssi[] = {
/* /index.ssi */
0x2F, 0x69, 0x6E, 0x64, 0x65, 0x78, 0x2E, 0x73, 0x73, 0x69, 0,
0x48, 0x54, 0x54, 0x50, 0x2F, 0x31, 0x2E, 0x30, 0x20, 0x32,
- 0x30, 0x30, 0x20, 0x4F, 0x4B, 0x0D, 0x0A, 0x53, 0x65, 0x72,
- 0x76, 0x65, 0x72, 0x3A, 0x20, 0x6C, 0x77, 0x49, 0x50, 0x2F,
- 0x70, 0x72, 0x65, 0x2D, 0x30, 0x2E, 0x36, 0x20, 0x28, 0x68,
- 0x74, 0x74, 0x70, 0x3A, 0x2F, 0x2F, 0x77, 0x77, 0x77, 0x2E,
- 0x73, 0x69, 0x63, 0x73, 0x2E, 0x73, 0x65, 0x2F, 0x7E, 0x61,
- 0x64, 0x61, 0x6D, 0x2F, 0x6C, 0x77, 0x69, 0x70, 0x2F, 0x29,
+ 0x30, 0x30, 0x20, 0x4F, 0x4B, 0x0D, 0x0A, 0x6C, 0x77, 0x49,
+ 0x50, 0x2F, 0x31, 0x2E, 0x34, 0x2E, 0x31, 0x20, 0x28, 0x68,
+ 0x74, 0x74, 0x70, 0x3A, 0x2F, 0x2F, 0x73, 0x61, 0x76, 0x61,
+ 0x6E, 0x6E, 0x61, 0x68, 0x2E, 0x6E, 0x6F, 0x6E, 0x67, 0x6E,
+ 0x75, 0x2E, 0x6F, 0x72, 0x67, 0x2F, 0x70, 0x72, 0x6F, 0x6A,
+ 0x65, 0x63, 0x74, 0x73, 0x2F, 0x6C, 0x77, 0x69, 0x70, 0x29,
0x0D, 0x0A, 0x43, 0x6F, 0x6E, 0x74, 0x65, 0x6E, 0x74, 0x2D,
0x74, 0x79, 0x70, 0x65, 0x3A, 0x20, 0x74, 0x65, 0x78, 0x74,
0x2F, 0x68, 0x74, 0x6D, 0x6C, 0x0D, 0x0A, 0x0D, 0x0A, 0x3C,
@@ -43,7 +43,7 @@ static const unsigned char data_index_ssi[] = {
0x6C, 0x3D, 0x22, 0x73, 0x68, 0x6F, 0x72, 0x74, 0x63, 0x75,
0x74, 0x20, 0x69, 0x63, 0x6F, 0x6E, 0x22, 0x20, 0x68, 0x72,
0x65, 0x66, 0x3D, 0x22, 0x69, 0x6D, 0x67, 0x2F, 0x66, 0x61,
- 0x76, 0x69, 0x63, 0x6F, 0x6E, 0x2E, 0x69, 0x63, 0x6F, 0x22,
+ 0x76, 0x69, 0x63, 0x6F, 0x6E, 0x2E, 0x70, 0x6E, 0x67, 0x22,
0x3E, 0x0A, 0x0A, 0x09, 0x09, 0x3C, 0x74, 0x69, 0x74, 0x6C,
0x65, 0x3E, 0x48, 0x54, 0x54, 0x50, 0x20, 0x53, 0x65, 0x72,
0x76, 0x65, 0x72, 0x3C, 0x2F, 0x74, 0x69, 0x74, 0x6C, 0x65,
@@ -275,13 +275,13 @@ static const unsigned char data_404_html[] = {
0x2F, 0x34, 0x30, 0x34, 0x2E, 0x68, 0x74, 0x6D, 0x6C, 0,
0x48, 0x54, 0x54, 0x50, 0x2F, 0x31, 0x2E, 0x30, 0x20, 0x34,
0x30, 0x34, 0x20, 0x46, 0x69, 0x6C, 0x65, 0x20, 0x6E, 0x6F,
- 0x74, 0x20, 0x66, 0x6F, 0x75, 0x6E, 0x64, 0x0D, 0x0A, 0x53,
- 0x65, 0x72, 0x76, 0x65, 0x72, 0x3A, 0x20, 0x6C, 0x77, 0x49,
- 0x50, 0x2F, 0x70, 0x72, 0x65, 0x2D, 0x30, 0x2E, 0x36, 0x20,
- 0x28, 0x68, 0x74, 0x74, 0x70, 0x3A, 0x2F, 0x2F, 0x77, 0x77,
- 0x77, 0x2E, 0x73, 0x69, 0x63, 0x73, 0x2E, 0x73, 0x65, 0x2F,
- 0x7E, 0x61, 0x64, 0x61, 0x6D, 0x2F, 0x6C, 0x77, 0x69, 0x70,
- 0x2F, 0x29, 0x0D, 0x0A, 0x43, 0x6F, 0x6E, 0x74, 0x65, 0x6E,
+ 0x74, 0x20, 0x66, 0x6F, 0x75, 0x6E, 0x64, 0x0D, 0x0A, 0x6C,
+ 0x77, 0x49, 0x50, 0x2F, 0x31, 0x2E, 0x34, 0x2E, 0x31, 0x20,
+ 0x28, 0x68, 0x74, 0x74, 0x70, 0x3A, 0x2F, 0x2F, 0x73, 0x61,
+ 0x76, 0x61, 0x6E, 0x6E, 0x61, 0x68, 0x2E, 0x6E, 0x6F, 0x6E,
+ 0x67, 0x6E, 0x75, 0x2E, 0x6F, 0x72, 0x67, 0x2F, 0x70, 0x72,
+ 0x6F, 0x6A, 0x65, 0x63, 0x74, 0x73, 0x2F, 0x6C, 0x77, 0x69,
+ 0x70, 0x29, 0x0D, 0x0A, 0x43, 0x6F, 0x6E, 0x74, 0x65, 0x6E,
0x74, 0x2D, 0x74, 0x79, 0x70, 0x65, 0x3A, 0x20, 0x74, 0x65,
0x78, 0x74, 0x2F, 0x68, 0x74, 0x6D, 0x6C, 0x0D, 0x0A, 0x0D,
0x0A, 0x3C, 0x21, 0x44, 0x4F, 0x43, 0x54, 0x59, 0x50, 0x45,
@@ -314,8 +314,8 @@ static const unsigned char data_404_html[] = {
0x72, 0x65, 0x6C, 0x3D, 0x22, 0x73, 0x68, 0x6F, 0x72, 0x74,
0x63, 0x75, 0x74, 0x20, 0x69, 0x63, 0x6F, 0x6E, 0x22, 0x20,
0x68, 0x72, 0x65, 0x66, 0x3D, 0x22, 0x69, 0x6D, 0x67, 0x2F,
- 0x66, 0x61, 0x76, 0x69, 0x63, 0x6F, 0x6E, 0x2E, 0x69, 0x63,
- 0x6F, 0x22, 0x3E, 0x0A, 0x0A, 0x09, 0x09, 0x3C, 0x74, 0x69,
+ 0x66, 0x61, 0x76, 0x69, 0x63, 0x6F, 0x6E, 0x2E, 0x70, 0x6E,
+ 0x67, 0x22, 0x3E, 0x0A, 0x0A, 0x09, 0x09, 0x3C, 0x74, 0x69,
0x74, 0x6C, 0x65, 0x3E, 0x48, 0x54, 0x54, 0x50, 0x20, 0x53,
0x65, 0x72, 0x76, 0x65, 0x72, 0x3C, 0x2F, 0x74, 0x69, 0x74,
0x6C, 0x65, 0x3E, 0x0A, 0x09, 0x3C, 0x2F, 0x68, 0x65, 0x61,
@@ -355,12 +355,12 @@ static const unsigned char data_about_html[] = {
/* /about.html */
0x2F, 0x61, 0x62, 0x6F, 0x75, 0x74, 0x2E, 0x68, 0x74, 0x6D, 0x6C, 0,
0x48, 0x54, 0x54, 0x50, 0x2F, 0x31, 0x2E, 0x30, 0x20, 0x32,
- 0x30, 0x30, 0x20, 0x4F, 0x4B, 0x0D, 0x0A, 0x53, 0x65, 0x72,
- 0x76, 0x65, 0x72, 0x3A, 0x20, 0x6C, 0x77, 0x49, 0x50, 0x2F,
- 0x70, 0x72, 0x65, 0x2D, 0x30, 0x2E, 0x36, 0x20, 0x28, 0x68,
- 0x74, 0x74, 0x70, 0x3A, 0x2F, 0x2F, 0x77, 0x77, 0x77, 0x2E,
- 0x73, 0x69, 0x63, 0x73, 0x2E, 0x73, 0x65, 0x2F, 0x7E, 0x61,
- 0x64, 0x61, 0x6D, 0x2F, 0x6C, 0x77, 0x69, 0x70, 0x2F, 0x29,
+ 0x30, 0x30, 0x20, 0x4F, 0x4B, 0x0D, 0x0A, 0x6C, 0x77, 0x49,
+ 0x50, 0x2F, 0x31, 0x2E, 0x34, 0x2E, 0x31, 0x20, 0x28, 0x68,
+ 0x74, 0x74, 0x70, 0x3A, 0x2F, 0x2F, 0x73, 0x61, 0x76, 0x61,
+ 0x6E, 0x6E, 0x61, 0x68, 0x2E, 0x6E, 0x6F, 0x6E, 0x67, 0x6E,
+ 0x75, 0x2E, 0x6F, 0x72, 0x67, 0x2F, 0x70, 0x72, 0x6F, 0x6A,
+ 0x65, 0x63, 0x74, 0x73, 0x2F, 0x6C, 0x77, 0x69, 0x70, 0x29,
0x0D, 0x0A, 0x43, 0x6F, 0x6E, 0x74, 0x65, 0x6E, 0x74, 0x2D,
0x74, 0x79, 0x70, 0x65, 0x3A, 0x20, 0x74, 0x65, 0x78, 0x74,
0x2F, 0x68, 0x74, 0x6D, 0x6C, 0x0D, 0x0A, 0x0D, 0x0A, 0x3C,
@@ -394,7 +394,7 @@ static const unsigned char data_about_html[] = {
0x6C, 0x3D, 0x22, 0x73, 0x68, 0x6F, 0x72, 0x74, 0x63, 0x75,
0x74, 0x20, 0x69, 0x63, 0x6F, 0x6E, 0x22, 0x20, 0x68, 0x72,
0x65, 0x66, 0x3D, 0x22, 0x69, 0x6D, 0x67, 0x2F, 0x66, 0x61,
- 0x76, 0x69, 0x63, 0x6F, 0x6E, 0x2E, 0x69, 0x63, 0x6F, 0x22,
+ 0x76, 0x69, 0x63, 0x6F, 0x6E, 0x2E, 0x70, 0x6E, 0x67, 0x22,
0x3E, 0x0A, 0x0A, 0x09, 0x09, 0x3C, 0x74, 0x69, 0x74, 0x6C,
0x65, 0x3E, 0x48, 0x54, 0x54, 0x50, 0x20, 0x53, 0x65, 0x72,
0x76, 0x65, 0x72, 0x3C, 0x2F, 0x74, 0x69, 0x74, 0x6C, 0x65,
@@ -437,103 +437,106 @@ static const unsigned char data_about_html[] = {
0x09, 0x3C, 0x2F, 0x62, 0x6F, 0x64, 0x79, 0x3E, 0x0A, 0x3C,
0x2F, 0x68, 0x74, 0x6D, 0x6C, 0x3E, 0x0A, 0x0A, };
-static const unsigned char data_img_sics_gif[] = {
- /* /img/sics.gif */
- 0x2F, 0x69, 0x6D, 0x67, 0x2F, 0x73, 0x69, 0x63, 0x73, 0x2E, 0x67, 0x69, 0x66, 0,
+static const unsigned char data_img_favicon_png[] = {
+ /* /img/favicon.png */
+ 0x2F, 0x69, 0x6D, 0x67, 0x2F, 0x66, 0x61, 0x76, 0x69, 0x63, 0x6F, 0x6E, 0x2E, 0x70, 0x6E, 0x67, 0,
0x48, 0x54, 0x54, 0x50, 0x2F, 0x31, 0x2E, 0x30, 0x20, 0x32,
- 0x30, 0x30, 0x20, 0x4F, 0x4B, 0x0D, 0x0A, 0x53, 0x65, 0x72,
- 0x76, 0x65, 0x72, 0x3A, 0x20, 0x6C, 0x77, 0x49, 0x50, 0x2F,
- 0x70, 0x72, 0x65, 0x2D, 0x30, 0x2E, 0x36, 0x20, 0x28, 0x68,
- 0x74, 0x74, 0x70, 0x3A, 0x2F, 0x2F, 0x77, 0x77, 0x77, 0x2E,
- 0x73, 0x69, 0x63, 0x73, 0x2E, 0x73, 0x65, 0x2F, 0x7E, 0x61,
- 0x64, 0x61, 0x6D, 0x2F, 0x6C, 0x77, 0x69, 0x70, 0x2F, 0x29,
+ 0x30, 0x30, 0x20, 0x4F, 0x4B, 0x0D, 0x0A, 0x6C, 0x77, 0x49,
+ 0x50, 0x2F, 0x31, 0x2E, 0x34, 0x2E, 0x31, 0x20, 0x28, 0x68,
+ 0x74, 0x74, 0x70, 0x3A, 0x2F, 0x2F, 0x73, 0x61, 0x76, 0x61,
+ 0x6E, 0x6E, 0x61, 0x68, 0x2E, 0x6E, 0x6F, 0x6E, 0x67, 0x6E,
+ 0x75, 0x2E, 0x6F, 0x72, 0x67, 0x2F, 0x70, 0x72, 0x6F, 0x6A,
+ 0x65, 0x63, 0x74, 0x73, 0x2F, 0x6C, 0x77, 0x69, 0x70, 0x29,
0x0D, 0x0A, 0x43, 0x6F, 0x6E, 0x74, 0x65, 0x6E, 0x74, 0x2D,
0x74, 0x79, 0x70, 0x65, 0x3A, 0x20, 0x69, 0x6D, 0x61, 0x67,
- 0x65, 0x2F, 0x67, 0x69, 0x66, 0x0D, 0x0A, 0x0D, 0x0A, 0x47,
- 0x49, 0x46, 0x38, 0x39, 0x61, 0x46, 0x00, 0x22, 0x00, 0xA5,
- 0x00, 0x00, 0xD9, 0x2B, 0x39, 0x6A, 0x6A, 0x6A, 0xBF, 0xBF,
- 0xBF, 0x93, 0x93, 0x93, 0x0F, 0x0F, 0x0F, 0xB0, 0xB0, 0xB0,
- 0xA6, 0xA6, 0xA6, 0x80, 0x80, 0x80, 0x76, 0x76, 0x76, 0x1E,
- 0x1E, 0x1E, 0x9D, 0x9D, 0x9D, 0x2E, 0x2E, 0x2E, 0x49, 0x49,
- 0x49, 0x54, 0x54, 0x54, 0x8A, 0x8A, 0x8A, 0x60, 0x60, 0x60,
- 0xC6, 0xA6, 0x99, 0xBD, 0xB5, 0xB2, 0xC2, 0xAB, 0xA1, 0xD9,
- 0x41, 0x40, 0xD5, 0x67, 0x55, 0xC0, 0xB0, 0xAA, 0xD5, 0x5E,
- 0x4E, 0xD6, 0x50, 0x45, 0xCC, 0x93, 0x7D, 0xC8, 0xA1, 0x90,
- 0xCE, 0x8B, 0x76, 0xD2, 0x7B, 0x65, 0xD1, 0x84, 0x6D, 0xC9,
- 0x99, 0x86, 0x3A, 0x3A, 0x3A, 0x00, 0x00, 0x00, 0xB8, 0xB8,
- 0xB8, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0x2C, 0x00, 0x00, 0x00, 0x00, 0x46,
- 0x00, 0x22, 0x00, 0x00, 0x06, 0xFE, 0x40, 0x90, 0x70, 0x48,
- 0x2C, 0x1A, 0x8F, 0xC8, 0xA4, 0x72, 0xC9, 0x6C, 0x3A, 0x9F,
- 0xD0, 0xA8, 0x74, 0x4A, 0xAD, 0x5A, 0xAF, 0xD8, 0xAC, 0x76,
- 0xA9, 0x40, 0x04, 0xBE, 0x83, 0xE2, 0x60, 0x3C, 0x50, 0x20,
- 0x0D, 0x8E, 0x6F, 0x00, 0x31, 0x28, 0x1C, 0x0D, 0x07, 0xB5,
- 0xC3, 0x60, 0x75, 0x24, 0x3E, 0xF8, 0xFC, 0x87, 0x11, 0x06,
- 0xE9, 0x3D, 0x46, 0x07, 0x0B, 0x7A, 0x7A, 0x7C, 0x43, 0x06,
- 0x1E, 0x84, 0x78, 0x0B, 0x07, 0x6E, 0x51, 0x01, 0x8A, 0x84,
- 0x08, 0x7E, 0x79, 0x80, 0x87, 0x89, 0x91, 0x7A, 0x93, 0x0A,
- 0x04, 0x99, 0x78, 0x96, 0x4F, 0x03, 0x9E, 0x79, 0x01, 0x94,
- 0x9F, 0x43, 0x9C, 0xA3, 0xA4, 0x05, 0x77, 0xA3, 0xA0, 0x4E,
- 0x98, 0x79, 0x0B, 0x1E, 0x83, 0xA4, 0xA6, 0x1F, 0x96, 0x05,
- 0x9D, 0xAA, 0x78, 0x01, 0x07, 0x84, 0x04, 0x1E, 0x1E, 0xBB,
- 0xB8, 0x51, 0x84, 0x0E, 0x43, 0x05, 0x07, 0x77, 0xA5, 0x7F,
- 0x42, 0xB1, 0xB2, 0x01, 0x63, 0x08, 0x0D, 0xBB, 0x01, 0x0C,
- 0x7A, 0x0D, 0x44, 0x0E, 0xD8, 0xAF, 0x4C, 0x05, 0x7A, 0x04,
- 0x47, 0x07, 0x07, 0xB7, 0x80, 0xA2, 0xE1, 0x7D, 0x44, 0x05,
- 0x01, 0x04, 0x01, 0xD0, 0xEA, 0x87, 0x93, 0x4F, 0xE0, 0x9A,
- 0x49, 0xCE, 0xD8, 0x79, 0x04, 0x66, 0x20, 0x15, 0x10, 0x10,
- 0x11, 0x92, 0x29, 0x80, 0xB6, 0xC0, 0x91, 0x15, 0x45, 0x1E,
- 0x90, 0x19, 0x71, 0x46, 0xA8, 0x5C, 0x04, 0x0E, 0x00, 0x22,
- 0x4E, 0xE8, 0x40, 0x24, 0x9F, 0x3E, 0x04, 0x06, 0xA7, 0x58,
- 0xD4, 0x93, 0xA0, 0x1C, 0x91, 0x3F, 0xE8, 0xF0, 0x88, 0x03,
- 0xB1, 0x21, 0xA2, 0x49, 0x00, 0x19, 0x86, 0xFC, 0x52, 0x44,
- 0xE0, 0x01, 0x9D, 0x29, 0x21, 0x15, 0x25, 0x50, 0xF7, 0x67,
- 0x25, 0x1E, 0x06, 0xFD, 0x4E, 0x9A, 0xB4, 0x90, 0xAC, 0x15,
- 0xFA, 0xCB, 0x52, 0x53, 0x1E, 0x8C, 0xF2, 0xF8, 0x07, 0x92,
- 0x2D, 0x08, 0x3A, 0x4D, 0x12, 0x49, 0x95, 0x49, 0xDB, 0x14,
- 0x04, 0xC4, 0x14, 0x85, 0x29, 0xAA, 0xE7, 0x01, 0x08, 0xA4,
- 0x49, 0x01, 0x14, 0x51, 0xE0, 0x53, 0x91, 0xD5, 0x29, 0x06,
- 0x1A, 0x64, 0x02, 0xF4, 0xC7, 0x81, 0x9E, 0x05, 0x20, 0x22,
- 0x64, 0xA5, 0x30, 0xAE, 0xAB, 0x9E, 0x97, 0x53, 0xD8, 0xB9,
- 0xFD, 0x50, 0xEF, 0x93, 0x02, 0x42, 0x74, 0x34, 0xE8, 0x9C,
- 0x20, 0x21, 0xC9, 0x01, 0x68, 0x78, 0xE6, 0x55, 0x29, 0x20,
- 0x56, 0x4F, 0x4C, 0x40, 0x51, 0x71, 0x82, 0xC0, 0x70, 0x21,
- 0x22, 0x85, 0xBE, 0x4B, 0x1C, 0x44, 0x05, 0xEA, 0xA4, 0x01,
- 0xBF, 0x22, 0xB5, 0xF0, 0x1C, 0x06, 0x51, 0x38, 0x8F, 0xE0,
- 0x22, 0xEC, 0x18, 0xAC, 0x39, 0x22, 0xD4, 0xD6, 0x93, 0x44,
- 0x01, 0x32, 0x82, 0xC8, 0xFC, 0x61, 0xB3, 0x01, 0x45, 0x0C,
- 0x2E, 0x83, 0x30, 0xD0, 0x0E, 0x17, 0x24, 0x0F, 0x70, 0x85,
- 0x94, 0xEE, 0x05, 0x05, 0x53, 0x4B, 0x32, 0x1B, 0x3F, 0x98,
- 0xD3, 0x1D, 0x29, 0x81, 0xB0, 0xAE, 0x1E, 0x8C, 0x7E, 0x68,
- 0xE0, 0x60, 0x5A, 0x54, 0x8F, 0xB0, 0x78, 0x69, 0x73, 0x06,
- 0xA2, 0x00, 0x6B, 0x57, 0xCA, 0x3D, 0x11, 0x50, 0xBD, 0x04,
- 0x30, 0x4B, 0x3A, 0xD4, 0xAB, 0x5F, 0x1F, 0x9B, 0x3D, 0x13,
- 0x74, 0x27, 0x88, 0x3C, 0x25, 0xE0, 0x17, 0xBE, 0x7A, 0x79,
- 0x45, 0x0D, 0x0C, 0xB0, 0x8B, 0xDA, 0x90, 0xCA, 0x80, 0x06,
- 0x5D, 0x17, 0x60, 0x1C, 0x22, 0x4C, 0xD8, 0x57, 0x22, 0x06,
- 0x20, 0x00, 0x98, 0x07, 0x08, 0xE4, 0x56, 0x80, 0x80, 0x1C,
- 0xC5, 0xB7, 0xC5, 0x82, 0x0C, 0x36, 0xE8, 0xE0, 0x83, 0x10,
- 0x46, 0x28, 0xE1, 0x84, 0x14, 0x56, 0x68, 0xA1, 0x10, 0x41,
- 0x00, 0x00, 0x3B, };
+ 0x65, 0x2F, 0x70, 0x6E, 0x67, 0x0D, 0x0A, 0x0D, 0x0A, 0x89,
+ 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00,
+ 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x10, 0x00,
+ 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1F, 0xF3,
+ 0xFF, 0x61, 0x00, 0x00, 0x02, 0xBF, 0x49, 0x44, 0x41, 0x54,
+ 0x38, 0xCB, 0xA5, 0x92, 0x4F, 0x6C, 0x14, 0x75, 0x14, 0xC7,
+ 0x3F, 0x3B, 0x3B, 0x33, 0xFB, 0xBF, 0xBB, 0x74, 0x59, 0xD8,
+ 0xA5, 0xC5, 0x76, 0x4B, 0x65, 0x6B, 0x49, 0x10, 0x41, 0x41,
+ 0x20, 0x84, 0xD2, 0x80, 0x6D, 0x6C, 0x62, 0x80, 0xC4, 0x78,
+ 0xF1, 0x64, 0xD2, 0x93, 0x89, 0x77, 0xF1, 0xE4, 0xD9, 0x83,
+ 0x37, 0x63, 0x3C, 0xE0, 0xC5, 0x43, 0x2F, 0x46, 0x23, 0x90,
+ 0x70, 0x30, 0x01, 0xA5, 0x6A, 0x29, 0x2D, 0x65, 0xA1, 0x14,
+ 0xD3, 0xAD, 0x08, 0xBB, 0x9A, 0xD9, 0xA6, 0xBB, 0x65, 0xF6,
+ 0x5F, 0x67, 0x77, 0xE7, 0x37, 0xF3, 0xF3, 0x62, 0xD7, 0xA6,
+ 0xE2, 0xC9, 0x77, 0x79, 0x2F, 0x2F, 0xEF, 0xFB, 0xC9, 0x37,
+ 0x2F, 0x5F, 0xF8, 0x9F, 0xE5, 0xD9, 0xBE, 0x78, 0x77, 0xF2,
+ 0x83, 0x54, 0xA2, 0x7F, 0xF8, 0x13, 0xAF, 0x2F, 0xFC, 0xB6,
+ 0xAB, 0x06, 0xF4, 0xEE, 0xB0, 0x9F, 0xDB, 0xF3, 0xD9, 0x92,
+ 0x91, 0x5F, 0xF9, 0x72, 0xEE, 0xDA, 0xE5, 0x4B, 0x80, 0xF8,
+ 0x4F, 0xC0, 0x89, 0x8B, 0xEF, 0xBF, 0x63, 0x05, 0x52, 0x53,
+ 0x17, 0x26, 0xC6, 0x19, 0x39, 0xD4, 0x47, 0xD0, 0xA7, 0x52,
+ 0xB1, 0xDA, 0x2C, 0x3D, 0x2D, 0xF3, 0xFD, 0x4F, 0x77, 0x29,
+ 0xAE, 0x64, 0x6D, 0xBF, 0x65, 0xBC, 0xF2, 0xC3, 0x95, 0xAF,
+ 0x1E, 0x6E, 0x6A, 0x94, 0x8E, 0x7A, 0xE7, 0xD1, 0xB1, 0xAA,
+ 0x9E, 0x9A, 0x7A, 0x61, 0xE8, 0x30, 0xAA, 0x3F, 0x84, 0x5F,
+ 0x53, 0xD8, 0xB7, 0x3B, 0x44, 0x40, 0xF3, 0x52, 0x6D, 0x41,
+ 0xAA, 0xA7, 0x8F, 0x57, 0x8F, 0x9F, 0xD6, 0x0E, 0x1D, 0x3B,
+ 0xB5, 0x08, 0xEC, 0xD9, 0x94, 0x79, 0x37, 0x07, 0x2D, 0x73,
+ 0x26, 0x77, 0x76, 0x74, 0xD4, 0xB3, 0x27, 0xB9, 0x8B, 0xC1,
+ 0x54, 0x17, 0x89, 0xA8, 0x1F, 0xAB, 0xED, 0x10, 0xF6, 0xAB,
+ 0xEC, 0x8D, 0x07, 0xD1, 0x75, 0x8D, 0x74, 0x32, 0x8A, 0xA2,
+ 0xFA, 0x88, 0xEC, 0xDA, 0x7B, 0xEE, 0xD1, 0xDC, 0x8F, 0x9F,
+ 0x77, 0x1C, 0x4C, 0xBC, 0xF7, 0xE1, 0xE4, 0x81, 0xE1, 0x03,
+ 0x9E, 0xA6, 0x03, 0x45, 0xB3, 0xC9, 0xFE, 0x54, 0x84, 0xB6,
+ 0x70, 0x51, 0x14, 0x0F, 0xEB, 0xF5, 0x36, 0x56, 0x5B, 0xD0,
+ 0xDB, 0x1D, 0xC4, 0xA7, 0xAB, 0x44, 0x23, 0x61, 0x32, 0x99,
+ 0xCC, 0x41, 0xD8, 0x99, 0xE9, 0x00, 0xA2, 0xB1, 0xEE, 0xB1,
+ 0x42, 0xA9, 0x8E, 0xEB, 0xBA, 0x9C, 0x3F, 0xDA, 0x83, 0x69,
+ 0xD9, 0xE4, 0x8C, 0x1A, 0xCB, 0x46, 0x8D, 0xAA, 0x65, 0x53,
+ 0x6B, 0x0A, 0x5A, 0xB6, 0x4D, 0x2C, 0xA4, 0x23, 0x5C, 0x49,
+ 0x38, 0x12, 0x63, 0x68, 0x64, 0x74, 0xBC, 0x03, 0x10, 0xAE,
+ 0x4C, 0xB9, 0xAE, 0x64, 0xF4, 0xE5, 0x5E, 0xBA, 0x02, 0x2A,
+ 0xAE, 0x10, 0x44, 0x83, 0x1A, 0xB3, 0x2B, 0xEB, 0xAC, 0x18,
+ 0x35, 0xCC, 0x5A, 0x93, 0xC7, 0x46, 0x85, 0xB6, 0xED, 0x20,
+ 0xA5, 0x8B, 0x70, 0x1C, 0xF6, 0xA7, 0xFB, 0x77, 0x77, 0x00,
+ 0xD9, 0xA5, 0x5C, 0xA9, 0x65, 0x35, 0x28, 0x99, 0x75, 0x2A,
+ 0xB5, 0x06, 0x21, 0x5D, 0xC1, 0x15, 0x36, 0xC7, 0x06, 0xBA,
+ 0xF0, 0x79, 0x5D, 0x14, 0x1C, 0xE2, 0x61, 0x15, 0x29, 0x1D,
+ 0x14, 0x24, 0x9A, 0xD7, 0xC3, 0xAD, 0x3B, 0xD9, 0xF5, 0xCE,
+ 0x13, 0xCB, 0x76, 0x24, 0xB9, 0x6F, 0xA0, 0x6F, 0xBC, 0x58,
+ 0xB5, 0x69, 0xD8, 0x92, 0x54, 0x3C, 0x4C, 0xAB, 0x2D, 0x10,
+ 0xC2, 0xE1, 0x59, 0x75, 0x03, 0x9F, 0xEA, 0x21, 0xF7, 0x47,
+ 0x09, 0x5C, 0x87, 0x46, 0xA3, 0x4E, 0x76, 0x71, 0x89, 0xD9,
+ 0x6F, 0xAF, 0x5E, 0x82, 0x8A, 0xA1, 0x02, 0xD0, 0x58, 0xFB,
+ 0xAC, 0x55, 0x2B, 0x7F, 0x3A, 0x3D, 0x6B, 0xA2, 0xA9, 0x5E,
+ 0xCE, 0x1E, 0xEE, 0x47, 0x91, 0x12, 0xC7, 0x71, 0x09, 0xEA,
+ 0x1E, 0x96, 0xF3, 0xAB, 0xDC, 0x5B, 0xFE, 0x93, 0x2B, 0x86,
+ 0x01, 0x96, 0x89, 0x59, 0xFC, 0xBD, 0x00, 0xF9, 0xF9, 0x7F,
+ 0x72, 0x50, 0x5E, 0x6A, 0x0F, 0xF7, 0x27, 0x26, 0x69, 0x94,
+ 0xA8, 0x9B, 0x25, 0x56, 0xD7, 0xCA, 0x94, 0xD6, 0x4D, 0x76,
+ 0x84, 0x34, 0x16, 0x73, 0x79, 0xA6, 0xAE, 0xCF, 0x50, 0x28,
+ 0x14, 0x58, 0x98, 0xBF, 0xC7, 0x6F, 0xB9, 0x5F, 0xF1, 0x79,
+ 0xDD, 0x37, 0xFF, 0x95, 0x83, 0xDC, 0xC2, 0xF4, 0xDD, 0x93,
+ 0x23, 0xE7, 0x64, 0x2C, 0xA4, 0x9F, 0x39, 0xF2, 0x52, 0x1A,
+ 0x21, 0x04, 0x5F, 0x7C, 0x7D, 0x93, 0xEF, 0x6E, 0xCC, 0xB1,
+ 0x56, 0x28, 0xF0, 0xC6, 0xEB, 0x83, 0x2C, 0x3E, 0xB8, 0x4F,
+ 0x44, 0x97, 0xE3, 0xF9, 0x99, 0x6F, 0x7E, 0x79, 0x5E, 0x94,
+ 0x35, 0x20, 0x46, 0xA0, 0xE7, 0xAD, 0x17, 0x5F, 0x3B, 0xF5,
+ 0x91, 0xF0, 0x06, 0xD3, 0x89, 0xF8, 0x0E, 0x1E, 0x3D, 0x2E,
+ 0x30, 0xD8, 0x9B, 0x60, 0x61, 0x7A, 0x3A, 0xCB, 0xC6, 0x93,
+ 0x8F, 0x69, 0x56, 0x1E, 0x00, 0x06, 0xB0, 0x01, 0xC8, 0xED,
+ 0x80, 0xF8, 0xDF, 0x31, 0x8D, 0x00, 0xE1, 0x58, 0x32, 0x9D,
+ 0x1C, 0x1A, 0xE8, 0x95, 0x33, 0x3F, 0xDF, 0x2A, 0x02, 0x36,
+ 0xD0, 0x00, 0x56, 0x81, 0xE2, 0xF3, 0x00, 0xDB, 0x5D, 0x79,
+ 0xB6, 0xCC, 0x72, 0x4B, 0x97, 0x5B, 0x8F, 0xFF, 0x02, 0x78,
+ 0x99, 0x27, 0xDD, 0x60, 0x50, 0xF9, 0x07, 0x00, 0x00, 0x00,
+ 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82, };
static const unsigned char data_css_siimple_min_css[] = {
/* /css/siimple.min.css */
0x2F, 0x63, 0x73, 0x73, 0x2F, 0x73, 0x69, 0x69, 0x6D, 0x70, 0x6C, 0x65, 0x2E, 0x6D, 0x69, 0x6E, 0x2E, 0x63, 0x73, 0x73, 0,
0x48, 0x54, 0x54, 0x50, 0x2F, 0x31, 0x2E, 0x30, 0x20, 0x32,
- 0x30, 0x30, 0x20, 0x4F, 0x4B, 0x0D, 0x0A, 0x53, 0x65, 0x72,
- 0x76, 0x65, 0x72, 0x3A, 0x20, 0x6C, 0x77, 0x49, 0x50, 0x2F,
- 0x70, 0x72, 0x65, 0x2D, 0x30, 0x2E, 0x36, 0x20, 0x28, 0x68,
- 0x74, 0x74, 0x70, 0x3A, 0x2F, 0x2F, 0x77, 0x77, 0x77, 0x2E,
- 0x73, 0x69, 0x63, 0x73, 0x2E, 0x73, 0x65, 0x2F, 0x7E, 0x61,
- 0x64, 0x61, 0x6D, 0x2F, 0x6C, 0x77, 0x69, 0x70, 0x2F, 0x29,
+ 0x30, 0x30, 0x20, 0x4F, 0x4B, 0x0D, 0x0A, 0x6C, 0x77, 0x49,
+ 0x50, 0x2F, 0x31, 0x2E, 0x34, 0x2E, 0x31, 0x20, 0x28, 0x68,
+ 0x74, 0x74, 0x70, 0x3A, 0x2F, 0x2F, 0x73, 0x61, 0x76, 0x61,
+ 0x6E, 0x6E, 0x61, 0x68, 0x2E, 0x6E, 0x6F, 0x6E, 0x67, 0x6E,
+ 0x75, 0x2E, 0x6F, 0x72, 0x67, 0x2F, 0x70, 0x72, 0x6F, 0x6A,
+ 0x65, 0x63, 0x74, 0x73, 0x2F, 0x6C, 0x77, 0x69, 0x70, 0x29,
0x0D, 0x0A, 0x43, 0x6F, 0x6E, 0x74, 0x65, 0x6E, 0x74, 0x2D,
0x74, 0x79, 0x70, 0x65, 0x3A, 0x20, 0x74, 0x65, 0x78, 0x74,
0x2F, 0x63, 0x73, 0x73, 0x0D, 0x0A, 0x0D, 0x0A, 0x0D, 0x0A,
@@ -1120,12 +1123,12 @@ static const unsigned char data_css_style_css[] = {
/* /css/style.css */
0x2F, 0x63, 0x73, 0x73, 0x2F, 0x73, 0x74, 0x79, 0x6C, 0x65, 0x2E, 0x63, 0x73, 0x73, 0,
0x48, 0x54, 0x54, 0x50, 0x2F, 0x31, 0x2E, 0x30, 0x20, 0x32,
- 0x30, 0x30, 0x20, 0x4F, 0x4B, 0x0D, 0x0A, 0x53, 0x65, 0x72,
- 0x76, 0x65, 0x72, 0x3A, 0x20, 0x6C, 0x77, 0x49, 0x50, 0x2F,
- 0x70, 0x72, 0x65, 0x2D, 0x30, 0x2E, 0x36, 0x20, 0x28, 0x68,
- 0x74, 0x74, 0x70, 0x3A, 0x2F, 0x2F, 0x77, 0x77, 0x77, 0x2E,
- 0x73, 0x69, 0x63, 0x73, 0x2E, 0x73, 0x65, 0x2F, 0x7E, 0x61,
- 0x64, 0x61, 0x6D, 0x2F, 0x6C, 0x77, 0x69, 0x70, 0x2F, 0x29,
+ 0x30, 0x30, 0x20, 0x4F, 0x4B, 0x0D, 0x0A, 0x6C, 0x77, 0x49,
+ 0x50, 0x2F, 0x31, 0x2E, 0x34, 0x2E, 0x31, 0x20, 0x28, 0x68,
+ 0x74, 0x74, 0x70, 0x3A, 0x2F, 0x2F, 0x73, 0x61, 0x76, 0x61,
+ 0x6E, 0x6E, 0x61, 0x68, 0x2E, 0x6E, 0x6F, 0x6E, 0x67, 0x6E,
+ 0x75, 0x2E, 0x6F, 0x72, 0x67, 0x2F, 0x70, 0x72, 0x6F, 0x6A,
+ 0x65, 0x63, 0x74, 0x73, 0x2F, 0x6C, 0x77, 0x69, 0x70, 0x29,
0x0D, 0x0A, 0x43, 0x6F, 0x6E, 0x74, 0x65, 0x6E, 0x74, 0x2D,
0x74, 0x79, 0x70, 0x65, 0x3A, 0x20, 0x74, 0x65, 0x78, 0x74,
0x2F, 0x63, 0x73, 0x73, 0x0D, 0x0A, 0x0D, 0x0A, 0x0D, 0x0A,
@@ -1264,7 +1267,7 @@ static const unsigned char data_css_style_css[] = {
0x67, 0x68, 0x74, 0x3A, 0x20, 0x31, 0x34, 0x70, 0x78, 0x3B,
0x0A, 0x09, 0x62, 0x61, 0x63, 0x6B, 0x67, 0x72, 0x6F, 0x75,
0x6E, 0x64, 0x2D, 0x63, 0x6F, 0x6C, 0x6F, 0x72, 0x3A, 0x20,
- 0x23, 0x46, 0x31, 0x46, 0x35, 0x46, 0x41, 0x3B, 0x20, 0x63,
+ 0x23, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x3B, 0x20, 0x63,
0x6F, 0x6C, 0x6F, 0x72, 0x3A, 0x20, 0x23, 0x39, 0x39, 0x39,
0x39, 0x39, 0x39, 0x3B, 0x0A, 0x09, 0x74, 0x65, 0x78, 0x74,
0x2D, 0x61, 0x6C, 0x69, 0x67, 0x6E, 0x3A, 0x20, 0x72, 0x69,
@@ -1332,15 +1335,15 @@ sizeof(data_about_html) - 12,
1
}};
-const struct fsdata_file file_img_sics_gif[] = {{
+const struct fsdata_file file_img_favicon_png[] = {{
file_about_html,
-data_img_sics_gif, data_img_sics_gif + 14,
-sizeof(data_img_sics_gif) - 14,
+data_img_favicon_png, data_img_favicon_png + 17,
+sizeof(data_img_favicon_png) - 17,
1
}};
const struct fsdata_file file_css_siimple_min_css[] = {{
-file_img_sics_gif,
+file_img_favicon_png,
data_css_siimple_min_css, data_css_siimple_min_css + 21,
sizeof(data_css_siimple_min_css) - 21,
1
diff --git a/examples/http_server/fsdata/makefsdata b/examples/http_server/fsdata/makefsdata
index a63c4ae..5361370 100755
--- a/examples/http_server/fsdata/makefsdata
+++ b/examples/http_server/fsdata/makefsdata
@@ -24,19 +24,23 @@ while($file = ) {
} else {
print(HEADER "HTTP/1.0 200 OK\r\n");
}
- print(HEADER "Server: lwIP/pre-0.6 (http://www.sics.se/~adam/lwip/)\r\n");
- if($file =~ /\.html$/ || $file =~ /\.shtml$/ || $file =~ /\.shtm$/ || $file =~ /\.ssi$/) {
+ print(HEADER "lwIP/1.4.1 (http://savannah.nongnu.org/projects/lwip)\r\n");
+ if($file =~ /\.html$/ || $file =~ /\.htm$/ || $file =~ /\.shtml$/ || $file =~ /\.shtm$/ || $file =~ /\.ssi$/) {
print(HEADER "Content-type: text/html\r\n");
} elsif($file =~ /\.js$/) {
print(HEADER "Content-type: application/x-javascript\r\n\r\n");
} elsif($file =~ /\.css$/) {
print(HEADER "Content-type: text/css\r\n\r\n");
+ } elsif($file =~ /\.ico$/) {
+ print(HEADER "Content-type: image/x-icon\r\n\r\n");
} elsif($file =~ /\.gif$/) {
print(HEADER "Content-type: image/gif\r\n");
} elsif($file =~ /\.png$/) {
print(HEADER "Content-type: image/png\r\n");
} elsif($file =~ /\.jpg$/) {
print(HEADER "Content-type: image/jpeg\r\n");
+ } elsif($file =~ /\.bmp$/) {
+ print(HEADER "Content-type: image/bmp\r\n\r\n");
} elsif($file =~ /\.class$/) {
print(HEADER "Content-type: application/octet-stream\r\n");
} elsif($file =~ /\.ram$/) {
diff --git a/examples/http_server/http_server.c b/examples/http_server/http_server.c
index b13318f..21dee61 100644
--- a/examples/http_server/http_server.c
+++ b/examples/http_server/http_server.c
@@ -24,7 +24,7 @@ enum {
SSI_LED_STATE
};
-char *gpio_handler(int iIndex, int iNumParams, char *pcParam[], char *pcValue[])
+char *gpio_cgi_handler(int iIndex, int iNumParams, char *pcParam[], char *pcValue[])
{
for (int i = 0; i < iNumParams; i++) {
if (strcmp(pcParam[i], "on") == 0) {
@@ -44,7 +44,7 @@ char *gpio_handler(int iIndex, int iNumParams, char *pcParam[], char *pcValue[])
return "/index.ssi";
}
-char *about_handler(int iIndex, int iNumParams, char *pcParam[], char *pcValue[])
+char *about_cgi_handler(int iIndex, int iNumParams, char *pcParam[], char *pcValue[])
{
return "/about.html";
}
@@ -74,8 +74,8 @@ int32_t ssi_handler(int32_t iIndex, char *pcInsert, int32_t iInsertLen)
void httpd_task(void *pvParameters)
{
tCGI pCGIs[] = {
- {"/gpio", (tCGIHandler) gpio_handler},
- {"/about", (tCGIHandler) about_handler},
+ {"/gpio", (tCGIHandler) gpio_cgi_handler},
+ {"/about", (tCGIHandler) about_cgi_handler},
};
const char *pcConfigSSITags[] = {
diff --git a/extras/httpd/readme.txt b/extras/httpd/readme.txt
new file mode 100644
index 0000000..8cf4ed7
--- /dev/null
+++ b/extras/httpd/readme.txt
@@ -0,0 +1,2 @@
+Note: this module expects your project to provide "fsdata.c" created with "makefsdata" utility.
+See examples/http_server.