summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adam@chlipala.net>2011-06-12 17:44:34 -0400
committerGravatar Adam Chlipala <adam@chlipala.net>2011-06-12 17:44:34 -0400
commitc650b605d88cd5c6ca5ab38247f240a192810c1d (patch)
tree22daca90ac99da0244b2cc1d24bef4c472af85f4 /tests
parent3175ee735c4f753a8e1d70f5a9f47206f5a44a75 (diff)
Keep user-set response headers on indirect returns
Diffstat (limited to 'tests')
-rw-r--r--tests/blob.ur32
-rw-r--r--tests/blob.urp8
-rw-r--r--tests/blob.urs1
3 files changed, 10 insertions, 31 deletions
diff --git a/tests/blob.ur b/tests/blob.ur
index c6106686..02f88f0d 100644
--- a/tests/blob.ur
+++ b/tests/blob.ur
@@ -1,27 +1,7 @@
-sequence s
-table t : { Id : int, Nam : option string, Data : blob, Desc : string, Typ : string }
+fun main () =
+ setHeader (blessResponseHeader "X-Test") "Test";
+ return <xml><body>Test</body></xml>
-fun see id =
- r <- oneRow (SELECT t.Data, t.Typ FROM t WHERE t.Id = {[id]});
- returnBlob r.T.Data (blessMime r.T.Typ)
-
-fun save r =
- id <- nextval s;
- dml (INSERT INTO t (Id, Nam, Data, Desc, Typ)
- VALUES ({[id]}, {[fileName r.Data]}, {[fileData r.Data]}, {[r.Desc]}, {[fileMimeType r.Data]}));
- main ()
-
-and main () =
- ls <- queryX (SELECT t.Id, t.Desc, octet_length(t.Data) AS Len FROM t ORDER BY t.Desc)
- (fn r => <xml><li><a link={see r.T.Id}>{[r.T.Desc]} ({[r.Len]})</a></li></xml>);
- return <xml><body>
- {ls}
-
- <br/>
-
- <form>
- <textbox{#Desc}/>
- <upload{#Data}/>
- <submit action={save}/>
- </form>
- </body></xml>
+fun bad () =
+ setHeader (blessResponseHeader "X-Test") "Test";
+ returnBlob (textBlob "hello") (blessMime "text/plain")
diff --git a/tests/blob.urp b/tests/blob.urp
index 6e0de2ee..1cec504a 100644
--- a/tests/blob.urp
+++ b/tests/blob.urp
@@ -1,7 +1,5 @@
-debug
-database dbname=blobo
-sql blob.sql
-allow mime image/gif
-allow mime image/png
+allow responseHeader X-Test
+allow mime text/plain
+rewrite url Blob/*
blob
diff --git a/tests/blob.urs b/tests/blob.urs
index 6ac44e0b..fa45e01a 100644
--- a/tests/blob.urs
+++ b/tests/blob.urs
@@ -1 +1,2 @@
val main : unit -> transaction page
+val bad : unit -> transaction page