* [RFC] http: remove experimental dechunk! method
@ 2015-03-02 20:34 Eric Wong
0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2015-03-02 20:34 UTC (permalink / raw)
To: unicorn-public
It was never used anywhere AFAIK and wastes precious bytes.
---
RFC since this didn't go through a deprecation period, but it's
never been documented or heavily publicized (but that goes for
this entire project :P)
ext/unicorn_http/unicorn_http.rl | 29 ---------------------------
test/unit/test_http_parser_ng.rb | 43 ----------------------------------------
2 files changed, 72 deletions(-)
diff --git a/ext/unicorn_http/unicorn_http.rl b/ext/unicorn_http/unicorn_http.rl
index 03b4726..4254540 100644
--- a/ext/unicorn_http/unicorn_http.rl
+++ b/ext/unicorn_http/unicorn_http.rl
@@ -590,34 +590,6 @@ static VALUE HttpParser_clear(VALUE self)
return self;
}
-/**
- * call-seq:
- * parser.dechunk! => parser
- *
- * Resets the parser to a state suitable for dechunking response bodies
- *
- */
-static VALUE HttpParser_dechunk_bang(VALUE self)
-{
- struct http_parser *hp = data_get(self);
-
- http_parser_init(hp);
-
- /*
- * we don't care about trailers in dechunk-only mode,
- * but if we did we'd set UH_FL_HASTRAILER and clear hp->env
- */
- if (0) {
- rb_funcall(hp->env, id_clear, 0);
- hp->flags = UH_FL_HASTRAILER;
- }
-
- hp->flags |= UH_FL_HASBODY | UH_FL_INBODY | UH_FL_CHUNKED;
- hp->cs = http_parser_en_ChunkedBody;
-
- return self;
-}
-
static void advance_str(VALUE str, off_t nr)
{
long len = RSTRING_LEN(str);
@@ -918,7 +890,6 @@ void Init_unicorn_http(void)
rb_define_alloc_func(cHttpParser, HttpParser_alloc);
rb_define_method(cHttpParser, "initialize", HttpParser_init, 0);
rb_define_method(cHttpParser, "clear", HttpParser_clear, 0);
- rb_define_method(cHttpParser, "dechunk!", HttpParser_dechunk_bang, 0);
rb_define_method(cHttpParser, "parse", HttpParser_parse, 0);
rb_define_method(cHttpParser, "add_parse", HttpParser_add_parse, 1);
rb_define_method(cHttpParser, "headers", HttpParser_headers, 2);
diff --git a/test/unit/test_http_parser_ng.rb b/test/unit/test_http_parser_ng.rb
index 0c81072..efd82e1 100644
--- a/test/unit/test_http_parser_ng.rb
+++ b/test/unit/test_http_parser_ng.rb
@@ -619,47 +619,4 @@ class HttpParserNgTest < Test::Unit::TestCase
assert_equal expect, env2
assert_equal "", @parser.buf
end
-
- def test_chunk_only
- tmp = ""
- assert_equal @parser, @parser.dechunk!
- assert_nil @parser.filter_body(tmp, "6\r\n")
- assert_equal "", tmp
- assert_nil @parser.filter_body(tmp, "abcdef")
- assert_equal "abcdef", tmp
- assert_nil @parser.filter_body(tmp, "\r\n")
- assert_equal "", tmp
- src = "0\r\n\r\n"
- assert_equal src.object_id, @parser.filter_body(tmp, src).object_id
- assert_equal "", tmp
- end
-
- def test_chunk_only_bad_align
- tmp = ""
- assert_equal @parser, @parser.dechunk!
- assert_nil @parser.filter_body(tmp, "6\r\na")
- assert_equal "a", tmp
- assert_nil @parser.filter_body(tmp, "bcde")
- assert_equal "bcde", tmp
- assert_nil @parser.filter_body(tmp, "f\r")
- assert_equal "f", tmp
- src = "\n0\r\n\r\n"
- assert_equal src.object_id, @parser.filter_body(tmp, src).object_id
- assert_equal "", tmp
- end
-
- def test_chunk_only_reset_ok
- tmp = ""
- assert_equal @parser, @parser.dechunk!
- src = "1\r\na\r\n0\r\n\r\n"
- assert_nil @parser.filter_body(tmp, src)
- assert_equal "a", tmp
- assert_equal src.object_id, @parser.filter_body(tmp, src).object_id
-
- assert_equal @parser, @parser.dechunk!
- src = "0\r\n\r\n"
- assert_equal src.object_id, @parser.filter_body(tmp, src).object_id
- assert_equal "", tmp
- assert_equal src, @parser.filter_body(tmp, src)
- end
end
--
EW
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2015-03-02 20:34 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-02 20:34 [RFC] http: remove experimental dechunk! method Eric Wong
Code repositories for project(s) associated with this public inbox
https://yhbt.net/unicorn.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).