Merge branch 'master' of https://github.com/EiffelWebFramework/EWF

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

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

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