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

Merge branch 'v1' into es17.01

Browse Source
This commit is contained in:
Jocelyn Fiat
2017-04-14 12:52:48 +02:00
parent 94ba19920e 2371ad4bd1
commit 3d146d9be9
4 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
library/server/wsf/policy_driven/wsf_method_helper.e
View File

@@ -108,13 +108,11 @@ feature -- Basic operations
handle_precondition_failed (req, res)
else
if attached req.http_if_unmodified_since as l_if_unmodified_since then
if l_if_unmodified_since.is_valid_as_string_8 then
create l_date.make_from_string (l_if_unmodified_since.to_string_8)
if not l_date.has_error then
if a_handler.modified_since (req, l_date.date_time) then
handle_precondition_failed (req, res)
l_failed := True
end
create l_date.make_from_string (l_if_unmodified_since)
if not l_date.has_error then
if a_handler.modified_since (req, l_date.date_time) then
handle_precondition_failed (req, res)
l_failed := True
end
end
end
@@ -128,13 +126,11 @@ feature -- Basic operations
handle_if_none_match_failed (req, res, a_handler)
else
if attached req.http_if_modified_since as l_if_modified_since then
if l_if_modified_since.is_valid_as_string_8 then
create l_date.make_from_string (l_if_modified_since.to_string_8)
if not l_date.has_error then
if not a_handler.modified_since (req, l_date.date_time) then
handle_not_modified (req, res, a_handler)
l_failed := True
end
create l_date.make_from_string (l_if_modified_since)
if not l_date.has_error then
if not a_handler.modified_since (req, l_date.date_time) then
handle_not_modified (req, res, a_handler)
l_failed := True
end
end
end

10
library/server/wsf/router/wsf_router_mapping.e
View File

@@ -50,8 +50,14 @@ feature -- Status report
debug_output: READABLE_STRING_GENERAL
-- String that should be displayed in debugger to represent `Current'.
local
s: STRING_32
do
Result := description + {STRING_32} " : " + associated_resource.to_string_32
create s.make_empty
s.append (description)
s.append_string_general (" : ")
s.append_string_general (associated_resource)
Result := s
end
feature -- Status
@@ -78,7 +84,7 @@ feature -- Status
end
note
copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

10
library/server/wsf/src/request/value/wsf_table.e
View File

@@ -145,10 +145,10 @@ feature -- Conversion
if attached {WSF_STRING} value (i.out) as s then
Result.put (s.value, i)
nb := nb + 1
elseif attached {WSF_STRING} value (name + "[" + i.out + "]") as s then
-- FIXME !!
Result.put (s.value, i)
nb := nb + 1
--FIXME elseif attached {WSF_STRING} value (name + "[" + i.out + "]") as s then
--
-- Result.put (s.value, i)
-- nb := nb + 1
else
Result := Void
end
@@ -236,7 +236,7 @@ feature -- Visitor
end
note
copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

10
library/server/wsf/src/response/wsf_not_found_response.e
View File

@@ -76,7 +76,7 @@ feature {WSF_RESPONSE} -- Output
if request.is_content_type_accepted ({HTTP_MIME_TYPES}.text_html) then
s := "<html lang=%"en%"><head>"
s.append ("<title>")
s.append (html_encoder.encoded_string (request.request_uri.to_string_32))
s.append (html_encoder.general_encoded_string (request.request_uri))
s.append ("Error 404 (Not Found)")
s.append ("</title>%N")
s.append ("[
@@ -101,7 +101,7 @@ feature {WSF_RESPONSE} -- Output
s.append ("<div class=%"inner2%"></div>")
s.append ("</div>")
s.append ("Error 404 (Not Found)</div>")
s.append ("<div id=%"message%">Error 404 (Not Found): <code>" + html_encoder.encoded_string (request.request_uri.to_string_32) + "</code></div>")
s.append ("<div id=%"message%">Error 404 (Not Found): <code>" + html_encoder.general_encoded_string (request.request_uri) + "</code></div>")
if attached suggested_items as lst and then not lst.is_empty then
s.append ("<div id=%"suggestions%"><strong>Perhaps you are looking for:</strong><ul>")
from
@@ -116,17 +116,17 @@ feature {WSF_RESPONSE} -- Output
l_text := l_loc
end
s.append ("<li>")
s.append ("<a href=%"" + l_loc + "%">" + html_encoder.encoded_string (l_text.to_string_32) + "</a>")
s.append ("<a href=%"" + l_loc + "%">" + html_encoder.general_encoded_string (l_text) + "</a>")
elseif l_text /= Void then
s.append ("<li>")
s.append (html_encoder.encoded_string (l_text.to_string_32))
s.append (html_encoder.general_encoded_string (l_text))
s.append ("</li>%N")
end
if (l_loc /= Void or l_text /= Void) then
if attached lst.item.description as l_desc then
s.append ("<br/> - ")
s.append (html_encoder.encoded_string (l_desc.to_string_32))
s.append (html_encoder.general_encoded_string (l_desc))
s.append ("%N")
end
s.append ("</li>%N")