Updated to compile with upcoming EiffelStudio 18.05 .
This commit is contained in:
@@ -27,10 +27,21 @@
|
|||||||
<custom name="ssl_enabled" excluded_value="true"/>
|
<custom name="ssl_enabled" excluded_value="true"/>
|
||||||
</condition>
|
</condition>
|
||||||
</cluster>
|
</cluster>
|
||||||
<cluster name="ssl_network" location="$|ssl\" recursive="true">
|
<cluster name="ssl_network" location="$|ssl\" recursive="false">
|
||||||
<condition>
|
<condition>
|
||||||
<custom name="ssl_enabled" value="true"/>
|
<custom name="ssl_enabled" value="true"/>
|
||||||
</condition>
|
</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>
|
||||||
</cluster>
|
</cluster>
|
||||||
</target>
|
</target>
|
||||||
|
|||||||
@@ -2,22 +2,9 @@ note
|
|||||||
description: "[
|
description: "[
|
||||||
Extension to HTTP_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
|
deferred class
|
||||||
HTTP_STREAM_SECURE_SOCKET_EXT
|
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
|
end
|
||||||
|
|||||||
@@ -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
|
||||||
Reference in New Issue
Block a user