summaryrefslogtreecommitdiff
path: root/php/src/php5
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2018-02-01 13:11:54 +0100
committerBenoit Foucher <benoit@zeroc.com>2018-02-01 13:11:54 +0100
commit1005c525cf00a6e4b2ec7db24a75e6a15582bd21 (patch)
treef3b67c1e15c846363797f79a9fa0107dc20e92e2 /php/src/php5
parentFixed syntax error (diff)
downloadice-1005c525cf00a6e4b2ec7db24a75e6a15582bd21.tar.bz2
ice-1005c525cf00a6e4b2ec7db24a75e6a15582bd21.tar.xz
ice-1005c525cf00a6e4b2ec7db24a75e6a15582bd21.zip
Changed ice_fixed to inherit invocation timeout, context and compress override from original proxy
Diffstat (limited to 'php/src/php5')
-rw-r--r--php/src/php5/Proxy.cpp22
1 files changed, 22 insertions, 0 deletions
diff --git a/php/src/php5/Proxy.cpp b/php/src/php5/Proxy.cpp
index 4758dd3db12..57d5ee52a55 100644
--- a/php/src/php5/Proxy.cpp
+++ b/php/src/php5/Proxy.cpp
@@ -1275,6 +1275,27 @@ ZEND_METHOD(Ice_ObjectPrx, ice_invocationTimeout)
}
}
+ZEND_METHOD(Ice_ObjectPrx, ice_getInvocationTimeout)
+{
+ if(ZEND_NUM_ARGS() != 0)
+ {
+ WRONG_PARAM_COUNT;
+ }
+
+ ProxyPtr _this = Wrapper<ProxyPtr>::value(getThis() TSRMLS_CC);
+ assert(_this);
+
+ try
+ {
+ ZVAL_LONG(return_value, static_cast<long>(_this->proxy->ice_getInvocationTimeout()));
+ }
+ catch(const IceUtil::Exception& ex)
+ {
+ throwException(ex TSRMLS_CC);
+ RETURN_NULL();
+ }
+}
+
ZEND_METHOD(Ice_ObjectPrx, ice_connectionId)
{
ProxyPtr _this = Wrapper<ProxyPtr>::value(getThis() TSRMLS_CC);
@@ -1770,6 +1791,7 @@ static zend_function_entry _proxyMethods[] =
ZEND_ME(Ice_ObjectPrx, ice_timeout, ICE_NULLPTR, ZEND_ACC_PUBLIC)
ZEND_ME(Ice_ObjectPrx, ice_getTimeout, ICE_NULLPTR, ZEND_ACC_PUBLIC)
ZEND_ME(Ice_ObjectPrx, ice_invocationTimeout, ICE_NULLPTR, ZEND_ACC_PUBLIC)
+ ZEND_ME(Ice_ObjectPrx, ice_getInvocationTimeout, ICE_NULLPTR, ZEND_ACC_PUBLIC)
ZEND_ME(Ice_ObjectPrx, ice_connectionId, ICE_NULLPTR, ZEND_ACC_PUBLIC)
ZEND_ME(Ice_ObjectPrx, ice_fixed, ICE_NULLPTR, ZEND_ACC_PUBLIC)
ZEND_ME(Ice_ObjectPrx, ice_getConnection, ICE_NULLPTR, ZEND_ACC_PUBLIC)