remove unused strings and useless shtml extension

Smoothieware · Apr 18, 2016 · 4075cc5 · 4075cc5
1 parent fb0b4a3
commit 4075cc5
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 71 deletions.
diff --git a/src/libs/Network/uip/webserver/http-strings b/src/libs/Network/uip/webserver/http-strings
@@ -1,23 +1,13 @@
-http_http "http://"
-http_200 "200 "
-http_301 "301 "
-http_302 "302 "
 http_get "GET "
 http_post "POST "
 http_options "OPTIONS "
 http_10 "HTTP/1.0"
 http_11 "HTTP/1.1"
-http_content_type "content-type: "
 http_content_length "Content-Length: "
 http_cache_control "Cache-Control: "
 http_no_cache "no-cache"
-http_texthtml "text/html"
-http_location "location: "
-http_host "host: "
-http_crnl "\r\n"
 http_index_html "/index.html"
 http_404_html "/404.html"
-http_referer "Referer:"
 http_header_preflight "HTTP/1.0 200 OK\r\nServer: uIP/1.0\r\nConnection: Keep-Alive\r\nAccess-Control-Allow-Origin: *\r\nAccess-Control-Allow-Methods: POST, GET, OPTIONS\r\nAccess-Control-Allow-Headers: X-Filename, Content-Type, Pragma, Cache-Control\r\nAccess-Control-Max-Age: 86400\r\n"
 http_header_200 "HTTP/1.0 200 OK\r\nServer: uIP/1.0\r\nAccess-Control-Allow-Origin: *\r\nConnection: close\r\n"
 http_header_304 "HTTP/1.0 304 Not Modified\r\nServer: uIP/1.0\r\nAccess-Control-Allow-Origin: *\r\nConnection: close\r\nExpires: Thu, 31 Dec 2037 23:55:55 GMT\r\nCache-Control: max-age=315360000\r\nX-Cache: HIT\r\n"
@@ -30,13 +20,9 @@ http_content_type_text "Content-type: text/text\r\n\r\n"
 http_content_type_png  "Content-type: image/png\r\n\r\n"
 http_content_type_gif  "Content-type: image/gif\r\n\r\n"
 http_content_type_jpg  "Content-type: image/jpeg\r\n\r\n"
-http_content_type_binary "Content-type: application/octet-stream\r\n\r\n"
 http_html ".html"
-http_shtml ".shtml"
-http_htm ".htm"
 http_css ".css"
 http_png ".png"
 http_gif ".gif"
 http_jpg ".jpg"
-http_text ".txt"
 http_txt ".txt"
diff --git a/src/libs/Network/uip/webserver/http-strings.c b/src/libs/Network/uip/webserver/http-strings.c
@@ -1,15 +1,3 @@
-const char http_http[8] = 
-/* "http://" */
-{0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, };
-const char http_200[5] = 
-/* "200 " */
-{0x32, 0x30, 0x30, 0x20, };
-const char http_301[5] = 
-/* "301 " */
-{0x33, 0x30, 0x31, 0x20, };
-const char http_302[5] = 
-/* "302 " */
-{0x33, 0x30, 0x32, 0x20, };
 const char http_get[5] = 
 /* "GET " */
 {0x47, 0x45, 0x54, 0x20, };
@@ -25,9 +13,6 @@ const char http_10[9] =
 const char http_11[9] = 
 /* "HTTP/1.1" */
 {0x48, 0x54, 0x54, 0x50, 0x2f, 0x31, 0x2e, 0x31, };
-const char http_content_type[15] = 
-/* "content-type: " */
-{0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x3a, 0x20, };
 const char http_content_length[17] = 
 /* "Content-Length: " */
 {0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x3a, 0x20, };
@@ -37,27 +22,12 @@ const char http_cache_control[16] =
 const char http_no_cache[9] = 
 /* "no-cache" */
 {0x6e, 0x6f, 0x2d, 0x63, 0x61, 0x63, 0x68, 0x65, };
-const char http_texthtml[10] = 
-/* "text/html" */
-{0x74, 0x65, 0x78, 0x74, 0x2f, 0x68, 0x74, 0x6d, 0x6c, };
-const char http_location[11] = 
-/* "location: " */
-{0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, };
-const char http_host[7] = 
-/* "host: " */
-{0x68, 0x6f, 0x73, 0x74, 0x3a, 0x20, };
-const char http_crnl[3] = 
-/* "\r\n" */
-{0xd, 0xa, };
 const char http_index_html[12] = 
 /* "/index.html" */
 {0x2f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2e, 0x68, 0x74, 0x6d, 0x6c, };
 const char http_404_html[10] = 
 /* "/404.html" */
 {0x2f, 0x34, 0x30, 0x34, 0x2e, 0x68, 0x74, 0x6d, 0x6c, };
-const char http_referer[9] = 
-/* "Referer:" */
-{0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x72, 0x3a, };
 const char http_header_preflight[251] = 
 /* "HTTP/1.0 200 OK\r\nServer: uIP/1.0\r\nConnection: Keep-Alive\r\nAccess-Control-Allow-Origin: *\r\nAccess-Control-Allow-Methods: POST, GET, OPTIONS\r\nAccess-Control-Allow-Headers: X-Filename, Content-Type, Pragma, Cache-Control\r\nAccess-Control-Max-Age: 86400\r\n" */
 {0x48, 0x54, 0x54, 0x50, 0x2f, 0x31, 0x2e, 0x30, 0x20, 0x32, 0x30, 0x30, 0x20, 0x4f, 0x4b, 0xd, 0xa, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x3a, 0x20, 0x75, 0x49, 0x50, 0x2f, 0x31, 0x2e, 0x30, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x4b, 0x65, 0x65, 0x70, 0x2d, 0x41, 0x6c, 0x69, 0x76, 0x65, 0xd, 0xa, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x2d, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x2d, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x3a, 0x20, 0x2a, 0xd, 0xa, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x2d, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x2d, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x3a, 0x20, 0x50, 0x4f, 0x53, 0x54, 0x2c, 0x20, 0x47, 0x45, 0x54, 0x2c, 0x20, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0xd, 0xa, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x2d, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x2d, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x3a, 0x20, 0x58, 0x2d, 0x46, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, 0x54, 0x79, 0x70, 0x65, 0x2c, 0x20, 0x50, 0x72, 0x61, 0x67, 0x6d, 0x61, 0x2c, 0x20, 0x43, 0x61, 0x63, 0x68, 0x65, 0x2d, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0xd, 0xa, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x2d, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x4d, 0x61, 0x78, 0x2d, 0x41, 0x67, 0x65, 0x3a, 0x20, 0x38, 0x36, 0x34, 0x30, 0x30, 0xd, 0xa, };
@@ -94,18 +64,9 @@ const char http_content_type_gif [28] =
 const char http_content_type_jpg [29] = 
 /* "Content-type: image/jpeg\r\n\r\n" */
 {0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x3a, 0x20, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x2f, 0x6a, 0x70, 0x65, 0x67, 0xd, 0xa, 0xd, 0xa, };
-const char http_content_type_binary[43] = 
-/* "Content-type: application/octet-stream\r\n\r\n" */
-{0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x3a, 0x20, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6f, 0x63, 0x74, 0x65, 0x74, 0x2d, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0xd, 0xa, 0xd, 0xa, };
 const char http_html[6] = 
 /* ".html" */
 {0x2e, 0x68, 0x74, 0x6d, 0x6c, };
-const char http_shtml[7] = 
-/* ".shtml" */
-{0x2e, 0x73, 0x68, 0x74, 0x6d, 0x6c, };
-const char http_htm[5] = 
-/* ".htm" */
-{0x2e, 0x68, 0x74, 0x6d, };
 const char http_css[5] = 
 /* ".css" */
 {0x2e, 0x63, 0x73, 0x73, };
@@ -118,9 +79,6 @@ const char http_gif[5] =
 const char http_jpg[5] = 
 /* ".jpg" */
 {0x2e, 0x6a, 0x70, 0x67, };
-const char http_text[5] = 
-/* ".txt" */
-{0x2e, 0x74, 0x78, 0x74, };
 const char http_txt[5] = 
 /* ".txt" */
 {0x2e, 0x74, 0x78, 0x74, };
diff --git a/src/libs/Network/uip/webserver/http-strings.h b/src/libs/Network/uip/webserver/http-strings.h
@@ -1,23 +1,13 @@
-extern const char http_http[8];
-extern const char http_200[5];
-extern const char http_301[5];
-extern const char http_302[5];
 extern const char http_get[5];
 extern const char http_post[6];
 extern const char http_options[9];
 extern const char http_10[9];
 extern const char http_11[9];
-extern const char http_content_type[15];
 extern const char http_content_length[17];
 extern const char http_cache_control[16];
 extern const char http_no_cache[9];
-extern const char http_texthtml[10];
-extern const char http_location[11];
-extern const char http_host[7];
-extern const char http_crnl[3];
 extern const char http_index_html[12];
 extern const char http_404_html[10];
-extern const char http_referer[9];
 extern const char http_header_preflight[251];
 extern const char http_header_200[86];
 extern const char http_header_304[184];
@@ -30,13 +20,9 @@ extern const char http_content_type_text[28];
 extern const char http_content_type_png [28];
 extern const char http_content_type_gif [28];
 extern const char http_content_type_jpg [29];
-extern const char http_content_type_binary[43];
 extern const char http_html[6];
-extern const char http_shtml[7];
-extern const char http_htm[5];
 extern const char http_css[5];
 extern const char http_png[5];
 extern const char http_gif[5];
 extern const char http_jpg[5];
-extern const char http_text[5];
 extern const char http_txt[5];
diff --git a/src/libs/Network/uip/webserver/httpd.c b/src/libs/Network/uip/webserver/httpd.c
@@ -299,7 +299,7 @@ static PT_THREAD(send_headers_3(struct httpd_state *s, const char *statushdr, ch
         ptr = strrchr(s->filename, ISO_period);
         if (ptr == NULL) {
             PSOCK_SEND_STR(&s->sout, http_content_type_plain); // http_content_type_binary);
-        } else if (strncmp(http_html, ptr, 5) == 0 || strncmp(http_shtml, ptr, 6) == 0) {
+        } else if (strncmp(http_html, ptr, 5) == 0) {
             PSOCK_SEND_STR(&s->sout, http_content_type_html);
         } else if (strncmp(http_css, ptr, 4) == 0) {
             PSOCK_SEND_STR(&s->sout, http_content_type_css);