Thanks to visit codestin.com
Credit goes to github.com

Skip to content

move chunked encoding code to http1 protocol handler #1819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Aug 9, 2018
Merged

move chunked encoding code to http1 protocol handler #1819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
37025e9
move chunked encoding code to http1 protocol handler
i110 Jul 31, 2018
e152ff4
simplify, by omitting the creating of a temporary list, and by making…
kazuho Aug 1, 2018
f40d93b
add an assertion: see https://github.com/h2o/h2o/pull/1819#pullreques…
i110 Aug 2, 2018
d60f7b1
drop off the chunked flag explicitly
i110 Aug 2, 2018
e4ef3a8
apply chunked encoding to pull mode responses collectly
i110 Aug 2, 2018
c151142
remove needless comment
i110 Aug 2, 2018
790c883
only close connection if the request was broken
i110 Aug 2, 2018
982f606
add test for chunked encoding in pull mode
i110 Aug 3, 2018
c5ab415
optimize for pull+content-length case
kazuho Aug 8, 2018
61efbcb
reduce the size of ostr_final to speed up the initialization of the o…
kazuho Aug 8, 2018
8d2992c
Merge branch 'master' into i110/remove-chunked-filter
kazuho Aug 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,6 @@ SET(LIB_SOURCE_FILES
lib/core/util.c

lib/handler/access_log.c
lib/handler/chunked.c
lib/handler/compress.c
lib/handler/compress/gzip.c
lib/handler/errordoc.c
Expand Down
8 changes: 0 additions & 8 deletions h2o.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@
107923A619A3215F00C52AD6 /* http2.h in Headers */ = {isa = PBXBuildFile; fileRef = 107923A119A3215F00C52AD6 /* http2.h */; };
107923A719A3215F00C52AD6 /* token.h in Headers */ = {isa = PBXBuildFile; fileRef = 107923A219A3215F00C52AD6 /* token.h */; };
107923A919A3215F00C52AD6 /* h2o.h in Headers */ = {isa = PBXBuildFile; fileRef = 107923A419A3215F00C52AD6 /* h2o.h */; };
107923C219A3217300C52AD6 /* chunked.c in Sources */ = {isa = PBXBuildFile; fileRef = 107923AE19A3217300C52AD6 /* chunked.c */; };
107923C319A3217300C52AD6 /* file.c in Sources */ = {isa = PBXBuildFile; fileRef = 107923AF19A3217300C52AD6 /* file.c */; };
107923C519A3217300C52AD6 /* http1.c in Sources */ = {isa = PBXBuildFile; fileRef = 107923B119A3217300C52AD6 /* http1.c */; };
107923C619A3217300C52AD6 /* connection.c in Sources */ = {isa = PBXBuildFile; fileRef = 107923B319A3217300C52AD6 /* connection.c */; };
Expand All @@ -124,7 +123,6 @@
1079242919A325BE00C52AD6 /* simple.c in Sources */ = {isa = PBXBuildFile; fileRef = 107923FC19A3238500C52AD6 /* simple.c */; settings = {COMPILER_FLAGS = "-Wno-deprecated-declarations"; }; };
1079243019A3260E00C52AD6 /* libh2o.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1079231519A320A700C52AD6 /* libh2o.a */; };
1079244119A3264300C52AD6 /* picohttpparser.c in Sources */ = {isa = PBXBuildFile; fileRef = 1079235A19A3210D00C52AD6 /* picohttpparser.c */; };
1079244419A3265C00C52AD6 /* chunked.c in Sources */ = {isa = PBXBuildFile; fileRef = 107923AE19A3217300C52AD6 /* chunked.c */; };
1079244719A3265C00C52AD6 /* http1.c in Sources */ = {isa = PBXBuildFile; fileRef = 107923B119A3217300C52AD6 /* http1.c */; };
1079244819A3265C00C52AD6 /* connection.c in Sources */ = {isa = PBXBuildFile; fileRef = 107923B319A3217300C52AD6 /* connection.c */; };
1079244A19A3266700C52AD6 /* frame.c in Sources */ = {isa = PBXBuildFile; fileRef = 107923B819A3217300C52AD6 /* frame.c */; };
Expand Down Expand Up @@ -307,7 +305,6 @@
E9708B681E52C80F0029E0A5 /* throttle_resp.c in Sources */ = {isa = PBXBuildFile; fileRef = 10C45D4E1CFD15FA0096DB06 /* throttle_resp.c */; };
E9708B691E52C80F0029E0A5 /* http2_debug_state.c in Sources */ = {isa = PBXBuildFile; fileRef = 084FC7C31D54BB9200E89F66 /* http2_debug_state.c */; };
E9708B6A1E52C81D0029E0A5 /* access_log.c in Sources */ = {isa = PBXBuildFile; fileRef = 101B670B19ADD3380084A351 /* access_log.c */; };
E9708B6B1E52C81D0029E0A5 /* chunked.c in Sources */ = {isa = PBXBuildFile; fileRef = 107923AE19A3217300C52AD6 /* chunked.c */; };
E9708B6C1E52C81D0029E0A5 /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = 1070866B1B787D06002B8F18 /* compress.c */; };
E9708B6D1E52C8250029E0A5 /* gzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 107E340F1C7EB13F00AEF5F8 /* gzip.c */; };
E9708B721E52C82A0029E0A5 /* errordoc.c in Sources */ = {isa = PBXBuildFile; fileRef = 106C22FE1C05436100405689 /* errordoc.c */; };
Expand Down Expand Up @@ -654,7 +651,6 @@
107923A319A3215F00C52AD6 /* websocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = websocket.h; sourceTree = "<group>"; };
107923A419A3215F00C52AD6 /* h2o.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = h2o.h; sourceTree = "<group>"; };
107923AB19A3216B00C52AD6 /* tokens.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = tokens.pl; sourceTree = "<group>"; };
107923AE19A3217300C52AD6 /* chunked.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = chunked.c; sourceTree = "<group>"; };
107923AF19A3217300C52AD6 /* file.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = file.c; sourceTree = "<group>"; };
107923B019A3217300C52AD6 /* headers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = headers.c; sourceTree = "<group>"; };
107923B119A3217300C52AD6 /* http1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = http1.c; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1123,7 +1119,6 @@
children = (
105534D91A3C7A2000627ECB /* configurator */,
101B670B19ADD3380084A351 /* access_log.c */,
107923AE19A3217300C52AD6 /* chunked.c */,
7D9372FD202AC70F005FE6AB /* server_timing.c */,
1070866B1B787D06002B8F18 /* compress.c */,
107E340E1C7EB10700AEF5F8 /* compress */,
Expand Down Expand Up @@ -2470,7 +2465,6 @@
104B9A491A5F9638009EEE64 /* headers.c in Sources */,
106C22FF1C05436100405689 /* errordoc.c in Sources */,
10C45D4F1CFD15FA0096DB06 /* throttle_resp.c in Sources */,
107923C219A3217300C52AD6 /* chunked.c in Sources */,
10A3D4081B50DAB700327CF9 /* close.c in Sources */,
105534EF1A440FC800627ECB /* config.c in Sources */,
10E299581A67E68500701AA6 /* scheduler.c in Sources */,
Expand Down Expand Up @@ -2545,7 +2539,6 @@
107D4D451B5880BC004A9B21 /* api.c in Sources */,
E987E5F31FD8C04D00DE4346 /* compress_fragment.c in Sources */,
1079245119A3266700C52AD6 /* token.c in Sources */,
1079244419A3265C00C52AD6 /* chunked.c in Sources */,
1070866A1B70A00F002B8F18 /* casper.c in Sources */,
E987E5F51FD8C04D00DE4346 /* encode.c in Sources */,
E987E5FC1FD8C04D00DE4346 /* utf8_util.c in Sources */,
Expand Down Expand Up @@ -2664,7 +2657,6 @@
E9708B651E52C80F0029E0A5 /* redirect.c in Sources */,
08F320DD1E7A9CA60038FA5A /* redis.c in Sources */,
10756E2A1AC126420009BF57 /* api.c in Sources */,
E9708B6B1E52C81D0029E0A5 /* chunked.c in Sources */,
7D9372FE202AC70F005FE6AB /* server_timing.c in Sources */,
10756E2B1AC126420009BF57 /* dumper.c in Sources */,
E9708B721E52C82A0029E0A5 /* errordoc.c in Sources */,
Expand Down
11 changes: 0 additions & 11 deletions include/h2o.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,10 +1125,6 @@ struct st_h2o_req_t {
* For delegated responses, redirect responses would be handled internally.
*/
unsigned char res_is_delegated : 1;
/**
* whether if the bytes sent is counted by ostreams other than final ostream
*/
unsigned char bytes_counted_by_ostream : 1;
/**
* set by the generator if the protocol handler should replay the request upon seeing 425
*/
Expand Down Expand Up @@ -1757,13 +1753,6 @@ h2o_access_log_filehandle_t *h2o_access_log_open_handle(const char *path, const
h2o_logger_t *h2o_access_log_register(h2o_pathconf_t *pathconf, h2o_access_log_filehandle_t *handle);
void h2o_access_log_register_configurator(h2o_globalconf_t *conf);

/* lib/chunked.c */

/**
* registers the chunked encoding output filter (added by default)
*/
void h2o_chunked_register(h2o_pathconf_t *pathconf);

/* lib/handler/server_timing.c */
void h2o_server_timing_register(h2o_pathconf_t *pathconf, int enforce);
void h2o_server_timing_register_configurator(h2o_globalconf_t *conf);
Expand Down
1 change: 0 additions & 1 deletion lib/core/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ void h2o_config_init_pathconf(h2o_pathconf_t *pathconf, h2o_globalconf_t *global
{
memset(pathconf, 0, sizeof(*pathconf));
pathconf->global = globalconf;
h2o_chunked_register(pathconf);
if (path != NULL)
pathconf->path = h2o_strdup(NULL, path, SIZE_MAX);
h2o_mem_addref_shared(mimemap);
Expand Down
123 changes: 0 additions & 123 deletions lib/handler/chunked.c
View file
Open in desktop

This file was deleted.

Loading