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.

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

Add Server field in HTTP API response header #2141

Merged
merged 1 commit into from
Jan 22, 2016
Merged

Conversation

Kubuxu
Copy link
Member

@Kubuxu Kubuxu commented Dec 31, 2015

Resolves #625

@Kubuxu
Copy link
Member Author

Kubuxu commented Jan 4, 2016

Tests are passing. One of Travis builds randomly hanged.

@@ -24,6 +24,7 @@ test_ls_cmd() {
printf "Access-Control-Allow-Headers: X-Stream-Output, X-Chunked-Output\r\n" >>expected_output &&
printf "Access-Control-Expose-Headers: X-Stream-Output, X-Chunked-Output\r\n" >>expected_output &&
printf "Content-Type: text/plain\r\n" >>expected_output &&
printf "Server: go-ipfs/%s\r\n" $(ipfs version | cut -d" " -f 3) >>expected_output &&
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use ipfs version -n instead of cut

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use ipfs version -n instead of cut

Just to make very sure we don't run into any superweird portability issues

@Kubuxu Kubuxu force-pushed the patch-1 branch 2 times, most recently from 8035a3a to f44eaf3 Compare January 5, 2016 11:42
@Kubuxu
Copy link
Member Author

Kubuxu commented Jan 5, 2016

I've addressed your comments. Tests are passing.

@RichardLitt
Copy link
Member

👍

@Kubuxu Kubuxu force-pushed the patch-1 branch 2 times, most recently from 9e74a0c to 1d6e577 Compare January 12, 2016 17:20
@@ -24,6 +24,7 @@ test_ls_cmd() {
printf "Access-Control-Allow-Headers: X-Stream-Output, X-Chunked-Output\r\n" >>expected_output &&
printf "Access-Control-Expose-Headers: X-Stream-Output, X-Chunked-Output\r\n" >>expected_output &&
printf "Content-Type: text/plain\r\n" >>expected_output &&
printf "Server: go-ipfs/%s\r\n" $(ipfs version -n) >>expected_output &&
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the delayed feedback -- it looks like circle-ci is failing because of the ordering of the expected headers -- now that server: is being set first, it needs to be expected first

👍 ❤️ apart from that

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is weird as Travis was successful.

Resolves ipfs#625
Included in tests.

License: MIT
Signed-off-by: Jakub (Kubuxu) Sztandera <[email protected]>
@Kubuxu
Copy link
Member Author

Kubuxu commented Jan 20, 2016

This time both CircleCI and Travis went through. I've changed nothing.

@ghost
Copy link

ghost commented Jan 20, 2016

Yep LGTM now, thanks!

@ghost ghost added the RFM label Jan 20, 2016
jbenet added a commit that referenced this pull request Jan 22, 2016
Add Server field in HTTP API response header
@jbenet jbenet merged commit a2b0287 into ipfs:master Jan 22, 2016
@jbenet
Copy link
Member

jbenet commented Jan 22, 2016

LGTM Thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants