diff --git a/library/server/ewf_support/ewf_support-safe.ecf b/library/server/ewf_support/ewf_support-safe.ecf deleted file mode 100644 index c31ae934..00000000 --- a/library/server/ewf_support/ewf_support-safe.ecf +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - /.git$ - /EIFGENs$ - /.svn$ - - - - - - - - - - - - - - - - - diff --git a/library/server/ewf_support/ewf_support.ecf b/library/server/ewf_support/ewf_support.ecf deleted file mode 100644 index e95a3590..00000000 --- a/library/server/ewf_support/ewf_support.ecf +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - /.git$ - /EIFGENs$ - /.svn$ - - - - - - - - - - - - - - - - - diff --git a/library/server/ewf_support/src/before_72/shared_execution_environment.e b/library/server/ewf_support/src/before_72/shared_execution_environment.e deleted file mode 100644 index 9c40c09d..00000000 --- a/library/server/ewf_support/src/before_72/shared_execution_environment.e +++ /dev/null @@ -1,49 +0,0 @@ -note - description: "Shared instance of execution environment." - legal: "See notice at end of class." - status: "See notice at end of class." - date: "$Date$" - revision: "$Revision$" -class - SHARED_EXECUTION_ENVIRONMENT - -feature {NONE} - - Execution_environment: EXECUTION_ENVIRONMENT - once - create Result - end - -note - copyright: "Copyright (c) 2012, Eiffel Software" - license: "GPL version 2 (see http://www.eiffel.com/licensing/gpl.txt)" - licensing_options: "http://www.eiffel.com/licensing" - copying: "[ - This file is part of Eiffel Software's Eiffel Development Environment. - - Eiffel Software's Eiffel Development Environment is free - software; you can redistribute it and/or modify it under - the terms of the GNU General Public License as published - by the Free Software Foundation, version 2 of the License - (available at the URL listed under "license" above). - - Eiffel Software's Eiffel Development Environment is - distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty - of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with Eiffel Software's Eiffel Development - Environment; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - ]" - source: "[ - Eiffel Software - 5949 Hollister Ave., Goleta, CA 93117 USA - Telephone 805-685-1006, Fax 805-685-6869 - Website http://www.eiffel.com - Customer support http://support.eiffel.com - ]" - -end diff --git a/library/server/ewf_support/src/before_72/wsf_support.e b/library/server/ewf_support/src/before_72/wsf_support.e deleted file mode 100644 index 8800bd7c..00000000 --- a/library/server/ewf_support/src/before_72/wsf_support.e +++ /dev/null @@ -1,36 +0,0 @@ -note - description: "[ - The WSF_SUPPORT class is meant to handle incompatibilities between version of libraries - And still allow to benefit from most recent improvements. - - Unicode is an example - ]" - date: "$Date$" - revision: "$Revision$" - -class - WSF_SUPPORT - -inherit - ANY - - SHARED_EXECUTION_ENVIRONMENT - export - {NONE} all - end - -feature -- Access: environment - - starting_environment: HASH_TABLE [READABLE_STRING_GENERAL, READABLE_STRING_GENERAL] - do - Result := execution_environment.starting_environment_variables - end - - environment_item (a_name: READABLE_STRING_GENERAL): detachable STRING_32 - do - if attached execution_environment.get (a_name.to_string_8) as v then - Result := v.to_string_32 - end - end - -end diff --git a/library/server/ewf_support/src/greater_or_72/wsf_support.e b/library/server/ewf_support/src/greater_or_72/wsf_support.e deleted file mode 100644 index 559333dd..00000000 --- a/library/server/ewf_support/src/greater_or_72/wsf_support.e +++ /dev/null @@ -1,34 +0,0 @@ -note - description: "[ - The WSF_SUPPORT class is meant to handle incompatibilities between version of libraries - And still allow to benefit from most recent improvements. - - Unicode is an example - ]" - date: "$Date$" - revision: "$Revision$" - -class - WSF_SUPPORT - -inherit - ANY - - SHARED_EXECUTION_ENVIRONMENT - export - {NONE} all - end - -feature -- Access: environment - - starting_environment: HASH_TABLE [READABLE_STRING_GENERAL, READABLE_STRING_GENERAL] - do - Result := execution_environment.starting_environment - end - - environment_item (a_name: READABLE_STRING_GENERAL): detachable STRING_32 - do - Result := execution_environment.item (a_name) - end - -end diff --git a/library/server/wsf/router/wsf_routed_skeleton_service.e b/library/server/wsf/router/wsf_routed_skeleton_service.e index 48284652..45fd8975 100644 --- a/library/server/wsf/router/wsf_routed_skeleton_service.e +++ b/library/server/wsf/router/wsf_routed_skeleton_service.e @@ -30,10 +30,15 @@ feature -- Execution handle_unavailable (res) elseif requires_proxy (req) then handle_use_proxy (req, res) - elseif maximum_uri_length > 0 and then req.request_uri.count.to_natural_32 > maximum_uri_length then + elseif + maximum_uri_length > 0 and then + req.request_uri.count.to_natural_32 > maximum_uri_length + then handle_request_uri_too_long (res) - elseif req.is_request_method ({HTTP_REQUEST_METHODS}.method_options) and then - req.request_uri.same_string ("*") then + elseif + req.is_request_method ({HTTP_REQUEST_METHODS}.method_options) and then + req.request_uri.same_string ("*") + then handle_server_options (req, res) else create l_sess diff --git a/library/server/wsf/src/service/wsf_to_wgi_service.e b/library/server/wsf/src/service/wsf_to_wgi_service.e index f39295f7..e78a8fa0 100644 --- a/library/server/wsf/src/service/wsf_to_wgi_service.e +++ b/library/server/wsf/src/service/wsf_to_wgi_service.e @@ -42,6 +42,9 @@ feature {WGI_CONNECTOR} -- Implementation: Execution w_req.destroy rescue if w_res /= Void then + if not (w_res.status_committed or w_res.header_committed) then + w_res.set_status_code ({HTTP_STATUS_CODE}.internal_server_error) + end w_res.flush end if w_req /= Void then diff --git a/library/server/wsf/src/wsf_request.e b/library/server/wsf/src/wsf_request.e index 6b9eb159..d7e843d0 100644 --- a/library/server/wsf/src/wsf_request.e +++ b/library/server/wsf/src/wsf_request.e @@ -234,7 +234,7 @@ feature -- Access: Input n: INTEGER do if raw_input_data_recorded and then attached raw_input_data as d then - buf.copy (d) + buf.append (d) else l_input := input if is_chunked_input then