Skip to content

Commit 52a438e

Browse files
authored
Merge pull request #145 from kevinresol/fix/header-toString-blank-line
Fix extra blank line when serializing empty header
2 parents 6fe0c03 + 4183122 commit 52a438e

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/tink/http/Header.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ class Header {
140140
inline function get_LINEBREAK() return '\r\n';
141141

142142
public function toString()
143-
return [for (f in fields) f.toString()].join(LINEBREAK) + LINEBREAK + LINEBREAK;
143+
return [for (f in fields) f.toString() + LINEBREAK].join('') + LINEBREAK;
144144

145145
inline function headerNotFound(name)
146146
return 'No $name header found';

tests/TestHeader.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class TestHeader {
2121
static public var credentials(default, null) = 'usr:pwd';
2222
static public var auth(default, null) = HeaderValue.basicAuth(credentials.split(':')[0], credentials.split(':')[1]);
2323
@:describe('Build Outgoing Request Header')
24-
@:variant(GET, 'https://www.example.com', HTTP1_1, [], 'GET / HTTP/1.1\r\n\r\n\r\n')
24+
@:variant(GET, 'https://www.example.com', HTTP1_1, [], 'GET / HTTP/1.1\r\n\r\n')
2525
@:variant(GET, 'https://www.example.com', HTTP2, [new tink.http.Header.HeaderField('host', 'v')], 'GET / HTTP/2\r\nhost: v\r\n\r\n')
2626
@:variant(GET, 'https://${TestHeader.credentials}@www.example.com', HTTP2, [], 'GET / HTTP/2\r\nauthorization: ${TestHeader.auth}\r\n\r\n')
2727
@:variant(GET, 'https://www.example.com', HTTP2, [new tink.http.Header.HeaderField(AUTHORIZATION, TestHeader.auth)], 'GET / HTTP/2\r\nauthorization: ${TestHeader.auth}\r\n\r\n')
@@ -31,7 +31,7 @@ class TestHeader {
3131
}
3232
#end
3333

34-
@:variant(200, 'OK', HTTP1_1, [], 'HTTP/1.1 200 OK\r\n\r\n\r\n')
34+
@:variant(200, 'OK', HTTP1_1, [], 'HTTP/1.1 200 OK\r\n\r\n')
3535
@:variant(403, 'Forbidden', HTTP2, [new tink.http.Header.HeaderField('content-length', '0')], 'HTTP/2 403 Forbidden\r\ncontent-length: 0\r\n\r\n')
3636
public function buildResponseHeader(code:Int, reason:String, version:Protocol, fields:Array<HeaderField>, str:String) {
3737
var header = new ResponseHeader(code, reason, fields, version);

0 commit comments

Comments
 (0)