diff --git a/contrib/library/network/server/nino/library/spec/before_15_01/tcp_stream_socket.e b/contrib/library/network/server/nino/library/spec/until_16_05/tcp_stream_socket.e
similarity index 85%
rename from contrib/library/network/server/nino/library/spec/before_15_01/tcp_stream_socket.e
rename to contrib/library/network/server/nino/library/spec/until_16_05/tcp_stream_socket.e
index 992a3652..2e2339a3 100644
--- a/contrib/library/network/server/nino/library/spec/before_15_01/tcp_stream_socket.e
+++ b/contrib/library/network/server/nino/library/spec/until_16_05/tcp_stream_socket.e
@@ -17,10 +17,21 @@ create
make_server_by_port
create {NETWORK_STREAM_SOCKET}
- make_from_descriptor_and_address
+ make_from_descriptor_and_address,
+ make_empty
feature {NONE} -- Initialization
+ make_server_by_address_and_port (a_address: INET_ADDRESS; a_port: INTEGER)
+ -- Create server socket on `a_address' and `a_port'.
+ require
+ valid_port: a_port >= 0
+ do
+ make
+ create address.make_from_address_and_port (a_address, a_port)
+ bind
+ end
+
make
-- Create a network stream socket.
do
@@ -28,16 +39,6 @@ feature {NONE} -- Initialization
set_reuse_address
end
- make_server_by_address_and_port (an_address: INET_ADDRESS; a_port: INTEGER)
- -- Create server socket on `an_address' and `a_port'.
- require
- valid_port: a_port >= 0
- do
- make
- create address.make_from_address_and_port (an_address, a_port)
- bind
- end
-
feature -- Basic operation
send_message (a_msg: STRING)
diff --git a/contrib/library/network/server/nino/library/tcp_stream_socket.e b/contrib/library/network/server/nino/library/tcp_stream_socket.e
index 682ed70e..7d849d59 100644
--- a/contrib/library/network/server/nino/library/tcp_stream_socket.e
+++ b/contrib/library/network/server/nino/library/tcp_stream_socket.e
@@ -29,16 +29,6 @@ feature {NONE} -- Initialization
set_reuse_address
end
- make_server_by_address_and_port (an_address: INET_ADDRESS; a_port: INTEGER)
- -- Create server socket on `an_address' and `a_port'.
- require
- valid_port: a_port >= 0
- do
- make
- create address.make_from_address_and_port (an_address, a_port)
- bind
- end
-
feature -- Basic operation
send_message (a_msg: STRING)
diff --git a/contrib/library/network/server/nino/nino-safe.ecf b/contrib/library/network/server/nino/nino-safe.ecf
index 64002980..715f0f94 100644
--- a/contrib/library/network/server/nino/nino-safe.ecf
+++ b/contrib/library/network/server/nino/nino-safe.ecf
@@ -22,13 +22,13 @@
tcp_stream_socket.e
-
+
-
+
-
+
diff --git a/contrib/library/network/server/nino/nino.ecf b/contrib/library/network/server/nino/nino.ecf
index a555a7bf..08a2b24a 100644
--- a/contrib/library/network/server/nino/nino.ecf
+++ b/contrib/library/network/server/nino/nino.ecf
@@ -1,35 +1,35 @@
-
-
-
-
-
- /.git$
- /EIFGENs$
- /CVS$
- /.svn$
-
-
-
-
-
-
-
-
- spec
-
-
- tcp_stream_socket.e
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ /.git$
+ /EIFGENs$
+ /CVS$
+ /.svn$
+
+
+
+
+
+
+
+
+ spec
+
+
+ tcp_stream_socket.e
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/security/openid/consumer/demo/demo-safe.ecf b/library/security/openid/consumer/demo/demo-safe.ecf
index 3d9c33c2..c06ca485 100644
--- a/library/security/openid/consumer/demo/demo-safe.ecf
+++ b/library/security/openid/consumer/demo/demo-safe.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,10 @@
/CVS$
/EIFGENs$
-
+
@@ -20,6 +21,6 @@
-
+
diff --git a/library/server/ewsgi/connectors/standalone/src/wgi_standalone_connector.e b/library/server/ewsgi/connectors/standalone/src/wgi_standalone_connector.e
index 19f2cbe9..49c2c70f 100644
--- a/library/server/ewsgi/connectors/standalone/src/wgi_standalone_connector.e
+++ b/library/server/ewsgi/connectors/standalone/src/wgi_standalone_connector.e
@@ -38,7 +38,7 @@ feature {NONE} -- Initialization
make_with_base (a_base: detachable separate READABLE_STRING_8)
-- Create current standalone connector with base url `a_base'
require
- a_base_starts_with_slash: a_base /= Void implies is_valid_base (a_base)
+ a_base_starts_with_slash: (a_base /= Void and then not a_base.is_empty) implies is_valid_base (a_base)
do
make
set_base (a_base)
@@ -181,6 +181,13 @@ feature -- Element change
feature -- Server
+ launch_on_port (a_port_number: INTEGER)
+ -- Launch server listening on port `a_port_number'.
+ do
+ set_port_number (a_port_number)
+ launch
+ end
+
launch
-- Launch web server listening.
do
diff --git a/library/server/ewsgi/examples/hello_world/src/hello_world.e b/library/server/ewsgi/examples/hello_world/src/hello_world.e
index 0c71ba22..85642a4c 100644
--- a/library/server/ewsgi/examples/hello_world/src/hello_world.e
+++ b/library/server/ewsgi/examples/hello_world/src/hello_world.e
@@ -15,13 +15,13 @@ feature {NONE} -- Initialization
make
do
print ("Example: start a Standalone web server on port " + port_number.out + ", %Nand reply Hello World for any request such as http://localhost:8123/%N")
- (create {STANDALONE_SERVICE [HELLO_WORLD_EXECUTION]}.make_custom ("")).listen (port_number)
+ (create {WGI_STANDALONE_CONNECTOR [HELLO_WORLD_EXECUTION]}.make_with_base ("")).launch_on_port (port_number)
end
port_number: INTEGER = 8123
note
- copyright: "2011-2015, Eiffel Software and others"
+ copyright: "2011-2016, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software
diff --git a/library/server/ewsgi/examples/hello_world/src/hello_world_execution.e b/library/server/ewsgi/examples/hello_world/src/hello_world_execution.e
index 5ecbc814..7e3c4bf8 100644
--- a/library/server/ewsgi/examples/hello_world/src/hello_world_execution.e
+++ b/library/server/ewsgi/examples/hello_world/src/hello_world_execution.e
@@ -18,12 +18,12 @@ feature {NONE} -- Initialization
execute
do
response.set_status_code (200, Void)
- response.put_header_text ("Content-Type: text/plain%R%N")
+ response.put_header_text ("Content-Length: 13%R%NContent-Type: text/plain%R%N")
response.put_string ("Hello World!%N")
end
note
- copyright: "2011-2015, Eiffel Software and others"
+ copyright: "2011-2016, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software
diff --git a/library/server/wsf/tests/tests.ecf b/library/server/wsf/tests/tests.ecf
index f3999f02..c25b8ce9 100644
--- a/library/server/wsf/tests/tests.ecf
+++ b/library/server/wsf/tests/tests.ecf
@@ -11,15 +11,16 @@
-
-
+
+
-
+
+