Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Permit OPTIONS request against any url, fixes #19398 #19569

Merged
merged 1 commit into from Jan 26, 2016
Merged

Permit OPTIONS request against any url, fixes #19398 #19569

merged 1 commit into from Jan 26, 2016

Conversation

aidanhs
Copy link
Contributor

@aidanhs aidanhs commented Jan 22, 2016

I've tested this (with https://github.com/aidanhs/Docker-Terminal) and it fixes #19398 (options requests working against any URL).

@aidanhs aidanhs mentioned this pull request Jan 22, 2016
Closed
@calavera
Copy link
Contributor

I'm okay with adding this, but tests fail:

03:32:04 ----------------------------------------------------------------------
03:32:04 FAIL: docker_api_test.go:18: DockerSuite.TestApiOptionsRoute
03:32:04 
03:32:04 docker_api_test.go:21:
03:32:04     c.Assert(status, checker.Equals, http.StatusOK)
03:32:04 ... obtained int = 404
03:32:04 ... expected int = 200
03:32:04 
03:32:04 
03:32:04 ----------------------------------------------------------------------
03:32:04

@aidanhs
Permit OPTIONS request against any url, fixes moby#19398
ada7920 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
@aidanhs
Copy link
Contributor Author

aidanhs commented Jan 23, 2016

http://www.gorillatoolkit.org/pkg/mux#Route.Path

The template must start with a "/".

Oops! Now fixed. At least, I can see TestApiOptionsRoute has passed in the tests run so far.

@calavera
Copy link
Contributor

LGTM

@icecrime
Copy link
Contributor

LGTM!

icecrime pushed a commit that referenced this pull request Jan 26, 2016
Merge pull request #19569 from aidanhs/aphs-fix-options-api
fd5013e 
Permit OPTIONS request against any url, fixes #19398
@icecrime icecrime merged commit fd5013e into moby:master Jan 26, 2016
@thaJeztah thaJeztah added this to the 1.10.0 milestone Jan 26, 2016
@aidanhs aidanhs deleted the aphs-fix-options-api branch January 27, 2016 00:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
docs/revisit impact/changelog
Projects
None yet
Milestone
1.10.0
Development

Successfully merging this pull request may close these issues.

api-cors-header - what does it do?
6 participants
@aidanhs @calavera @icecrime @tiborvass @thaJeztah @GordonTheTurtle