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

Reverted a previous change, we should not truncated Content-Type after ;

Browse Source 
In the case of multipart/form-data  the parameter "boundary=" is essential
This commit is contained in:
Jocelyn Fiat
2012-03-20 14:35:04 +01:00
parent 743f26c376
commit 6c7ba93062
1 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
library/server/ewsgi/src/implementation/wgi_request_from_table.e
View File

@@ -241,13 +241,13 @@ feature {NONE} -- Element change: CGI meta parameter related to PATH_INFO
-- Fill with variable from `a_vars' -- Fill with variable from `a_vars'
local local
s: like meta_string_variable s: like meta_string_variable
s8: STRING_8
table: HASH_TABLE [READABLE_STRING_8, READABLE_STRING_8] table: HASH_TABLE [READABLE_STRING_8, READABLE_STRING_8]
l_query_string: like query_string l_query_string: like query_string
l_request_uri: detachable STRING_32 l_request_uri: detachable STRING_32
p: INTEGER l_empty_string: like empty_string
do do
create {STRING_8} empty_string.make_empty create {STRING_8} l_empty_string.make_empty
empty_string := l_empty_string
create table.make (a_vars.count) create table.make (a_vars.count)
table.compare_objects table.compare_objects
@@ -262,24 +262,15 @@ feature {NONE} -- Element change: CGI meta parameter related to PATH_INFO
end end
--| QUERY_STRING --| QUERY_STRING
l_query_string := meta_string_variable_or_default ({WGI_META_NAMES}.query_string, empty_string, False) l_query_string := meta_string_variable_or_default ({WGI_META_NAMES}.query_string, l_empty_string, False)
query_string := l_query_string query_string := l_query_string
--| REQUEST_METHOD --| REQUEST_METHOD
request_method := meta_string_variable_or_default ({WGI_META_NAMES}.request_method, empty_string, False) request_method := meta_string_variable_or_default ({WGI_META_NAMES}.request_method, l_empty_string, False)
--| CONTENT_TYPE --| CONTENT_TYPE
s := meta_string_variable ({WGI_META_NAMES}.content_type) s := meta_string_variable ({WGI_META_NAMES}.content_type)
if s /= Void and then not s.is_empty then if s /= Void and then not s.is_empty then
p := s.index_of (';', 1)
if p > 0 then
s8 := s.substring (1, p - 1)
s8.right_adjust
s := s8
end
check
no_white_space: not has_white_space (s)
end
content_type := s content_type := s
else else
content_type := Void content_type := Void
@@ -289,10 +280,10 @@ feature {NONE} -- Element change: CGI meta parameter related to PATH_INFO
content_length := meta_string_variable ({WGI_META_NAMES}.content_length) content_length := meta_string_variable ({WGI_META_NAMES}.content_length)
--| PATH_INFO --| PATH_INFO
path_info := meta_string_variable_or_default ({WGI_META_NAMES}.path_info, empty_string, False) path_info := meta_string_variable_or_default ({WGI_META_NAMES}.path_info, l_empty_string, False)
--| SERVER_NAME --| SERVER_NAME
server_name := meta_string_variable_or_default ({WGI_META_NAMES}.server_name, empty_string, False) server_name := meta_string_variable_or_default ({WGI_META_NAMES}.server_name, l_empty_string, False)
--| SERVER_PORT --| SERVER_PORT
s := meta_string_variable ({WGI_META_NAMES}.server_port) s := meta_string_variable ({WGI_META_NAMES}.server_port)
@@ -303,13 +294,13 @@ feature {NONE} -- Element change: CGI meta parameter related to PATH_INFO
end end
--| SCRIPT_NAME --| SCRIPT_NAME
script_name := meta_string_variable_or_default ({WGI_META_NAMES}.script_name, empty_string, False) script_name := meta_string_variable_or_default ({WGI_META_NAMES}.script_name, l_empty_string, False)
--| REMOTE_ADDR --| REMOTE_ADDR
remote_addr := meta_string_variable_or_default ({WGI_META_NAMES}.remote_addr, empty_string, False) remote_addr := meta_string_variable_or_default ({WGI_META_NAMES}.remote_addr, l_empty_string, False)
--| REMOTE_HOST --| REMOTE_HOST
remote_host := meta_string_variable_or_default ({WGI_META_NAMES}.remote_host, empty_string, False) remote_host := meta_string_variable_or_default ({WGI_META_NAMES}.remote_host, l_empty_string, False)
--| REQUEST_URI --| REQUEST_URI
s := meta_string_variable ({WGI_META_NAMES}.request_uri) s := meta_string_variable ({WGI_META_NAMES}.request_uri)