Removed WGI_RESPONSE.write (..)
Replaced any internal call to WGI_RESPONSE.write () by the associated implementation (i.e output.put_string (...) ) Added WGI_OUTPUT_STREAM.put_crlf Renamed WSF_RESPONSE.put_response (a_message) as `send (a_message)' WSF_RESPONSE_MESSAGE.send_to (res) is now exported only to WSF_RESPONSE
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
note
|
||||
description: "Summary description for {WGI_NINO_CONNECTOR}."
|
||||
author: ""
|
||||
date: "$Date$"
|
||||
revision: "$Revision$"
|
||||
|
||||
@@ -127,7 +126,7 @@ feature -- Server
|
||||
end
|
||||
|
||||
note
|
||||
copyright: "2011-2012, Eiffel Software and others"
|
||||
copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
source: "[
|
||||
Eiffel Software
|
||||
|
||||
@@ -21,19 +21,24 @@ create
|
||||
feature -- Header output operation
|
||||
|
||||
put_header_text (a_text: READABLE_STRING_8)
|
||||
local
|
||||
o: like output
|
||||
do
|
||||
write (a_text)
|
||||
o := output
|
||||
o.put_string (a_text)
|
||||
|
||||
-- Nino does not support persistent connection for now
|
||||
write ("Connection: close")
|
||||
write (crlf)
|
||||
o.put_string ("Connection: close")
|
||||
o.put_crlf
|
||||
|
||||
-- end of headers
|
||||
write (crlf)
|
||||
o.put_crlf
|
||||
|
||||
header_committed := True
|
||||
end
|
||||
|
||||
;note
|
||||
copyright: "2011-2012, Eiffel Software and others"
|
||||
copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
source: "[
|
||||
Eiffel Software
|
||||
|
||||
@@ -42,14 +42,6 @@ feature -- Status report
|
||||
deferred
|
||||
end
|
||||
|
||||
feature {WGI_RESPONSE} -- Core output operation
|
||||
|
||||
write (s: READABLE_STRING_8)
|
||||
-- Send the string `s'
|
||||
-- this can be used for header and body
|
||||
deferred
|
||||
end
|
||||
|
||||
feature -- Status setting
|
||||
|
||||
status_is_set: BOOLEAN
|
||||
|
||||
@@ -48,15 +48,6 @@ feature -- Status report
|
||||
Result := status_is_set and header_committed
|
||||
end
|
||||
|
||||
feature {NONE} -- Core output operation
|
||||
|
||||
write (s: READABLE_STRING_8)
|
||||
-- Send the content of `s'
|
||||
-- this can be used for header and body
|
||||
do
|
||||
output.put_string (s)
|
||||
end
|
||||
|
||||
feature -- Status setting
|
||||
|
||||
status_is_set: BOOLEAN
|
||||
@@ -81,8 +72,8 @@ feature -- Header output operation
|
||||
|
||||
put_header_text (a_text: READABLE_STRING_8)
|
||||
do
|
||||
write (a_text)
|
||||
write (crlf)
|
||||
output.put_string (a_text)
|
||||
output.put_crlf
|
||||
header_committed := True
|
||||
end
|
||||
|
||||
@@ -126,9 +117,6 @@ feature -- Output operation
|
||||
|
||||
feature {NONE} -- Implementation: Access
|
||||
|
||||
crlf: STRING = "%R%N"
|
||||
-- End of header
|
||||
|
||||
output: WGI_OUTPUT_STREAM
|
||||
-- Server output channel
|
||||
|
||||
|
||||
@@ -52,7 +52,13 @@ feature -- Specific output
|
||||
-- Send `s' to http client as header line
|
||||
do
|
||||
put_string (s)
|
||||
put_string ("%R%N")
|
||||
put_crlf
|
||||
end
|
||||
|
||||
put_crlf
|
||||
-- Send "%R%N" string
|
||||
do
|
||||
put_string (crlf)
|
||||
end
|
||||
|
||||
feature -- Status writing
|
||||
@@ -80,6 +86,10 @@ feature -- Basic operations
|
||||
deferred
|
||||
end
|
||||
|
||||
feature -- Constant
|
||||
|
||||
crlf: STRING = "%R%N"
|
||||
|
||||
note
|
||||
copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
|
||||
Reference in New Issue
Block a user