Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into mainline

  • Loading branch information...
commit ffc65a05113121d6bb9176b5c9bc4a817f4ee976 2 parents 3486901 + 50e6f87
Jesse Gumm choptastic authored
5 src/misultin_bridge_modules/misultin_request_bridge.erl
View
@@ -76,6 +76,8 @@ header(transfer_encoding, Req) ->
misultin_utility:get_key_value('Transfer-Encoding', Req:get(headers));
header(accept_language, Req) ->
misultin_utility:get_key_value('Accept-Language', Req:get(headers));
+header(accept_encoding, Req) ->
+ misultin_utility:get_key_value('Accept-Encoding', Req:get(headers));
header(Header, Req) ->
misultin_utility:get_key_value(Header, Req:get(headers)).
@@ -84,7 +86,8 @@ headers(Req) ->
if_match, if_none_match, if_range, if_unmodified_since,
range, referer, user_agent, accept_language, accept_ranges, cookie,
keep_alive, location, content_length, content_type,
- content_encoding, authorization, x_forwarded_for, transfer_encoding
+ content_encoding, authorization, x_forwarded_for, transfer_encoding,
+ accept_encoding
],
Headers2 = lists:map(fun(H) -> {H, header(H, Req)} end, Headers1),
[{K, V} || {K, V} <- Headers2, V /= undefined].
5 src/mochiweb_bridge_modules/mochiweb_request_bridge.erl
View
@@ -91,6 +91,8 @@ header(x_forwarded_for, Req) ->
Req:get_header_value("x-forwarded-for");
header(transfer_encoding, Req) ->
Req:get_header_value("transfer-encoding");
+header(accept_encoding, Req) ->
+ Req:get_header_value("accept-encoding");
header(Header, Req) ->
Req:get_header_value(Header).
@@ -100,7 +102,8 @@ headers(Req) ->
if_none_match, if_unmodified_since, if_range, range,
referer, user_agent, accept_language, accept_ranges,
cookie, keep_alive, location, content_length, content_type,
- content_encoding, authorization, x_forwarded_for, transfer_encoding
+ content_encoding, authorization, x_forwarded_for, transfer_encoding,
+ accept_encoding
],
Headers1 = lists:map(fun(H) -> {H, header(H, Req)} end, Headers),
[{K, V} || {K, V} <- Headers1, V /= undefined].
Please sign in to comment.
Something went wrong with that request. Please try again.