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

Moved httpd library from ewsgi/connectors/standalone/lib/httpd to httpd.

Browse Source 
Reused the http_network library as well inside httpd library.
This commit is contained in:
Jocelyn FIAT
2016-10-12 22:54:21 +02:00
parent d28f794828
commit c132d7734b
48 changed files with 86 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,8 @@
<library name="encoder" location="..\..\..\..\text\encoder\encoder-safe.ecf"/>
<library name="ewsgi" location="..\..\ewsgi-safe.ecf" readonly="false"/>
<library name="http" location="..\..\..\..\network\protocol\http\http-safe.ecf"/>
<library name="httpd" location="lib\httpd\httpd-safe.ecf" readonly="false"/>
<library name="http_network" location="..\..\..\httpd\http_network-safe.ecf" readonly="false"/>
<library name="httpd" location="..\..\..\httpd\httpd-safe.ecf" readonly="false"/>
<cluster name="src" location=".\src\">
<cluster name="implementation" location="$|implementation\" hidden="true"/>
</cluster>

3
library/server/ewsgi/connectors/standalone/standalone.ecf
View File

@@ -15,7 +15,8 @@
<library name="encoder" location="..\..\..\..\text\encoder\encoder.ecf"/>
<library name="ewsgi" location="..\..\ewsgi.ecf" readonly="false"/>
<library name="http" location="..\..\..\..\network\protocol\http\http.ecf"/>
<library name="httpd" location="lib\httpd\httpd.ecf" readonly="false"/>
<library name="http_network" location="..\..\..\httpd\http_network.ecf" readonly="false"/>
<library name="httpd" location="..\..\..\httpd\httpd.ecf" readonly="false"/>
<cluster name="src" location=".\src\">
<cluster name="implementation" location="$|implementation\" hidden="true"/>
</cluster>

0
library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/none/httpd_connection_handler.e → library/server/httpd/concurrency/none/httpd_connection_handler.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/none/httpd_request_handler.e → library/server/httpd/concurrency/none/httpd_request_handler.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/none/httpd_request_handler_factory.e → library/server/httpd/concurrency/none/httpd_request_handler_factory.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/httpd_connection_handler.e → library/server/httpd/concurrency/scoop/httpd_connection_handler.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/httpd_request_handler.e → library/server/httpd/concurrency/scoop/httpd_request_handler.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/httpd_request_handler_factory.e → library/server/httpd/concurrency/scoop/httpd_request_handler_factory.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/pool/concurrent_pool.e → library/server/httpd/concurrency/scoop/pool/concurrent_pool.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/pool/concurrent_pool_factory.e → library/server/httpd/concurrency/scoop/pool/concurrent_pool_factory.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/pool/concurrent_pool_item.e → library/server/httpd/concurrency/scoop/pool/concurrent_pool_item.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/httpd_connection_handler.e → library/server/httpd/concurrency/thread/httpd_connection_handler.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/httpd_request_handler.e → library/server/httpd/concurrency/thread/httpd_request_handler.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/httpd_request_handler_factory.e → library/server/httpd/concurrency/thread/httpd_request_handler_factory.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/pool/pooled_thread.e → library/server/httpd/concurrency/thread/pool/pooled_thread.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/pool/thread_pool.e → library/server/httpd/concurrency/thread/pool/thread_pool.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/configuration/httpd_configuration_i.e → library/server/httpd/configuration/httpd_configuration_i.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/configuration/httpd_constants.e → library/server/httpd/configuration/httpd_constants.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/configuration/httpd_request_settings.e → library/server/httpd/configuration/httpd_request_settings.e
View File

29
library/server/ewsgi/connectors/standalone/lib/httpd/http_network-safe.ecf → library/server/httpd/http_network-safe.ecf
View File

@@ -10,12 +10,19 @@
<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="all" syntax="standard">
<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
</option>
<setting name="concurrency" value="scoop"/>
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf" readonly="false"/>
<library name="net_ssl" location="$ISE_LIBRARY\unstable\library\network\socket\netssl\net_ssl-safe.ecf">
<condition>
<custom name="ssl_enabled" value="true"/>
</condition>
<condition>
<custom name="net_ssl_enabled" value="true"/>
</condition>
<condition>
<custom name="httpd_ssl_enabled" value="true"/>
</condition>
</library>
<cluster name="network" location=".\network\">
<file_rule>
@@ -25,11 +32,25 @@
</condition>
</file_rule>
<cluster name="ssl_network" location="$|ssl\" recursive="true">
<condition>
<custom name="ssl_enabled" value="true"/>
</condition>
<condition>
<custom name="net_ssl_enabled" value="true"/>
</condition>
<condition>
<custom name="httpd_ssl_enabled" value="true"/>
</condition>
<file_rule>
<exclude>/httpd_stream_ssl_socket_ext.e$</exclude>
<condition>
<version type="compiler" max="16.11.0.0"/>
<custom name="ssl_enabled" value="true"/>
</condition>
<condition>
<version type="compiler" max="16.11.0.0"/>
<custom name="net_ssl_enabled" value="true"/>
</condition>
<condition>
<version type="compiler" max="16.11.0.0"/>
<custom name="httpd_ssl_enabled" value="true"/>
@@ -42,6 +63,14 @@
<version type="compiler" max="16.11.0.0"/>
</condition>
<cluster name="ssl_network_until_16_05" location="$|ssl\" recursive="true">
<condition>
<custom name="ssl_enabled" value="true"/>
<version type="compiler" max="16.11.0.0"/>
</condition>
<condition>
<custom name="net_ssl_enabled" value="true"/>
<version type="compiler" max="16.11.0.0"/>
</condition>
<condition>
<custom name="httpd_ssl_enabled" value="true"/>
<version type="compiler" max="16.11.0.0"/>

28
library/server/ewsgi/connectors/standalone/lib/httpd/http_network.ecf → library/server/httpd/http_network.ecf
View File

@@ -14,9 +14,15 @@
<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
<library name="net" location="$ISE_LIBRARY\library\net\net.ecf"/>
<library name="net_ssl" location="$ISE_LIBRARY\unstable\library\network\socket\netssl\net_ssl.ecf">
<condition>
<custom name="ssl_enabled" value="true"/>
</condition>
<condition>
<custom name="net_ssl_enabled" value="true"/>
</condition>
<condition>
<custom name="httpd_ssl_enabled" value="true"/>
</condition>
</library>
<cluster name="network" location=".\network\">
<file_rule>
@@ -26,11 +32,25 @@
</condition>
</file_rule>
<cluster name="ssl_network" location="$|ssl\" recursive="true">
<condition>
<custom name="ssl_enabled" value="true"/>
</condition>
<condition>
<custom name="net_ssl_enabled" value="true"/>
</condition>
<condition>
<custom name="httpd_ssl_enabled" value="true"/>
</condition>
<file_rule>
<exclude>/httpd_stream_ssl_socket_ext.e$</exclude>
<condition>
<version type="compiler" max="16.11.0.0"/>
<custom name="ssl_enabled" value="true"/>
</condition>
<condition>
<version type="compiler" max="16.11.0.0"/>
<custom name="net_ssl_enabled" value="true"/>
</condition>
<condition>
<version type="compiler" max="16.11.0.0"/>
<custom name="httpd_ssl_enabled" value="true"/>
@@ -43,6 +63,14 @@
<version type="compiler" max="16.11.0.0"/>
</condition>
<cluster name="ssl_network_until_16_05" location="$|ssl\" recursive="true">
<condition>
<custom name="ssl_enabled" value="true"/>
<version type="compiler" max="16.11.0.0"/>
</condition>
<condition>
<custom name="net_ssl_enabled" value="true"/>
<version type="compiler" max="16.11.0.0"/>
</condition>
<condition>
<custom name="httpd_ssl_enabled" value="true"/>
<version type="compiler" max="16.11.0.0"/>

39
library/server/ewsgi/connectors/standalone/lib/httpd/httpd-safe.ecf → library/server/httpd/httpd-safe.ecf
View File

@@ -22,8 +22,12 @@
</condition>
</external_include>
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
<library name="http_network" location="http_network-safe.ecf" readonly="false"/>
<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf"/>
<library name="net_ssl" location="$ISE_LIBRARY\unstable\library\network\socket\netssl\net_ssl-safe.ecf">
<condition>
<custom name="ssl_enabled" value="true"/>
</condition>
<condition>
<custom name="httpd_ssl_enabled" value="true"/>
</condition>
@@ -43,10 +47,14 @@
</file_rule>
<cluster name="no_ssl" location="$|no_ssl\" recursive="true">
<condition>
<custom name="ssl_enabled" excluded_value="true"/>
<custom name="httpd_ssl_enabled" excluded_value="true"/>
</condition>
</cluster>
<cluster name="ssl" location="$|ssl\" recursive="true">
<condition>
<custom name="ssl_enabled" value="true"/>
</condition>
<condition>
<custom name="httpd_ssl_enabled" value="true"/>
</condition>
@@ -67,36 +75,5 @@
</condition>
</cluster>
</cluster>
<cluster name="network" location=".\network\">
<file_rule>
<exclude>/httpd_stream_socket_ext.e$</exclude>
<condition>
<version type="compiler" max="16.11.0.0"/>
</condition>
</file_rule>
<cluster name="ssl_network" location="$|ssl\" recursive="true">
<condition>
<custom name="httpd_ssl_enabled" value="true"/>
</condition>
<file_rule>
<exclude>/httpd_stream_ssl_socket_ext.e$</exclude>
<condition>
<version type="compiler" max="16.11.0.0"/>
<custom name="httpd_ssl_enabled" value="true"/>
</condition>
</file_rule>
</cluster>
</cluster>
<cluster name="network_until_16_05" location=".\network\until_16_05\" recursive="false">
<condition>
<version type="compiler" max="16.11.0.0"/>
</condition>
<cluster name="ssl_network_until_16_05" location="$|ssl\" recursive="true">
<condition>
<custom name="httpd_ssl_enabled" value="true"/>
<version type="compiler" max="16.11.0.0"/>
</condition>
</cluster>
</cluster>
</target>
</system>

39
library/server/ewsgi/connectors/standalone/lib/httpd/httpd.ecf → library/server/httpd/httpd.ecf
View File

@@ -11,8 +11,12 @@
</option>
<setting name="concurrency" value="thread"/>
<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
<library name="http_network" location="http_network.ecf" readonly="false"/>
<library name="net" location="$ISE_LIBRARY\library\net\net.ecf"/>
<library name="net_ssl" location="$ISE_LIBRARY\unstable\library\network\socket\netssl\net_ssl.ecf">
<condition>
<custom name="ssl_enabled" value="true"/>
</condition>
<condition>
<custom name="httpd_ssl_enabled" value="true"/>
</condition>
@@ -23,37 +27,6 @@
</condition>
</library>
<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
<cluster name="network" location=".\network\">
<file_rule>
<exclude>/httpd_stream_socket_ext.e$</exclude>
<condition>
<version type="compiler" max="16.11.0.0"/>
</condition>
</file_rule>
<cluster name="ssl_network" location="$|ssl\" recursive="true">
<condition>
<custom name="httpd_ssl_enabled" value="true"/>
</condition>
<file_rule>
<exclude>/httpd_stream_ssl_socket_ext.e$</exclude>
<condition>
<version type="compiler" max="16.11.0.0"/>
<custom name="httpd_ssl_enabled" value="true"/>
</condition>
</file_rule>
</cluster>
</cluster>
<cluster name="network_until_16_05" location=".\network\until_16_05\" recursive="false">
<condition>
<version type="compiler" max="16.11.0.0"/>
</condition>
<cluster name="ssl_network_until_16_05" location="$|ssl\" recursive="true">
<condition>
<custom name="httpd_ssl_enabled" value="true"/>
<version type="compiler" max="16.11.0.0"/>
</condition>
</cluster>
</cluster>
<cluster name="httpd_server" location=".\" recursive="true">
<file_rule>
<exclude>/concurrency$</exclude>
@@ -63,10 +36,14 @@
</file_rule>
<cluster name="no_ssl" location="$|no_ssl\" recursive="true">
<condition>
<custom name="ssl_enabled" excluded_value="true"/>
<custom name="httpd_ssl_enabled" excluded_value="true"/>
</condition>
</cluster>
<cluster name="ssl" location="$|ssl\" recursive="true">
<condition>
<custom name="ssl_enabled" value="true"/>
</condition>
<condition>
<custom name="httpd_ssl_enabled" value="true"/>
</condition>

0
library/server/ewsgi/connectors/standalone/lib/httpd/httpd_connection_handler_i.e → library/server/httpd/httpd_connection_handler_i.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/httpd_controller.e → library/server/httpd/httpd_controller.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/httpd_debug_facilities.e → library/server/httpd/httpd_debug_facilities.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/httpd_logger.e → library/server/httpd/httpd_logger.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/httpd_logger_constants.e → library/server/httpd/httpd_logger_constants.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/httpd_request_handler_factory_i.e → library/server/httpd/httpd_request_handler_factory_i.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/httpd_request_handler_i.e → library/server/httpd/httpd_request_handler_i.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/httpd_server_i.e → library/server/httpd/httpd_server_i.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/httpd_server_observer.e → library/server/httpd/httpd_server_observer.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/network/httpd_stream_socket.e → library/server/httpd/network/httpd_stream_socket.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/network/httpd_stream_socket_ext.e → library/server/httpd/network/httpd_stream_socket_ext.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/network/ssl/httpd_stream_ssl_socket.e → library/server/httpd/network/ssl/httpd_stream_ssl_socket.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/network/ssl/httpd_stream_ssl_socket_ext.e → library/server/httpd/network/ssl/httpd_stream_ssl_socket_ext.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/network/until_16_05/httpd_stream_socket_ext.e → library/server/httpd/network/until_16_05/httpd_stream_socket_ext.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/network/until_16_05/ssl/httpd_stream_ssl_socket_ext.e → library/server/httpd/network/until_16_05/ssl/httpd_stream_ssl_socket_ext.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/no_ssl/httpd_configuration.e → library/server/httpd/no_ssl/httpd_configuration.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/no_ssl/httpd_server.e → library/server/httpd/no_ssl/httpd_server.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/no_ssl/httpd_socket_factory.e → library/server/httpd/no_ssl/httpd_socket_factory.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/package.iron → library/server/httpd/package.iron
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/spec/include_until_16_05/ew_httpd_net.h → library/server/httpd/spec/include_until_16_05/ew_httpd_net.h
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/ssl/httpd_configuration.e → library/server/httpd/ssl/httpd_configuration.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/ssl/httpd_server.e → library/server/httpd/ssl/httpd_server.e
View File

0
library/server/ewsgi/connectors/standalone/lib/httpd/ssl/httpd_socket_factory.e → library/server/httpd/ssl/httpd_socket_factory.e
View File

10
library/server/wsf/connector/standalone-safe.ecf
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-12-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-12-0 http://www.eiffel.com/developers/xml/configuration-1-12-0.xsd" name="wsf_standalone" uuid="9BF2D71A-0986-4025-9C97-15B65F07C568" library_target="wsf_standalone">
<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="wsf_standalone" uuid="9BF2D71A-0986-4025-9C97-15B65F07C568" library_target="wsf_standalone">
<target name="wsf_standalone">
<root all_classes="true"/>
<file_rule>
@@ -7,16 +7,16 @@
<exclude>/\.git$</exclude>
<exclude>/\.svn$</exclude>
</file_rule>
<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
<option concurrency="none" warning="true" full_class_checking="true" is_attached_by_default="true" is_obsolete_routine_type="true" void_safety="all" syntax="provisional">
</option>
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
<library name="connector_standalone" location="..\..\ewsgi\connectors\standalone\standalone-safe.ecf"/>
<library name="connector_standalone" location="..\..\ewsgi\connectors\standalone\standalone-safe.ecf" use_application_options="true"/>
<library name="encoder" location="..\..\..\text\encoder\encoder-safe.ecf" readonly="false"/>
<library name="error" location="..\..\..\utility\general\error\error-safe.ecf"/>
<library name="ewsgi" location="..\..\ewsgi\ewsgi-safe.ecf"/>
<library name="ewsgi" location="..\..\ewsgi\ewsgi-safe.ecf" use_application_options="true"/>
<library name="http" location="..\..\..\network\protocol\http\http-safe.ecf"/>
<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
<library name="wsf" location="..\wsf-safe.ecf"/>
<library name="wsf" location="..\wsf-safe.ecf" use_application_options="true"/>
<cluster name="wsf_standalone" location=".\standalone\" recursive="true"/>
</target>
</system>

8
library/server/wsf/default/standalone-safe.ecf
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-12-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-12-0 http://www.eiffel.com/developers/xml/configuration-1-12-0.xsd" name="default_standalone" uuid="5CBA8C5A-3191-434A-8DE1-C0C3CAC9C4F4" library_target="default_standalone">
<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="default_standalone" uuid="5CBA8C5A-3191-434A-8DE1-C0C3CAC9C4F4" library_target="default_standalone">
<target name="default_standalone">
<root all_classes="true"/>
<file_rule>
@@ -7,11 +7,11 @@
<exclude>/\.git$</exclude>
<exclude>/\.svn$</exclude>
</file_rule>
<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
<option concurrency="none" warning="true" full_class_checking="true" is_attached_by_default="true" is_obsolete_routine_type="true" void_safety="all" syntax="provisional">
</option>
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
<library name="wsf" location="..\wsf-safe.ecf"/>
<library name="wsf_standalone" location="..\connector\standalone-safe.ecf"/>
<library name="wsf" location="..\wsf-safe.ecf" use_application_options="true"/>
<library name="wsf_standalone" location="..\connector\standalone-safe.ecf" use_application_options="true"/>
<cluster name="default_standalone" location=".\standalone\" recursive="true"/>
</target>
</system>