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

Be sure to use ecf custom variable "ssl_enabled" and not the variant "httpd_ssl_enabled" or else.

Browse Source 
Include again the openssl include folder for EiffelStudio before 16.11, otherwise eif_openssl is not found.
This commit is contained in:
Jocelyn Fiat
2016-10-14 14:32:04 +02:00
parent 16f667af2c
commit a4d737d548
6 changed files with 56 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/simple_ssl/simple_ssl.ecf
View File

@@ -13,7 +13,7 @@
</option> </option>
<setting name="console_application" value="true"/> <setting name="console_application" value="true"/>
<setting name="concurrency" value="scoop"/> <setting name="concurrency" value="scoop"/>
<variable name="httpd_ssl_enabled" value="true"/> <variable name="ssl_enabled" value="true"/>
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/> <library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
<library name="default_standalone" location="..\..\library\server\wsf\default\standalone-safe.ecf"/> <library name="default_standalone" location="..\..\library\server\wsf\default\standalone-safe.ecf"/>
<library name="http" location="..\..\library\network\protocol\http\http-safe.ecf"/> <library name="http" location="..\..\library\network\protocol\http\http-safe.ecf"/>

22
library/network/http_network/http_network-safe.ecf
View File

@@ -34,6 +34,28 @@
<custom name="httpd_ssl_enabled" value="true"/> <custom name="httpd_ssl_enabled" value="true"/>
</condition> </condition>
</library> </library>
<external_include location="$(ISE_LIBRARY)/unstable/library/network/socket/netssl/spec/include">
<condition>
<platform excluded_value="windows"/>
<custom name="ssl_enabled" value="true"/>
<version type="compiler" max="16.11.0.0"/>
</condition>
</external_include>
<external_include location="$(ISE_LIBRARY)\unstable\library\network\socket\netssl\spec\include">
<condition>
<platform value="windows"/>
<custom name="ssl_enabled" value="true"/>
<version type="compiler" max="16.11.0.0"/>
</condition>
</external_include>
<external_cflag value="-D_WINSOCKAPI_">
<condition>
<platform value="windows"/>
<custom name="ssl_enabled" value="true"/>
<version type="compiler" max="16.11.0.0"/>
</condition>
</external_cflag>
<cluster name="network" location=".\src\"> <cluster name="network" location=".\src\">
<file_rule> <file_rule>
<exclude>/http_stream_socket_ext.e$</exclude> <exclude>/http_stream_socket_ext.e$</exclude>

25
library/network/http_network/http_network.ecf
View File

@@ -34,6 +34,28 @@
<custom name="httpd_ssl_enabled" value="true"/> <custom name="httpd_ssl_enabled" value="true"/>
</condition> </condition>
</library> </library>
<external_include location="$(ISE_LIBRARY)/unstable/library/network/socket/netssl/spec/include">
<condition>
<platform excluded_value="windows"/>
<custom name="ssl_enabled" value="true"/>
<version type="compiler" max="16.11.0.0"/>
</condition>
</external_include>
<external_include location="$(ISE_LIBRARY)\unstable\library\network\socket\netssl\spec\include">
<condition>
<platform value="windows"/>
<custom name="ssl_enabled" value="true"/>
<version type="compiler" max="16.11.0.0"/>
</condition>
</external_include>
<external_cflag value="-D_WINSOCKAPI_">
<condition>
<platform value="windows"/>
<custom name="ssl_enabled" value="true"/>
<version type="compiler" max="16.11.0.0"/>
</condition>
</external_cflag>
<cluster name="network" location=".\src\"> <cluster name="network" location=".\src\">
<file_rule> <file_rule>
<exclude>/http_stream_socket_ext.e$</exclude> <exclude>/http_stream_socket_ext.e$</exclude>
@@ -95,4 +117,7 @@
</cluster> </cluster>
</cluster> </cluster>
</target> </target>
<target name="http_network_ssl" extends="http_network">
<variable name="ssl_enabled" value="true" />
</target>
</system> </system>

13
library/network/websocket/server/example/echo_websocket_server/echo_websocket_server-safe.ecf
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="ISO-8859-1"?>
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="echo_websocket_server" uuid="C9B3DA5F-DF0D-4C0F-924A-130B5C1E6604"> <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="echo_websocket_server" uuid="C9B3DA5F-DF0D-4C0F-924A-130B5C1E6604">
<target name="common"> <target name="common">
<file_rule> <file_rule>
<exclude>/.git$</exclude> <exclude>/.git$</exclude>
@@ -7,11 +7,12 @@
<exclude>/CVS$</exclude> <exclude>/CVS$</exclude>
<exclude>/EIFGENs$</exclude> <exclude>/EIFGENs$</exclude>
</file_rule> </file_rule>
<option concurrency="none" debug="true" warning="true" full_class_checking="false" is_attached_by_default="true" is_obsolete_routine_type="true" void_safety="all" syntax="transitional"> <option debug="true" warning="true" full_class_checking="false" is_attached_by_default="true" is_obsolete_routine_type="true" void_safety="all" syntax="transitional">
<debug name="ws" enabled="true"/> <debug name="ws" enabled="true"/>
<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/> <assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
</option> </option>
<setting name="console_application" value="true"/> <setting name="console_application" value="true"/>
<setting name="concurrency" value="scoop"/>
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"> <library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf">
<option> <option>
<assertions precondition="true"/> <assertions precondition="true"/>
@@ -30,18 +31,16 @@
</target> </target>
<target name="echo_websocket_server_mt" extends="common"> <target name="echo_websocket_server_mt" extends="common">
<root class="APPLICATION" feature="make_and_launch"/> <root class="APPLICATION" feature="make_and_launch"/>
<option concurrency="thread" root_concurrency="thread"> <setting name="concurrency" value="thread"/>
</option>
</target> </target>
<target name="echo_websocket_server_mt_ssl" extends="echo_websocket_server_mt"> <target name="echo_websocket_server_mt_ssl" extends="echo_websocket_server_mt">
<variable name="ssl_enabled" value="true"/> <variable name="ssl_enabled" value="true"/>
</target> </target>
<target name="echo_websocket_server_scoop" extends="common"> <target name="echo_websocket_server_scoop" extends="common">
<root class="APPLICATION" feature="make_and_launch"/> <root class="APPLICATION" feature="make_and_launch"/>
<option concurrency="scoop" root_concurrency="scoop"> <setting name="concurrency" value="scoop"/>
</option>
</target> </target>
<target name="echo_websocket_server_scoop_ssl" extends="echo_websocket_server_scoop"> <target name="echo_websocket_server_scoop_ssl" extends="echo_websocket_server_scoop">
<variable name="httpd_ssl_enabled" value="true"/> <variable name="ssl_enabled" value="true"/>
</target> </target>
</system> </system>

2
library/server/ewsgi/connectors/standalone/test_standalone-safe.ecf
View File

@@ -27,7 +27,7 @@
<target name="test_connector_standalone" extends="test_standalone_scoop"> <target name="test_connector_standalone" extends="test_standalone_scoop">
</target> </target>
<target name="test_standalone_scoop_ssl" extends="test_standalone_scoop"> <target name="test_standalone_scoop_ssl" extends="test_standalone_scoop">
<variable name="httpd_ssl_enabled" value="true"/> <variable name="ssl_enabled" value="true"/>
<variable name="libcurl_http_client_disabled" value="true"/> <variable name="libcurl_http_client_disabled" value="true"/>
<variable name="net_http_client_disabled" value="false"/> <variable name="net_http_client_disabled" value="false"/>
<variable name="netssl_http_client_enabled" value="true"/> <variable name="netssl_http_client_enabled" value="true"/>

2
tests/all-stable-safe.ecf
View File

@@ -67,6 +67,6 @@
<target name="all_stable_with_ssl" extends="all_stable"> <target name="all_stable_with_ssl" extends="all_stable">
<description>Compiling with ssl enabled</description> <description>Compiling with ssl enabled</description>
<root all_classes="true"/> <root all_classes="true"/>
<variable name="httpd_ssl_enabled" value="true"/> <variable name="ssl_enabled" value="true"/>
</target> </target>
</system> </system>