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

Don't overwrite the Content-Type when compressing #420

Closed
wants to merge 2 commits into from
Closed

Don't overwrite the Content-Type when compressing #420

wants to merge 2 commits into from

Conversation

Labels
None yet
Projects
None yet
4 participants
@Hello71
Copy link
Contributor

@Hello71 Hello71 commented Oct 19, 2018

https://trac.torproject.org/projects/tor/ticket/28100

@coveralls
Copy link

@coveralls coveralls commented Oct 19, 2018

Pull Request Test Coverage Report for Build 2719

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-0.0002%) to 62.037%

Totals Coverage Status
Change from base Build 2718: -0.0002%
Covered Lines: 44113
Relevant Lines: 71107

💛 - Coveralls

Copy link
Contributor

@teor2345 teor2345 left a comment

Looks fine to me, but we could tweak the comment so it's more readable.

@@ -166,22 +166,16 @@ write_http_response_header_impl(dir_connection_t *conn, ssize_t length,
buf_free(buf);
}

/** As write_http_response_header_impl, but sets encoding and content-typed
* based on whether the response will be <b>compressed</b> or not. */
/** As write_http_response_header_impl, but translates compress_method_t into
Copy link
Contributor

@teor2345 teor2345 Oct 30, 2018

The argument name also changes from method to encoding`.
So let's say:

Suggested change
/** As write_http_response_header_impl, but translates compress_method_t into
/** As write_http_response_header_impl, but translates method into

You can keep the types as well if you want.

/** As write_http_response_header_impl, but sets encoding and content-typed
* based on whether the response will be <b>compressed</b> or not. */
/** As write_http_response_header_impl, but translates compress_method_t into
* const char * */
Copy link
Contributor

@teor2345 teor2345 Oct 30, 2018

Suggested change
* const char * */
* encoding */

@teor2345
Copy link
Contributor

@teor2345 teor2345 commented Oct 30, 2018

test-stem is now active on master's CI:
https://trac.torproject.org/projects/tor/ticket/27913

Closing and re-opening to re-run the merged branch.

@teor2345 teor2345 closed this Oct 30, 2018
@teor2345 teor2345 reopened this Oct 30, 2018
@nmathewson
Copy link
Contributor

@nmathewson nmathewson commented Nov 2, 2018

squashed and merged

@nmathewson nmathewson closed this Nov 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment