summaryrefslogtreecommitdiff
path: root/php/src
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2015-10-02 10:15:53 -0400
committerJoe George <joe@zeroc.com>2015-10-02 10:22:03 -0400
commit050487e45b488a59407b88854045e261ce675661 (patch)
tree4fe6560b2b5a1c797b26879af4c1e96de189065e /php/src
parentRemoved ARM configuraton from WinRT testsuite solutions (diff)
downloadice-050487e45b488a59407b88854045e261ce675661.tar.bz2
ice-050487e45b488a59407b88854045e261ce675661.tar.xz
ice-050487e45b488a59407b88854045e261ce675661.zip
Various OS X El Capitan fixes for PHPv3.6.1-el_capitan
Diffstat (limited to 'php/src')
-rw-r--r--php/src/IcePHP/Init.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/php/src/IcePHP/Init.cpp b/php/src/IcePHP/Init.cpp
index a20c839801f..782d644b6d7 100644
--- a/php/src/IcePHP/Init.cpp
+++ b/php/src/IcePHP/Init.cpp
@@ -181,6 +181,10 @@ int initIceGlobals(zend_ice_globals* g)
ZEND_MINIT_FUNCTION(ice)
{
+ Ice::registerIceSSL(false);
+ Ice::registerIceDiscovery(false);
+ Ice::registerIceLocatorDiscovery(false);
+
REGISTER_INI_ENTRIES();
ZEND_INIT_MODULE_GLOBALS(ice, initIceGlobals, 0);