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

Fixing issues related to status code.

Browse Source
This commit is contained in:
Jocelyn FIAT
2014-11-28 16:10:50 +01:00
parent 975ef90bab
commit 440d3f9c91
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,16 +259,19 @@ feature -- Header output operation: helpers
put_header (a_status_code: INTEGER; a_headers: detachable ARRAY [TUPLE [name: READABLE_STRING_8; value: READABLE_STRING_8]]) put_header (a_status_code: INTEGER; a_headers: detachable ARRAY [TUPLE [name: READABLE_STRING_8; value: READABLE_STRING_8]])
-- Put headers with status `a_status', and headers from `a_headers' -- Put headers with status `a_status', and headers from `a_headers'
require require
a_status_code_valid: a_status_code > 0
status_not_committed: not status_committed status_not_committed: not status_committed
header_not_committed: not header_committed header_not_committed: not header_committed
local local
h: HTTP_HEADER h: HTTP_HEADER
do do
set_status_code (a_status_code)
if a_headers /= Void then if a_headers /= Void then
create h.make_from_array (a_headers) create h.make_from_array (a_headers)
put_header_text (h.string) put_header_text (h.string)
end end
ensure ensure
status_code_set: status_code = a_status_code
status_set: status_is_set status_set: status_is_set
message_writable: message_writable message_writable: message_writable
end end
@@ -276,16 +279,19 @@ feature -- Header output operation: helpers
add_header (a_status_code: INTEGER; a_headers: detachable ARRAY [TUPLE [name: READABLE_STRING_8; value: READABLE_STRING_8]]) add_header (a_status_code: INTEGER; a_headers: detachable ARRAY [TUPLE [name: READABLE_STRING_8; value: READABLE_STRING_8]])
-- Put headers with status `a_status', and headers from `a_headers' -- Put headers with status `a_status', and headers from `a_headers'
require require
a_status_code_valid: a_status_code > 0
status_not_committed: not status_committed status_not_committed: not status_committed
header_not_committed: not header_committed header_not_committed: not header_committed
local local
h: HTTP_HEADER h: HTTP_HEADER
do do
set_status_code (a_status_code)
if a_headers /= Void then if a_headers /= Void then
create h.make_from_array (a_headers) create h.make_from_array (a_headers)
add_header_text (h.string) add_header_text (h.string)
end end
ensure ensure
status_code_set: status_code = a_status_code
status_set: status_is_set status_set: status_is_set
message_writable: message_writable message_writable: message_writable
end end
@@ -473,9 +479,7 @@ feature -- Redirect
end end
h.put_location (a_url) h.put_location (a_url)
if a_status_code = 0 then if a_status_code = 0 then
if not status_is_set then
set_status_code ({HTTP_STATUS_CODE}.temp_redirect) set_status_code ({HTTP_STATUS_CODE}.temp_redirect)
end
else else
set_status_code (a_status_code) set_status_code (a_status_code)
end end