+ +
+ + +µC/OS is a full-featured embedded operating system originally developed by Micriµm™. In addition to the two highly popular kernels, µC/OS features support for TCP/IP, USB-Device, USB-Host, and Modbus, as well as a robust File System. + +Since its founding in 1999 as a private company, Micriµm and its team of engineers have offered world-class embedded software components for the most critical and demanding real-time applications. Recognized as having some of the cleanest code in the industry, with easy-to-understand documentation, the Micrium real-time kernels, and software components have successfully been deployed in thousands of products worldwide across a broad range of industries. Micrium’s µC/OS-II™ kernel has been certified for use in safety-critical applications and remains a respected favorite in the medical, aerospace, and industrial markets. µC/OS continues to be the RTOS of choice for engineers requiring the most reliable and trusted solution for their mission-critical applications. + +---------- + +.. raw:: HTML + + ++ +
+ + +Founded by a team of former Micrium employees, Weston Embedded Solutions is the official custodian for the µC/OS RTOS and Stacks software repository to ensure it remains the trusted choice for embedded engineers around the world. + +---------- + +Product Documentation and Release Notes +*************** +https://micrium.atlassian.net/ + +Technical Support +***************** +https://weston-embedded.com/micrium-support + +Example Projects +********* +https://weston-embedded.com/micrium-examples + +Commercial Licensing Option +********* +https://weston-embedded.com/products/cesium + +Who to Contact +********* +https://weston-embedded.com/company/contact \ No newline at end of file diff --git a/Server/Add-on/Auth/http-s_auth.c b/Server/Add-on/Auth/http-s_auth.c index 811e419..4139093 100644 --- a/Server/Add-on/Auth/http-s_auth.c +++ b/Server/Add-on/Auth/http-s_auth.c @@ -18,7 +18,7 @@ * HTTPs AUTHENTIFICATION MODULE * * Filename : http-s_auth.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Add-on/Auth/http-s_auth.h b/Server/Add-on/Auth/http-s_auth.h index 982b696..d732366 100644 --- a/Server/Add-on/Auth/http-s_auth.h +++ b/Server/Add-on/Auth/http-s_auth.h @@ -18,7 +18,7 @@ * HTTPs AUTHENTIFICATION MODULE * * Filename : http-s_auth.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Add-on/CtrlLayer/http-s_ctrl_layer.c b/Server/Add-on/CtrlLayer/http-s_ctrl_layer.c index 51fe4cd..56b68a1 100644 --- a/Server/Add-on/CtrlLayer/http-s_ctrl_layer.c +++ b/Server/Add-on/CtrlLayer/http-s_ctrl_layer.c @@ -18,7 +18,7 @@ * HTTPs CONTROL LAYER * * Filename : http-s_ctrl_layer.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Add-on/CtrlLayer/http-s_ctrl_layer.h b/Server/Add-on/CtrlLayer/http-s_ctrl_layer.h index f27e0c8..b36263a 100644 --- a/Server/Add-on/CtrlLayer/http-s_ctrl_layer.h +++ b/Server/Add-on/CtrlLayer/http-s_ctrl_layer.h @@ -18,7 +18,7 @@ * HTTPs CONTROL LAYER * * Filename : http-s_ctrl_layer.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Add-on/CtrlLayer/http-s_ctrl_layer_mem.c b/Server/Add-on/CtrlLayer/http-s_ctrl_layer_mem.c index c08c8f0..2fac284 100644 --- a/Server/Add-on/CtrlLayer/http-s_ctrl_layer_mem.c +++ b/Server/Add-on/CtrlLayer/http-s_ctrl_layer_mem.c @@ -18,7 +18,7 @@ * HTTPs CONTROL LAYER MEMORY * * Filename : http-s_ctrl_layer_mem.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Add-on/CtrlLayer/http-s_ctrl_layer_mem.h b/Server/Add-on/CtrlLayer/http-s_ctrl_layer_mem.h index f3ea6e1..a3cd1e1 100644 --- a/Server/Add-on/CtrlLayer/http-s_ctrl_layer_mem.h +++ b/Server/Add-on/CtrlLayer/http-s_ctrl_layer_mem.h @@ -18,7 +18,7 @@ * HTTPs CONTROL LAYER MEMORY * * Filename : http-s_ctrl_layer_mem.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Add-on/CtrlLayer/http-s_ctrl_layer_rest_cfg.c b/Server/Add-on/CtrlLayer/http-s_ctrl_layer_rest_cfg.c index c150fc3..d617e92 100644 --- a/Server/Add-on/CtrlLayer/http-s_ctrl_layer_rest_cfg.c +++ b/Server/Add-on/CtrlLayer/http-s_ctrl_layer_rest_cfg.c @@ -18,7 +18,7 @@ * HTTPs CONTROL LAYER REST CONFIGURATION * * Filename : http-s_ctrl_layer_rest_cfg.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Add-on/CtrlLayer/http-s_ctrl_layer_rest_cfg.h b/Server/Add-on/CtrlLayer/http-s_ctrl_layer_rest_cfg.h index 42be7d1..fdbe783 100644 --- a/Server/Add-on/CtrlLayer/http-s_ctrl_layer_rest_cfg.h +++ b/Server/Add-on/CtrlLayer/http-s_ctrl_layer_rest_cfg.h @@ -18,7 +18,7 @@ * HTTPs CONTROL LAYER REST CONFIGURATION * * Filename : http-s_ctrl_layer_rest_cfg.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Add-on/REST/http-s_rest.c b/Server/Add-on/REST/http-s_rest.c index cd14303..ce6b3d2 100644 --- a/Server/Add-on/REST/http-s_rest.c +++ b/Server/Add-on/REST/http-s_rest.c @@ -18,7 +18,7 @@ * HTTPs REST * * Filename : http-s_rest.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Add-on/REST/http-s_rest.h b/Server/Add-on/REST/http-s_rest.h index 8080024..64fefa4 100644 --- a/Server/Add-on/REST/http-s_rest.h +++ b/Server/Add-on/REST/http-s_rest.h @@ -18,7 +18,7 @@ * HTTPs REST * * Filename : http-s_rest.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Add-on/REST/http-s_rest_hook_cfg.c b/Server/Add-on/REST/http-s_rest_hook_cfg.c index 095f9ab..35b4fd2 100644 --- a/Server/Add-on/REST/http-s_rest_hook_cfg.c +++ b/Server/Add-on/REST/http-s_rest_hook_cfg.c @@ -18,7 +18,7 @@ * HTTPs REST HOOK CONFIGURATION * * Filename : http-s_rest_hook_cfg.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Add-on/REST/http-s_rest_hook_cfg.h b/Server/Add-on/REST/http-s_rest_hook_cfg.h index 4767f3c..7d3e4d1 100644 --- a/Server/Add-on/REST/http-s_rest_hook_cfg.h +++ b/Server/Add-on/REST/http-s_rest_hook_cfg.h @@ -18,7 +18,7 @@ * HTTPs REST HOOK CONFIGURATION * * Filename : http-s_rest_hook_cfg.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Add-on/REST/http-s_rest_mem.c b/Server/Add-on/REST/http-s_rest_mem.c index bf8d8f8..d1d4289 100644 --- a/Server/Add-on/REST/http-s_rest_mem.c +++ b/Server/Add-on/REST/http-s_rest_mem.c @@ -18,7 +18,7 @@ * HTTPs REST MEMORY * * Filename : http-s_rest_mem.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Add-on/REST/http-s_rest_mem.h b/Server/Add-on/REST/http-s_rest_mem.h index 6d47252..7238a16 100644 --- a/Server/Add-on/REST/http-s_rest_mem.h +++ b/Server/Add-on/REST/http-s_rest_mem.h @@ -18,7 +18,7 @@ * HTTPs REST MEMORY * * Filename : http-s_rest_mem.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Cfg/Template/http-s_cfg.h b/Server/Cfg/Template/http-s_cfg.h index c66e4e4..e49a38c 100644 --- a/Server/Cfg/Template/http-s_cfg.h +++ b/Server/Cfg/Template/http-s_cfg.h @@ -3,7 +3,7 @@ * uC/HTTP * Hypertext Transfer Protocol * -* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com +* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com * * SPDX-License-Identifier: APACHE-2.0 * @@ -22,7 +22,7 @@ * TEMPLATE * * Filename : http-s_cfg.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Cfg/Template/http-s_instance_cfg.c b/Server/Cfg/Template/http-s_instance_cfg.c index 943b5da..8e956c5 100644 --- a/Server/Cfg/Template/http-s_instance_cfg.c +++ b/Server/Cfg/Template/http-s_instance_cfg.c @@ -3,7 +3,7 @@ * uC/HTTP * Hypertext Transfer Protocol * -* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com +* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com * * SPDX-License-Identifier: APACHE-2.0 * @@ -22,7 +22,7 @@ * TEMPLATE * * Filename : http-s_instance_cfg.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Cfg/Template/http-s_instance_cfg.h b/Server/Cfg/Template/http-s_instance_cfg.h index 90ef3f7..82187e8 100644 --- a/Server/Cfg/Template/http-s_instance_cfg.h +++ b/Server/Cfg/Template/http-s_instance_cfg.h @@ -3,7 +3,7 @@ * uC/HTTP * Hypertext Transfer Protocol * -* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com +* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com * * SPDX-License-Identifier: APACHE-2.0 * @@ -22,7 +22,7 @@ * TEMPLATE * * Filename : http-s_instance_cfg.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Examples/Basic/app_basic.c b/Server/Examples/Basic/app_basic.c index da6a0eb..7268e5d 100644 --- a/Server/Examples/Basic/app_basic.c +++ b/Server/Examples/Basic/app_basic.c @@ -18,7 +18,7 @@ * HTTP INSTANCE BASIC APPLICATION * * Filename : app_basic.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* * Note(s) : (1) This example shows how to initialize uC/HTTPs, initialize a web server instance and start it. * diff --git a/Server/Examples/Basic/app_basic.h b/Server/Examples/Basic/app_basic.h index 8b6e39f..86da8bf 100644 --- a/Server/Examples/Basic/app_basic.h +++ b/Server/Examples/Basic/app_basic.h @@ -18,7 +18,7 @@ * HTTP INSTANCE BASIC APPLICATION * * Filename : app_basic.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Examples/Basic/app_basic_http-s_hooks.c b/Server/Examples/Basic/app_basic_http-s_hooks.c index 9b90a01..3f0c3f7 100644 --- a/Server/Examples/Basic/app_basic_http-s_hooks.c +++ b/Server/Examples/Basic/app_basic_http-s_hooks.c @@ -18,7 +18,7 @@ * HTTP INSTANCE SERVER HOOKS FILE * * Filename : app_basic_http-s_hooks.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Examples/Basic/app_basic_http-s_instance_cfg.c b/Server/Examples/Basic/app_basic_http-s_instance_cfg.c index 3b4f067..c7ca5d1 100644 --- a/Server/Examples/Basic/app_basic_http-s_instance_cfg.c +++ b/Server/Examples/Basic/app_basic_http-s_instance_cfg.c @@ -18,7 +18,7 @@ * HTTP INSTANCE SERVER CONFIGURATION FILE * * Filename : app_basic_http-s_instance_cfg.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Examples/Basic/app_basic_http-s_instance_cfg.h b/Server/Examples/Basic/app_basic_http-s_instance_cfg.h index 0463ab5..5910539 100644 --- a/Server/Examples/Basic/app_basic_http-s_instance_cfg.h +++ b/Server/Examples/Basic/app_basic_http-s_instance_cfg.h @@ -18,7 +18,7 @@ * HTTP INSTANCE SERVER CONFIGURATION FILE * * Filename : app_basic_http-s_instance_cfg.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Examples/CtrlLayer/app_global.c b/Server/Examples/CtrlLayer/app_global.c index 684ffac..c6109ba 100644 --- a/Server/Examples/CtrlLayer/app_global.c +++ b/Server/Examples/CtrlLayer/app_global.c @@ -18,7 +18,7 @@ * HTTP APPLICATION WITH CONTROL LAYER * * Filename : app_global.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* * Note(s) : (1) This application regroup with the control layer a login layer, a default page app layer * and a REST app layer. diff --git a/Server/Examples/CtrlLayer/app_global.h b/Server/Examples/CtrlLayer/app_global.h index 8280a40..56e7127 100644 --- a/Server/Examples/CtrlLayer/app_global.h +++ b/Server/Examples/CtrlLayer/app_global.h @@ -18,7 +18,7 @@ * HTTP APPLICATION WITH CONTROL LAYER * * Filename : app_global.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* * Note(s) : (1) This application regroup with the control layer a login layer, a default page app layer * and a REST app layer. diff --git a/Server/Examples/CtrlLayer/app_global_auth_rights_cfg.h b/Server/Examples/CtrlLayer/app_global_auth_rights_cfg.h index 8d3c066..0e01f4d 100644 --- a/Server/Examples/CtrlLayer/app_global_auth_rights_cfg.h +++ b/Server/Examples/CtrlLayer/app_global_auth_rights_cfg.h @@ -18,7 +18,7 @@ * HTTP APPLICATION AUTHORIZATION RIGHTS * * Filename : app_global_auth_rights_cfg.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Examples/CtrlLayer/app_global_ctrl_layer_cfg.c b/Server/Examples/CtrlLayer/app_global_ctrl_layer_cfg.c index c735632..2564ed2 100644 --- a/Server/Examples/CtrlLayer/app_global_ctrl_layer_cfg.c +++ b/Server/Examples/CtrlLayer/app_global_ctrl_layer_cfg.c @@ -18,7 +18,7 @@ * HTTP APPLICATION CONTROL LAYER CONFIGURATION * * Filename : app_global_ctrl_layer_cfg.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Examples/CtrlLayer/app_global_ctrl_layer_cfg.h b/Server/Examples/CtrlLayer/app_global_ctrl_layer_cfg.h index 8c2e074..e808b80 100644 --- a/Server/Examples/CtrlLayer/app_global_ctrl_layer_cfg.h +++ b/Server/Examples/CtrlLayer/app_global_ctrl_layer_cfg.h @@ -18,7 +18,7 @@ * HTTP APPLICATION CONTROL LAYER CONFIGURATION * * Filename : app_global_ctrl_layer_cfg.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Examples/CtrlLayer/app_global_http-s_instance_cfg.c b/Server/Examples/CtrlLayer/app_global_http-s_instance_cfg.c index b9d9086..7370751 100644 --- a/Server/Examples/CtrlLayer/app_global_http-s_instance_cfg.c +++ b/Server/Examples/CtrlLayer/app_global_http-s_instance_cfg.c @@ -18,7 +18,7 @@ * HTTP INSTANCE SERVER CONFIGURATION FILE * * Filename : app_global_http-s_instance_cfg.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Examples/CtrlLayer/app_global_http-s_instance_cfg.h b/Server/Examples/CtrlLayer/app_global_http-s_instance_cfg.h index 45bf17d..8d8a7af 100644 --- a/Server/Examples/CtrlLayer/app_global_http-s_instance_cfg.h +++ b/Server/Examples/CtrlLayer/app_global_http-s_instance_cfg.h @@ -20,7 +20,7 @@ * TEMPLATE * * Filename : app_global_http-s_instance_cfg.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Examples/NoFS/app_no_fs.c b/Server/Examples/NoFS/app_no_fs.c index 4e82dcf..7d166ea 100644 --- a/Server/Examples/NoFS/app_no_fs.c +++ b/Server/Examples/NoFS/app_no_fs.c @@ -18,7 +18,7 @@ * HTTP INSTANCE INITALIZATION WITH NO FS APPLICATION * * Filename : app_no_fs.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* * Note(s) : (1) This example shows how to initialize uC/HTTPs without the need of a File System, * initialize a web server instance and start it. diff --git a/Server/Examples/NoFS/app_no_fs.h b/Server/Examples/NoFS/app_no_fs.h index 3d48db6..90b8db9 100644 --- a/Server/Examples/NoFS/app_no_fs.h +++ b/Server/Examples/NoFS/app_no_fs.h @@ -18,7 +18,7 @@ * HTTP INSTANCE INITALIZATION WITH NO FS APPLICATION * * Filename : app_no_fs.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Examples/NoFS/app_no_fs_http-s_hooks.c b/Server/Examples/NoFS/app_no_fs_http-s_hooks.c index 5ce7b20..f0d5aed 100644 --- a/Server/Examples/NoFS/app_no_fs_http-s_hooks.c +++ b/Server/Examples/NoFS/app_no_fs_http-s_hooks.c @@ -18,7 +18,7 @@ * HTTP INSTANCE SERVER HOOKS FILE * * Filename : app_no_fs_http-s_hooks.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Examples/NoFS/app_no_fs_http-s_instance_cfg.c b/Server/Examples/NoFS/app_no_fs_http-s_instance_cfg.c index c107816..4c5e5ac 100644 --- a/Server/Examples/NoFS/app_no_fs_http-s_instance_cfg.c +++ b/Server/Examples/NoFS/app_no_fs_http-s_instance_cfg.c @@ -18,7 +18,7 @@ * HTTP INSTANCE SERVER CONFIGURATION FILE * * Filename : app_no_fs_http-s_instance_cfg.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Examples/NoFS/app_no_fs_http-s_instance_cfg.h b/Server/Examples/NoFS/app_no_fs_http-s_instance_cfg.h index 779ad9c..aa490b1 100644 --- a/Server/Examples/NoFS/app_no_fs_http-s_instance_cfg.h +++ b/Server/Examples/NoFS/app_no_fs_http-s_instance_cfg.h @@ -18,7 +18,7 @@ * HTTP INSTANCE SERVER CONFIGURATION FILE * * Filename : app_no_fs_http-s_instance_cfg.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Examples/REST/app_rest.c b/Server/Examples/REST/app_rest.c index 1e6cb5a..a2f853c 100644 --- a/Server/Examples/REST/app_rest.c +++ b/Server/Examples/REST/app_rest.c @@ -18,7 +18,7 @@ * HTTP REST APPLICATION * * Filename : app_rest.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Examples/REST/app_rest.h b/Server/Examples/REST/app_rest.h index c07a973..9a617f1 100644 --- a/Server/Examples/REST/app_rest.h +++ b/Server/Examples/REST/app_rest.h @@ -18,7 +18,7 @@ * HTTP LOGIN APPLICATION * * Filename : app_rest.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Examples/REST/app_rest_http-s_instance_cfg.c b/Server/Examples/REST/app_rest_http-s_instance_cfg.c index 0ca4e4f..5bdd0a3 100644 --- a/Server/Examples/REST/app_rest_http-s_instance_cfg.c +++ b/Server/Examples/REST/app_rest_http-s_instance_cfg.c @@ -18,7 +18,7 @@ * HTTP INSTANCE SERVER CONFIGURATION FILE * * Filename : app_rest_http-s_instance_cfg.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Examples/REST/app_rest_http-s_instance_cfg.h b/Server/Examples/REST/app_rest_http-s_instance_cfg.h index 531dc32..29e23f4 100644 --- a/Server/Examples/REST/app_rest_http-s_instance_cfg.h +++ b/Server/Examples/REST/app_rest_http-s_instance_cfg.h @@ -20,7 +20,7 @@ * TEMPLATE * * Filename : app_rest_http-s_instance_cfg.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Examples/SSL-TLS/http-s_hooks.c b/Server/Examples/SSL-TLS/http-s_hooks.c index bfa8e06..966823b 100644 --- a/Server/Examples/SSL-TLS/http-s_hooks.c +++ b/Server/Examples/SSL-TLS/http-s_hooks.c @@ -18,7 +18,7 @@ * HTTP INSTANCE SERVER HOOKS FILE * * Filename : http-s_hooks.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Examples/SSL-TLS/http-s_instance_secure_cfg.c b/Server/Examples/SSL-TLS/http-s_instance_secure_cfg.c index f41264f..27cf670 100644 --- a/Server/Examples/SSL-TLS/http-s_instance_secure_cfg.c +++ b/Server/Examples/SSL-TLS/http-s_instance_secure_cfg.c @@ -18,7 +18,7 @@ * HTTP INSTANCE SERVER CONFIGURATION FILE * * Filename : http-s_instance_secure_cfg.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Examples/SSL-TLS/http-s_instance_secure_cfg.h b/Server/Examples/SSL-TLS/http-s_instance_secure_cfg.h index f986b7b..257bfb0 100644 --- a/Server/Examples/SSL-TLS/http-s_instance_secure_cfg.h +++ b/Server/Examples/SSL-TLS/http-s_instance_secure_cfg.h @@ -18,7 +18,7 @@ * HTTP INSTANCE SERVER CONFIGURATION FILE * * Filename : http-s_instance_secure_cfg.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/FS/Static/Cfg/Template/http-s_fs_static_cfg.h b/Server/FS/Static/Cfg/Template/http-s_fs_static_cfg.h index 0a2c028..caca853 100644 --- a/Server/FS/Static/Cfg/Template/http-s_fs_static_cfg.h +++ b/Server/FS/Static/Cfg/Template/http-s_fs_static_cfg.h @@ -18,7 +18,7 @@ * NET FS STATIC CONFIGURATION * * Filename : http-s_fs_static_cfg.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/FS/Static/http-s_fs_static.c b/Server/FS/Static/http-s_fs_static.c index 63ee7bb..5595b2a 100644 --- a/Server/FS/Static/http-s_fs_static.c +++ b/Server/FS/Static/http-s_fs_static.c @@ -20,7 +20,7 @@ * HTTPs STATIC FILE SYSTEM * * Filename : http-s_fs_static.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* * Note(s) : (1) All files MUST be added prior to the first file or directory access. * diff --git a/Server/FS/Static/http-s_fs_static.h b/Server/FS/Static/http-s_fs_static.h index 1370f4a..428db18 100644 --- a/Server/FS/Static/http-s_fs_static.h +++ b/Server/FS/Static/http-s_fs_static.h @@ -20,7 +20,7 @@ * HTTPs STATIC FILE SYSTEM * * Filename : http-s_fs_static.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/FS/Static/static_files.h b/Server/FS/Static/static_files.h index 4b656e8..df18006 100644 --- a/Server/FS/Static/static_files.h +++ b/Server/FS/Static/static_files.h @@ -18,7 +18,7 @@ * NO FILE SYSTEM * * Filename : static_files.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* * Note(s) : (1) This file defines the various arrays' content being used as file. ********************************************************************************************************* diff --git a/Server/Source/http-s.c b/Server/Source/http-s.c index 21d9bfb..f393bf1 100644 --- a/Server/Source/http-s.c +++ b/Server/Source/http-s.c @@ -3,7 +3,7 @@ * uC/HTTP * Hypertext Transfer Protocol * -* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com +* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com * * SPDX-License-Identifier: APACHE-2.0 * @@ -20,7 +20,7 @@ * HTTP SERVER * * Filename : http-s.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Source/http-s.h b/Server/Source/http-s.h index cb9be65..a84e1db 100644 --- a/Server/Source/http-s.h +++ b/Server/Source/http-s.h @@ -3,7 +3,7 @@ * uC/HTTP * Hypertext Transfer Protocol * -* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com +* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com * * SPDX-License-Identifier: APACHE-2.0 * @@ -20,7 +20,7 @@ * HTTP SERVER * * Filename : http-s.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ @@ -70,7 +70,7 @@ ********************************************************************************************************* */ -#define HTTPs_VERSION 30100u /* See Note #1. */ +#define HTTPs_VERSION 30101u /* See Note #1. */ /* diff --git a/Server/Source/http-s_conn.c b/Server/Source/http-s_conn.c index 09e4a38..6768a52 100644 --- a/Server/Source/http-s_conn.c +++ b/Server/Source/http-s_conn.c @@ -3,7 +3,7 @@ * uC/HTTP * Hypertext Transfer Protocol * -* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com +* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com * * SPDX-License-Identifier: APACHE-2.0 * @@ -20,7 +20,7 @@ * HTTP SERVER CONNECTION MODULE * * Filename : http-s_conn.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ @@ -91,6 +91,7 @@ void HTTPsConn_Process (HTTPs_INSTANCE *p_instance) const HTTPs_CFG *p_cfg; HTTPs_CONN *p_conn; HTTPs_CONN *p_conn_next; + NET_ERR net_err; CPU_BOOLEAN done; CPU_BOOLEAN hook_def; CPU_BOOLEAN process; @@ -138,6 +139,12 @@ void HTTPsConn_Process (HTTPs_INSTANCE *p_instance) case HTTPs_SOCK_STATE_ERR: /* Fatal err. */ + if (p_conn->State == HTTPs_CONN_STATE_ERR_INTERNAL) { + process = DEF_YES; + break; + } + /* 'break;' intentionally omitted. */ + case HTTPs_SOCK_STATE_CLOSE: /* Transaction completed. */ default: HTTPsConn_Close(p_instance, p_conn); @@ -237,7 +244,9 @@ void HTTPsConn_Process (HTTPs_INSTANCE *p_instance) case HTTPs_CONN_STATE_ERR_INTERNAL: HTTPsConn_ErrInternal(p_instance, p_conn); - p_conn->SockState = HTTPs_SOCK_STATE_CLOSE; + p_conn->SockState = NetSock_IsConn(p_conn->SockID, &net_err) ? + HTTPs_SOCK_STATE_ERR : + HTTPs_SOCK_STATE_CLOSE; break; @@ -457,8 +466,9 @@ static void HTTPsConn_ErrInternal (HTTPs_INSTANCE *p_instance, break; case HTTPs_ERR_FORM_FORMAT_INV: + case HTTPs_ERR_FORM_APP_PARSE_FAULT: HTTPs_ERR_INC(p_ctr_err->ErrInternal_ReqBodyFormFormatInvalid); - p_conn->StatusCode = HTTP_STATUS_INTERNAL_SERVER_ERR; + p_conn->StatusCode = HTTP_STATUS_BAD_REQUEST; break; case HTTPs_ERR_FORM_FILE_UPLOAD_OPEN: diff --git a/Server/Source/http-s_conn.h b/Server/Source/http-s_conn.h index df79427..d5369e7 100644 --- a/Server/Source/http-s_conn.h +++ b/Server/Source/http-s_conn.h @@ -3,7 +3,7 @@ * uC/HTTP * Hypertext Transfer Protocol * -* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com +* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com * * SPDX-License-Identifier: APACHE-2.0 * @@ -20,7 +20,7 @@ * HTTP SERVER CONNECTION MODULE * * Filename : http-s_conn.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Source/http-s_mem.c b/Server/Source/http-s_mem.c index 5e12863..be6d3e8 100644 --- a/Server/Source/http-s_mem.c +++ b/Server/Source/http-s_mem.c @@ -3,7 +3,7 @@ * uC/HTTP * Hypertext Transfer Protocol * -* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com +* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com * * SPDX-License-Identifier: APACHE-2.0 * @@ -20,7 +20,7 @@ * HTTP SERVER MEMORY LIBRARY * * Filename : http-s_mem.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Source/http-s_mem.h b/Server/Source/http-s_mem.h index 220762e..dfd95b2 100644 --- a/Server/Source/http-s_mem.h +++ b/Server/Source/http-s_mem.h @@ -3,7 +3,7 @@ * uC/HTTP * Hypertext Transfer Protocol * -* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com +* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com * * SPDX-License-Identifier: APACHE-2.0 * @@ -20,7 +20,7 @@ * HTTP SERVER MEMORY LIBRARY * * Filename : http-s_mem.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Source/http-s_req.c b/Server/Source/http-s_req.c index d94374f..227f108 100644 --- a/Server/Source/http-s_req.c +++ b/Server/Source/http-s_req.c @@ -3,7 +3,7 @@ * uC/HTTP * Hypertext Transfer Protocol * -* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com +* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com * * SPDX-License-Identifier: APACHE-2.0 * @@ -20,7 +20,7 @@ * HTTP SERVER REQUEST MODULE * * Filename : http-s_req.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ @@ -1601,7 +1601,7 @@ static void HTTPsReq_HdrParse (HTTPs_INSTANCE *p_instance, p_field_end, &len); if (p_val != DEF_NULL) { - len = p_field_end - p_val; + len = p_field_end - p_val; /* Get content type key by comparing field val name. */ field_key = HTTP_Dict_KeyGet(HTTP_Dict_ContentType, HTTP_Dict_ContentTypeSize, @@ -1629,40 +1629,49 @@ static void HTTPsReq_HdrParse (HTTPs_INSTANCE *p_instance, (HTTPs_CFG_FORM_MULTIPART_EN == DEF_ENABLED)) /* ----------------- STO BOUNDARY VAL ----------------- */ /* Boundary should be located after content type ... */ - /* val (see Note #3b). */ + /* ... val (see Note #3b). */ + + if ((p_cfg->FormCfgPtr != DEF_NULL) && + (p_conn->FormBoundaryPtr != DEF_NULL)) { /* Find end of content type val. */ - p_dictionary = HTTP_Dict_EntryGet(HTTP_Dict_ContentType, - HTTP_Dict_ContentTypeSize, - HTTP_CONTENT_TYPE_MULTIPART_FORM); - p_val = p_val + p_dictionary->StrLen + 1; - p_val = HTTP_StrGraphSrchFirst(p_val, len); - len = len - (p_val - p_field); + p_dictionary = HTTP_Dict_EntryGet(HTTP_Dict_ContentType, + HTTP_Dict_ContentTypeSize, + HTTP_CONTENT_TYPE_MULTIPART_FORM); + p_val = p_val + p_dictionary->StrLen + 1; + p_val = HTTP_StrGraphSrchFirst(p_val, len); + len = len - (p_val - p_field); /* Find beginning of boundary token. */ - p_val = Str_Str_N(p_val, - HTTP_STR_MULTIPART_BOUNDARY, - sizeof(HTTP_STR_MULTIPART_BOUNDARY)); + p_val = Str_Str_N(p_val, + HTTP_STR_MULTIPART_BOUNDARY, + sizeof(HTTP_STR_MULTIPART_BOUNDARY)); - if (p_val == DEF_NULL) { - *p_err = HTTPs_ERR_REQ_FORMAT_INVALID; - return; - } + if (p_val == DEF_NULL) { + *p_err = HTTPs_ERR_REQ_FORMAT_INVALID; + return; + } /* Boundary located after '='. */ - p_val = Str_Char_N(p_val, len, ASCII_CHAR_EQUALS_SIGN); - p_val++; /* Remove space before boundary val. */ - p_val = HTTP_StrGraphSrchFirst(p_val, - len); - len = p_field_end - p_val; + p_val = Str_Char_N(p_val, len, ASCII_CHAR_EQUALS_SIGN); + if (p_val == DEF_NULL) { + *p_err = HTTPs_ERR_REQ_FORMAT_INVALID; + return; + } + + p_val++; /* Remove space before boundary val. */ + p_val = HTTP_StrGraphSrchFirst(p_val, + len); + len = p_field_end - p_val; /* Copy boundary val to Conn struct. */ - Str_Copy_N(p_conn->FormBoundaryPtr, - p_val, - len); + Str_Copy_N(p_conn->FormBoundaryPtr, + p_val, + len); /* Make sure to create a string. */ - p_conn->FormBoundaryPtr[len] = ASCII_CHAR_NULL; + p_conn->FormBoundaryPtr[len] = ASCII_CHAR_NULL; - p_conn->FormBoundaryLen = len; + p_conn->FormBoundaryLen = len; + } #endif break; @@ -1676,8 +1685,8 @@ static void HTTPsReq_HdrParse (HTTPs_INSTANCE *p_instance, } } - } else { /* Should not occurs. */ - *p_err = HTTPs_ERR_REQ_MORE_DATA_REQUIRED; + } else { /* Should not occur. */ + *p_err = HTTPs_ERR_REQ_MORE_DATA_REQUIRED; return; } break; diff --git a/Server/Source/http-s_req.h b/Server/Source/http-s_req.h index dd8c509..7c704e1 100644 --- a/Server/Source/http-s_req.h +++ b/Server/Source/http-s_req.h @@ -3,7 +3,7 @@ * uC/HTTP * Hypertext Transfer Protocol * -* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com +* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com * * SPDX-License-Identifier: APACHE-2.0 * @@ -20,7 +20,7 @@ * HTTP SERVER REQUEST MODULE * * Filename : http-s_req.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Source/http-s_resp.c b/Server/Source/http-s_resp.c index a5f4f36..7785346 100644 --- a/Server/Source/http-s_resp.c +++ b/Server/Source/http-s_resp.c @@ -3,7 +3,7 @@ * uC/HTTP * Hypertext Transfer Protocol * -* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com +* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com * * SPDX-License-Identifier: APACHE-2.0 * @@ -20,7 +20,7 @@ * HTTP SERVER RESPONSE MODULE * * Filename : http-s_resp.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Source/http-s_resp.h b/Server/Source/http-s_resp.h index b7cfd98..d041063 100644 --- a/Server/Source/http-s_resp.h +++ b/Server/Source/http-s_resp.h @@ -3,7 +3,7 @@ * uC/HTTP * Hypertext Transfer Protocol * -* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com +* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com * * SPDX-License-Identifier: APACHE-2.0 * @@ -20,7 +20,7 @@ * HTTP SERVER RESPONSE MODULE * * Filename : http-s_resp.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Source/http-s_sock.c b/Server/Source/http-s_sock.c index ea729dd..1b8f174 100644 --- a/Server/Source/http-s_sock.c +++ b/Server/Source/http-s_sock.c @@ -3,7 +3,7 @@ * uC/HTTP * Hypertext Transfer Protocol * -* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com +* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com * * SPDX-License-Identifier: APACHE-2.0 * @@ -20,7 +20,7 @@ * HTTP SERVER SOCKET MODULE * * Filename : http-s_sock.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Source/http-s_sock.h b/Server/Source/http-s_sock.h index cfae951..8c3f83c 100644 --- a/Server/Source/http-s_sock.h +++ b/Server/Source/http-s_sock.h @@ -3,7 +3,7 @@ * uC/HTTP * Hypertext Transfer Protocol * -* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com +* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com * * SPDX-License-Identifier: APACHE-2.0 * @@ -20,7 +20,7 @@ * HTTP SERVER SOCKET MODULE * * Filename : http-s_sock.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Source/http-s_str.c b/Server/Source/http-s_str.c index c92c2dc..ccfbaec 100644 --- a/Server/Source/http-s_str.c +++ b/Server/Source/http-s_str.c @@ -3,7 +3,7 @@ * uC/HTTP * Hypertext Transfer Protocol * -* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com +* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com * * SPDX-License-Identifier: APACHE-2.0 * @@ -20,7 +20,7 @@ * HTTP SERVER STRING MODULE * * Filename : http-s_str.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Source/http-s_str.h b/Server/Source/http-s_str.h index 226f843..6e29ea5 100644 --- a/Server/Source/http-s_str.h +++ b/Server/Source/http-s_str.h @@ -3,7 +3,7 @@ * uC/HTTP * Hypertext Transfer Protocol * -* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com +* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com * * SPDX-License-Identifier: APACHE-2.0 * @@ -20,7 +20,7 @@ * HTTP SERVER STRING MODULE * * Filename : http-s_str.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Source/http-s_task.c b/Server/Source/http-s_task.c index 9f301c1..c974fef 100644 --- a/Server/Source/http-s_task.c +++ b/Server/Source/http-s_task.c @@ -3,7 +3,7 @@ * uC/HTTP * Hypertext Transfer Protocol * -* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com +* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com * * SPDX-License-Identifier: APACHE-2.0 * @@ -20,7 +20,7 @@ * HTTP SERVER TASK MODULE * * Filename : http-s_task.c -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/Server/Source/http-s_task.h b/Server/Source/http-s_task.h index 1951532..4035185 100644 --- a/Server/Source/http-s_task.h +++ b/Server/Source/http-s_task.h @@ -3,7 +3,7 @@ * uC/HTTP * Hypertext Transfer Protocol * -* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com +* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com * * SPDX-License-Identifier: APACHE-2.0 * @@ -20,7 +20,7 @@ * HTTP SERVER TASK MODULE * * Filename : http-s_task.h -* Version : V3.01.00 +* Version : V3.01.01 ********************************************************************************************************* */ diff --git a/readme.md b/readme.md deleted file mode 100644 index 3db0901..0000000 --- a/readme.md +++ /dev/null @@ -1,9 +0,0 @@ -# uC/HTTP - -The Micriµm HTTP product suite includes both µC/HTTPc and µC/HTTPs. - -µC/HTTPc is the Micrum HyperText Transport Protocol client. - -µC/HTTPs is a HyperText Transport Protocol server, a.k.a. web server. - -## For the complete documentation, visit https://doc.micrium.com/display/ucos/ \ No newline at end of file