Skip to content

Commit 9b2ab61

Browse files
author
Steven Liu
committed
add new line to debug dev after dumping body to debug dev
1 parent 5bc7b0d commit 9b2ab61

File tree

3 files changed

+37
-0
lines changed

3 files changed

+37
-0
lines changed

lib/httpclient.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,6 +1256,8 @@ def do_get_block(req, proxy, conn, &block)
12561256
content << part
12571257
end
12581258
end
1259+
@debug_dev << "\n" if @debug_dev
1260+
12591261
# there could be a race condition but it's OK to cache unreusable
12601262
# connection because we do retry for that case.
12611263
@session_manager.keep(sess) unless sess.closed?
@@ -1290,6 +1292,8 @@ def do_get_stream(req, proxy, conn)
12901292
set_encoding(part, res.body_encoding)
12911293
pipew.write(part)
12921294
end
1295+
@debug_dev << "\n" if @debug_dev
1296+
12931297
pipew.close
12941298
@session_manager.keep(sess) unless sess.closed?
12951299
_ = @request_filter.collect { |filter|

test/test_http-access2.rb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,15 @@ def test_debug_dev
6060
assert(!str.empty?)
6161
end
6262

63+
def test_debug_dev_shared_dev
64+
str = "".dup
65+
@client.debug_dev = str
66+
@client.get(serverurl)
67+
str << "another stuff\n"
68+
lines = str.split(/(?:\r?\n)+/)
69+
assert_equal('another stuff', lines[-1])
70+
end
71+
6372
def _test_protocol_version_http09
6473
@client.protocol_version = 'HTTP/0.9'
6574
str = "".dup

test/test_httpclient.rb

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,18 @@ def test_debug_dev
5757
assert(!str.empty?)
5858
end
5959

60+
def test_debug_dev_shared_dev
61+
str = "".dup
62+
@client.debug_dev = str
63+
@client.get(serverurl + 'hello')
64+
65+
str << "another stuff\n"
66+
lines = str.split(/(?:\r?\n)+/)
67+
68+
assert_equal('hello', lines[-2])
69+
assert_equal('another stuff', lines[-1])
70+
end
71+
6072
def test_debug_dev_stream
6173
str = "".dup
6274
@client.debug_dev = str
@@ -65,6 +77,18 @@ def test_debug_dev_stream
6577
assert(!str.empty?)
6678
end
6779

80+
def test_debug_dev_stream_shared_dev
81+
str = "".dup
82+
@client.debug_dev = str
83+
conn = @client.get_async(serverurl)
84+
Thread.pass while !conn.finished?
85+
86+
str << "another stuff\n"
87+
lines = str.split(/(?:\r?\n)+/)
88+
89+
assert_equal('another stuff', lines[-1])
90+
end
91+
6892
def test_protocol_version_http09
6993
@client.protocol_version = 'HTTP/0.9'
7094
@client.debug_dev = str = ''.dup

0 commit comments

Comments
 (0)