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

Merge branch 'master' into es17.01

Browse Source
This commit is contained in:
Jocelyn Fiat
2017-05-15 13:20:24 +02:00
parent 24d834fb0b 485a3812d9
commit cd382bca64
7 changed files with 66 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,7 @@
<file_rule>
<exclude>/http_stream_socket_ext.e$</exclude>
<condition>
<version type="compiler" max="16.9.9.9124"/>
<version type="compiler" max="17.02"/>
</condition>
</file_rule>
<cluster name="disabled_ssl_network" location="$|no_ssl\" recursive="true">
@@ -113,6 +113,11 @@
</condition>
</cluster>
</cluster>
<cluster name="network_until_17_01" location=".\src\until_17_01\">
<condition>
<version type="compiler" min="16.9.9.9124" max="17.02"/>
</condition>
</cluster>
</target>
<target name="http_network_ssl" extends="http_network">
<variable name="ssl_enabled" value="true"/>