backup/EWF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved redirect_now_custom to allow custom status code, custom header, and custom content

Browse Source
This commit is contained in:
Jocelyn Fiat
2012-02-01 10:57:52 +01:00
parent a1354136fa
commit 645b35590b
2 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
library/protocol/http/src/http_header.e
View File

@@ -33,7 +33,8 @@ inherit
create
make,
make_with_count,
make_from_array
make_from_array,
make_from_header
convert
make_from_array ({ARRAY [TUPLE [key: READABLE_STRING_8; value: READABLE_STRING_8]]}),
@@ -54,6 +55,7 @@ feature {NONE} -- Initialization
end
make_from_array (a_headers: ARRAY [TUPLE [key: READABLE_STRING_8; value: READABLE_STRING_8]])
-- Create HEADER from array of pair (key,value)
do
if a_headers.is_empty then
make_with_count (0)
@@ -67,6 +69,20 @@ feature {NONE} -- Initialization
end
end
make_from_header (a_header: HTTP_HEADER)
-- Create Current from existing HEADER `a_header'
local
lst: like headers
do
lst := a_header.headers
make_with_count (lst.count)
across
lst as c
loop
add_header (c.item.string)
end
end
feature -- Recycle
recycle

39
library/server/wsf/src/wsf_response.e
View File

@@ -234,9 +234,10 @@ feature -- Helper
feature -- Redirect
redirect_now_with_custom_status_code (a_url: READABLE_STRING_8; a_status_code: INTEGER)
-- Redirect to the given url `a_url' and precise custom `a_status_code'
redirect_now_custom (a_url: READABLE_STRING_8; a_status_code: INTEGER; a_header: detachable HTTP_HEADER; a_content: detachable TUPLE [body: READABLE_STRING_8; type: READABLE_STRING_8])
-- Redirect to the given url `a_url' and precise custom `a_status_code', custom header and content
-- Please see http://www.faqs.org/rfcs/rfc2616 to use proper status code.
-- if `a_status_code' is 0, use the default {HTTP_STATUS_CODE}.moved_permanently
require
header_not_committed: not header_committed
local
@@ -245,12 +246,27 @@ feature -- Redirect
if header_committed then
-- This might be a trouble about content-length
put_string ("Headers already sent.%NCannot redirect, for now please follow this <a %"href=%"" + a_url + "%">link</a> instead%N")
else
if a_header /= Void then
create h.make_from_header (a_header)
else
create h.make_with_count (1)
end
h.put_location (a_url)
h.put_content_length (0)
if a_status_code = 0 then
set_status_code ({HTTP_STATUS_CODE}.moved_permanently)
else
set_status_code (a_status_code)
end
if a_content /= Void then
h.put_content_length (a_content.body.count)
h.put_content_type (a_content.type)
put_header_text (h.string)
put_string (a_content.body)
else
h.put_content_length (0)
put_header_text (h.string)
end
end
end
@@ -259,26 +275,13 @@ feature -- Redirect
require
header_not_committed: not header_committed
do
redirect_now_with_custom_status_code (a_url, {HTTP_STATUS_CODE}.moved_permanently)
redirect_now_custom (a_url, {HTTP_STATUS_CODE}.moved_permanently, Void, Void)
end
redirect_now_with_content (a_url: READABLE_STRING_8; a_content: READABLE_STRING_8; a_content_type: READABLE_STRING_8)
-- Redirect to the given url `a_url'
local
h: HTTP_HEADER
do
if header_committed then
-- This might be a trouble about content-length
put_string ("Headers already sent.%NCannot redirect, for now please follow this <a %"href=%"" + a_url + "%">link</a> instead%N")
else
create h.make_with_count (1)
h.put_location (a_url)
h.put_content_length (a_content.count)
h.put_content_type (a_content_type)
set_status_code ({HTTP_STATUS_CODE}.moved_permanently)
put_header_text (h.string)
put_string (a_content)
end
redirect_now_custom (a_url, {HTTP_STATUS_CODE}.moved_permanently, Void, [a_content, a_content_type])
end
note