From 5c98d7ba4ea685c34ddea538b5d3552435a122eb Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Fri, 23 Mar 2012 16:49:13 +0100 Subject: [PATCH] Use media_type as replacement for type_and_subtype_string in HTTP_CONTENT_TYPE --- library/protocol/http/src/http_content_type.e | 16 ++++++++-------- ...f_application_x_www_form_urlencoded_handler.e | 2 +- .../src/mime/wsf_multipart_form_data_handler.e | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/library/protocol/http/src/http_content_type.e b/library/protocol/http/src/http_content_type.e index f8069818..ccc37341 100644 --- a/library/protocol/http/src/http_content_type.e +++ b/library/protocol/http/src/http_content_type.e @@ -199,7 +199,7 @@ feature -- Conversion do res := internal_string if res = Void then - create res.make_from_string (type_and_subtype_string) + create res.make_from_string (media_type) if has_parameter then res.append_character (';') res.append_character (' ') @@ -214,13 +214,13 @@ feature -- Conversion Result := res end - type_and_subtype_string: READABLE_STRING_8 + media_type: READABLE_STRING_8 -- String representation of type/subtype local - res: like internal_type_and_subtype_string + res: like internal_media_type s: like subtype do - res := internal_type_and_subtype_string + res := internal_media_type if res = Void then create res.make_from_string (type) s := subtype @@ -230,7 +230,7 @@ feature -- Conversion res.append_character ('/') res.append (s) end - internal_type_and_subtype_string := res + internal_media_type := res end Result := res end @@ -239,7 +239,7 @@ feature {NONE} -- Internal internal_string: detachable STRING_8 - internal_type_and_subtype_string: detachable STRING_8 + internal_media_type: detachable STRING_8 feature -- Status report @@ -256,9 +256,9 @@ feature -- Status report end end - same_type_and_subtype (s: READABLE_STRING_8): BOOLEAN + same_media_type (s: READABLE_STRING_8): BOOLEAN do - Result := type_and_subtype_string.same_string (s) + Result := media_type.same_string (s) end same_string (s: READABLE_STRING_8): BOOLEAN diff --git a/library/server/wsf/src/mime/wsf_application_x_www_form_urlencoded_handler.e b/library/server/wsf/src/mime/wsf_application_x_www_form_urlencoded_handler.e index 325e1151..d2afeca0 100644 --- a/library/server/wsf/src/mime/wsf_application_x_www_form_urlencoded_handler.e +++ b/library/server/wsf/src/mime/wsf_application_x_www_form_urlencoded_handler.e @@ -16,7 +16,7 @@ feature -- Status report valid_content_type (a_content_type: HTTP_CONTENT_TYPE): BOOLEAN do - Result := a_content_type.same_type_and_subtype ({HTTP_MIME_TYPES}.application_x_www_form_encoded) + Result := a_content_type.same_media_type ({HTTP_MIME_TYPES}.application_x_www_form_encoded) end feature -- Execution diff --git a/library/server/wsf/src/mime/wsf_multipart_form_data_handler.e b/library/server/wsf/src/mime/wsf_multipart_form_data_handler.e index 9861208f..d6da8333 100644 --- a/library/server/wsf/src/mime/wsf_multipart_form_data_handler.e +++ b/library/server/wsf/src/mime/wsf_multipart_form_data_handler.e @@ -26,7 +26,7 @@ feature -- Status report valid_content_type (a_content_type: HTTP_CONTENT_TYPE): BOOLEAN do - Result := a_content_type.same_type_and_subtype ({HTTP_MIME_TYPES}.multipart_form_data) + Result := a_content_type.same_media_type ({HTTP_MIME_TYPES}.multipart_form_data) end feature -- Execution