pdxx
/
fastdfs
mirror of https://github.com/happyfish100/fastdfs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

http.conf add parameter http.multi_range.enabed

pull/56/merge
yuqing 2017-05-26 10:42:16 +08:00
parent 7042f8d061
commit 712d9010d7
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -1,7 +1,8 @@
Version 5.11 2017-05-25 Version 5.11 2017-05-26
* bug fixed: file_offset has no effect when use trunk file * bug fixed: file_offset has no effect when use trunk file
* add storage access log header * add storage access log header
* http.conf add parameter http.multi_range.enabed
Version 5.10 2017-03-29 Version 5.10 2017-03-29
* use fc_safe_read instead of read, and fc_safe_write instead of write * use fc_safe_read instead of read, and fc_safe_write instead of write

11
common/fdfs_http_shared.c
View File

@ -124,6 +124,10 @@ int fdfs_http_params_load(IniContext *pIniContext, \
"http.need_find_content_type", \ "http.need_find_content_type", \
pIniContext, true); pIniContext, true);
pParams->support_multi_range = iniGetBoolValue(NULL, \
"http.multi_range.enabed", \
pIniContext, true);
pParams->server_port = iniGetIntValue(NULL, "http.server_port", \ pParams->server_port = iniGetIntValue(NULL, "http.server_port", \
pIniContext, 80); pIniContext, 80);
if (pParams->server_port <= 0) if (pParams->server_port <= 0)
@ -137,7 +141,8 @@ int fdfs_http_params_load(IniContext *pIniContext, \
pParams->anti_steal_token = iniGetBoolValue(NULL, \ pParams->anti_steal_token = iniGetBoolValue(NULL, \
"http.anti_steal.check_token", \ "http.anti_steal.check_token", \
pIniContext, false); pIniContext, false);
if (pParams->need_find_content_type || pParams->anti_steal_token) if (pParams->need_find_content_type || pParams->anti_steal_token ||
pParams->support_multi_range)
{ {
mime_types_filename = iniGetStrValue(NULL, "http.mime_types_filename", \ mime_types_filename = iniGetStrValue(NULL, "http.mime_types_filename", \
pIniContext); pIniContext);
@ -275,7 +280,7 @@ int fdfs_http_params_load(IniContext *pIniContext, \
return result; return result;
} }
if (!pParams->need_find_content_type) if (!(pParams->need_find_content_type || pParams->support_multi_range))
{ {
hash_destroy(&pParams->content_type_hash); hash_destroy(&pParams->content_type_hash);
} }
@ -294,7 +299,7 @@ int fdfs_http_params_load(IniContext *pIniContext, \
void fdfs_http_params_destroy(FDFSHTTPParams *pParams) void fdfs_http_params_destroy(FDFSHTTPParams *pParams)
{ {
if (pParams->need_find_content_type) if (!(pParams->need_find_content_type || pParams->support_multi_range))
{ {
hash_destroy(&pParams->content_type_hash); hash_destroy(&pParams->content_type_hash);
} }

3
common/fdfs_http_shared.h
View File

@ -25,6 +25,9 @@ typedef struct
/* if need find content type by file extension name */ /* if need find content type by file extension name */
bool need_find_content_type; bool need_find_content_type;
/* if support multi range */
bool support_multi_range;
/* the web server port */ /* the web server port */
int server_port; int server_port;

3
conf/http.conf
View File

@ -24,3 +24,6 @@ http.anti_steal.secret_key=FastDFS1234567890
# default value is empty (no file sepecified) # default value is empty (no file sepecified)
http.anti_steal.token_check_fail=/home/yuqing/fastdfs/conf/anti-steal.jpg http.anti_steal.token_check_fail=/home/yuqing/fastdfs/conf/anti-steal.jpg
# if support multi regions for HTTP Range
# default value is true
http.multi_range.enabed = true