diff --git a/library/network/http_client/net_http_client-safe.ecf b/library/network/http_client/net_http_client-safe.ecf
index 642bf916..30e47099 100644
--- a/library/network/http_client/net_http_client-safe.ecf
+++ b/library/network/http_client/net_http_client-safe.ecf
@@ -13,8 +13,12 @@
+
+
+
+
@@ -25,10 +29,14 @@
+
+
+
+
diff --git a/library/network/http_client/net_http_client.ecf b/library/network/http_client/net_http_client.ecf
index b2286d7e..2ee39ea7 100644
--- a/library/network/http_client/net_http_client.ecf
+++ b/library/network/http_client/net_http_client.ecf
@@ -13,8 +13,12 @@
+
+
+
+
@@ -25,10 +29,14 @@
+
+
+
+
diff --git a/library/network/http_client/src/spec/net/implementation/net_http_client_connection.e b/library/network/http_client/src/spec/net/implementation/net_http_client_connection.e
index df2ace03..3139689f 100644
--- a/library/network/http_client/src/spec/net/implementation/net_http_client_connection.e
+++ b/library/network/http_client/src/spec/net/implementation/net_http_client_connection.e
@@ -11,7 +11,7 @@ create
feature {NONE} -- Initialization
- make (a_socket: NETWORK_STREAM_SOCKET; a_host: READABLE_STRING_GENERAL; a_port: INTEGER)
+ make (a_socket: HTTP_STREAM_SOCKET; a_host: READABLE_STRING_GENERAL; a_port: INTEGER)
do
socket := a_socket
host := a_host
@@ -20,7 +20,7 @@ feature {NONE} -- Initialization
feature -- Access
- socket: NETWORK_STREAM_SOCKET
+ socket: HTTP_STREAM_SOCKET
-- Persistent connection socket.
host: READABLE_STRING_GENERAL
@@ -40,7 +40,7 @@ feature -- Status report
end
note
- copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+ copyright: "2011-2016, Jocelyn Fiat, Javier Velilla, 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_client/src/spec/net/net_http_client_request.e b/library/network/http_client/src/spec/net/net_http_client_request.e
index 1014c929..5de2cf0d 100644
--- a/library/network/http_client/src/spec/net/net_http_client_request.e
+++ b/library/network/http_client/src/spec/net/net_http_client_request.e
@@ -28,11 +28,11 @@ feature {NONE} -- Internal
session: NET_HTTP_CLIENT_SESSION
net_http_client_version: STRING = "0.1"
- session_socket (a_host: READABLE_STRING_8; a_port: INTEGER; a_is_https: BOOLEAN; ctx: detachable HTTP_CLIENT_REQUEST_CONTEXT): NETWORK_STREAM_SOCKET
+ session_socket (a_host: READABLE_STRING_8; a_port: INTEGER; a_is_https: BOOLEAN; ctx: detachable HTTP_CLIENT_REQUEST_CONTEXT): HTTP_STREAM_SOCKET
-- Session socket to use for connection.
-- Eventually reuse the persistent connection if any.
local
- l_socket: detachable NETWORK_STREAM_SOCKET
+ l_socket: detachable HTTP_STREAM_SOCKET
do
if
attached session.persistent_connection as l_persistent_connection and then
@@ -40,12 +40,12 @@ feature {NONE} -- Internal
then
l_socket := l_persistent_connection.socket
if a_is_https then
- if attached {SSL_NETWORK_STREAM_SOCKET} l_socket as l_ssl_socket then
+ if attached {HTTP_STREAM_SSL_SOCKET} l_socket as l_ssl_socket then
Result := l_ssl_socket
else
l_socket := Void
end
- elseif attached {SSL_NETWORK_STREAM_SOCKET} l_socket as l_ssl_socket then
+ elseif attached {HTTP_STREAM_SSL_SOCKET} l_socket as l_ssl_socket then
l_socket := Void
end
if l_socket /= Void and then not l_socket.is_connected then
@@ -59,7 +59,7 @@ feature {NONE} -- Internal
else
session.set_persistent_connection (Void)
if a_is_https then
- create {SSL_NETWORK_STREAM_SOCKET} Result.make_client_by_port (a_port, a_host)
+ create {HTTP_STREAM_SSL_SOCKET} Result.make_client_by_port (a_port, a_host)
else
create Result.make_client_by_port (a_port, a_host)
end
@@ -81,7 +81,7 @@ feature -- Access
l_cookie: detachable READABLE_STRING_8
l_request_uri: STRING
l_url: HTTP_URL
- l_socket: NETWORK_STREAM_SOCKET
+ l_socket: HTTP_STREAM_SOCKET
s: STRING
l_message: STRING
l_content_length: INTEGER
@@ -438,7 +438,7 @@ feature {NONE} -- Helpers
io.error.put_string (m)
end
- is_ready_for_reading (a_socket: NETWORK_STREAM_SOCKET): BOOLEAN
+ is_ready_for_reading (a_socket: HTTP_STREAM_SOCKET): BOOLEAN
-- Is `a_socket' ready for reading?
do
Result := a_socket.ready_for_reading
@@ -518,7 +518,7 @@ feature {NONE} -- Helpers
Result := utf.utf_32_string_to_utf_8_string_8 (s)
end
- put_string_using_chunked_transfer_encoding (a_string: READABLE_STRING_8; a_chunk_size: INTEGER; a_output: NETWORK_STREAM_SOCKET)
+ put_string_using_chunked_transfer_encoding (a_string: READABLE_STRING_8; a_chunk_size: INTEGER; a_output: HTTP_STREAM_SOCKET)
local
i,n: INTEGER
do
@@ -534,7 +534,7 @@ feature {NONE} -- Helpers
put_chunk_end (Void, Void, a_output)
end
- put_chunk (a_content: READABLE_STRING_8; a_ext: detachable READABLE_STRING_8; a_output: NETWORK_STREAM_SOCKET)
+ put_chunk (a_content: READABLE_STRING_8; a_ext: detachable READABLE_STRING_8; a_output: HTTP_STREAM_SOCKET)
-- Write chunk non empty `a_content' to `a_output'
-- with optional extension `a_ext': chunk-extension= *( ";" chunk-ext-name [ "=" chunk-ext-val ] )
-- Note: that header "Transfer-Encoding: chunked" is required.
@@ -569,7 +569,7 @@ feature {NONE} -- Helpers
a_output.put_string (crlf)
end
- put_chunk_end (a_ext: detachable READABLE_STRING_8; a_trailer: detachable READABLE_STRING_8; a_output: NETWORK_STREAM_SOCKET)
+ put_chunk_end (a_ext: detachable READABLE_STRING_8; a_trailer: detachable READABLE_STRING_8; a_output: HTTP_STREAM_SOCKET)
-- Put end of chunked content,
-- with optional extension `a_ext': chunk-extension= *( ";" chunk-ext-name [ "=" chunk-ext-val ] )
-- and with optional trailer `a_trailer' : trailer= *(entity-header CRLF)
@@ -595,7 +595,7 @@ feature {NONE} -- Helpers
a_output.put_string (crlf)
end
- append_file_content_to_socket_using_chunked_transfer_encoding (a_file: FILE; a_len: INTEGER; a_chunk_size: INTEGER; a_output: NETWORK_STREAM_SOCKET)
+ append_file_content_to_socket_using_chunked_transfer_encoding (a_file: FILE; a_len: INTEGER; a_chunk_size: INTEGER; a_output: HTTP_STREAM_SOCKET)
-- Append `a_file' content as chunks of `a_chunk_size' length to `a_output'.
-- If `a_len' >= 0 then read only `a_len' characters.
require
@@ -631,7 +631,7 @@ feature {NONE} -- Helpers
end
end
- append_file_content_to_socket (a_file: FILE; a_len: INTEGER; a_output: NETWORK_STREAM_SOCKET)
+ append_file_content_to_socket (a_file: FILE; a_len: INTEGER; a_output: HTTP_STREAM_SOCKET)
-- Append `a_file' content to `a_output'.
-- If `a_len' >= 0 then read only `a_len' characters.
require
@@ -704,7 +704,7 @@ feature {NONE} -- Helpers
end
end
- append_socket_header_content_to (a_response: HTTP_CLIENT_RESPONSE; a_socket: NETWORK_STREAM_SOCKET; a_output: STRING)
+ append_socket_header_content_to (a_response: HTTP_CLIENT_RESPONSE; a_socket: HTTP_STREAM_SOCKET; a_output: STRING)
-- Get header from `a_socket' into `a_output'.
local
s: READABLE_STRING_8
@@ -714,7 +714,7 @@ feature {NONE} -- Helpers
until
s.same_string ("%R") or not a_socket.readable or a_response.error_occurred
loop
- a_socket.read_line_thread_aware
+ a_socket.read_line_noexception
s := a_socket.last_string
if s.is_empty then
if session.is_debug_verbose then
@@ -730,7 +730,7 @@ feature {NONE} -- Helpers
end
end
- append_socket_content_to (a_response: HTTP_CLIENT_RESPONSE; a_socket: NETWORK_STREAM_SOCKET; a_len: INTEGER; a_output: STRING)
+ append_socket_content_to (a_response: HTTP_CLIENT_RESPONSE; a_socket: HTTP_STREAM_SOCKET; a_len: INTEGER; a_output: STRING)
-- Get content from `a_socket' and append it to `a_output'.
-- If `a_len' is negative, try to get as much as possible,
-- this is probably HTTP/1.0 without any Content-Length.
@@ -749,7 +749,7 @@ feature {NONE} -- Helpers
until
r = 0 or else not a_socket.readable or else a_response.error_occurred
loop
- a_socket.read_stream_thread_aware (r)
+ a_socket.read_stream_noexception (r)
l_count := l_count + a_socket.bytes_read
if session.is_debug_verbose then
log ("Debug: - byte read=" + a_socket.bytes_read.out + "%N")
@@ -772,7 +772,7 @@ feature {NONE} -- Helpers
until
n < l_chunk_size or not a_socket.readable
loop
- a_socket.read_stream_thread_aware (l_chunk_size)
+ a_socket.read_stream_noexception (l_chunk_size)
s := a_socket.last_string
n := a_socket.bytes_read
l_count := l_count + n
@@ -782,7 +782,7 @@ feature {NONE} -- Helpers
end
end
- append_socket_chunked_content_to (a_response: HTTP_CLIENT_RESPONSE; a_socket: NETWORK_STREAM_SOCKET; a_output: STRING)
+ append_socket_chunked_content_to (a_response: HTTP_CLIENT_RESPONSE; a_socket: HTTP_STREAM_SOCKET; a_output: STRING)
-- Get chunked content from `a_socket' and append it to `a_output'.
require
socket_readable: a_socket.readable
@@ -803,7 +803,7 @@ feature {NONE} -- Helpers
until
n = 0 or not a_socket.readable
loop
- a_socket.read_line_thread_aware -- Read chunk info
+ a_socket.read_line_noexception
s := a_socket.last_string
s.right_adjust
if session.is_debug_verbose then
@@ -832,7 +832,7 @@ feature {NONE} -- Helpers
until
r = 0 or else not a_socket.readable or else a_response.error_occurred
loop
- a_socket.read_stream_thread_aware (r)
+ a_socket.read_stream_noexception (r)
l_count := l_count + a_socket.bytes_read
if session.is_debug_verbose then
log ("Debug: - byte read=" + a_socket.bytes_read.out + "%N")
@@ -842,9 +842,9 @@ feature {NONE} -- Helpers
a_output.append (a_socket.last_string)
end
- a_socket.read_character
+ a_socket.read_character_noexception
check a_socket.last_character = '%R' end
- a_socket.read_character
+ a_socket.read_character_noexception
check a_socket.last_character = '%N' end
if session.is_debug_verbose then
log ("Debug: - Found CRNL %N")
diff --git a/library/network/http_client/src/spec/net/no_ssl/ssl_network_stream_socket.e b/library/network/http_client/src/spec/net/no_ssl/ssl_network_stream_socket.e
deleted file mode 100644
index 5a3264c7..00000000
--- a/library/network/http_client/src/spec/net/no_ssl/ssl_network_stream_socket.e
+++ /dev/null
@@ -1,22 +0,0 @@
-note
- description: "[
- A fake SSL network stream socket... when SSL is disabled at compilation time.
- Its behavior is similar to NETWORK_STREAM_SOCKET.
- ]"
- date: "$Date$"
- revision: "$Revision$"
-
-class
- SSL_NETWORK_STREAM_SOCKET
-
-inherit
- NETWORK_STREAM_SOCKET
-
-create
- make, make_empty, make_client_by_port, make_client_by_address_and_port, make_server_by_port, make_loopback_server_by_port
-
-create {SSL_NETWORK_STREAM_SOCKET}
- make_from_descriptor_and_address, create_from_descriptor
-
-
-end
diff --git a/library/server/httpd/http_network-safe.ecf b/library/network/http_network/http_network-safe.ecf
similarity index 76%
rename from library/server/httpd/http_network-safe.ecf
rename to library/network/http_network/http_network-safe.ecf
index 66d8878c..4924a1d1 100644
--- a/library/server/httpd/http_network-safe.ecf
+++ b/library/network/http_network/http_network-safe.ecf
@@ -1,5 +1,5 @@
-
+
@@ -11,6 +11,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -24,13 +34,20 @@
-
+
/httpd_stream_socket_ext.e$
+
+
+
+
+
+
+
@@ -58,7 +75,7 @@
-
+
diff --git a/library/server/httpd/http_network.ecf b/library/network/http_network/http_network.ecf
similarity index 83%
rename from library/server/httpd/http_network.ecf
rename to library/network/http_network/http_network.ecf
index b90cf5d9..c828be6c 100644
--- a/library/server/httpd/http_network.ecf
+++ b/library/network/http_network/http_network.ecf
@@ -1,5 +1,5 @@
-
+
@@ -11,6 +11,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -24,7 +34,7 @@
-
+
/httpd_stream_socket_ext.e$
@@ -58,7 +68,7 @@
-
+
diff --git a/library/network/http_network/license.lic b/library/network/http_network/license.lic
new file mode 100644
index 00000000..b6e9ed5e
--- /dev/null
+++ b/library/network/http_network/license.lic
@@ -0,0 +1,10 @@
+${NOTE_KEYWORD}
+ copyright: "2011-${YEAR}, 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
+ ]"
diff --git a/library/server/httpd/spec/include_until_16_05/ew_httpd_net.h b/library/network/http_network/spec/include_until_16_05/ew_httpd_net.h
similarity index 100%
rename from library/server/httpd/spec/include_until_16_05/ew_httpd_net.h
rename to library/network/http_network/spec/include_until_16_05/ew_httpd_net.h
diff --git a/library/server/httpd/network/httpd_stream_socket.e b/library/network/http_network/src/http_stream_socket.e
similarity index 96%
rename from library/server/httpd/network/httpd_stream_socket.e
rename to library/network/http_network/src/http_stream_socket.e
index b916b2f5..163af388 100644
--- a/library/server/httpd/network/httpd_stream_socket.e
+++ b/library/network/http_network/src/http_stream_socket.e
@@ -1,15 +1,15 @@
note
- description: "Summary description for {HTTPD_STREAM_SOCKET}."
+ description: "Summary description for {HTTP_STREAM_SOCKET}."
date: "$Date$"
revision: "$Revision$"
class
- HTTPD_STREAM_SOCKET
+ HTTP_STREAM_SOCKET
inherit
NETWORK_STREAM_SOCKET
- HTTPD_STREAM_SOCKET_EXT
+ HTTP_STREAM_SOCKET_EXT
create
make, make_empty,
@@ -230,7 +230,7 @@ feature -- Status report
end
note
- copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+ copyright: "2011-2016, 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/server/httpd/network/httpd_stream_socket_ext.e b/library/network/http_network/src/http_stream_socket_ext.e
similarity index 89%
rename from library/server/httpd/network/httpd_stream_socket_ext.e
rename to library/network/http_network/src/http_stream_socket_ext.e
index 0598f873..24331793 100644
--- a/library/server/httpd/network/httpd_stream_socket_ext.e
+++ b/library/network/http_network/src/http_stream_socket_ext.e
@@ -6,7 +6,7 @@ note
]"
deferred class
- HTTPD_STREAM_SOCKET_EXT
+ HTTP_STREAM_SOCKET_EXT
feature {NONE} -- No-Exception network operation
diff --git a/library/network/http_network/src/no_ssl/http_stream_ssl_socket.e b/library/network/http_network/src/no_ssl/http_stream_ssl_socket.e
new file mode 100644
index 00000000..3430ccc8
--- /dev/null
+++ b/library/network/http_network/src/no_ssl/http_stream_ssl_socket.e
@@ -0,0 +1,27 @@
+note
+ description: "[
+ A fake SSL network stream socket... when SSL is disabled at compilation time.
+ Its behavior is similar to HTTP_STREAM_SOCKET.
+ ]"
+ date: "$Date$"
+ revision: "$Revision$"
+
+class
+ HTTP_STREAM_SSL_SOCKET
+
+inherit
+ HTTP_STREAM_SOCKET
+
+create
+ make, make_empty,
+ make_client_by_port, make_client_by_address_and_port,
+ make_server_by_port, make_server_by_address_and_port, make_loopback_server_by_port
+
+create {HTTP_STREAM_SSL_SOCKET}
+ make_from_descriptor_and_address
+
+note
+ copyright: "2011-2013, Javier Velilla, Jocelyn Fiat and others"
+ license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+
+end
diff --git a/library/server/httpd/network/ssl/httpd_stream_ssl_socket.e b/library/network/http_network/src/ssl/http_stream_ssl_socket.e
similarity index 96%
rename from library/server/httpd/network/ssl/httpd_stream_ssl_socket.e
rename to library/network/http_network/src/ssl/http_stream_ssl_socket.e
index 15435601..408ced76 100644
--- a/library/server/httpd/network/ssl/httpd_stream_ssl_socket.e
+++ b/library/network/http_network/src/ssl/http_stream_ssl_socket.e
@@ -4,10 +4,10 @@ note
revision: "$Revision$"
class
- HTTPD_STREAM_SSL_SOCKET
+ HTTP_STREAM_SSL_SOCKET
inherit
- HTTPD_STREAM_SOCKET
+ HTTP_STREAM_SOCKET
undefine
make_empty, make_from_descriptor_and_address,
error_number,
@@ -31,7 +31,7 @@ inherit
put_managed_pointer -- Redefine to allow support of compiler before 16.11.
end
- HTTPD_STREAM_SSL_SOCKET_EXT
+ HTTP_STREAM_SSL_SOCKET_EXT
create
make, make_empty,
@@ -105,7 +105,7 @@ feature -- Output
-- Put data of length `nb_bytes' pointed by `start_pos' index in `p' at
-- current position.
do
- Precursor {HTTPD_STREAM_SOCKET} (p, start_pos, nb_bytes)
+ Precursor {HTTP_STREAM_SOCKET} (p, start_pos, nb_bytes)
end
put_pointer_content_noexception (a_pointer: POINTER; a_offset, a_byte_count: INTEGER)
diff --git a/library/server/httpd/network/ssl/httpd_stream_ssl_socket_ext.e b/library/network/http_network/src/ssl/http_stream_ssl_socket_ext.e
similarity index 78%
rename from library/server/httpd/network/ssl/httpd_stream_ssl_socket_ext.e
rename to library/network/http_network/src/ssl/http_stream_ssl_socket_ext.e
index e8f095e8..64df0d9e 100644
--- a/library/server/httpd/network/ssl/httpd_stream_ssl_socket_ext.e
+++ b/library/network/http_network/src/ssl/http_stream_ssl_socket_ext.e
@@ -1,12 +1,12 @@
note
description: "[
- Extension to HTTPD_STREAM_SOCKET to support backward compatibility.
+ Extension to HTTP_STREAM_SOCKET to support backward compatibility.
TO BE REMOVED IN THE FUTURE, WHEN 16.05 IS OLD.
]"
deferred class
- HTTPD_STREAM_SSL_SOCKET_EXT
+ HTTP_STREAM_SSL_SOCKET_EXT
feature {NONE} -- SSL bridge
diff --git a/library/server/httpd/network/until_16_05/httpd_stream_socket_ext.e b/library/network/http_network/src/until_16_05/http_stream_socket_ext.e
similarity index 99%
rename from library/server/httpd/network/until_16_05/httpd_stream_socket_ext.e
rename to library/network/http_network/src/until_16_05/http_stream_socket_ext.e
index 188ac076..98450d4c 100644
--- a/library/server/httpd/network/until_16_05/httpd_stream_socket_ext.e
+++ b/library/network/http_network/src/until_16_05/http_stream_socket_ext.e
@@ -9,7 +9,7 @@ note
]"
deferred class
- HTTPD_STREAM_SOCKET_EXT
+ HTTP_STREAM_SOCKET_EXT
inherit
PLATFORM
diff --git a/library/server/httpd/network/until_16_05/ssl/httpd_stream_ssl_socket_ext.e b/library/network/http_network/src/until_16_05/ssl/http_stream_ssl_socket_ext.e
similarity index 89%
rename from library/server/httpd/network/until_16_05/ssl/httpd_stream_ssl_socket_ext.e
rename to library/network/http_network/src/until_16_05/ssl/http_stream_ssl_socket_ext.e
index 4fa6ac64..e5efd1e5 100644
--- a/library/server/httpd/network/until_16_05/ssl/httpd_stream_ssl_socket_ext.e
+++ b/library/network/http_network/src/until_16_05/ssl/http_stream_ssl_socket_ext.e
@@ -1,12 +1,12 @@
note
description: "[
- Extension to HTTPD_STREAM_SOCKET to support backward compatibility.
+ Extension to HTTP_STREAM_SOCKET to support backward compatibility.
TO BE REMOVED IN THE FUTURE, WHEN 16.05 IS OLD.
]"
deferred class
- HTTPD_STREAM_SSL_SOCKET_EXT
+ HTTP_STREAM_SSL_SOCKET_EXT
feature {NONE} -- SSL bridge
diff --git a/library/server/ewsgi/connectors/standalone/standalone-safe.ecf b/library/server/ewsgi/connectors/standalone/standalone-safe.ecf
index 7d2dcfaa..ef21ab31 100644
--- a/library/server/ewsgi/connectors/standalone/standalone-safe.ecf
+++ b/library/server/ewsgi/connectors/standalone/standalone-safe.ecf
@@ -16,7 +16,7 @@
-
+
diff --git a/library/server/ewsgi/connectors/standalone/standalone.ecf b/library/server/ewsgi/connectors/standalone/standalone.ecf
index 5a766114..f587ebf3 100644
--- a/library/server/ewsgi/connectors/standalone/standalone.ecf
+++ b/library/server/ewsgi/connectors/standalone/standalone.ecf
@@ -15,7 +15,7 @@
-
+
diff --git a/library/server/httpd/concurrency/none/httpd_connection_handler.e b/library/server/httpd/concurrency/none/httpd_connection_handler.e
index 5bc857c4..ca0ff4ec 100644
--- a/library/server/httpd/concurrency/none/httpd_connection_handler.e
+++ b/library/server/httpd/concurrency/none/httpd_connection_handler.e
@@ -33,9 +33,9 @@ feature -- Access
feature {HTTPD_SERVER_I} -- Execution
- accept_incoming_connection (a_listening_socket: HTTPD_STREAM_SOCKET)
+ accept_incoming_connection (a_listening_socket: HTTP_STREAM_SOCKET)
local
- cl: HTTPD_STREAM_SOCKET
+ cl: HTTP_STREAM_SOCKET
do
is_shutdown_requested := is_shutdown_requested or shutdown_requested (server)
if is_shutdown_requested then
diff --git a/library/server/httpd/concurrency/scoop/httpd_connection_handler.e b/library/server/httpd/concurrency/scoop/httpd_connection_handler.e
index 3941b86b..a38ddd85 100644
--- a/library/server/httpd/concurrency/scoop/httpd_connection_handler.e
+++ b/library/server/httpd/concurrency/scoop/httpd_connection_handler.e
@@ -64,19 +64,19 @@ feature {HTTPD_SERVER_I} -- Execution
p.gracefull_stop
end
- accept_incoming_connection (a_listening_socket: HTTPD_STREAM_SOCKET)
+ accept_incoming_connection (a_listening_socket: HTTP_STREAM_SOCKET)
--
do
accept_connection_on_pool (pool, a_listening_socket) -- Wait on not pool.is_full or is_stop_requested
end
- accept_connection_on_pool (a_pool: like pool; a_listening_socket: HTTPD_STREAM_SOCKET)
+ accept_connection_on_pool (a_pool: like pool; a_listening_socket: HTTP_STREAM_SOCKET)
-- Process accept connection
-- note that the precondition matters for scoop synchronization.
require
concurrency: not a_pool.is_full or is_shutdown_requested or a_pool.stop_requested
local
- cl: separate HTTPD_STREAM_SOCKET
+ cl: separate HTTP_STREAM_SOCKET
do
debug ("dbglog")
dbglog (generator + ".ENTER accept_connection_on_pool")
@@ -121,7 +121,7 @@ feature {HTTPD_SERVER_I} -- Status report
feature {NONE} -- Implementation
- separate_client_socket (hdl: separate HTTPD_REQUEST_HANDLER): separate HTTPD_STREAM_SOCKET
+ separate_client_socket (hdl: separate HTTPD_REQUEST_HANDLER): separate HTTP_STREAM_SOCKET
-- Client socket for request handler `hdl'.
do
Result := hdl.client_socket
diff --git a/library/server/httpd/concurrency/thread/httpd_connection_handler.e b/library/server/httpd/concurrency/thread/httpd_connection_handler.e
index 75115d3b..384fe6ed 100644
--- a/library/server/httpd/concurrency/thread/httpd_connection_handler.e
+++ b/library/server/httpd/concurrency/thread/httpd_connection_handler.e
@@ -51,9 +51,9 @@ feature {HTTPD_SERVER_I} -- Execution
p.terminate
end
- accept_incoming_connection (a_listening_socket: HTTPD_STREAM_SOCKET)
+ accept_incoming_connection (a_listening_socket: HTTP_STREAM_SOCKET)
local
- cl: separate HTTPD_STREAM_SOCKET
+ cl: separate HTTP_STREAM_SOCKET
do
debug ("dbglog")
dbglog (generator + ".ENTER accept_connection {"+ a_listening_socket.descriptor.out +"}")
diff --git a/library/server/httpd/httpd-safe.ecf b/library/server/httpd/httpd-safe.ecf
index 077126be..9bec7606 100644
--- a/library/server/httpd/httpd-safe.ecf
+++ b/library/server/httpd/httpd-safe.ecf
@@ -11,18 +11,8 @@
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/library/server/httpd/httpd.ecf b/library/server/httpd/httpd.ecf
index 8d357c2b..bf62bd67 100644
--- a/library/server/httpd/httpd.ecf
+++ b/library/server/httpd/httpd.ecf
@@ -11,7 +11,7 @@
-
+
diff --git a/library/server/httpd/httpd_connection_handler_i.e b/library/server/httpd/httpd_connection_handler_i.e
index be3e51f3..d24241bf 100644
--- a/library/server/httpd/httpd_connection_handler_i.e
+++ b/library/server/httpd/httpd_connection_handler_i.e
@@ -39,7 +39,7 @@ feature {NONE} -- Access
feature {HTTPD_SERVER_I} -- Execution
- accept_incoming_connection (a_listening_socket: HTTPD_STREAM_SOCKET)
+ accept_incoming_connection (a_listening_socket: HTTP_STREAM_SOCKET)
-- Accept incoming connection from `a_listening_socket'.
deferred
end
diff --git a/library/server/httpd/httpd_request_handler_i.e b/library/server/httpd/httpd_request_handler_i.e
index 59eac4e4..9ef5380d 100644
--- a/library/server/httpd/httpd_request_handler_i.e
+++ b/library/server/httpd/httpd_request_handler_i.e
@@ -72,9 +72,9 @@ feature -- Status report
feature -- Access
- internal_client_socket: detachable HTTPD_STREAM_SOCKET
+ internal_client_socket: detachable HTTP_STREAM_SOCKET
- client_socket: HTTPD_STREAM_SOCKET
+ client_socket: HTTP_STREAM_SOCKET
local
s: like internal_client_socket
do
@@ -331,7 +331,7 @@ feature -- Execution
feature -- Request processing
- process_request (a_socket: HTTPD_STREAM_SOCKET)
+ process_request (a_socket: HTTP_STREAM_SOCKET)
-- Process request on socket `a_socket'.
require
no_error: not has_error
@@ -343,7 +343,7 @@ feature -- Request processing
deferred
end
- process_bad_request (a_socket: HTTPD_STREAM_SOCKET)
+ process_bad_request (a_socket: HTTP_STREAM_SOCKET)
-- Process bad request catched on `a_socket'.
require
has_error: has_error
@@ -378,7 +378,7 @@ feature -- Request processing
feature -- Parsing
- get_request_header (a_socket: HTTPD_STREAM_SOCKET; a_is_reusing_connection: BOOLEAN)
+ get_request_header (a_socket: HTTP_STREAM_SOCKET; a_is_reusing_connection: BOOLEAN)
-- Analyze message extracted from `a_socket' as HTTP request.
-- If `a_is_reusing_connection' is True, then first use
-- Note: it reads from socket.
@@ -504,7 +504,7 @@ feature -- Parsing
end
end
- next_line (a_socket: HTTPD_STREAM_SOCKET): detachable STRING
+ next_line (a_socket: HTTP_STREAM_SOCKET): detachable STRING
-- Next line fetched from `a_socket' is available.
-- note: may update `has_error'.
require
@@ -569,7 +569,7 @@ feature -- Output
feature {NONE} -- Helpers
- socket_has_incoming_data (a_socket: HTTPD_STREAM_SOCKET): BOOLEAN
+ socket_has_incoming_data (a_socket: HTTP_STREAM_SOCKET): BOOLEAN
-- Is there any data to read on `a_socket' ?
require
a_socket.readable
diff --git a/library/server/httpd/httpd_server_i.e b/library/server/httpd/httpd_server_i.e
index 3b1ac5d2..990afd29 100644
--- a/library/server/httpd/httpd_server_i.e
+++ b/library/server/httpd/httpd_server_i.e
@@ -151,7 +151,7 @@ feature -- Listening
-- Creates a socket and connects to the http server.
-- `a_server': The main server object
local
- l_listening_socket: detachable HTTPD_STREAM_SOCKET
+ l_listening_socket: detachable HTTP_STREAM_SOCKET
l_http_port: INTEGER
l_connection_handler: HTTPD_CONNECTION_HANDLER
do
@@ -234,7 +234,7 @@ feature -- Listening
feature {NONE} -- Factory
- new_listening_socket (a_addr: detachable INET_ADDRESS; a_http_port: INTEGER): HTTPD_STREAM_SOCKET
+ new_listening_socket (a_addr: detachable INET_ADDRESS; a_http_port: INTEGER): HTTP_STREAM_SOCKET
do
if a_addr /= Void then
create Result.make_server_by_address_and_port (a_addr, a_http_port)
diff --git a/library/server/httpd/license.lic b/library/server/httpd/license.lic
new file mode 100644
index 00000000..b6e9ed5e
--- /dev/null
+++ b/library/server/httpd/license.lic
@@ -0,0 +1,10 @@
+${NOTE_KEYWORD}
+ copyright: "2011-${YEAR}, 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
+ ]"
diff --git a/library/server/httpd/no_ssl/httpd_socket_factory.e b/library/server/httpd/no_ssl/httpd_socket_factory.e
index 6c08bc32..f3fb05ba 100644
--- a/library/server/httpd/no_ssl/httpd_socket_factory.e
+++ b/library/server/httpd/no_ssl/httpd_socket_factory.e
@@ -8,7 +8,7 @@ deferred class
feature -- Access
- new_client_socket (a_is_secure: BOOLEAN): HTTPD_STREAM_SOCKET
+ new_client_socket (a_is_secure: BOOLEAN): HTTP_STREAM_SOCKET
do
check not_secure: not a_is_secure end
create Result.make_empty
diff --git a/library/server/httpd/ssl/httpd_server.e b/library/server/httpd/ssl/httpd_server.e
index e1b5bca0..0b811e60 100644
--- a/library/server/httpd/ssl/httpd_server.e
+++ b/library/server/httpd/ssl/httpd_server.e
@@ -19,7 +19,7 @@ create
feature {NONE} -- Factory
- new_listening_socket (a_addr: detachable INET_ADDRESS; a_http_port: INTEGER): HTTPD_STREAM_SOCKET
+ new_listening_socket (a_addr: detachable INET_ADDRESS; a_http_port: INTEGER): HTTP_STREAM_SOCKET
local
s_ssl: HTTPD_STREAM_SSL_SOCKET
do
diff --git a/library/server/httpd/ssl/httpd_socket_factory.e b/library/server/httpd/ssl/httpd_socket_factory.e
index ff410db5..d9237ae1 100644
--- a/library/server/httpd/ssl/httpd_socket_factory.e
+++ b/library/server/httpd/ssl/httpd_socket_factory.e
@@ -8,7 +8,7 @@ deferred class
feature -- Access
- new_client_socket (a_is_secure: BOOLEAN): HTTPD_STREAM_SOCKET
+ new_client_socket (a_is_secure: BOOLEAN): HTTP_STREAM_SOCKET
do
if a_is_secure then
create {HTTPD_STREAM_SSL_SOCKET} Result.make_empty