Merge branch 'develop'

This commit is contained in:
Michael RICOIS 2017-03-24 09:14:02 +01:00
commit 77496f7f99
2 changed files with 1 additions and 3 deletions

View File

@ -104,7 +104,7 @@ class ServiceController extends Zend_Controller_Action
// --- Get hostname - add compatibility with Reverse Proxy
$hostName = $request->getHttpHost();
$hostScheme = $request->getScheme();
$fichierWsdl = $hostScheme . '-' . $hostName . '-' . $fichierWsdl;
$fichierWsdl = $hostName . '-' . $hostScheme . '-' . $fichierWsdl;
$c = Zend_registry::get('config');
$wsdlPath = $c->profil->path->shared . '/wsdl';
@ -119,7 +119,6 @@ class ServiceController extends Zend_Controller_Action
|| isset($_GET['wsdl-auto'])) {
// --- Définition du webservice
$wsdl = new Zend_Soap_AutoDiscover();
$wsdl->setUri($hostScheme . '://' . $hostName);
$wsdl->setComplexTypeStrategy('Zend_Soap_Wsdl_Strategy_ArrayOfTypeSequence');
$wsdl->setOperationBodyStyle(array('use' => 'literal'));
$wsdl->setBindingStyle(array('style' => 'document'));

View File

@ -25,7 +25,6 @@ return array(
'gestion' => array(
'actif' => true,
'versions' => array(
'0.4' => array( 'actif' => true, 'defaut' => 'beta' ),
'0.3' => array( 'actif' => true, 'defaut' => true ),
),
'idClient' => array(1),