New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow a maximum size parameter for HttpEntity 'toStrict' #2186

Merged
merged 9 commits into from Sep 5, 2018

Conversation

Projects
None yet
4 participants
@raboof
Member

raboof commented Aug 31, 2018

Refs #2137

@akka-ci

This comment has been minimized.

Show comment
Hide comment
@akka-ci

akka-ci Aug 31, 2018

Collaborator

Test FAILed.

Collaborator

akka-ci commented Aug 31, 2018

Test FAILed.

@akka-ci

This comment has been minimized.

Show comment
Hide comment
@akka-ci

akka-ci Sep 3, 2018

Collaborator

Test PASSed.

Collaborator

akka-ci commented Sep 3, 2018

Test PASSed.

@akka-ci

This comment has been minimized.

Show comment
Hide comment
@akka-ci

akka-ci Sep 3, 2018

Collaborator

Test PASSed.

Collaborator

akka-ci commented Sep 3, 2018

Test PASSed.

@akka-ci

This comment has been minimized.

Show comment
Hide comment
@akka-ci

akka-ci Sep 3, 2018

Collaborator

Test PASSed.

Collaborator

akka-ci commented Sep 3, 2018

Test PASSed.

@akka-ci

This comment has been minimized.

Show comment
Hide comment
@akka-ci

akka-ci Sep 4, 2018

Collaborator

Test FAILed.

Collaborator

akka-ci commented Sep 4, 2018

Test FAILed.

@akka-ci akka-ci added validating and removed needs-attention labels Sep 4, 2018

@raboof raboof changed the title from [wip] Allow a maximum size parameter for HttpEntity 'toStrict' to Allow a maximum size parameter for HttpEntity 'toStrict' Sep 4, 2018

@akka-ci akka-ci added needs-attention and removed validating labels Sep 4, 2018

@akka-ci

This comment has been minimized.

Show comment
Hide comment
@akka-ci

akka-ci Sep 4, 2018

Collaborator

Test FAILed.

Collaborator

akka-ci commented Sep 4, 2018

Test FAILed.

@raboof

This comment has been minimized.

Show comment
Hide comment
@raboof

raboof Sep 4, 2018

Member

PLS BUILD

Member

raboof commented Sep 4, 2018

PLS BUILD

@akka-ci akka-ci added validating and removed needs-attention labels Sep 4, 2018

@akka-ci

This comment has been minimized.

Show comment
Hide comment
@akka-ci

akka-ci Sep 4, 2018

Collaborator

Test PASSed.

Collaborator

akka-ci commented Sep 4, 2018

Test PASSed.

@akka-ci

This comment has been minimized.

Show comment
Hide comment
@akka-ci

akka-ci Sep 4, 2018

Collaborator

Test FAILed.

Collaborator

akka-ci commented Sep 4, 2018

Test FAILed.

@raboof

This comment has been minimized.

Show comment
Hide comment
@raboof

raboof Sep 4, 2018

Member

PLS BUILD

Member

raboof commented Sep 4, 2018

PLS BUILD

@akka-ci

This comment has been minimized.

Show comment
Hide comment
@akka-ci

akka-ci Sep 4, 2018

Collaborator

Test PASSed.

Collaborator

akka-ci commented Sep 4, 2018

Test PASSed.

@akka-ci

This comment has been minimized.

Show comment
Hide comment
@akka-ci

akka-ci Sep 5, 2018

Collaborator

Test PASSed.

Collaborator

akka-ci commented Sep 5, 2018

Test PASSed.

@akka-ci

This comment has been minimized.

Show comment
Hide comment
@akka-ci

akka-ci Sep 5, 2018

Collaborator

Test PASSed.

Collaborator

akka-ci commented Sep 5, 2018

Test PASSed.

@jrudolph

LGTM

@@ -413,6 +413,10 @@ akka.http {
# programmatically via `withSizeLimit`.)
max-content-length = 8m
# The maximum number of bytes to allow when reading the entire entity into memory with `toStrict`
# (which is used by the `toStrictEntity` and `extractStrictEntity` directives)
max-to-strict-bytes = 8m

This comment has been minimized.

@jrudolph

jrudolph Sep 5, 2018

Member

Seems in good company there 👍

@jrudolph

jrudolph Sep 5, 2018

Member

Seems in good company there 👍

@jrudolph jrudolph merged commit d0cee31 into master Sep 5, 2018

4 checks passed

Jenkins PR Validation Test PASSed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
typesafe-cla-validator All users have signed the CLA
Details

@jrudolph jrudolph deleted the allowMaxToStrictSize branch Sep 5, 2018

Synesso added a commit to Synesso/akka-http that referenced this pull request Sep 5, 2018

Allow a maximum size parameter for HttpEntity 'toStrict' (#2186)
And apply configurable default limit otherwise.

Fixes #268. Refs #2137.

jrudolph added a commit to jrudolph/akka-http that referenced this pull request Sep 5, 2018

Allow a maximum size parameter for HttpEntity 'toStrict' (#2186)
And apply configurable default limit otherwise.

Fixes #268. Refs #2137.

(cherry picked from commit d0cee31)

jrudolph added a commit to jrudolph/akka-http that referenced this pull request Sep 5, 2018

[backport from master] Allow a maximum size parameter for HttpEntity …
…'toStrict' (#2186)

And apply configurable default limit otherwise.

Fixes #268. Refs #2137.

(cherry picked from commit d0cee31)

@raboof raboof added this to the 10.1.5 milestone Sep 5, 2018

jrudolph added a commit to jrudolph/akka-http that referenced this pull request Sep 5, 2018

[backport from master] Allow a maximum size parameter for HttpEntity …
…'toStrict' (#2186)

And apply configurable default limit otherwise.

Fixes #268. Refs #2137.

(cherry picked from commit d0cee31)

jrudolph added a commit to jrudolph/akka-http that referenced this pull request Sep 5, 2018

[backport from master] Allow a maximum size parameter for HttpEntity …
…'toStrict' (#2186)

And apply configurable default limit otherwise.

Fixes #268. Refs #2137.

(cherry picked from commit d0cee31)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment