Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
capnproto
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
capnproto
Commits
b0775d6d
Unverified
Commit
b0775d6d
authored
6 years ago
by
Kenton Varda
Committed by
GitHub
6 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #644 from capnproto/full-bodied-gets
Support sending GETs with bodies.
parents
5e7eb1d8
bfd0001a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
57 additions
and
7 deletions
+57
-7
http-test.c++
c++/src/kj/compat/http-test.c++
+32
-0
http.c++
c++/src/kj/compat/http.c++
+25
-7
No files found.
c++/src/kj/compat/http-test.c++
View file @
b0775d6d
...
...
@@ -699,6 +699,38 @@ kj::ArrayPtr<const HttpRequestTestCase> requestTestCases() {
{{
HttpHeaderId
::
HOST
,
HUGE_STRING
}},
uint64_t
(
0
),
{}
},
{
"GET /foo/bar HTTP/1.1
\r\n
"
"Content-Length: 6
\r\n
"
"Host: example.com
\r\n
"
"
\r\n
"
"foobar"
,
HttpMethod
::
GET
,
"/foo/bar"
,
{{
HttpHeaderId
::
HOST
,
"example.com"
}},
uint64_t
(
6
),
{
"foobar"
},
},
{
"GET /foo/bar HTTP/1.1
\r\n
"
"Transfer-Encoding: chunked
\r\n
"
"Host: example.com
\r\n
"
"
\r\n
"
"3
\r\n
"
"foo
\r\n
"
"3
\r\n
"
"bar
\r\n
"
"0
\r\n
"
"
\r\n
"
,
HttpMethod
::
GET
,
"/foo/bar"
,
{{
HttpHeaderId
::
HOST
,
"example.com"
},
{
HttpHeaderId
::
TRANSFER_ENCODING
,
"chunked"
}},
nullptr
,
{
"foo"
,
"bar"
},
}
};
// TODO(cleanup): A bug in GCC 4.8, fixed in 4.9, prevents REQUEST_TEST_CASES from implicitly
...
...
This diff is collapsed.
Click to expand it.
c++/src/kj/compat/http.c++
View file @
b0775d6d
...
...
@@ -2451,19 +2451,37 @@ public:
kj
::
StringPtr
connectionHeaders
[
CONNECTION_HEADERS_COUNT
];
kj
::
String
lengthStr
;
if
(
method
==
HttpMethod
::
GET
||
method
==
HttpMethod
::
HEAD
)
{
// No entity-body.
}
else
KJ_IF_MAYBE
(
s
,
expectedBodySize
)
{
lengthStr
=
kj
::
str
(
*
s
);
connectionHeaders
[
BuiltinHeaderIndices
::
CONTENT_LENGTH
]
=
lengthStr
;
bool
isGet
=
method
==
HttpMethod
::
GET
||
method
==
HttpMethod
::
HEAD
;
bool
hasBody
;
KJ_IF_MAYBE
(
s
,
expectedBodySize
)
{
if
(
isGet
&&
*
s
==
0
)
{
// GET with empty body; don't send any Content-Length.
hasBody
=
false
;
}
else
{
lengthStr
=
kj
::
str
(
*
s
);
connectionHeaders
[
BuiltinHeaderIndices
::
CONTENT_LENGTH
]
=
lengthStr
;
hasBody
=
true
;
}
}
else
{
connectionHeaders
[
BuiltinHeaderIndices
::
TRANSFER_ENCODING
]
=
"chunked"
;
if
(
isGet
&&
headers
.
get
(
HttpHeaderId
::
TRANSFER_ENCODING
)
==
nullptr
)
{
// GET with empty body; don't send any Transfer-Encoding.
hasBody
=
false
;
}
else
{
// HACK: Normally GET requests shouldn't have bodies. But, if the caller set a
// Transfer-Encoding header on a GET, we use this as a special signal that it might
// actually want to send a body. This allows pass-through of a GET request with a chunked
// body to "just work". We strongly discourage writing any new code that sends
// full-bodied GETs.
connectionHeaders
[
BuiltinHeaderIndices
::
TRANSFER_ENCODING
]
=
"chunked"
;
hasBody
=
true
;
}
}
httpOutput
.
writeHeaders
(
headers
.
serializeRequest
(
method
,
url
,
connectionHeaders
));
kj
::
Own
<
kj
::
AsyncOutputStream
>
bodyStream
;
if
(
method
==
HttpMethod
::
GET
||
method
==
HttpMethod
::
HEAD
)
{
if
(
!
hasBody
)
{
// No entity-body.
httpOutput
.
finishBody
();
bodyStream
=
heap
<
HttpNullEntityWriter
>
();
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment