apache/nuttx-apps
1
0
Fork 0
mirror of https://github.com/apache/nuttx-apps.git synced 2025-10-19 11:23:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged in masayuki2009/nuttx.apps/fix_webserver (pull request #179)

Browse Source 
apps/examples/webserver: Fix to compile with CONFIG_NETUTILS_HTTPD_SENDFILE=y

Also, in this PR, some configs such as CONFIG_NETUTILS_HTTPDFILESTATS
can be selected by menuconfig.

Signed-off-by: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com>

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
Masayuki Ishikawa
2019-07-03 12:20:29 +00:00
committed by Gregory Nutt
parent ee8af2a59e
commit b12b61df69
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/webserver/webserver_main.c
View File

@@ -189,7 +189,9 @@ int webserver_main(int argc, char *argv[])
#ifdef CONFIG_NET_TCP #ifdef CONFIG_NET_TCP
printf("Starting webserver\n"); printf("Starting webserver\n");
httpd_init(); httpd_init();
#ifndef CONFIG_NETUTILS_HTTPD_SCRIPT_DISABLE
cgi_register(); cgi_register();
#endif
httpd_listen(); httpd_listen();
#endif #endif

12
include/netutils/httpd.h
View File

@@ -63,18 +63,6 @@
# define CONFIG_NETUTILS_HTTPDSTACKSIZE 4096 # define CONFIG_NETUTILS_HTTPDSTACKSIZE 4096
#endif #endif
#ifndef CONFIG_NETUTILS_HTTPDFSSTATS
# define CONFIG_NETUTILS_HTTPDFSSTATS
#endif
#ifndef CONFIG_NETUTILS_HTTPDFILESTATS
# define CONFIG_NETUTILS_HTTPDFILESTATS
#endif
#ifndef CONFIG_NET_STATISTICS
# undef CONFIG_NETUTILS_HTTPDNETSTATS
#endif
/* For efficiency reasons, the size of the IO buffer should be a multiple /* For efficiency reasons, the size of the IO buffer should be a multiple
* of the TCP MSS value. Also, the current design requires that the IO * of the TCP MSS value. Also, the current design requires that the IO
* buffer be sufficiently large to contain the entire GET request. * buffer be sufficiently large to contain the entire GET request.

15
netutils/webserver/Kconfig
View File

@@ -158,4 +158,19 @@ config NETUTILS_HTTPD_KEEPALIVE_DISABLE
Keep-alive should normally be disabled if timeouts are enabled, Keep-alive should normally be disabled if timeouts are enabled,
otherwise a rogue HTTP client could block the httpd indefinitely. otherwise a rogue HTTP client could block the httpd indefinitely.
config NETUTILS_HTTPDFILESTATS
bool "Show file stats"
depends on !NETUTILS_HTTPD_SCRIPT_DISABLE
default y
config NETUTILS_HTTPDFSSTATS
bool "Show fs stats"
depends on !NETUTILS_HTTPD_SCRIPT_DISABLE
default y
config NETUTILS_HTTPDNETSTATS
bool "Show net stats"
depends on !NETUTILS_HTTPD_SCRIPT_DISABLE && NET_STATISTICS
default y
endif # NETUTILS_WEBSERVER endif # NETUTILS_WEBSERVER