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

Updated to compile with upcoming EiffelStudio 18.05 .

Browse Source
This commit is contained in:
Jocelyn FIAT
2018-05-28 16:11:24 +02:00
parent da2e26f697
commit 7ed1e815b0
3 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,10 +27,21 @@
<custom name="ssl_enabled" excluded_value="true"/>
</condition>
</cluster>
<cluster name="ssl_network" location="$|ssl\" recursive="true">
<cluster name="ssl_network" location="$|ssl\" recursive="false">
<condition>
<custom name="ssl_enabled" value="true"/>
</condition>
<file_rule>
<exclude>/http_stream_secure_socket_ext\.e$</exclude>
<condition>
<version type="compiler" max="18.05.0.0"/>
</condition>
</file_rule>
</cluster>
<cluster name="ssl_network_until_18_05" location="$|ssl\until_18.05" recursive="true">
<condition>
<version type="compiler" max="18.05.0.0"/>
</condition>
</cluster>
</cluster>
</target>

13
library/network/http_network/src/ssl/http_stream_secure_socket_ext.e
View File

@@ -2,22 +2,9 @@ note
description: "[
Extension to HTTP_STREAM_SOCKET to support backward compatibility.
TO BE REMOVED IN THE FUTURE, WHEN 16.05 IS OLD.
]"
deferred class
HTTP_STREAM_SECURE_SOCKET_EXT
feature {NONE} -- SSL bridge
ssl_write (a_ssl: SSL; a_pointer: POINTER; a_byte_count: INTEGER): INTEGER
do
Result := a_ssl.write (a_pointer, a_byte_count)
if a_ssl.was_error then
if Result >= 0 then
Result := -1
end
end
end
end

23
library/network/http_network/src/ssl/until_18.05/http_stream_secure_socket_ext.e Normal file
View File

@@ -0,0 +1,23 @@
note
description: "[
Extension to HTTP_STREAM_SOCKET to support backward compatibility.
TO BE REMOVED IN THE FUTURE, WHEN 16.05 IS OLD.
]"
deferred class
HTTP_STREAM_SECURE_SOCKET_EXT
feature {NONE} -- SSL bridge
ssl_write (a_ssl: SSL; a_pointer: POINTER; a_byte_count: INTEGER): INTEGER
do
Result := a_ssl.write (a_pointer, a_byte_count)
if a_ssl.was_error then
if Result >= 0 then
Result := -1
end
end
end
end