summaryrefslogtreecommitdiff
path: root/php/src/IcePHP/Communicator.cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2009-12-11 17:13:15 -0800
committerMark Spruiell <mes@zeroc.com>2009-12-11 17:13:15 -0800
commit47631a32ad0dc53e2fa2fa46e66cb9fa47f9f9f2 (patch)
tree1180b77b948e8ffeb576972884f151475ed58da8 /php/src/IcePHP/Communicator.cpp
parentbug 4431 - update CHANGES for Glacier2 helpers (diff)
downloadice-47631a32ad0dc53e2fa2fa46e66cb9fa47f9f9f2.tar.bz2
ice-47631a32ad0dc53e2fa2fa46e66cb9fa47f9f9f2.tar.xz
ice-47631a32ad0dc53e2fa2fa46e66cb9fa47f9f9f2.zip
PHP fixes for 5.3.x
Diffstat (limited to 'php/src/IcePHP/Communicator.cpp')
-rw-r--r--php/src/IcePHP/Communicator.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/php/src/IcePHP/Communicator.cpp b/php/src/IcePHP/Communicator.cpp
index 8b768d72dae..36c1d1378c0 100644
--- a/php/src/IcePHP/Communicator.cpp
+++ b/php/src/IcePHP/Communicator.cpp
@@ -1289,14 +1289,27 @@ IcePHP::communicatorInit(TSRMLS_D)
//
// Create the profiles from configuration settings.
//
+ const char* empty = "";
const char* config = INI_STR(const_cast<char*>("ice.config"));
+ if(!config)
+ {
+ config = empty;
+ }
const char* options = INI_STR(const_cast<char*>("ice.options"));
+ if(!options)
+ {
+ options = empty;
+ }
if(!createProfile(_defaultProfileName, config, options TSRMLS_CC))
{
return false;
}
const char* profiles = INI_STR(const_cast<char*>("ice.profiles"));
+ if(!profiles)
+ {
+ profiles = empty;
+ }
if(strlen(profiles) > 0)
{
if(!parseProfiles(profiles TSRMLS_CC))