diff options
| author | lishu <[email protected]> | 2018-12-28 14:32:04 +0800 |
|---|---|---|
| committer | lishu <[email protected]> | 2018-12-28 14:32:04 +0800 |
| commit | 5c446067492e4f7a444c55bd955ad7f51946db37 (patch) | |
| tree | ea2bc0faa4cb97de00ad2aedd9424606518f02f5 /src | |
| parent | 3c39b52d815b771eef7398e2b229c1ebe4dffab1 (diff) | |
| parent | 23b9b2da400a828f750bdc88a09db003b3a8cb2e (diff) | |
Merge branch 'master' of https://git.mesalab.cn/MESA_Platform/http
# Conflicts:
# bin/http.inf
# readme.txt
# src/HTTP_Analyze.c
# src/HTTP_Analyze.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/HTTP_Analyze.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/HTTP_Analyze.c b/src/HTTP_Analyze.c index 5fcfa9f..5ff5e5c 100644 --- a/src/HTTP_Analyze.c +++ b/src/HTTP_Analyze.c @@ -904,8 +904,7 @@ uchar http_judgeHttpProtocol(http_stream *a_http_stream, uchar curdir, struct tc } return GO_BACK; } - //��־һ������buffer���棬һ������data���� - + //��־һ������buffer���棬һ������data���� /*20181113*/ //a_http_stream->pbuf = (char*)dictator_realloc(thread_seq, a_http_stream->pbuf, HTTP_START_FLAGS_LEN); //memcpy((void*)(a_http_stream->pbuf+(*buflen)), (void*)((uchar*)tcp_detail->pdata+*offset),HTTP_START_FLAGS_LEN-*buflen); |