Better support for unicode path and values.
Added WSF_REQUEST.percent_encoded_path_info: READABLE_STRING_8
to keep url encoded path info, as it is useful for specific component
The router is now using WSF_REQUEST.percent_encoded_path_info
since URI_TEMPLATE are handling URI (and not IRI)
this fixes an issue with unicode path parameters.
This should not break existing code, and this fixes various unicode related issues related
to PATH parameter and path info
but also any component using file names.
(required EiffelStudio >= 7.2)
This commit is contained in:
@@ -15,8 +15,6 @@ class
|
||||
inherit
|
||||
ENCODER [READABLE_STRING_32, READABLE_STRING_8]
|
||||
|
||||
UTF8_ENCODER_HELPER
|
||||
|
||||
PLATFORM
|
||||
export
|
||||
{NONE} all
|
||||
@@ -37,9 +35,13 @@ feature -- Encoder
|
||||
|
||||
encoded_string (s: READABLE_STRING_32): STRING_8
|
||||
-- UTF8-encoded value of `s'.
|
||||
do
|
||||
Result := general_encoded_string (s)
|
||||
end
|
||||
|
||||
general_encoded_string (s: READABLE_STRING_GENERAL): STRING_8
|
||||
do
|
||||
Result := utf32_to_utf8 (s)
|
||||
has_error := not last_conversion_successful
|
||||
end
|
||||
|
||||
feature -- Decoder
|
||||
@@ -48,11 +50,34 @@ feature -- Decoder
|
||||
-- The UTF8-encoded equivalent of the given string
|
||||
do
|
||||
Result := utf8_to_utf32 (v)
|
||||
has_error := not last_conversion_successful
|
||||
has_error := not is_valid_utf8 (v)
|
||||
end
|
||||
|
||||
feature {NONE} -- UTF implementation
|
||||
|
||||
utf32_to_utf8 (s: READABLE_STRING_GENERAL): STRING_8
|
||||
local
|
||||
utf: UTF_CONVERTER
|
||||
do
|
||||
Result := utf.utf_32_string_to_utf_8_string_8 (s)
|
||||
end
|
||||
|
||||
utf8_to_utf32 (s: READABLE_STRING_8): STRING_32
|
||||
local
|
||||
utf: UTF_CONVERTER
|
||||
do
|
||||
Result := utf.utf_8_string_8_to_string_32 (s)
|
||||
end
|
||||
|
||||
is_valid_utf8 (s: READABLE_STRING_8): BOOLEAN
|
||||
local
|
||||
utf: UTF_CONVERTER
|
||||
do
|
||||
Result := utf.is_valid_utf_8_string_8 (s)
|
||||
end
|
||||
|
||||
note
|
||||
copyright: "2011-2012, Eiffel Software and others"
|
||||
copyright: "2011-2013, Eiffel Software and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
source: "[
|
||||
Eiffel Software
|
||||
|
||||
Reference in New Issue
Block a user