Empty body for zero length payloads #522
Merged
+337
−6
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Update `RawRequest` and `HttpServerResponseImpl` so they return `content-length: 0` and an empty body when no writes are made to `HttpClientRequest` and `HttpServerResponse` respectively. This also adds some regression level tests against the bytes sent and received from the server.
| headers = _copyHeaders(); | ||
| headers.headers().set(HttpHeaderNames.CONTENT_LENGTH, 0); | ||
| } | ||
|
|
||
| Observable toReturn = Observable.just(headers); |
There was a problem hiding this comment.
This is cognate to ContentWriterImpl ll61
jamesgorman2
changed the title
| @@ -52,7 +52,7 @@ private HttpServerResponseImpl(final State<C> state) { | |||
| super(new OnSubscribe<Void>() { | |||
| @Override | |||
| public void call(Subscriber<? super Void> subscriber) { | |||
| state.sendHeaders().write(Observable.<C>empty()).unsafeSubscribe(subscriber); | |||
| state.sendHeaders().unsafeSubscribe(subscriber); | |||
| } | |||
There was a problem hiding this comment.
Turns out this is write unnecessary - this was causing differing behaviour between
public Observable<Void> handle(HttpServerRequest<ByteBuf> request, HttpServerResponse<ByteBuf> response) {
return response;
}
and
public Observable<Void> handle(HttpServerRequest<ByteBuf> request, HttpServerResponse<ByteBuf> response) {
return response
.sendHeaders();
}
the former previously returned with an empty chunk, the latter content-length: 0
|
@jamesgorman2 Thanks for this, good work. When you address my review comment, I will be happy to pull this in. |
Make in style of other tests byt hiding details. Move client test code over to client rule TO BE SQUASHED
jamesgorman2
force-pushed
the
zero-content-length
branch
from
33f7462 to
522d72c
Compare
| } | ||
|
|
||
|
|
||
| private static class RawMessageHandler extends ChannelDuplexHandler { |
There was a problem hiding this comment.
I've left this in to capture the response since there's no #channelProvider() method on the server side.
|
Thanks @jamesgorman2 ! |
This was referenced Jul 1, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update
RawRequestandHttpServerResponseImplso they returncontent-length: 0and an empty body when no writes are made toHttpClientRequestandHttpServerResponserespectively.This also adds some regression level tests against the bytes sent and received from the server.
(#470, #520)