From 6ed25fd60b0cc502ae79baf20456bb2d2b02973e Mon Sep 17 00:00:00 2001
From: Drew Varner <Drew.Varner@ninefx.com>
Date: Fri, 6 Jun 2014 02:37:24 -0400
Subject: Allow users to pass a raw binary() as the expires header.

---
 test/http_SUITE.erl                          |  8 ++++++++
 test/http_SUITE_data/rest_expires_binary.erl | 18 ++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 test/http_SUITE_data/rest_expires_binary.erl

(limited to 'test')

diff --git a/test/http_SUITE.erl b/test/http_SUITE.erl
index 8ab99cb..0e115e0 100644
--- a/test/http_SUITE.erl
+++ b/test/http_SUITE.erl
@@ -207,6 +207,7 @@ init_dispatch(Config) ->
 			{"/patch", rest_patch_resource, []},
 			{"/resetags", rest_resource_etags, []},
 			{"/rest_expires", rest_expires, []},
+			{"/rest_expires_binary", rest_expires_binary, []},
 			{"/rest_empty_resource", rest_empty_resource, []},
 			{"/loop_stream_recv", http_loop_stream_recv, []},
 			{"/", http_handler, []}
@@ -687,6 +688,13 @@ rest_expires(Config) ->
 	Expires = LastModified = <<"Fri, 21 Sep 2012 22:36:14 GMT">>,
 	ok.
 
+rest_expires_binary(Config) ->
+	ConnPid = gun_open(Config),
+	Ref = gun:get(ConnPid, "/rest_expires_binary"),
+	{response, nofin, 200, Headers} = gun:await(ConnPid, Ref),
+	{_, <<"0">>} = lists:keyfind(<<"expires">>, 1, Headers),
+	ok.
+
 rest_keepalive(Config) ->
 	ConnPid = gun_open(Config),
 	Refs = [gun:get(ConnPid, "/simple") || _ <- lists:seq(1, 10)],
diff --git a/test/http_SUITE_data/rest_expires_binary.erl b/test/http_SUITE_data/rest_expires_binary.erl
new file mode 100644
index 0000000..4cbd001
--- /dev/null
+++ b/test/http_SUITE_data/rest_expires_binary.erl
@@ -0,0 +1,18 @@
+-module(rest_expires_binary).
+
+-export([init/3]).
+-export([content_types_provided/2]).
+-export([get_text_plain/2]).
+-export([expires/2]).
+
+init(_Transport, _Req, _Opts) ->
+	{upgrade, protocol, cowboy_rest}.
+
+content_types_provided(Req, State) ->
+	{[{{<<"text">>, <<"plain">>, []}, get_text_plain}], Req, State}.
+
+get_text_plain(Req, State) ->
+	{<<"This is REST!">>, Req, State}.
+
+expires(Req, State) ->
+	{<<"0">>, Req, State}.
-- 
cgit v1.2.3