mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-12-25 18:14:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

httpd: ssi: support selecting ssi files by file flags, not by extension (at runtime) only

Browse Source
This commit is contained in:
goldsimon 2017-11-16 22:29:44 +01:00
parent 8bd670430a
commit da01bc4d15
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/apps/httpd/httpd.c
View File

@ -2234,8 +2234,16 @@ http_find_file(struct http_state *hs, const char *uri, int is_09)
} else { } else {
file = http_get_404_file(hs, &uri); file = http_get_404_file(hs, &uri);
} }
#if LWIP_HTTPD_SSI && LWIP_HTTPD_SSI_BY_FILE_EXTENSION #if LWIP_HTTPD_SSI
tag_check = http_uri_is_ssi(file, uri); if (file != NULL) {
if (file->flags & FS_FILE_FLAGS_SSI) {
tag_check = 1;
} else {
#if LWIP_HTTPD_SSI_BY_FILE_EXTENSION
tag_check = http_uri_is_ssi(file, uri);
#endif /* LWIP_HTTPD_SSI_BY_FILE_EXTENSION */
}
}
#endif /* LWIP_HTTPD_SSI */ #endif /* LWIP_HTTPD_SSI */
} }
if (file == NULL) { if (file == NULL) {

2
src/include/lwip/apps/fs.h
View File

@ -52,6 +52,8 @@ struct fsdata_chksum {
#define FS_FILE_FLAGS_HEADER_INCLUDED 0x01 #define FS_FILE_FLAGS_HEADER_INCLUDED 0x01
#define FS_FILE_FLAGS_HEADER_PERSISTENT 0x02 #define FS_FILE_FLAGS_HEADER_PERSISTENT 0x02
#define FS_FILE_FLAGS_HEADER_KEEPALIVE 0x04
#define FS_FILE_FLAGS_SSI 0x08
/** Define FS_FILE_EXTENSION_T_DEFINED if you have typedef'ed to your private /** Define FS_FILE_EXTENSION_T_DEFINED if you have typedef'ed to your private
* pointer type (defaults to 'void' so the default usage is 'void*') * pointer type (defaults to 'void' so the default usage is 'void*')