From 9c207f4c9bddee2650067ba87b70bde301a2011e Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Tue, 7 Mar 2017 14:36:16 +0100 Subject: [PATCH] Added put_content_type_utf_8_text_html to HTTP_HEADER . Improved the directory index access denied message. --- library/network/protocol/http/src/http_header_modifier.e | 5 +++-- library/server/wsf/router/wsf_file_system_handler.e | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/library/network/protocol/http/src/http_header_modifier.e b/library/network/protocol/http/src/http_header_modifier.e index 9c06a9f9..97be07bb 100644 --- a/library/network/protocol/http/src/http_header_modifier.e +++ b/library/network/protocol/http/src/http_header_modifier.e @@ -374,6 +374,7 @@ feature -- Content-type helpers put_content_type_text_css do put_content_type ({HTTP_MIME_TYPES}.text_css) end put_content_type_text_csv do put_content_type ({HTTP_MIME_TYPES}.text_csv) end put_content_type_text_html do put_content_type ({HTTP_MIME_TYPES}.text_html) end + put_content_type_utf_8_text_html do put_content_type_with_charset ({HTTP_MIME_TYPES}.text_html, "utf-8") end put_content_type_text_javascript do put_content_type ({HTTP_MIME_TYPES}.text_javascript) end put_content_type_text_json do put_content_type ({HTTP_MIME_TYPES}.text_json) end put_content_type_text_plain do put_content_type ({HTTP_MIME_TYPES}.text_plain) end @@ -517,7 +518,7 @@ feature -- Others dt.second_add (a_seconds) put_expires_date (dt) put_cache_control ("max-age=" + a_seconds.out) - end + end put_expires_string (a_expires: STRING) -- Put "Expires" header with `a_expires' string value @@ -682,7 +683,7 @@ feature {NONE} -- Constants end note - copyright: "2011-2014, Jocelyn Fiat, Eiffel Software and others" + copyright: "2011-2017, Jocelyn Fiat, Eiffel Software and others" license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)" source: "[ Eiffel Software diff --git a/library/server/wsf/router/wsf_file_system_handler.e b/library/server/wsf/router/wsf_file_system_handler.e index 9cd4f647..e62380bb 100644 --- a/library/server/wsf/router/wsf_file_system_handler.e +++ b/library/server/wsf/router/wsf_file_system_handler.e @@ -460,7 +460,7 @@ feature -- Execution create h.make h.put_content_type_text_plain create s.make_empty - s.append ("Directory index: Access denied%N") + s.append ("Directory index %"" + uri + "%": Access denied%N") res.set_status_code ({HTTP_STATUS_CODE}.forbidden) h.put_content_length (s.count) res.put_header_lines (h) @@ -642,7 +642,7 @@ feature {NONE} -- implementation: date time end note - copyright: "2011-2016, 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