backup/EWF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reuse implementation from WSF_REQUEST to get input data for MIME handlers.

Browse Source
This commit is contained in:
Jocelyn Fiat
2013-03-29 17:50:34 +01:00
parent 8647ae1cd3
commit a8a3f3cb8b
3 changed files with 8 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/server/wsf/src/mime/wsf_multipart_form_data_handler.e
View File

@@ -52,7 +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 > 0 implies req.content_length_value.as_integer_32 = s.count
same_content_length: req.content_length_value > 0 implies req.content_length_value.as_integer_32 <= s.count
vars_attached: vars /= Void
local
p,i,next_b: INTEGER

38
library/server/wsf/src/support/wsf_mime_handler_helper.e
View File

@@ -9,42 +9,10 @@ deferred class
feature {NONE} -- Implementation
full_input_data (req: WSF_REQUEST): READABLE_STRING_8
full_input_data (req: WSF_REQUEST): STRING_8
do
Result := read_input_data (req.input, req.content_length_value)
end
read_input_data (a_input: WGI_INPUT_STREAM; a_content_length: NATURAL_64): STRING_8
-- All data from input form
local
n: INTEGER
t: STRING
do
if a_content_length > 0 then
create Result.make (a_content_length.as_integer_32)
n := a_input.read_to_string (Result, 1, Result.capacity)
check n = a_content_length end
else
from
n := 8_192
create Result.make (n)
until
n = 0
loop
a_input.read_string (n)
t := a_input.last_string
if t.count = 0 then
n := 0
else
if t.count < n then
n := 0
end
Result.append_string (t)
end
end
end
ensure
same_content_length: a_content_length > 0 implies Result.count = a_content_length.as_integer_32
create Result.make (0)
req.read_input_data_into (Result)
end
add_string_value_to_table (a_name: READABLE_STRING_8; a_value: READABLE_STRING_8; a_table: HASH_TABLE [WSF_VALUE, READABLE_STRING_GENERAL])

14
library/server/wsf/src/wsf_request.e
View File

@@ -211,22 +211,16 @@ feature -- Access: Input
until
n = 0
loop
l_input.read_string (n)
s := l_input.last_string
if s.count = 0 then
l_input.append_to_string (buf, n)
if l_input.last_appended_count < n then
n := 0
else
if s.count < n then
n := 0
end
buf.append (s)
end
end
else
n := content_length_value.as_integer_32
if n > 0 then
buf.resize (buf.count + n)
n := l_input.read_to_string (buf, buf.count + 1, n)
l_input.append_to_string (buf, n)
n := l_input.last_appended_count
check n = content_length_value.as_integer_32 end
end
end