merges upstream #4
Open
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
As described here http://docs.aws.amazon.com/AmazonS3/latest/API/mpUploadListParts.html Cleaned up related code a bit as well.
- Avoid no method 'name' for nil error. - The default spaceship operator also will return a nil instead of -1,0,1 if the objects provided are not comparable. - coincidentally fixes a compatability issue seen with ruby 2.3.1
Kureev
reviewed
Oct 28, 2016
| @@ -460,7 +462,7 @@ def normalize_request(webrick_req) | |||
| s_req.path = webrick_req.path | |||
| s_req.is_path_style = true | |||
|
|
|||
| if !@root_hostnames.include?(host) | |||
| if !@root_hostnames.include?(host) && !(IPAddr.new(host) rescue nil) | |||
There was a problem hiding this comment.
Ok, that's an alternative solution to fix this. Can we merge this one first without re-testing everything else?
There was a problem hiding this comment.
this is from upstream ... I thought you had the same fix
There was a problem hiding this comment.
they've merged in the fix I propose and then refactored it to this solution it seems
|
This PR works: |
Kureev
approved these changes
Nov 4, 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.
It contains fixes we need to get docker working. Specifically jubos#114