http.server.redirection: Refactor <custom-redirect>

Avoid duplication and make use of canned HTTP responses.

diff --git a/basis/http/server/redirection/redirection.factor b/basis/http/server/redirection/redirection.factor
index 76885ff7a4843f6fd4de8b9bb5017f8e5ca15dba..4a166afd34bf44bc01c2bc41859a2f3c42998527 100644 (file)
--- a/basis/http/server/redirection/redirection.factor
+++ b/basis/http/server/redirection/redirection.factor
@@ -14,15 +14,14 @@ M: url relative-to-request
         f >>query
     swap derive-url ensure-port ;
 
-: <custom-redirect> ( url code message -- response )
-    <trivial-response>
-        swap dup url? [ relative-to-request ] when
-        "location" set-header ;
+: <custom-redirect> ( url response -- response' )
+    swap dup url? [ relative-to-request ] when
+    "location" set-header ;
 
 \ <custom-redirect> DEBUG add-input-logging
 
 : <permanent-redirect> ( url -- response )
-    301 "Moved Permanently" <custom-redirect> ;
+    <301> <custom-redirect> ;
 
 : <temporary-redirect> ( url -- response )
-    307 "Temporary Redirect" <custom-redirect> ;
+    <307> <custom-redirect> ;