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

Fixed sending of chunk, especially the ending where there is an optional Trailer, and a mandatory final CRLF

Browse Source 
Now put_chunk does not support anymore empty chunk, and thus does not call put_chunk_end if ever it is called with empty chunk content.
Fixed the `transfered_content_length' when dealing with chunk transfert encoding
This commit is contained in:
Jocelyn Fiat
2012-12-18 23:34:55 +01:00
parent de93ce32ff
commit 0d87c7939a
1 changed files with 44 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
library/server/wsf/src/wsf_response.e
View File

@@ -13,6 +13,8 @@ note
]" ]"
date: "$Date$" date: "$Date$"
revision: "$Revision$" revision: "$Revision$"
EIS: "name=Hypertext Transfer Protocol -- HTTP/1.1 ", "protocol=URI", "src=http://www.w3.org/Protocols/rfc2616/rfc2616.html"
EIS: "name=Chunked Transfer Coding", "protocol=URI", "src=http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.6.1"
class class
WSF_RESPONSE WSF_RESPONSE
@@ -222,11 +224,6 @@ feature -- Output operation
l_chunk_size_line: STRING_8 l_chunk_size_line: STRING_8
i: INTEGER i: INTEGER
do do
if s.is_empty then
-- Should not occur due to precondition,
-- but let's handle the case for backward compatibility reason.
put_chunk_end
else
--| Remove all left '0' --| Remove all left '0'
l_chunk_size_line := s.count.to_hex_string l_chunk_size_line := s.count.to_hex_string
from from
@@ -245,21 +242,39 @@ feature -- Output operation
l_chunk_size_line.append (a_extension) l_chunk_size_line.append (a_extension)
end end
l_chunk_size_line.append ({HTTP_CONSTANTS}.crlf) l_chunk_size_line.append ({HTTP_CONSTANTS}.crlf)
put_string (l_chunk_size_line)
wgi_response.put_string (l_chunk_size_line)
put_string (s) put_string (s)
put_string ({HTTP_CONSTANTS}.crlf) wgi_response.put_string ({HTTP_CONSTANTS}.crlf)
flush flush
increment_transfered_content_length (s.count) ensure
end transfered_content_length = old transfered_content_length + s.count.to_natural_64
end end
put_chunk_end put_chunk_end
-- Put end of chunked content -- Put end of chunked content
-- without any optional trailer.
do do
put_string ("0" + {HTTP_CONSTANTS}.crlf) wgi_response.put_string ("0")
wgi_response.put_string ({HTTP_CONSTANTS}.crlf)
-- No trailer
wgi_response.put_string ({HTTP_CONSTANTS}.crlf)
flush flush
end end
put_chunk_end_with_trailer (a_trailer: detachable READABLE_STRING_8)
-- Put end of chunked content
-- with optional trailer: *(entity-header CRLF)
require
a_trailer_well_formatted: (a_trailer /= Void and then not a_trailer.is_empty) implies a_trailer.ends_with ({HTTP_CONSTANTS}.crlf)
do
if a_trailer /= Void and then not a_trailer.is_empty then
wgi_response.put_string (a_trailer)
end
wgi_response.put_string ({HTTP_CONSTANTS}.crlf)
end
flush flush
-- Flush if it makes sense -- Flush if it makes sense
do do