Commit ecc87844 authored by Giovannoni Laurent's avatar Giovannoni Laurent

Merge branch 'develop' into 'master'

Develop

See merge request !13
parents 9c961695 10f8df38
......@@ -47,7 +47,7 @@ class Uri
/**
* @var integer The port
*/
protected $port = 80;
protected $port;
/**
* @var string The path
......
......@@ -55,14 +55,18 @@ class StreamClient
'header' => $headers,
'content' => $body ? $request->getBody()->getContents() : null,
'ignore_errors' => true,
'timeout' => 30
'timeout' => 30,
),
'ssl' => array(
'verify_peer' => false,
'verify_peer_name' => false
)
);
$context = stream_context_create($opts);
// Get response
$this->socket = fopen((string) $request->getUri(), 'r', false, $context);
$this->socket = fopen((string) $request->getUri(), 'r', false, $context);
}
/**
......
<?xml version="1.0" encoding="UTF-8"?>
<MaarchWSClient>
<!-- REST FRONTAL -->
<WS name="MaarchRestWS" type="REST" uri="http://superadmin:superadmin@127.0.0.1/rest/" SSL="false" cacheUse="0" />
<WS name="MaarchRestWS" type="REST" uri="https://superadmin:superadmin@demo.maarchcourrier.com/rest/" />
<!-- SOAP FRONTAL -->
<WS name="MaarchSoapWS" type="SOAP" uri="http://127.0.0.1/ws_server.php?WSDL" SSL="false" cacheUse="0" >
<WS name="MaarchSoapWS" type="SOAP" uri="https://demo.maarchcourrier.com/ws_server.php?WSDL" SSL="false" cacheUse="0" >
<proxy>
<user>superadmin</user>
<pass>superadmin</pass>
......
<?xml version="1.0" encoding="UTF-8"?>
<MaarchWSClient>
<!-- REST FRONTAL -->
<WS name="MaarchRestWS" type="REST" uri="http://superadmin:superadmin@127.0.0.1/MaarchCourrier/rest/" SSL="false" cacheUse="0" />
<!-- REST FRONTAL -->
<WS name="MaarchRestWS" type="REST" uri="http://superadmin:superadmin@127.0.0.1/rest/" SSL="false" cacheUse="0" />
<!-- SOAP FRONTAL -->
<WS name="MaarchSoapWS" type="SOAP" uri="http://127.0.0.1/MaarchCourrier/ws_server.php?WSDL" SSL="false" cacheUse="0" >
<WS name="MaarchSoapWS" type="SOAP" uri="http://127.0.0.1/ws_server.php?WSDL" SSL="false" cacheUse="0" >
<proxy>
<user>superadmin</user>
<pass>superadmin</pass>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment