diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-11 13:19:59 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-11 13:19:59 +0000 |
| commit | 26ef7179b0f6c3be8c76eefdca033392209ee42d (patch) | |
| tree | 06ea25a4404d94f98a2c42a56c34a9dfeb7a3aac /apps/netutils/webserver/Kconfig | |
| parent | ff113b400adf80f5bf6f07233a2355e48b00676d (diff) | |
| download | nuttx-26ef7179b0f6c3be8c76eefdca033392209ee42d.tar.gz nuttx-26ef7179b0f6c3be8c76eefdca033392209ee42d.tar.bz2 nuttx-26ef7179b0f6c3be8c76eefdca033392209ee42d.zip | |
AVR corrections from Richard Cochran; uIP webserver enhancements from Kate
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5126 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/netutils/webserver/Kconfig')
| -rw-r--r-- | apps/netutils/webserver/Kconfig | 37 |
1 files changed, 34 insertions, 3 deletions
diff --git a/apps/netutils/webserver/Kconfig b/apps/netutils/webserver/Kconfig index c3ebe755d..fd17a6a97 100644 --- a/apps/netutils/webserver/Kconfig +++ b/apps/netutils/webserver/Kconfig @@ -15,7 +15,8 @@ if NETUTILS_WEBSERVER config NETUTILS_HTTPD_SCRIPT_DISABLE bool "Disable %! scripting" - default n + default y if NETUTILS_HTTPD_SENDFILE + default n if !NETUTILS_HTTPD_SENDFILE ---help--- This option, if selected, will elide the %! scripting @@ -52,10 +53,40 @@ config NETUTILS_HTTPD_SERVERHEADER_DISABLE ---help--- This option, if selected, will elide the Server\: header +choice + prompt "File Transfer Method" + default NETUTILS_HTTPD_CLASSIC + +config NETUTILS_HTTPD_CLASSIC + bool "Pre-processed files" + ---help--- + Traditionally, the uIP-based webserver only sends "files" that have + been prepared as a data structure using nutts/tools/mkfsdata.pl + config NETUTILS_HTTPD_MMAP bool "File mmap-ing" - default n ---help--- - Replaces standard uIP server file open operations with mmap-ing operations. + Traditionally, the uIP-based webserver only sends "files" that have + been prepared as a data structure using nutts/tools/mkfsdata.pl + However, extensions have been contributed. If this option is + selected, then files can be accessed from the NuttX file system + as well. This selection will map the files into memory (using mmap) + so that the logic is still basically compatible with the classic + approach. + +config NETUTILS_HTTPD_MMAP + bool "sendfile()" + select NETUTILS_HTTPD_SCRIPT_DISABLE + ---help--- + Traditionally, the uIP-based webserver only sends "files" that have + been prepared as a data structure using nutts/tools/mkfsdata.pl + However, extensions have been contributed. If this option is + selected, then files can be accessed from the NuttX file system + as well. This selection will use the NuttX sendfile() interface + to send files. NOTE: if this option is selected, then scripting + must be disabled. + +endchoice + endif |