Minor fixups to the documentation and preprocessor tokens.

[pub/USBasp.git] / Projects / Webserver / Lib / HTTPServerApp.c

diff --git a/Projects/Webserver/Lib/HTTPServerApp.c b/Projects/Webserver/Lib/HTTPServerApp.c
index e31bdbb..4c12271 100644 (file)
--- a/Projects/Webserver/Lib/HTTPServerApp.c
+++ b/Projects/Webserver/Lib/HTTPServerApp.c
@@ -59,7 +59,7 @@ char PROGMEM HTTP404Header[] = "HTTP/1.1 404 Not Found\r\n"
 /** Default MIME type sent if no other MIME type can be determined */\r
 char PROGMEM DefaultMIMEType[] = "text/plain";\r
 \r
 /** Default MIME type sent if no other MIME type can be determined */\r
 char PROGMEM DefaultMIMEType[] = "text/plain";\r
 \r

-/** List of MIME types for each supported file extension - must be terminated with \ref END_OF_MIME_LIST entry. */\r
+/** List of MIME types for each supported file extension. */\r

 MIME_Type_t PROGMEM MIMETypes[] =\r
        {\r
                {.Extension = "htm", .MIMEType = "text/html"},\r
 MIME_Type_t PROGMEM MIMETypes[] =\r
        {\r
                {.Extension = "htm", .MIMEType = "text/html"},\r


@@ -67,9 +67,9 @@ MIME_Type_t PROGMEM MIMETypes[] =
                {.Extension = "gif", .MIMEType = "image/gif"},\r
                {.Extension = "bmp", .MIMEType = "image/bmp"},\r
                {.Extension = "png", .MIMEType = "image/png"},\r
                {.Extension = "gif", .MIMEType = "image/gif"},\r
                {.Extension = "bmp", .MIMEType = "image/bmp"},\r
                {.Extension = "png", .MIMEType = "image/png"},\r

+               {.Extension = "ico", .MIMEType = "image/x-icon"},\r

                {.Extension = "exe", .MIMEType = "application/octet-stream"},\r
                {.Extension = "gz",  .MIMEType = "application/x-gzip"},\r
                {.Extension = "exe", .MIMEType = "application/octet-stream"},\r
                {.Extension = "gz",  .MIMEType = "application/x-gzip"},\r

-               {.Extension = "ico", .MIMEType = "image/x-icon"},\r

                {.Extension = "zip", .MIMEType = "application/zip"},\r
                {.Extension = "pdf", .MIMEType = "application/pdf"},\r
        };\r
                {.Extension = "zip", .MIMEType = "application/zip"},\r
                {.Extension = "pdf", .MIMEType = "application/pdf"},\r
        };\r


@@ -125,7 +125,7 @@ void WebserverApp_Callback(void)
                AppState->CurrentState = AppState->NextState;\r
        }\r
 \r
                AppState->CurrentState = AppState->NextState;\r
        }\r
 \r

-       if (uip_rexmit() || uip_newdata() || uip_acked() || uip_connected() || uip_poll())\r
+       if (uip_rexmit() || uip_acked() || uip_newdata() || uip_connected() || uip_poll())\r

        {\r
                switch (AppState->CurrentState)\r
                {\r
        {\r
                switch (AppState->CurrentState)\r
                {\r