diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..e69de29b
diff --git a/library/network/http_network/http_network.ecf b/library/network/http_network/http_network.ecf
index 7d9358f2..6aef2a97 100644
--- a/library/network/http_network/http_network.ecf
+++ b/library/network/http_network/http_network.ecf
@@ -57,7 +57,7 @@
/http_stream_socket_ext.e$
-
+
@@ -113,6 +113,11 @@
+
+
+
+
+
diff --git a/library/network/http_network/src/http_stream_socket.e b/library/network/http_network/src/http_stream_socket.e
index 3d6905c1..0e726744 100644
--- a/library/network/http_network/src/http_stream_socket.e
+++ b/library/network/http_network/src/http_stream_socket.e
@@ -36,13 +36,13 @@ feature -- Input
-- Make result available in `last_character'.
-- No exception raised!
do
- read_to_managed_pointer_noexception (socket_buffer, 0, character_8_bytes)
+ read_to_managed_pointer_noexception (read_socket_buffer, 0, character_8_bytes)
if was_error then
-- Socket error already set.
elseif bytes_read /= character_8_bytes then
socket_error := "Peer closed connection"
else
- last_character := socket_buffer.read_character (0)
+ last_character := read_socket_buffer.read_character (0)
socket_error := Void
end
end
@@ -208,8 +208,8 @@ feature -- Output
put_character_noexception (c: CHARACTER)
-- Write character `c' to socket.
do
- socket_buffer.put_character (c, 0)
- put_managed_pointer_noexception (socket_buffer, 0, character_8_bytes)
+ put_socket_buffer.put_character (c, 0)
+ put_managed_pointer_noexception (put_socket_buffer, 0, character_8_bytes)
end
put_string_8_noexception (s: READABLE_STRING_8)
@@ -244,7 +244,7 @@ feature -- Status report
end
note
- copyright: "2011-2016, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
+ copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software
diff --git a/library/network/http_network/src/http_stream_socket_ext.e b/library/network/http_network/src/http_stream_socket_ext.e
index 24331793..6784d023 100644
--- a/library/network/http_network/src/http_stream_socket_ext.e
+++ b/library/network/http_network/src/http_stream_socket_ext.e
@@ -2,12 +2,20 @@ note
description: "[
Extension to HTTPD_STREAM_SOCKET to support backward compatibility.
- TO BE REMOVED IN THE FUTURE, WHEN 16.05 IS OLD.
+ TO BE REMOVED IN THE FUTURE, When there is no need to support older compilers.
]"
deferred class
HTTP_STREAM_SOCKET_EXT
-feature {NONE} -- No-Exception network operation
-
+note
+ copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
+ license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+ source: "[
+ Eiffel Software
+ 5949 Hollister Ave., Goleta, CA 93117 USA
+ Telephone 805-685-1006, Fax 805-685-6869
+ Website http://www.eiffel.com
+ Customer support http://support.eiffel.com
+ ]"
end
diff --git a/library/network/http_network/src/until_16_05/http_stream_socket_ext.e b/library/network/http_network/src/until_16_05/http_stream_socket_ext.e
index bb80fc59..e1afb655 100644
--- a/library/network/http_network/src/until_16_05/http_stream_socket_ext.e
+++ b/library/network/http_network/src/until_16_05/http_stream_socket_ext.e
@@ -51,6 +51,20 @@ feature -- Access
deferred
end
+ socket_buffer: MANAGED_POINTER
+ deferred
+ end
+
+ read_socket_buffer: MANAGED_POINTER
+ do
+ Result := socket_buffer
+ end
+
+ put_socket_buffer: MANAGED_POINTER
+ do
+ Result := socket_buffer
+ end
+
feature -- Socket Recv and Send timeout.
set_recv_timeout (a_timeout_seconds: INTEGER)
diff --git a/library/network/http_network/src/until_17_01/http_stream_socket_ext.e b/library/network/http_network/src/until_17_01/http_stream_socket_ext.e
new file mode 100644
index 00000000..4fd8c60c
--- /dev/null
+++ b/library/network/http_network/src/until_17_01/http_stream_socket_ext.e
@@ -0,0 +1,29 @@
+note
+ description: "[
+ Extension to HTTPD_STREAM_SOCKET to support backward compatibility.
+
+ TO BE REMOVED IN THE FUTURE, WHEN 17.01 IS OLD.
+ ]"
+
+deferred class
+ HTTP_STREAM_SOCKET_EXT
+
+feature -- Access
+
+ socket_buffer: MANAGED_POINTER
+ deferred
+ end
+
+ read_socket_buffer: MANAGED_POINTER
+ do
+ Result := socket_buffer
+ end
+
+ put_socket_buffer: MANAGED_POINTER
+ do
+ Result := socket_buffer
+ end
+
+feature {NONE} -- No-Exception network operation
+
+end
diff --git a/library/network/websocket/server/example/echo_websocket_server/echo_websocket_server.ecf b/library/network/websocket/server/example/echo_websocket_server/echo_websocket_server.ecf
index 86d892fd..fb865f91 100644
--- a/library/network/websocket/server/example/echo_websocket_server/echo_websocket_server.ecf
+++ b/library/network/websocket/server/example/echo_websocket_server/echo_websocket_server.ecf
@@ -1,6 +1,6 @@
-
+
/\.git$
/\.svn$