Merge branch 'v1' into es17.05

# Conflicts: # library/network/http_client/tests/test.ecf
2017-06-20 09:49:51 +02:00
parent 406a46816e a6806c676a
commit c51a0a4788
36 changed files with 2388 additions and 432 deletions
--- a/library/network/http_client/tests/test.ecf
+++ b/library/network/http_client/tests/test.ecf
@@ -13,7 +13,8 @@
 		<capability>
 			<concurrency support="thread"/>
 		</capability>
-		<variable name="netssl_http_client_enabled" value="false"/>
+		<variable name="ssl_enabled" value="true"/>
+		<variable name="netssl_http_client_enabled" value="true"/>
 		<variable name="net_http_client_disabled" value="false"/>
 		<variable name="libcurl_http_client_disabled" value="false"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>