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

Fixed compilation issue for CGI and libFCGI connector

Browse Source 
due to recent changes in interface  (use READABLE_STRING_8)
This commit is contained in:
Jocelyn Fiat
2011-12-02 12:05:07 +01:00
parent e70d67aed5
commit 03938b43c3
6 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
examples/hello_routed_world/hello-safe.ecf
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-9-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-9-0 http://www.eiffel.com/developers/xml/configuration-1-9-0.xsd" name="hello_routed_world" uuid="7C9887BD-4AE4-47F2-A0AA-4BBB6736D433">
<target name="hello_routed_world">
<target name="hello_connector">
<root class="HELLO_ROUTED_WORLD" feature="make"/>
<file_rule>
<exclude>/EIFGENs$</exclude>
@@ -12,13 +12,26 @@
</option>
<setting name="concurrency" value="thread"/>
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
<library name="connector_nino" location="..\..\library\server\ewsgi\connectors\nino\nino-safe.ecf" readonly="false"/>
<library name="default_nino" location="..\..\library\server\wsf\default\nino-safe.ecf" readonly="false"/>
<library name="encoder" location="..\..\library\text\encoder\encoder-safe.ecf" readonly="false"/>
<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf" readonly="false"/>
<library name="http" location="..\..\library\protocol\http\http-safe.ecf" readonly="false"/>
<library name="router" location="..\..\library\server\request\router\router-safe.ecf" readonly="false"/>
<library name="uri_template" location="..\..\library\protocol\uri_template\uri_template-safe.ecf" readonly="false"/>
</target>
<target name="hello_nino" extends="hello_connector">
<library name="connector_nino" location="..\..\library\server\ewsgi\connectors\nino\nino-safe.ecf" readonly="false"/>
<library name="default_nino" location="..\..\library\server\wsf\default\nino-safe.ecf" readonly="false"/>
<cluster name="src" location="src\" recursive="true"/>
</target>
<target name="hello_cgi" extends="hello_connector">
<library name="connector_cgi" location="..\..\library\server\ewsgi\connectors\cgi\cgi-safe.ecf" readonly="false"/>
<library name="default_cgi" location="..\..\library\server\wsf\default\cgi-safe.ecf" readonly="false"/>
<cluster name="src" location="src\" recursive="true"/>
</target>
<target name="hello_libfcgi" extends="hello_connector">
<library name="connector_libfcgi" location="..\..\library\server\ewsgi\connectors\libfcgi\libfcgi-safe.ecf" readonly="false"/>
<library name="default_libfcgi" location="..\..\library\server\wsf\default\libfcgi-safe.ecf" readonly="false"/>
<cluster name="src" location="src\" recursive="true"/>
</target>
</system>

14
library/server/ewsgi/connectors/cgi/src/wgi_cgi_output_stream.e
View File

@@ -10,6 +10,9 @@ class
inherit
WGI_OUTPUT_STREAM
rename
put_string as put_readable_string_8
end
CONSOLE
rename
@@ -51,6 +54,17 @@ feature -- Status writing
put_header_line (s)
end
put_readable_string_8 (s: READABLE_STRING_8)
-- Write `s' at end of default output.
local
ext: C_STRING
do
if s.count > 0 then
create ext.make (s)
console_ps (file_pointer, ext.managed_data.item, s.count)
end
end
note
copyright: "2011-2011, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"

2
library/server/ewsgi/connectors/libfcgi/src/wgi_libfcgi_output_stream.e
View File

@@ -58,7 +58,7 @@ feature -- Status writing
feature -- Basic operation
put_string (s: STRING)
put_string (s: READABLE_STRING_8)
-- Send `s' to http client
do
fcgi.put_string (s)

2
library/server/libfcgi/implementation/fake/fcgi_imp.e
View File

@@ -49,7 +49,7 @@ feature -- FCGI connection
feature -- FCGI output
put_string (a_str: STRING)
put_string (a_str: READABLE_STRING_8)
-- Put `a_str' on the FastCGI stdout.
do
io.put_string (a_str)

2
library/server/libfcgi/implementation/linux/fcgi_imp.e
View File

@@ -67,7 +67,7 @@ feature -- FCGI Connection
feature -- FCGI output
put_string (a_str: STRING)
put_string (a_str: READABLE_STRING_8)
-- Put `a_str' on the FastCGI stdout.
local
l_c_str: C_STRING

2
library/server/libfcgi/implementation/windows/fcgi_imp.e
View File

@@ -126,7 +126,7 @@ feature -- FCGI connection
feature -- FCGI output
put_string (a_str: STRING)
put_string (a_str: READABLE_STRING_8)
-- Put `a_str' on the FastCGI stdout.
local
l_c_str: C_STRING