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 7cd7670a..39ea826f 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
@@ -52,6 +52,7 @@ feature {NONE} -- Implementation: Form analyzer
 		require
 			a_content_type_valid: a_content_type /= Void and not a_content_type.has_error
 			s_attached: s /= Void
+			same_content_length: req.content_length_value = s.count
 			vars_attached: vars /= Void
 		local
 			p,i,next_b: INTEGER
@@ -233,7 +234,7 @@ feature {NONE} -- Implementation: Form analyzer
 			-- Default content type		
 
 note
-	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, 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/src/request/value/wsf_uploaded_file.e b/library/server/wsf/src/request/value/wsf_uploaded_file.e
index 1371b45a..1fbcc973 100644
--- a/library/server/wsf/src/request/value/wsf_uploaded_file.e
+++ b/library/server/wsf/src/request/value/wsf_uploaded_file.e
@@ -10,6 +10,9 @@ class
 
 inherit
 	WSF_VALUE
+		redefine
+			debug_output
+		end
 
 create
 	make
@@ -31,6 +34,23 @@ feature -- Access
 
 	url_encoded_name: READABLE_STRING_8
 
+feature -- Status report
+
+	debug_output: STRING
+			-- String that should be displayed in debugger to represent `Current'.
+		do
+			Result := Precursor
+			if
+				exists and then
+				attached tmp_name as n
+			then
+				Result.append_character (' ')
+				Result.append_character ('%"')
+				Result.append (n)
+				Result.append_character ('%"')
+			end
+		end
+
 feature -- Element change
 
 	change_name (a_name: like name)