From 020f0ec96823d7a9d78829164c6bf5b3e03fbf80 Mon Sep 17 00:00:00 2001
From: richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Mon, 1 Aug 2011 16:03:49 +0000
Subject: [PATCH] Comment the command line interpreter and lwIP sockets based
 server code.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1532 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
---
 Demo/WIN32-MSVC-lwIP/FreeRTOSConfig.h         |   8 +-
 Demo/WIN32-MSVC-lwIP/WIN32.suo                | Bin 98304 -> 98816 bytes
 .../BasicSocketCommandServer.c                |   2 +-
 .../fsdata.c                                  | 166 ++++++++----------
 .../makefsdata/fs/index.shtml                 |   4 +-
 .../makefsdata/fs/runtime.shtml               |   4 +-
 .../makefsdata/fsdata.c                       | 166 ++++++++----------
 Demo/WIN32-MSVC-lwIP/lwIP_Apps/lwIP_Apps.c    | 136 +++++++++-----
 Demo/WIN32-MSVC-lwIP/lwIP_Apps/lwipopts.h     |   6 +
 Demo/WIN32-MSVC-lwIP/main.c                   |  24 ++-
 10 files changed, 271 insertions(+), 245 deletions(-)

diff --git a/Demo/WIN32-MSVC-lwIP/FreeRTOSConfig.h b/Demo/WIN32-MSVC-lwIP/FreeRTOSConfig.h
index 060ea0711..b6cd85c01 100644
--- a/Demo/WIN32-MSVC-lwIP/FreeRTOSConfig.h
+++ b/Demo/WIN32-MSVC-lwIP/FreeRTOSConfig.h
@@ -65,15 +65,13 @@
  * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
  *----------------------------------------------------------*/
 
-#define configINCLUDE_STANDARD_DEMO_TASKS 1
-
 #define configUSE_PREEMPTION			1
 #define configUSE_IDLE_HOOK				1
 #define configUSE_TICK_HOOK				0
 #define configTICK_RATE_HZ				( 1000 ) /* In this non-real time simulated environment the tick frequency has to be at least a multiple of the Win32 tick frequency, and therefore very slow. */
 #define configMINIMAL_STACK_SIZE		( ( unsigned short ) 60 ) /* In this simulated case, the stack only has to hold one small structure as the real stack is part of the win32 thread. */
 #define configTOTAL_HEAP_SIZE			( ( size_t ) 0 ) /* This parameter has no effect when heap_3.c is included in the project. */
-#define configMAX_TASK_NAME_LEN			( 6 )
+#define configMAX_TASK_NAME_LEN			( 7 )
 #define configUSE_TRACE_FACILITY		1
 #define configUSE_16_BIT_TICKS			0
 #define configIDLE_SHOULD_YIELD			1
@@ -121,8 +119,8 @@ void vMainConfigureTimerForRunTimeStats( void );
 #define portGET_RUN_TIME_COUNTER_VALUE() ulMainGetRunTimeCounterValue()
 
 
-/*extern void vAssertCalled( void );
-#define configASSERT( x ) if( ( x ) == 0 ) vAssertCalled()*/
+extern void vAssertCalled( void );
+#define configASSERT( x ) if( ( x ) == 0 ) vAssertCalled()
 
 #define configNETWORK_INTERFACE_TO_USE 1L
 
diff --git a/Demo/WIN32-MSVC-lwIP/WIN32.suo b/Demo/WIN32-MSVC-lwIP/WIN32.suo
index 22ee8c87720cce4335a7ad64159b395a3d166be7..86113f5382e2d6ebc2f811b2a3404fb49f659f4c 100644
GIT binary patch
delta 4522
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
b@F-sRp{CND63tgT^S?5Bxhj`2MC$NwtWf(S

delta 4539
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

diff --git a/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/BasicSocketCommandServer/BasicSocketCommandServer.c b/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/BasicSocketCommandServer/BasicSocketCommandServer.c
index 85a722a36..733a188b4 100644
--- a/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/BasicSocketCommandServer/BasicSocketCommandServer.c
+++ b/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/BasicSocketCommandServer/BasicSocketCommandServer.c
@@ -69,7 +69,7 @@
 
 /*-----------------------------------------------------------*/
 
-void vBasicTelnetServer( void *pvParameters )
+void vBasicSocketsCommandInterpreterTask( void *pvParameters )
 {
 long lSocket, lClientFd, lBytes, lAddrLen = sizeof( struct sockaddr_in );
 struct sockaddr_in sLocalAddr;
diff --git a/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/httpserver_raw_from_lwIP_download/fsdata.c b/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/httpserver_raw_from_lwIP_download/fsdata.c
index 19ebe78bc..f2ddfd935 100644
--- a/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/httpserver_raw_from_lwIP_download/fsdata.c
+++ b/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/httpserver_raw_from_lwIP_download/fsdata.c
@@ -91,7 +91,7 @@ Pragma: no-cache
 0x30,0x38,0x20,0x31,0x34,0x3a,0x30,0x30,0x3a,0x30,0x30,0x20,0x47,0x4d,0x54,0x0d,
 0x0a,0x50,0x72,0x61,0x67,0x6d,0x61,0x3a,0x20,0x6e,0x6f,0x2d,0x63,0x61,0x63,0x68,
 0x65,0x0d,0x0a,0x0d,0x0a,
-/* raw file data (886 bytes) */
+/* raw file data (762 bytes) */
 0x3c,0x21,0x44,0x4f,0x43,0x54,0x59,0x50,0x45,0x20,0x48,0x54,0x4d,0x4c,0x20,0x50,
 0x55,0x42,0x4c,0x49,0x43,0x20,0x22,0x2d,0x2f,0x2f,0x57,0x33,0x43,0x2f,0x2f,0x44,
 0x54,0x44,0x20,0x48,0x54,0x4d,0x4c,0x20,0x34,0x2e,0x30,0x31,0x20,0x54,0x72,0x61,
@@ -101,53 +101,45 @@ Pragma: no-cache
 0x2e,0x64,0x74,0x64,0x22,0x3e,0x0d,0x0a,0x3c,0x68,0x74,0x6d,0x6c,0x3e,0x0d,0x0a,
 0x20,0x20,0x3c,0x68,0x65,0x61,0x64,0x3e,0x0d,0x0a,0x20,0x20,0x20,0x20,0x3c,0x74,
 0x69,0x74,0x6c,0x65,0x3e,0x46,0x72,0x65,0x65,0x52,0x54,0x4f,0x53,0x2e,0x6f,0x72,
-0x67,0x20,0x75,0x49,0x50,0x20,0x57,0x45,0x42,0x20,0x73,0x65,0x72,0x76,0x65,0x72,
-0x20,0x64,0x65,0x6d,0x6f,0x3c,0x2f,0x74,0x69,0x74,0x6c,0x65,0x3e,0x0d,0x0a,0x20,
-0x20,0x3c,0x2f,0x68,0x65,0x61,0x64,0x3e,0x0d,0x0a,0x20,0x20,0x3c,0x42,0x4f,0x44,
-0x59,0x20,0x6f,0x6e,0x4c,0x6f,0x61,0x64,0x3d,0x22,0x77,0x69,0x6e,0x64,0x6f,0x77,
-0x2e,0x73,0x65,0x74,0x54,0x69,0x6d,0x65,0x6f,0x75,0x74,0x28,0x26,0x71,0x75,0x6f,
-0x74,0x3b,0x6c,0x6f,0x63,0x61,0x74,0x69,0x6f,0x6e,0x2e,0x68,0x72,0x65,0x66,0x3d,
-0x27,0x69,0x6e,0x64,0x65,0x78,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x27,0x26,0x71,0x75,
-0x6f,0x74,0x3b,0x2c,0x32,0x30,0x30,0x30,0x29,0x22,0x3e,0x0d,0x0a,0x3c,0x66,0x6f,
-0x6e,0x74,0x20,0x66,0x61,0x63,0x65,0x3d,0x22,0x61,0x72,0x69,0x61,0x6c,0x22,0x3e,
-0x0d,0x0a,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x69,0x6e,0x64,0x65,0x78,
-0x2e,0x73,0x68,0x74,0x6d,0x6c,0x22,0x3e,0x54,0x61,0x73,0x6b,0x20,0x53,0x74,0x61,
-0x74,0x73,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,0x3c,0x2f,0x62,0x3e,0x20,
-0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x72,0x75,0x6e,0x74,0x69,0x6d,0x65,
-0x2e,0x73,0x68,0x74,0x6d,0x6c,0x22,0x3e,0x52,0x75,0x6e,0x20,0x54,0x69,0x6d,0x65,
-0x20,0x53,0x74,0x61,0x74,0x73,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,0x3c,
-0x2f,0x62,0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x73,0x74,0x61,
-0x74,0x73,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x22,0x3e,0x54,0x43,0x50,0x20,0x53,0x74,
+0x67,0x20,0x6c,0x77,0x49,0x50,0x20,0x57,0x45,0x42,0x20,0x73,0x65,0x72,0x76,0x65,
+0x72,0x20,0x64,0x65,0x6d,0x6f,0x3c,0x2f,0x74,0x69,0x74,0x6c,0x65,0x3e,0x0d,0x0a,
+0x20,0x20,0x3c,0x2f,0x68,0x65,0x61,0x64,0x3e,0x0d,0x0a,0x20,0x20,0x3c,0x42,0x4f,
+0x44,0x59,0x20,0x6f,0x6e,0x4c,0x6f,0x61,0x64,0x3d,0x22,0x77,0x69,0x6e,0x64,0x6f,
+0x77,0x2e,0x73,0x65,0x74,0x54,0x69,0x6d,0x65,0x6f,0x75,0x74,0x28,0x26,0x71,0x75,
+0x6f,0x74,0x3b,0x6c,0x6f,0x63,0x61,0x74,0x69,0x6f,0x6e,0x2e,0x68,0x72,0x65,0x66,
+0x3d,0x27,0x69,0x6e,0x64,0x65,0x78,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x27,0x26,0x71,
+0x75,0x6f,0x74,0x3b,0x2c,0x32,0x30,0x30,0x30,0x29,0x22,0x3e,0x0d,0x0a,0x3c,0x66,
+0x6f,0x6e,0x74,0x20,0x66,0x61,0x63,0x65,0x3d,0x22,0x61,0x72,0x69,0x61,0x6c,0x22,
+0x3e,0x0d,0x0a,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x69,0x6e,0x64,0x65,
+0x78,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x22,0x3e,0x54,0x61,0x73,0x6b,0x20,0x53,0x74,
 0x61,0x74,0x73,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,0x3c,0x2f,0x62,0x3e,
-0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x74,0x63,0x70,0x2e,0x73,0x68,
-0x74,0x6d,0x6c,0x22,0x3e,0x43,0x6f,0x6e,0x6e,0x65,0x63,0x74,0x69,0x6f,0x6e,0x73,
-0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,0x3c,0x2f,0x62,0x3e,0x20,0x3c,0x61,
-0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x77,0x77,
-0x77,0x2e,0x66,0x72,0x65,0x65,0x72,0x74,0x6f,0x73,0x2e,0x6f,0x72,0x67,0x2f,0x22,
-0x3e,0x46,0x72,0x65,0x65,0x52,0x54,0x4f,0x53,0x20,0x48,0x6f,0x6d,0x65,0x70,0x61,
-0x67,0x65,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,0x3c,0x2f,0x62,0x3e,0x20,
-0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x69,0x6f,0x2e,0x73,0x68,0x74,0x6d,
-0x6c,0x22,0x3e,0x49,0x4f,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,0x3c,0x2f,
-0x62,0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x6c,0x6f,0x67,0x6f,
-0x2e,0x6a,0x70,0x67,0x22,0x3e,0x33,0x37,0x4b,0x20,0x6a,0x70,0x67,0x3c,0x2f,0x61,
-0x3e,0x0d,0x0a,0x3c,0x62,0x72,0x3e,0x3c,0x70,0x3e,0x0d,0x0a,0x3c,0x68,0x72,0x3e,
-0x0d,0x0a,0x3c,0x62,0x72,0x3e,0x3c,0x70,0x3e,0x0d,0x0a,0x3c,0x68,0x32,0x3e,0x54,
-0x61,0x73,0x6b,0x20,0x73,0x74,0x61,0x74,0x69,0x73,0x74,0x69,0x63,0x73,0x3c,0x2f,
-0x68,0x32,0x3e,0x0d,0x0a,0x50,0x61,0x67,0x65,0x20,0x77,0x69,0x6c,0x6c,0x20,0x72,
-0x65,0x66,0x72,0x65,0x73,0x68,0x20,0x65,0x76,0x65,0x72,0x79,0x20,0x32,0x20,0x73,
-0x65,0x63,0x6f,0x6e,0x64,0x73,0x2e,0x3c,0x70,0x3e,0x0d,0x0a,0x3c,0x66,0x6f,0x6e,
-0x74,0x20,0x66,0x61,0x63,0x65,0x3d,0x22,0x63,0x6f,0x75,0x72,0x69,0x65,0x72,0x22,
-0x3e,0x3c,0x70,0x72,0x65,0x3e,0x54,0x61,0x73,0x6b,0x20,0x20,0x20,0x20,0x20,0x20,
-0x20,0x20,0x20,0x20,0x53,0x74,0x61,0x74,0x65,0x20,0x20,0x50,0x72,0x69,0x6f,0x72,
-0x69,0x74,0x79,0x20,0x20,0x53,0x74,0x61,0x63,0x6b,0x09,0x23,0x3c,0x62,0x72,0x3e,
-0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,
+0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x72,0x75,0x6e,0x74,0x69,0x6d,
+0x65,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x22,0x3e,0x52,0x75,0x6e,0x20,0x54,0x69,0x6d,
+0x65,0x20,0x53,0x74,0x61,0x74,0x73,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,
+0x3c,0x2f,0x62,0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x68,0x74,
+0x74,0x70,0x3a,0x2f,0x2f,0x77,0x77,0x77,0x2e,0x66,0x72,0x65,0x65,0x72,0x74,0x6f,
+0x73,0x2e,0x6f,0x72,0x67,0x2f,0x22,0x3e,0x46,0x72,0x65,0x65,0x52,0x54,0x4f,0x53,
+0x20,0x48,0x6f,0x6d,0x65,0x70,0x61,0x67,0x65,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,
+0x3e,0x7c,0x3c,0x2f,0x62,0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,
+0x6c,0x6f,0x67,0x6f,0x2e,0x6a,0x70,0x67,0x22,0x3e,0x33,0x37,0x4b,0x20,0x6a,0x70,
+0x67,0x3c,0x2f,0x61,0x3e,0x0d,0x0a,0x3c,0x62,0x72,0x3e,0x3c,0x70,0x3e,0x0d,0x0a,
+0x3c,0x68,0x72,0x3e,0x0d,0x0a,0x3c,0x62,0x72,0x3e,0x3c,0x70,0x3e,0x0d,0x0a,0x3c,
+0x68,0x32,0x3e,0x54,0x61,0x73,0x6b,0x20,0x73,0x74,0x61,0x74,0x69,0x73,0x74,0x69,
+0x63,0x73,0x3c,0x2f,0x68,0x32,0x3e,0x0d,0x0a,0x50,0x61,0x67,0x65,0x20,0x77,0x69,
+0x6c,0x6c,0x20,0x72,0x65,0x66,0x72,0x65,0x73,0x68,0x20,0x65,0x76,0x65,0x72,0x79,
+0x20,0x32,0x20,0x73,0x65,0x63,0x6f,0x6e,0x64,0x73,0x2e,0x3c,0x70,0x3e,0x0d,0x0a,
+0x3c,0x66,0x6f,0x6e,0x74,0x20,0x66,0x61,0x63,0x65,0x3d,0x22,0x63,0x6f,0x75,0x72,
+0x69,0x65,0x72,0x22,0x3e,0x3c,0x70,0x72,0x65,0x3e,0x54,0x61,0x73,0x6b,0x20,0x20,
+0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x53,0x74,0x61,0x74,0x65,0x20,0x20,0x50,
+0x72,0x69,0x6f,0x72,0x69,0x74,0x79,0x20,0x20,0x53,0x74,0x61,0x63,0x6b,0x09,0x23,
+0x3c,0x62,0x72,0x3e,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,
 0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,
 0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,
-0x3c,0x62,0x72,0x3e,0x0d,0x0a,0x3c,0x21,0x2d,0x2d,0x23,0x72,0x74,0x6f,0x73,0x5f,
-0x73,0x74,0x61,0x74,0x73,0x2d,0x2d,0x3e,0x0d,0x0a,0x3c,0x2f,0x70,0x72,0x65,0x3e,
-0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,0x0d,0x0a,0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,
-0x0d,0x0a,0x3c,0x2f,0x62,0x6f,0x64,0x79,0x3e,0x0d,0x0a,0x3c,0x2f,0x68,0x74,0x6d,
-0x6c,0x3e,0x0d,0x0a,0x0d,0x0a,};
+0x2a,0x2a,0x2a,0x2a,0x3c,0x62,0x72,0x3e,0x0d,0x0a,0x3c,0x21,0x2d,0x2d,0x23,0x72,
+0x74,0x6f,0x73,0x5f,0x73,0x74,0x61,0x74,0x73,0x2d,0x2d,0x3e,0x0d,0x0a,0x3c,0x2f,
+0x70,0x72,0x65,0x3e,0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,0x0d,0x0a,0x3c,0x2f,0x66,
+0x6f,0x6e,0x74,0x3e,0x0d,0x0a,0x3c,0x2f,0x62,0x6f,0x64,0x79,0x3e,0x0d,0x0a,0x3c,
+0x2f,0x68,0x74,0x6d,0x6c,0x3e,0x0d,0x0a,0x0d,0x0a,};
 
 static const unsigned int dummy_align__logo_jpg = 2;
 static const unsigned char data__logo_jpg[] = {
@@ -1987,7 +1979,7 @@ Pragma: no-cache
 0x30,0x38,0x20,0x31,0x34,0x3a,0x30,0x30,0x3a,0x30,0x30,0x20,0x47,0x4d,0x54,0x0d,
 0x0a,0x50,0x72,0x61,0x67,0x6d,0x61,0x3a,0x20,0x6e,0x6f,0x2d,0x63,0x61,0x63,0x68,
 0x65,0x0d,0x0a,0x0d,0x0a,
-/* raw file data (882 bytes) */
+/* raw file data (758 bytes) */
 0x3c,0x21,0x44,0x4f,0x43,0x54,0x59,0x50,0x45,0x20,0x48,0x54,0x4d,0x4c,0x20,0x50,
 0x55,0x42,0x4c,0x49,0x43,0x20,0x22,0x2d,0x2f,0x2f,0x57,0x33,0x43,0x2f,0x2f,0x44,
 0x54,0x44,0x20,0x48,0x54,0x4d,0x4c,0x20,0x34,0x2e,0x30,0x31,0x20,0x54,0x72,0x61,
@@ -1997,53 +1989,45 @@ Pragma: no-cache
 0x2e,0x64,0x74,0x64,0x22,0x3e,0x0d,0x0a,0x3c,0x68,0x74,0x6d,0x6c,0x3e,0x0d,0x0a,
 0x20,0x20,0x3c,0x68,0x65,0x61,0x64,0x3e,0x0d,0x0a,0x20,0x20,0x20,0x20,0x3c,0x74,
 0x69,0x74,0x6c,0x65,0x3e,0x46,0x72,0x65,0x65,0x52,0x54,0x4f,0x53,0x2e,0x6f,0x72,
-0x67,0x20,0x75,0x49,0x50,0x20,0x57,0x45,0x42,0x20,0x73,0x65,0x72,0x76,0x65,0x72,
-0x20,0x64,0x65,0x6d,0x6f,0x3c,0x2f,0x74,0x69,0x74,0x6c,0x65,0x3e,0x0d,0x0a,0x20,
-0x20,0x3c,0x2f,0x68,0x65,0x61,0x64,0x3e,0x0d,0x0a,0x20,0x20,0x3c,0x42,0x4f,0x44,
-0x59,0x20,0x6f,0x6e,0x4c,0x6f,0x61,0x64,0x3d,0x22,0x77,0x69,0x6e,0x64,0x6f,0x77,
-0x2e,0x73,0x65,0x74,0x54,0x69,0x6d,0x65,0x6f,0x75,0x74,0x28,0x26,0x71,0x75,0x6f,
-0x74,0x3b,0x6c,0x6f,0x63,0x61,0x74,0x69,0x6f,0x6e,0x2e,0x68,0x72,0x65,0x66,0x3d,
-0x27,0x72,0x75,0x6e,0x74,0x69,0x6d,0x65,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x27,0x26,
-0x71,0x75,0x6f,0x74,0x3b,0x2c,0x32,0x30,0x30,0x30,0x29,0x22,0x3e,0x0d,0x0a,0x3c,
-0x66,0x6f,0x6e,0x74,0x20,0x66,0x61,0x63,0x65,0x3d,0x22,0x61,0x72,0x69,0x61,0x6c,
-0x22,0x3e,0x0d,0x0a,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x69,0x6e,0x64,
-0x65,0x78,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x22,0x3e,0x54,0x61,0x73,0x6b,0x20,0x53,
-0x74,0x61,0x74,0x73,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,0x3c,0x2f,0x62,
-0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x72,0x75,0x6e,0x74,0x69,
-0x6d,0x65,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x22,0x3e,0x52,0x75,0x6e,0x20,0x54,0x69,
-0x6d,0x65,0x20,0x53,0x74,0x61,0x74,0x73,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,
-0x7c,0x3c,0x2f,0x62,0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x73,
-0x74,0x61,0x74,0x73,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x22,0x3e,0x54,0x43,0x50,0x20,
+0x67,0x20,0x6c,0x77,0x49,0x50,0x20,0x57,0x45,0x42,0x20,0x73,0x65,0x72,0x76,0x65,
+0x72,0x20,0x64,0x65,0x6d,0x6f,0x3c,0x2f,0x74,0x69,0x74,0x6c,0x65,0x3e,0x0d,0x0a,
+0x20,0x20,0x3c,0x2f,0x68,0x65,0x61,0x64,0x3e,0x0d,0x0a,0x20,0x20,0x3c,0x42,0x4f,
+0x44,0x59,0x20,0x6f,0x6e,0x4c,0x6f,0x61,0x64,0x3d,0x22,0x77,0x69,0x6e,0x64,0x6f,
+0x77,0x2e,0x73,0x65,0x74,0x54,0x69,0x6d,0x65,0x6f,0x75,0x74,0x28,0x26,0x71,0x75,
+0x6f,0x74,0x3b,0x6c,0x6f,0x63,0x61,0x74,0x69,0x6f,0x6e,0x2e,0x68,0x72,0x65,0x66,
+0x3d,0x27,0x72,0x75,0x6e,0x74,0x69,0x6d,0x65,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x27,
+0x26,0x71,0x75,0x6f,0x74,0x3b,0x2c,0x32,0x30,0x30,0x30,0x29,0x22,0x3e,0x0d,0x0a,
+0x3c,0x66,0x6f,0x6e,0x74,0x20,0x66,0x61,0x63,0x65,0x3d,0x22,0x61,0x72,0x69,0x61,
+0x6c,0x22,0x3e,0x0d,0x0a,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x69,0x6e,
+0x64,0x65,0x78,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x22,0x3e,0x54,0x61,0x73,0x6b,0x20,
 0x53,0x74,0x61,0x74,0x73,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,0x3c,0x2f,
-0x62,0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x74,0x63,0x70,0x2e,
-0x73,0x68,0x74,0x6d,0x6c,0x22,0x3e,0x43,0x6f,0x6e,0x6e,0x65,0x63,0x74,0x69,0x6f,
-0x6e,0x73,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,0x3c,0x2f,0x62,0x3e,0x20,
-0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,
-0x77,0x77,0x77,0x2e,0x66,0x72,0x65,0x65,0x72,0x74,0x6f,0x73,0x2e,0x6f,0x72,0x67,
-0x2f,0x22,0x3e,0x46,0x72,0x65,0x65,0x52,0x54,0x4f,0x53,0x20,0x48,0x6f,0x6d,0x65,
-0x70,0x61,0x67,0x65,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,0x3c,0x2f,0x62,
-0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x69,0x6f,0x2e,0x73,0x68,
-0x74,0x6d,0x6c,0x22,0x3e,0x49,0x4f,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,
-0x3c,0x2f,0x62,0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x6c,0x6f,
-0x67,0x6f,0x2e,0x6a,0x70,0x67,0x22,0x3e,0x33,0x37,0x4b,0x20,0x6a,0x70,0x67,0x3c,
-0x2f,0x61,0x3e,0x0d,0x0a,0x3c,0x62,0x72,0x3e,0x3c,0x70,0x3e,0x0d,0x0a,0x3c,0x68,
-0x72,0x3e,0x0d,0x0a,0x3c,0x62,0x72,0x3e,0x3c,0x70,0x3e,0x0d,0x0a,0x3c,0x68,0x32,
-0x3e,0x52,0x75,0x6e,0x2d,0x74,0x69,0x6d,0x65,0x20,0x73,0x74,0x61,0x74,0x69,0x73,
-0x74,0x69,0x63,0x73,0x3c,0x2f,0x68,0x32,0x3e,0x0d,0x0a,0x50,0x61,0x67,0x65,0x20,
-0x77,0x69,0x6c,0x6c,0x20,0x72,0x65,0x66,0x72,0x65,0x73,0x68,0x20,0x65,0x76,0x65,
-0x72,0x79,0x20,0x32,0x20,0x73,0x65,0x63,0x6f,0x6e,0x64,0x73,0x2e,0x3c,0x70,0x3e,
-0x0d,0x0a,0x3c,0x66,0x6f,0x6e,0x74,0x20,0x66,0x61,0x63,0x65,0x3d,0x22,0x63,0x6f,
-0x75,0x72,0x69,0x65,0x72,0x22,0x3e,0x3c,0x70,0x72,0x65,0x3e,0x54,0x61,0x73,0x6b,
-0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x41,0x62,0x73,0x20,
-0x54,0x69,0x6d,0x65,0x20,0x20,0x20,0x20,0x20,0x20,0x25,0x20,0x54,0x69,0x6d,0x65,
-0x3c,0x62,0x72,0x3e,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,
+0x62,0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x72,0x75,0x6e,0x74,
+0x69,0x6d,0x65,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x22,0x3e,0x52,0x75,0x6e,0x20,0x54,
+0x69,0x6d,0x65,0x20,0x53,0x74,0x61,0x74,0x73,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,
+0x3e,0x7c,0x3c,0x2f,0x62,0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,
+0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x77,0x77,0x77,0x2e,0x66,0x72,0x65,0x65,0x72,
+0x74,0x6f,0x73,0x2e,0x6f,0x72,0x67,0x2f,0x22,0x3e,0x46,0x72,0x65,0x65,0x52,0x54,
+0x4f,0x53,0x20,0x48,0x6f,0x6d,0x65,0x70,0x61,0x67,0x65,0x3c,0x2f,0x61,0x3e,0x20,
+0x3c,0x62,0x3e,0x7c,0x3c,0x2f,0x62,0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,
+0x3d,0x22,0x6c,0x6f,0x67,0x6f,0x2e,0x6a,0x70,0x67,0x22,0x3e,0x33,0x37,0x4b,0x20,
+0x6a,0x70,0x67,0x3c,0x2f,0x61,0x3e,0x0d,0x0a,0x3c,0x62,0x72,0x3e,0x3c,0x70,0x3e,
+0x0d,0x0a,0x3c,0x68,0x72,0x3e,0x0d,0x0a,0x3c,0x62,0x72,0x3e,0x3c,0x70,0x3e,0x0d,
+0x0a,0x3c,0x68,0x32,0x3e,0x52,0x75,0x6e,0x2d,0x74,0x69,0x6d,0x65,0x20,0x73,0x74,
+0x61,0x74,0x69,0x73,0x74,0x69,0x63,0x73,0x3c,0x2f,0x68,0x32,0x3e,0x0d,0x0a,0x50,
+0x61,0x67,0x65,0x20,0x77,0x69,0x6c,0x6c,0x20,0x72,0x65,0x66,0x72,0x65,0x73,0x68,
+0x20,0x65,0x76,0x65,0x72,0x79,0x20,0x32,0x20,0x73,0x65,0x63,0x6f,0x6e,0x64,0x73,
+0x2e,0x3c,0x70,0x3e,0x0d,0x0a,0x3c,0x66,0x6f,0x6e,0x74,0x20,0x66,0x61,0x63,0x65,
+0x3d,0x22,0x63,0x6f,0x75,0x72,0x69,0x65,0x72,0x22,0x3e,0x3c,0x70,0x72,0x65,0x3e,
+0x54,0x61,0x73,0x6b,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+0x41,0x62,0x73,0x20,0x54,0x69,0x6d,0x65,0x20,0x20,0x20,0x20,0x20,0x20,0x25,0x20,
+0x54,0x69,0x6d,0x65,0x3c,0x62,0x72,0x3e,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,
+0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,
 0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,
-0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x3c,0x62,0x72,0x3e,
-0x0d,0x0a,0x3c,0x21,0x2d,0x2d,0x23,0x72,0x75,0x6e,0x5f,0x73,0x74,0x61,0x74,0x73,
-0x2d,0x2d,0x3e,0x0d,0x0d,0x0a,0x3c,0x2f,0x70,0x72,0x65,0x3e,0x3c,0x2f,0x66,0x6f,
-0x6e,0x74,0x3e,0x0d,0x0a,0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,0x0d,0x0a,0x3c,0x2f,
-0x62,0x6f,0x64,0x79,0x3e,0x0d,0x0a,0x3c,0x2f,0x68,0x74,0x6d,0x6c,0x3e,0x0d,0x0a,
-0x0d,0x0a,};
+0x3c,0x62,0x72,0x3e,0x0d,0x0a,0x3c,0x21,0x2d,0x2d,0x23,0x72,0x75,0x6e,0x5f,0x73,
+0x74,0x61,0x74,0x73,0x2d,0x2d,0x3e,0x0d,0x0d,0x0a,0x3c,0x2f,0x70,0x72,0x65,0x3e,
+0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,0x0d,0x0a,0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,
+0x0d,0x0a,0x3c,0x2f,0x62,0x6f,0x64,0x79,0x3e,0x0d,0x0a,0x3c,0x2f,0x68,0x74,0x6d,
+0x6c,0x3e,0x0d,0x0a,0x0d,0x0a,};
 
 
 
diff --git a/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/httpserver_raw_from_lwIP_download/makefsdata/fs/index.shtml b/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/httpserver_raw_from_lwIP_download/makefsdata/fs/index.shtml
index 67b82c8d8..90358d158 100644
--- a/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/httpserver_raw_from_lwIP_download/makefsdata/fs/index.shtml
+++ b/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/httpserver_raw_from_lwIP_download/makefsdata/fs/index.shtml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
   <head>
-    <title>FreeRTOS.org uIP WEB server demo</title>
+    <title>FreeRTOS.org lwIP WEB server demo</title>
   </head>
   <BODY onLoad="window.setTimeout(&quot;location.href='index.shtml'&quot;,2000)">
 <font face="arial">
-<a href="index.shtml">Task Stats</a> <b>|</b> <a href="runtime.shtml">Run Time Stats</a> <b>|</b> <a href="stats.shtml">TCP Stats</a> <b>|</b> <a href="tcp.shtml">Connections</a> <b>|</b> <a href="http://www.freertos.org/">FreeRTOS Homepage</a> <b>|</b> <a href="io.shtml">IO</a> <b>|</b> <a href="logo.jpg">37K jpg</a>
+<a href="index.shtml">Task Stats</a> <b>|</b> <a href="runtime.shtml">Run Time Stats</a> <b>|</b> <a href="http://www.freertos.org/">FreeRTOS Homepage</a> <b>|</b> <a href="logo.jpg">37K jpg</a>
 <br><p>
 <hr>
 <br><p>
diff --git a/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/httpserver_raw_from_lwIP_download/makefsdata/fs/runtime.shtml b/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/httpserver_raw_from_lwIP_download/makefsdata/fs/runtime.shtml
index 5beab4ac7..e66202b9d 100644
--- a/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/httpserver_raw_from_lwIP_download/makefsdata/fs/runtime.shtml
+++ b/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/httpserver_raw_from_lwIP_download/makefsdata/fs/runtime.shtml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
   <head>
-    <title>FreeRTOS.org uIP WEB server demo</title>
+    <title>FreeRTOS.org lwIP WEB server demo</title>
   </head>
   <BODY onLoad="window.setTimeout(&quot;location.href='runtime.shtml'&quot;,2000)">
 <font face="arial">
-<a href="index.shtml">Task Stats</a> <b>|</b> <a href="runtime.shtml">Run Time Stats</a> <b>|</b> <a href="stats.shtml">TCP Stats</a> <b>|</b> <a href="tcp.shtml">Connections</a> <b>|</b> <a href="http://www.freertos.org/">FreeRTOS Homepage</a> <b>|</b> <a href="io.shtml">IO</a> <b>|</b> <a href="logo.jpg">37K jpg</a>
+<a href="index.shtml">Task Stats</a> <b>|</b> <a href="runtime.shtml">Run Time Stats</a> <b>|</b> <a href="http://www.freertos.org/">FreeRTOS Homepage</a> <b>|</b> <a href="logo.jpg">37K jpg</a>
 <br><p>
 <hr>
 <br><p>
diff --git a/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/httpserver_raw_from_lwIP_download/makefsdata/fsdata.c b/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/httpserver_raw_from_lwIP_download/makefsdata/fsdata.c
index 19ebe78bc..f2ddfd935 100644
--- a/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/httpserver_raw_from_lwIP_download/makefsdata/fsdata.c
+++ b/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/httpserver_raw_from_lwIP_download/makefsdata/fsdata.c
@@ -91,7 +91,7 @@ Pragma: no-cache
 0x30,0x38,0x20,0x31,0x34,0x3a,0x30,0x30,0x3a,0x30,0x30,0x20,0x47,0x4d,0x54,0x0d,
 0x0a,0x50,0x72,0x61,0x67,0x6d,0x61,0x3a,0x20,0x6e,0x6f,0x2d,0x63,0x61,0x63,0x68,
 0x65,0x0d,0x0a,0x0d,0x0a,
-/* raw file data (886 bytes) */
+/* raw file data (762 bytes) */
 0x3c,0x21,0x44,0x4f,0x43,0x54,0x59,0x50,0x45,0x20,0x48,0x54,0x4d,0x4c,0x20,0x50,
 0x55,0x42,0x4c,0x49,0x43,0x20,0x22,0x2d,0x2f,0x2f,0x57,0x33,0x43,0x2f,0x2f,0x44,
 0x54,0x44,0x20,0x48,0x54,0x4d,0x4c,0x20,0x34,0x2e,0x30,0x31,0x20,0x54,0x72,0x61,
@@ -101,53 +101,45 @@ Pragma: no-cache
 0x2e,0x64,0x74,0x64,0x22,0x3e,0x0d,0x0a,0x3c,0x68,0x74,0x6d,0x6c,0x3e,0x0d,0x0a,
 0x20,0x20,0x3c,0x68,0x65,0x61,0x64,0x3e,0x0d,0x0a,0x20,0x20,0x20,0x20,0x3c,0x74,
 0x69,0x74,0x6c,0x65,0x3e,0x46,0x72,0x65,0x65,0x52,0x54,0x4f,0x53,0x2e,0x6f,0x72,
-0x67,0x20,0x75,0x49,0x50,0x20,0x57,0x45,0x42,0x20,0x73,0x65,0x72,0x76,0x65,0x72,
-0x20,0x64,0x65,0x6d,0x6f,0x3c,0x2f,0x74,0x69,0x74,0x6c,0x65,0x3e,0x0d,0x0a,0x20,
-0x20,0x3c,0x2f,0x68,0x65,0x61,0x64,0x3e,0x0d,0x0a,0x20,0x20,0x3c,0x42,0x4f,0x44,
-0x59,0x20,0x6f,0x6e,0x4c,0x6f,0x61,0x64,0x3d,0x22,0x77,0x69,0x6e,0x64,0x6f,0x77,
-0x2e,0x73,0x65,0x74,0x54,0x69,0x6d,0x65,0x6f,0x75,0x74,0x28,0x26,0x71,0x75,0x6f,
-0x74,0x3b,0x6c,0x6f,0x63,0x61,0x74,0x69,0x6f,0x6e,0x2e,0x68,0x72,0x65,0x66,0x3d,
-0x27,0x69,0x6e,0x64,0x65,0x78,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x27,0x26,0x71,0x75,
-0x6f,0x74,0x3b,0x2c,0x32,0x30,0x30,0x30,0x29,0x22,0x3e,0x0d,0x0a,0x3c,0x66,0x6f,
-0x6e,0x74,0x20,0x66,0x61,0x63,0x65,0x3d,0x22,0x61,0x72,0x69,0x61,0x6c,0x22,0x3e,
-0x0d,0x0a,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x69,0x6e,0x64,0x65,0x78,
-0x2e,0x73,0x68,0x74,0x6d,0x6c,0x22,0x3e,0x54,0x61,0x73,0x6b,0x20,0x53,0x74,0x61,
-0x74,0x73,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,0x3c,0x2f,0x62,0x3e,0x20,
-0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x72,0x75,0x6e,0x74,0x69,0x6d,0x65,
-0x2e,0x73,0x68,0x74,0x6d,0x6c,0x22,0x3e,0x52,0x75,0x6e,0x20,0x54,0x69,0x6d,0x65,
-0x20,0x53,0x74,0x61,0x74,0x73,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,0x3c,
-0x2f,0x62,0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x73,0x74,0x61,
-0x74,0x73,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x22,0x3e,0x54,0x43,0x50,0x20,0x53,0x74,
+0x67,0x20,0x6c,0x77,0x49,0x50,0x20,0x57,0x45,0x42,0x20,0x73,0x65,0x72,0x76,0x65,
+0x72,0x20,0x64,0x65,0x6d,0x6f,0x3c,0x2f,0x74,0x69,0x74,0x6c,0x65,0x3e,0x0d,0x0a,
+0x20,0x20,0x3c,0x2f,0x68,0x65,0x61,0x64,0x3e,0x0d,0x0a,0x20,0x20,0x3c,0x42,0x4f,
+0x44,0x59,0x20,0x6f,0x6e,0x4c,0x6f,0x61,0x64,0x3d,0x22,0x77,0x69,0x6e,0x64,0x6f,
+0x77,0x2e,0x73,0x65,0x74,0x54,0x69,0x6d,0x65,0x6f,0x75,0x74,0x28,0x26,0x71,0x75,
+0x6f,0x74,0x3b,0x6c,0x6f,0x63,0x61,0x74,0x69,0x6f,0x6e,0x2e,0x68,0x72,0x65,0x66,
+0x3d,0x27,0x69,0x6e,0x64,0x65,0x78,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x27,0x26,0x71,
+0x75,0x6f,0x74,0x3b,0x2c,0x32,0x30,0x30,0x30,0x29,0x22,0x3e,0x0d,0x0a,0x3c,0x66,
+0x6f,0x6e,0x74,0x20,0x66,0x61,0x63,0x65,0x3d,0x22,0x61,0x72,0x69,0x61,0x6c,0x22,
+0x3e,0x0d,0x0a,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x69,0x6e,0x64,0x65,
+0x78,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x22,0x3e,0x54,0x61,0x73,0x6b,0x20,0x53,0x74,
 0x61,0x74,0x73,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,0x3c,0x2f,0x62,0x3e,
-0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x74,0x63,0x70,0x2e,0x73,0x68,
-0x74,0x6d,0x6c,0x22,0x3e,0x43,0x6f,0x6e,0x6e,0x65,0x63,0x74,0x69,0x6f,0x6e,0x73,
-0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,0x3c,0x2f,0x62,0x3e,0x20,0x3c,0x61,
-0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x77,0x77,
-0x77,0x2e,0x66,0x72,0x65,0x65,0x72,0x74,0x6f,0x73,0x2e,0x6f,0x72,0x67,0x2f,0x22,
-0x3e,0x46,0x72,0x65,0x65,0x52,0x54,0x4f,0x53,0x20,0x48,0x6f,0x6d,0x65,0x70,0x61,
-0x67,0x65,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,0x3c,0x2f,0x62,0x3e,0x20,
-0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x69,0x6f,0x2e,0x73,0x68,0x74,0x6d,
-0x6c,0x22,0x3e,0x49,0x4f,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,0x3c,0x2f,
-0x62,0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x6c,0x6f,0x67,0x6f,
-0x2e,0x6a,0x70,0x67,0x22,0x3e,0x33,0x37,0x4b,0x20,0x6a,0x70,0x67,0x3c,0x2f,0x61,
-0x3e,0x0d,0x0a,0x3c,0x62,0x72,0x3e,0x3c,0x70,0x3e,0x0d,0x0a,0x3c,0x68,0x72,0x3e,
-0x0d,0x0a,0x3c,0x62,0x72,0x3e,0x3c,0x70,0x3e,0x0d,0x0a,0x3c,0x68,0x32,0x3e,0x54,
-0x61,0x73,0x6b,0x20,0x73,0x74,0x61,0x74,0x69,0x73,0x74,0x69,0x63,0x73,0x3c,0x2f,
-0x68,0x32,0x3e,0x0d,0x0a,0x50,0x61,0x67,0x65,0x20,0x77,0x69,0x6c,0x6c,0x20,0x72,
-0x65,0x66,0x72,0x65,0x73,0x68,0x20,0x65,0x76,0x65,0x72,0x79,0x20,0x32,0x20,0x73,
-0x65,0x63,0x6f,0x6e,0x64,0x73,0x2e,0x3c,0x70,0x3e,0x0d,0x0a,0x3c,0x66,0x6f,0x6e,
-0x74,0x20,0x66,0x61,0x63,0x65,0x3d,0x22,0x63,0x6f,0x75,0x72,0x69,0x65,0x72,0x22,
-0x3e,0x3c,0x70,0x72,0x65,0x3e,0x54,0x61,0x73,0x6b,0x20,0x20,0x20,0x20,0x20,0x20,
-0x20,0x20,0x20,0x20,0x53,0x74,0x61,0x74,0x65,0x20,0x20,0x50,0x72,0x69,0x6f,0x72,
-0x69,0x74,0x79,0x20,0x20,0x53,0x74,0x61,0x63,0x6b,0x09,0x23,0x3c,0x62,0x72,0x3e,
-0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,
+0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x72,0x75,0x6e,0x74,0x69,0x6d,
+0x65,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x22,0x3e,0x52,0x75,0x6e,0x20,0x54,0x69,0x6d,
+0x65,0x20,0x53,0x74,0x61,0x74,0x73,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,
+0x3c,0x2f,0x62,0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x68,0x74,
+0x74,0x70,0x3a,0x2f,0x2f,0x77,0x77,0x77,0x2e,0x66,0x72,0x65,0x65,0x72,0x74,0x6f,
+0x73,0x2e,0x6f,0x72,0x67,0x2f,0x22,0x3e,0x46,0x72,0x65,0x65,0x52,0x54,0x4f,0x53,
+0x20,0x48,0x6f,0x6d,0x65,0x70,0x61,0x67,0x65,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,
+0x3e,0x7c,0x3c,0x2f,0x62,0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,
+0x6c,0x6f,0x67,0x6f,0x2e,0x6a,0x70,0x67,0x22,0x3e,0x33,0x37,0x4b,0x20,0x6a,0x70,
+0x67,0x3c,0x2f,0x61,0x3e,0x0d,0x0a,0x3c,0x62,0x72,0x3e,0x3c,0x70,0x3e,0x0d,0x0a,
+0x3c,0x68,0x72,0x3e,0x0d,0x0a,0x3c,0x62,0x72,0x3e,0x3c,0x70,0x3e,0x0d,0x0a,0x3c,
+0x68,0x32,0x3e,0x54,0x61,0x73,0x6b,0x20,0x73,0x74,0x61,0x74,0x69,0x73,0x74,0x69,
+0x63,0x73,0x3c,0x2f,0x68,0x32,0x3e,0x0d,0x0a,0x50,0x61,0x67,0x65,0x20,0x77,0x69,
+0x6c,0x6c,0x20,0x72,0x65,0x66,0x72,0x65,0x73,0x68,0x20,0x65,0x76,0x65,0x72,0x79,
+0x20,0x32,0x20,0x73,0x65,0x63,0x6f,0x6e,0x64,0x73,0x2e,0x3c,0x70,0x3e,0x0d,0x0a,
+0x3c,0x66,0x6f,0x6e,0x74,0x20,0x66,0x61,0x63,0x65,0x3d,0x22,0x63,0x6f,0x75,0x72,
+0x69,0x65,0x72,0x22,0x3e,0x3c,0x70,0x72,0x65,0x3e,0x54,0x61,0x73,0x6b,0x20,0x20,
+0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x53,0x74,0x61,0x74,0x65,0x20,0x20,0x50,
+0x72,0x69,0x6f,0x72,0x69,0x74,0x79,0x20,0x20,0x53,0x74,0x61,0x63,0x6b,0x09,0x23,
+0x3c,0x62,0x72,0x3e,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,
 0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,
 0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,
-0x3c,0x62,0x72,0x3e,0x0d,0x0a,0x3c,0x21,0x2d,0x2d,0x23,0x72,0x74,0x6f,0x73,0x5f,
-0x73,0x74,0x61,0x74,0x73,0x2d,0x2d,0x3e,0x0d,0x0a,0x3c,0x2f,0x70,0x72,0x65,0x3e,
-0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,0x0d,0x0a,0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,
-0x0d,0x0a,0x3c,0x2f,0x62,0x6f,0x64,0x79,0x3e,0x0d,0x0a,0x3c,0x2f,0x68,0x74,0x6d,
-0x6c,0x3e,0x0d,0x0a,0x0d,0x0a,};
+0x2a,0x2a,0x2a,0x2a,0x3c,0x62,0x72,0x3e,0x0d,0x0a,0x3c,0x21,0x2d,0x2d,0x23,0x72,
+0x74,0x6f,0x73,0x5f,0x73,0x74,0x61,0x74,0x73,0x2d,0x2d,0x3e,0x0d,0x0a,0x3c,0x2f,
+0x70,0x72,0x65,0x3e,0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,0x0d,0x0a,0x3c,0x2f,0x66,
+0x6f,0x6e,0x74,0x3e,0x0d,0x0a,0x3c,0x2f,0x62,0x6f,0x64,0x79,0x3e,0x0d,0x0a,0x3c,
+0x2f,0x68,0x74,0x6d,0x6c,0x3e,0x0d,0x0a,0x0d,0x0a,};
 
 static const unsigned int dummy_align__logo_jpg = 2;
 static const unsigned char data__logo_jpg[] = {
@@ -1987,7 +1979,7 @@ Pragma: no-cache
 0x30,0x38,0x20,0x31,0x34,0x3a,0x30,0x30,0x3a,0x30,0x30,0x20,0x47,0x4d,0x54,0x0d,
 0x0a,0x50,0x72,0x61,0x67,0x6d,0x61,0x3a,0x20,0x6e,0x6f,0x2d,0x63,0x61,0x63,0x68,
 0x65,0x0d,0x0a,0x0d,0x0a,
-/* raw file data (882 bytes) */
+/* raw file data (758 bytes) */
 0x3c,0x21,0x44,0x4f,0x43,0x54,0x59,0x50,0x45,0x20,0x48,0x54,0x4d,0x4c,0x20,0x50,
 0x55,0x42,0x4c,0x49,0x43,0x20,0x22,0x2d,0x2f,0x2f,0x57,0x33,0x43,0x2f,0x2f,0x44,
 0x54,0x44,0x20,0x48,0x54,0x4d,0x4c,0x20,0x34,0x2e,0x30,0x31,0x20,0x54,0x72,0x61,
@@ -1997,53 +1989,45 @@ Pragma: no-cache
 0x2e,0x64,0x74,0x64,0x22,0x3e,0x0d,0x0a,0x3c,0x68,0x74,0x6d,0x6c,0x3e,0x0d,0x0a,
 0x20,0x20,0x3c,0x68,0x65,0x61,0x64,0x3e,0x0d,0x0a,0x20,0x20,0x20,0x20,0x3c,0x74,
 0x69,0x74,0x6c,0x65,0x3e,0x46,0x72,0x65,0x65,0x52,0x54,0x4f,0x53,0x2e,0x6f,0x72,
-0x67,0x20,0x75,0x49,0x50,0x20,0x57,0x45,0x42,0x20,0x73,0x65,0x72,0x76,0x65,0x72,
-0x20,0x64,0x65,0x6d,0x6f,0x3c,0x2f,0x74,0x69,0x74,0x6c,0x65,0x3e,0x0d,0x0a,0x20,
-0x20,0x3c,0x2f,0x68,0x65,0x61,0x64,0x3e,0x0d,0x0a,0x20,0x20,0x3c,0x42,0x4f,0x44,
-0x59,0x20,0x6f,0x6e,0x4c,0x6f,0x61,0x64,0x3d,0x22,0x77,0x69,0x6e,0x64,0x6f,0x77,
-0x2e,0x73,0x65,0x74,0x54,0x69,0x6d,0x65,0x6f,0x75,0x74,0x28,0x26,0x71,0x75,0x6f,
-0x74,0x3b,0x6c,0x6f,0x63,0x61,0x74,0x69,0x6f,0x6e,0x2e,0x68,0x72,0x65,0x66,0x3d,
-0x27,0x72,0x75,0x6e,0x74,0x69,0x6d,0x65,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x27,0x26,
-0x71,0x75,0x6f,0x74,0x3b,0x2c,0x32,0x30,0x30,0x30,0x29,0x22,0x3e,0x0d,0x0a,0x3c,
-0x66,0x6f,0x6e,0x74,0x20,0x66,0x61,0x63,0x65,0x3d,0x22,0x61,0x72,0x69,0x61,0x6c,
-0x22,0x3e,0x0d,0x0a,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x69,0x6e,0x64,
-0x65,0x78,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x22,0x3e,0x54,0x61,0x73,0x6b,0x20,0x53,
-0x74,0x61,0x74,0x73,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,0x3c,0x2f,0x62,
-0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x72,0x75,0x6e,0x74,0x69,
-0x6d,0x65,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x22,0x3e,0x52,0x75,0x6e,0x20,0x54,0x69,
-0x6d,0x65,0x20,0x53,0x74,0x61,0x74,0x73,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,
-0x7c,0x3c,0x2f,0x62,0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x73,
-0x74,0x61,0x74,0x73,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x22,0x3e,0x54,0x43,0x50,0x20,
+0x67,0x20,0x6c,0x77,0x49,0x50,0x20,0x57,0x45,0x42,0x20,0x73,0x65,0x72,0x76,0x65,
+0x72,0x20,0x64,0x65,0x6d,0x6f,0x3c,0x2f,0x74,0x69,0x74,0x6c,0x65,0x3e,0x0d,0x0a,
+0x20,0x20,0x3c,0x2f,0x68,0x65,0x61,0x64,0x3e,0x0d,0x0a,0x20,0x20,0x3c,0x42,0x4f,
+0x44,0x59,0x20,0x6f,0x6e,0x4c,0x6f,0x61,0x64,0x3d,0x22,0x77,0x69,0x6e,0x64,0x6f,
+0x77,0x2e,0x73,0x65,0x74,0x54,0x69,0x6d,0x65,0x6f,0x75,0x74,0x28,0x26,0x71,0x75,
+0x6f,0x74,0x3b,0x6c,0x6f,0x63,0x61,0x74,0x69,0x6f,0x6e,0x2e,0x68,0x72,0x65,0x66,
+0x3d,0x27,0x72,0x75,0x6e,0x74,0x69,0x6d,0x65,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x27,
+0x26,0x71,0x75,0x6f,0x74,0x3b,0x2c,0x32,0x30,0x30,0x30,0x29,0x22,0x3e,0x0d,0x0a,
+0x3c,0x66,0x6f,0x6e,0x74,0x20,0x66,0x61,0x63,0x65,0x3d,0x22,0x61,0x72,0x69,0x61,
+0x6c,0x22,0x3e,0x0d,0x0a,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x69,0x6e,
+0x64,0x65,0x78,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x22,0x3e,0x54,0x61,0x73,0x6b,0x20,
 0x53,0x74,0x61,0x74,0x73,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,0x3c,0x2f,
-0x62,0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x74,0x63,0x70,0x2e,
-0x73,0x68,0x74,0x6d,0x6c,0x22,0x3e,0x43,0x6f,0x6e,0x6e,0x65,0x63,0x74,0x69,0x6f,
-0x6e,0x73,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,0x3c,0x2f,0x62,0x3e,0x20,
-0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,
-0x77,0x77,0x77,0x2e,0x66,0x72,0x65,0x65,0x72,0x74,0x6f,0x73,0x2e,0x6f,0x72,0x67,
-0x2f,0x22,0x3e,0x46,0x72,0x65,0x65,0x52,0x54,0x4f,0x53,0x20,0x48,0x6f,0x6d,0x65,
-0x70,0x61,0x67,0x65,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,0x3c,0x2f,0x62,
-0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x69,0x6f,0x2e,0x73,0x68,
-0x74,0x6d,0x6c,0x22,0x3e,0x49,0x4f,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,0x3e,0x7c,
-0x3c,0x2f,0x62,0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x6c,0x6f,
-0x67,0x6f,0x2e,0x6a,0x70,0x67,0x22,0x3e,0x33,0x37,0x4b,0x20,0x6a,0x70,0x67,0x3c,
-0x2f,0x61,0x3e,0x0d,0x0a,0x3c,0x62,0x72,0x3e,0x3c,0x70,0x3e,0x0d,0x0a,0x3c,0x68,
-0x72,0x3e,0x0d,0x0a,0x3c,0x62,0x72,0x3e,0x3c,0x70,0x3e,0x0d,0x0a,0x3c,0x68,0x32,
-0x3e,0x52,0x75,0x6e,0x2d,0x74,0x69,0x6d,0x65,0x20,0x73,0x74,0x61,0x74,0x69,0x73,
-0x74,0x69,0x63,0x73,0x3c,0x2f,0x68,0x32,0x3e,0x0d,0x0a,0x50,0x61,0x67,0x65,0x20,
-0x77,0x69,0x6c,0x6c,0x20,0x72,0x65,0x66,0x72,0x65,0x73,0x68,0x20,0x65,0x76,0x65,
-0x72,0x79,0x20,0x32,0x20,0x73,0x65,0x63,0x6f,0x6e,0x64,0x73,0x2e,0x3c,0x70,0x3e,
-0x0d,0x0a,0x3c,0x66,0x6f,0x6e,0x74,0x20,0x66,0x61,0x63,0x65,0x3d,0x22,0x63,0x6f,
-0x75,0x72,0x69,0x65,0x72,0x22,0x3e,0x3c,0x70,0x72,0x65,0x3e,0x54,0x61,0x73,0x6b,
-0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x41,0x62,0x73,0x20,
-0x54,0x69,0x6d,0x65,0x20,0x20,0x20,0x20,0x20,0x20,0x25,0x20,0x54,0x69,0x6d,0x65,
-0x3c,0x62,0x72,0x3e,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,
+0x62,0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,0x72,0x75,0x6e,0x74,
+0x69,0x6d,0x65,0x2e,0x73,0x68,0x74,0x6d,0x6c,0x22,0x3e,0x52,0x75,0x6e,0x20,0x54,
+0x69,0x6d,0x65,0x20,0x53,0x74,0x61,0x74,0x73,0x3c,0x2f,0x61,0x3e,0x20,0x3c,0x62,
+0x3e,0x7c,0x3c,0x2f,0x62,0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,0x3d,0x22,
+0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x77,0x77,0x77,0x2e,0x66,0x72,0x65,0x65,0x72,
+0x74,0x6f,0x73,0x2e,0x6f,0x72,0x67,0x2f,0x22,0x3e,0x46,0x72,0x65,0x65,0x52,0x54,
+0x4f,0x53,0x20,0x48,0x6f,0x6d,0x65,0x70,0x61,0x67,0x65,0x3c,0x2f,0x61,0x3e,0x20,
+0x3c,0x62,0x3e,0x7c,0x3c,0x2f,0x62,0x3e,0x20,0x3c,0x61,0x20,0x68,0x72,0x65,0x66,
+0x3d,0x22,0x6c,0x6f,0x67,0x6f,0x2e,0x6a,0x70,0x67,0x22,0x3e,0x33,0x37,0x4b,0x20,
+0x6a,0x70,0x67,0x3c,0x2f,0x61,0x3e,0x0d,0x0a,0x3c,0x62,0x72,0x3e,0x3c,0x70,0x3e,
+0x0d,0x0a,0x3c,0x68,0x72,0x3e,0x0d,0x0a,0x3c,0x62,0x72,0x3e,0x3c,0x70,0x3e,0x0d,
+0x0a,0x3c,0x68,0x32,0x3e,0x52,0x75,0x6e,0x2d,0x74,0x69,0x6d,0x65,0x20,0x73,0x74,
+0x61,0x74,0x69,0x73,0x74,0x69,0x63,0x73,0x3c,0x2f,0x68,0x32,0x3e,0x0d,0x0a,0x50,
+0x61,0x67,0x65,0x20,0x77,0x69,0x6c,0x6c,0x20,0x72,0x65,0x66,0x72,0x65,0x73,0x68,
+0x20,0x65,0x76,0x65,0x72,0x79,0x20,0x32,0x20,0x73,0x65,0x63,0x6f,0x6e,0x64,0x73,
+0x2e,0x3c,0x70,0x3e,0x0d,0x0a,0x3c,0x66,0x6f,0x6e,0x74,0x20,0x66,0x61,0x63,0x65,
+0x3d,0x22,0x63,0x6f,0x75,0x72,0x69,0x65,0x72,0x22,0x3e,0x3c,0x70,0x72,0x65,0x3e,
+0x54,0x61,0x73,0x6b,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+0x41,0x62,0x73,0x20,0x54,0x69,0x6d,0x65,0x20,0x20,0x20,0x20,0x20,0x20,0x25,0x20,
+0x54,0x69,0x6d,0x65,0x3c,0x62,0x72,0x3e,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,
+0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,
 0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,
-0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x2a,0x3c,0x62,0x72,0x3e,
-0x0d,0x0a,0x3c,0x21,0x2d,0x2d,0x23,0x72,0x75,0x6e,0x5f,0x73,0x74,0x61,0x74,0x73,
-0x2d,0x2d,0x3e,0x0d,0x0d,0x0a,0x3c,0x2f,0x70,0x72,0x65,0x3e,0x3c,0x2f,0x66,0x6f,
-0x6e,0x74,0x3e,0x0d,0x0a,0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,0x0d,0x0a,0x3c,0x2f,
-0x62,0x6f,0x64,0x79,0x3e,0x0d,0x0a,0x3c,0x2f,0x68,0x74,0x6d,0x6c,0x3e,0x0d,0x0a,
-0x0d,0x0a,};
+0x3c,0x62,0x72,0x3e,0x0d,0x0a,0x3c,0x21,0x2d,0x2d,0x23,0x72,0x75,0x6e,0x5f,0x73,
+0x74,0x61,0x74,0x73,0x2d,0x2d,0x3e,0x0d,0x0d,0x0a,0x3c,0x2f,0x70,0x72,0x65,0x3e,
+0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,0x0d,0x0a,0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,
+0x0d,0x0a,0x3c,0x2f,0x62,0x6f,0x64,0x79,0x3e,0x0d,0x0a,0x3c,0x2f,0x68,0x74,0x6d,
+0x6c,0x3e,0x0d,0x0a,0x0d,0x0a,};
 
 
 
diff --git a/Demo/WIN32-MSVC-lwIP/lwIP_Apps/lwIP_Apps.c b/Demo/WIN32-MSVC-lwIP/lwIP_Apps/lwIP_Apps.c
index aa186b34d..ab4f20758 100644
--- a/Demo/WIN32-MSVC-lwIP/lwIP_Apps/lwIP_Apps.c
+++ b/Demo/WIN32-MSVC-lwIP/lwIP_Apps/lwIP_Apps.c
@@ -53,25 +53,11 @@
 
 #include "FreeRTOS.h"
 #include "task.h"
+#include "semphr.h"
 
 /* lwIP core includes */
 #include "lwip/opt.h"
-#include "lwip/sys.h"
-#include "lwip/timers.h"
-#include "lwip/debug.h"
-#include "lwip/stats.h"
-#include "lwip/init.h"
 #include "lwip/tcpip.h"
-#include "lwip/netif.h"
-#include "lwip/tcp.h"
-#include "lwip/udp.h"
-#include "lwip/dns.h"
-#include "lwip/dhcp.h"
-#include "lwip/autoip.h"
-#include "lwip/sockets.h"
-
-/* lwIP netif includes */
-#include "netif/etharp.h"
 
 /* applications includes */
 #include "apps/httpserver_raw_from_lwIP_download/httpd.h"
@@ -79,71 +65,96 @@
 /* include the port-dependent configuration */
 #include "lwipcfg_msvc.h"
 
-static struct netif netif;
+/* Dimensions the cTxBuffer array - which is itself used to hold replies from 
+command line commands.  cTxBuffer is a shared buffer, so protected by the 
+xTxBufferMutex mutex. */
+#define lwipappsTX_BUFFER_SIZE	1024
 
-static void apps_init( void );
+/* The maximum time to block waiting to obtain the xTxBufferMutex to become
+available. */
+#define lwipappsMAX_TIME_TO_WAIT_FOR_TX_BUFFER_MS	( 100 / portTICK_RATE_MS )
 
+/* Definitions of the various SSI callback functions within the pccSSITags 
+array.  If pccSSITags is updated, then these definitions must also be updated. */
 #define ssiTASK_STATS_INDEX			0
 #define ssiRUN_TIME_STATS_INDEX		1
 
-extern void vBasicTelnetServer( void *pvParameters );
+/*-----------------------------------------------------------*/
+
+/*
+ * The function that implements the lwIP based sockets command interpreter
+ * server.
+ */
+extern void vBasicSocketsCommandInterpreterTask( void *pvParameters );
 
 /*
  * The SSI handler callback function passed to lwIP.
  */
 static unsigned short uslwIPAppsSSIHandler( int iIndex, char *pcBuffer, int iBufferLength );
 
+/*-----------------------------------------------------------*/
 
-/* The SSI strings that are embedded in the served html files. */
+/* The SSI strings that are embedded in the served html files.  If this array
+is changed, then the index position defined by the #defines such as 
+ssiTASK_STATS_INDEX above must also be updated. */
 static const char *pccSSITags[] = 
 {
 	"rtos_stats",
 	"run_stats"
 };
 
+/* Semaphore used to guard the Tx buffer. */
+static xSemaphoreHandle xTxBufferMutex = NULL;
+
+/* The Tx buffer itself.  This is used to hold the text generated by the 
+execution of command line commands, and (hopefully) the execution of 
+server side include callbacks.  It is a shared buffer so protected by the
+xTxBufferMutex mutex.  pcLwipAppsBlockingGetTxBuffer() and 
+vLwipAppsReleaseTxBuffer() are provided to obtain and release the 
+xTxBufferMutex respectively.  pcLwipAppsBlockingGetTxBuffer() must be used with
+caution as it has the potential to block. */
+static signed char cTxBuffer[ lwipappsTX_BUFFER_SIZE ];
+
+/*-----------------------------------------------------------*/
+
 
 /* Called from the TCP/IP thread. */
 void lwIPAppsInit( void *pvArgument )
 {
-ip_addr_t ipaddr, netmask, gw;
-extern err_t ethernetif_init( struct netif *netif );
+ip_addr_t xIPAddr, xNetMask, xGateway;
+extern err_t ethernetif_init( struct netif *xNetIf );
+static struct netif xNetIf;
 
 	( void ) pvArgument;
 
-	ip_addr_set_zero( &gw );
-	ip_addr_set_zero( &ipaddr );
-	ip_addr_set_zero( &netmask );
+	/* Set up the network interface. */
+	ip_addr_set_zero( &xGateway );
+	ip_addr_set_zero( &xIPAddr );
+	ip_addr_set_zero( &xNetMask );
 
-	LWIP_PORT_INIT_GW(&gw);
-	LWIP_PORT_INIT_IPADDR(&ipaddr);
-	LWIP_PORT_INIT_NETMASK(&netmask);
-	printf("Starting lwIP, local interface IP is %s\n", ip_ntoa(&ipaddr));
+	LWIP_PORT_INIT_GW(&xGateway);
+	LWIP_PORT_INIT_IPADDR(&xIPAddr);
+	LWIP_PORT_INIT_NETMASK(&xNetMask);
+	printf("Starting lwIP, local interface IP is %s\n", ip_ntoa(&xIPAddr));
 
-	netif_set_default(netif_add(&netif, &ipaddr, &netmask, &gw, NULL, ethernetif_init, tcpip_input));
+	netif_set_default( netif_add( &xNetIf, &xIPAddr, &xNetMask, &xGateway, NULL, ethernetif_init, tcpip_input ) );
+	netif_set_up( &xNetIf );
 
-	#if LWIP_NETIF_STATUS_CALLBACK
-		netif_set_status_callback(&netif, status_callback);
-	#endif /* LWIP_NETIF_STATUS_CALLBACK */
-	#if LWIP_NETIF_LINK_CALLBACK
-		netif_set_link_callback(&netif, link_callback);
-	#endif /* LWIP_NETIF_LINK_CALLBACK */
-
-	netif_set_up( &netif );
-	apps_init();
+	/* Install the server side include handler. */
 	http_set_ssi_handler( uslwIPAppsSSIHandler, pccSSITags, sizeof( pccSSITags ) / sizeof( char * ) );
-}
-/*-----------------------------------------------------------*/
 
-/* This function initializes applications */
-static void apps_init( void )
-{
+	/* Create the mutex used to ensure mutual exclusive access to the Tx 
+	buffer. */
+	xTxBufferMutex = xSemaphoreCreateMutex();
+	configASSERT( xTxBufferMutex );
+
 	/* Create the httpd server from the standard lwIP code.  This demonstrates
 	use of the lwIP raw API. */
 	httpd_init();
 
 	/* Create the FreeRTOS defined basic command server.  This demonstrates use
 	of the lwIP sockets API. */
-	xTaskCreate( vBasicTelnetServer, ( signed char * ) "Telnet", configMINIMAL_STACK_SIZE * 10, NULL, configMAX_PRIORITIES - 2, NULL );
+	xTaskCreate( vBasicSocketsCommandInterpreterTask, ( signed char * ) "CmdInt", configMINIMAL_STACK_SIZE * 10, NULL, configMAX_PRIORITIES - 2, NULL );
 }
 /*-----------------------------------------------------------*/
 
@@ -153,6 +164,7 @@ static unsigned int uiUpdateCount = 0;
 static char cUpdateString[ 200 ];
 extern char *pcMainGetTaskStatusMessage( void );
 
+	/* Unused parameter. */
 	( void ) iBufferLength;
 
 	/* The SSI handler function that generates text depending on the index of
@@ -161,18 +173,50 @@ extern char *pcMainGetTaskStatusMessage( void );
 	switch( iIndex )
 	{
 		case ssiTASK_STATS_INDEX :
-			vTaskList( pcBuffer );
+			vTaskList( ( signed char * ) pcBuffer );
 			break;
 
 		case ssiRUN_TIME_STATS_INDEX :
-			vTaskGetRunTimeStats( pcBuffer );
+			vTaskGetRunTimeStats( ( signed char * ) pcBuffer );
 			break;
 	}
 
+	/* Include a count of the number of times an SSI function has been executed
+	in the returned string. */
 	uiUpdateCount++;
 	sprintf( cUpdateString, "\r\n\r\n%u\r\nStatus - %s", uiUpdateCount, pcMainGetTaskStatusMessage() );
 	strcat( pcBuffer, cUpdateString );
+
 	return strlen( pcBuffer );
 }
 /*-----------------------------------------------------------*/
 
+signed char *pcLwipAppsBlockingGetTxBuffer( void )
+{
+signed char *pcReturn;
+
+	/* Attempt to obtain the semaphore that guards the Tx buffer. */
+	if( xSemaphoreTakeRecursive( xTxBufferMutex, lwipappsMAX_TIME_TO_WAIT_FOR_TX_BUFFER_MS ) == pdFAIL )
+	{
+		/* The semaphore could not be obtained before timing out. */
+		pcReturn = NULL;
+	}
+	else
+	{
+		/* The semaphore was obtained successfully.  Return a pointer to the
+		Tx buffer. */
+		pcReturn = cTxBuffer;
+	}
+
+	return pcReturn;
+}
+/*-----------------------------------------------------------*/
+
+void vLwipAppsReleaseTxBuffer( void )
+{
+	/* Finished with the Tx buffer.  Return the mutex. */
+	xSemaphoreGiveRecursive( xTxBufferMutex );
+}
+
+
+
diff --git a/Demo/WIN32-MSVC-lwIP/lwIP_Apps/lwipopts.h b/Demo/WIN32-MSVC-lwIP/lwIP_Apps/lwipopts.h
index 810d0be20..152b7117a 100644
--- a/Demo/WIN32-MSVC-lwIP/lwIP_Apps/lwipopts.h
+++ b/Demo/WIN32-MSVC-lwIP/lwIP_Apps/lwipopts.h
@@ -32,6 +32,12 @@
 #ifndef __LWIPOPTS_H__
 #define __LWIPOPTS_H__
 
+/* Functions used to obtain and release exclusive access to the Tx buffer.  The
+Get function will block if the Tx buffer is not available - use with care! */
+signed char *pcLwipBlockingGetTxBuffer( void );
+void vLwipAppsReleaseTxBuffer( void );
+
+
 /* SSI options. */
 #define TCPIP_THREAD_NAME              "tcpip"
 #define LWIP_HTTPD_MAX_TAG_NAME_LEN 20
diff --git a/Demo/WIN32-MSVC-lwIP/main.c b/Demo/WIN32-MSVC-lwIP/main.c
index 85a658a98..27aecaee1 100644
--- a/Demo/WIN32-MSVC-lwIP/main.c
+++ b/Demo/WIN32-MSVC-lwIP/main.c
@@ -102,6 +102,7 @@
 
 /* lwIP includes. */
 #include "lwip/tcpip.h"
+#include "lwIP_Apps.h"
 
 /* Utils includes. */
 #include "CommandInterpreter.h"
@@ -318,7 +319,7 @@ unsigned long ulReturn;
 static const signed char *prvTaskStatsCommand( void )
 {
 static signed char *pcReturn = NULL;
-static char cTxBuffer[ 1024 ]; /*_RB_ Remove this. */
+const char *const pcHeader = "Task          State  Priority  Stack	#\r\n************************************************\r\n";
 
 	/* This is the callback function that is executed when the command line
 	command defined by the xTaskStats structure is entered.  This function
@@ -328,8 +329,12 @@ static char cTxBuffer[ 1024 ]; /*_RB_ Remove this. */
 	if( pcReturn == NULL )
 	{
 		/* Generate a table of task state. */
-		vTaskList( cTxBuffer );
-		pcReturn = cTxBuffer;
+		pcReturn = pcLwipAppsBlockingGetTxBuffer();
+		if( pcReturn != NULL )
+		{
+			strcpy( pcReturn, pcHeader );
+			vTaskList( pcReturn + strlen( pcHeader ) );
+		}
 	}
 	else
 	{
@@ -337,6 +342,7 @@ static char cTxBuffer[ 1024 ]; /*_RB_ Remove this. */
 		called it just resets itself and returns NULL to say no more strings
 		are going to be generated. */
 		pcReturn = NULL;
+		vLwipAppsReleaseTxBuffer();
 	}
 
 	return pcReturn;
@@ -346,8 +352,7 @@ static char cTxBuffer[ 1024 ]; /*_RB_ Remove this. */
 static const signed char *prvRunTimeStatsCommand( void )
 {
 static signed char *pcReturn = NULL;
-static char cTxBuffer[ 1024 ]; /*_RB_ Remove this. */
-
+const char * const pcHeader = "Task            Abs Time      % Time\r\n****************************************\r\n";
 
 	/* This is the callback function that is executed when the command line
 	command defined by the xRunTimeStats structure is entered.  This function
@@ -358,8 +363,12 @@ static char cTxBuffer[ 1024 ]; /*_RB_ Remove this. */
 	if( pcReturn == NULL )
 	{
 		/* Generate a table of run time stats. */
-		vTaskGetRunTimeStats( cTxBuffer );
-		pcReturn = cTxBuffer;
+		pcReturn = pcLwipAppsBlockingGetTxBuffer();
+		if( pcReturn != NULL )
+		{
+			strcpy( pcReturn, pcHeader );
+			vTaskGetRunTimeStats( pcReturn + strlen( pcHeader ) );
+		}
 	}
 	else
 	{
@@ -367,6 +376,7 @@ static char cTxBuffer[ 1024 ]; /*_RB_ Remove this. */
 		called it just resets itself and returns NULL to say no more strings
 		are going to be generated. */
 		pcReturn = NULL;
+		vLwipAppsReleaseTxBuffer();
 	}
 
 	return pcReturn;
-- 
2.39.5