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

server_expect_body_length etc.: remove useless task parameter

storage_pool
YuQing 2021-03-16 19:05:50 +08:00
parent aa4f66c578
commit f60fcf0d82
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sf_binlog_writer.c
View File

@ -596,7 +596,7 @@ int sf_binlog_writer_init_normal(SFBinlogWriterInfo *writer,
return result; return result;
} }
if (create) { if (create) {
SF_CHOWN_RETURN_ON_ERROR(filepath, geteuid(), getegid()); SF_CHOWN_TO_RUNBY_RETURN_ON_ERROR(filepath);
} }
writer->file.fd = -1; writer->file.fd = -1;

3
src/sf_global.h
View File

@ -101,6 +101,9 @@ extern SFContext g_sf_context;
} \ } \
} while (0) } while (0)
#define SF_CHOWN_TO_RUNBY_RETURN_ON_ERROR(path) \
SF_CHOWN_RETURN_ON_ERROR(path, geteuid(), getegid())
#define SF_SET_CONTEXT_INI_CONFIG(config, filename, pIniContext, \ #define SF_SET_CONTEXT_INI_CONFIG(config, filename, pIniContext, \
section_name, def_inner_port, def_outer_port, def_work_threads) \ section_name, def_inner_port, def_outer_port, def_work_threads) \
do { \ do { \

8
src/sf_proto.h
View File

@ -309,19 +309,19 @@ static inline int sf_server_check_body_length(
body_length, max_body_length); body_length, max_body_length);
} }
#define server_expect_body_length(task, expect_body_len) \ #define server_expect_body_length(expect_body_len) \
sf_server_expect_body_length(&RESPONSE, REQUEST.header.body_len, \ sf_server_expect_body_length(&RESPONSE, REQUEST.header.body_len, \
expect_body_len) expect_body_len)
#define server_check_min_body_length(task, min_body_length) \ #define server_check_min_body_length(min_body_length) \
sf_server_check_min_body_length(&RESPONSE, REQUEST.header.body_len, \ sf_server_check_min_body_length(&RESPONSE, REQUEST.header.body_len, \
min_body_length) min_body_length)
#define server_check_max_body_length(task, max_body_length) \ #define server_check_max_body_length(max_body_length) \
sf_server_check_max_body_length(&RESPONSE, REQUEST.header.body_len, \ sf_server_check_max_body_length(&RESPONSE, REQUEST.header.body_len, \
max_body_length) max_body_length)
#define server_check_body_length(task, min_body_length, max_body_length) \ #define server_check_body_length(min_body_length, max_body_length) \
sf_server_check_body_length(&RESPONSE, REQUEST.header.body_len, \ sf_server_check_body_length(&RESPONSE, REQUEST.header.body_len, \
min_body_length, max_body_length) min_body_length, max_body_length)