From b25cb8e3b1dd4856e544b428dc84ef9ad50356b3 Mon Sep 17 00:00:00 2001 From: Sam Smith Date: Mon, 26 May 2014 20:06:16 +0100 Subject: [PATCH] Expose ZMQ_MAX_SOCKETS_DFLT as a constant Expose ZMQ_MAX_SOCKETS_DFLT as ZMQ::CTXOPT_MAX_SOCKETS_DEFAULT. Additionally, update the 032-contextopt.phpt test case so that it won't fail if ZMQ_MAX_SOCKETS_DFLT changes. Fixes mkoppanen/php-zmq#118 --- tests/032-contextopt.phpt | 4 ++-- zmq.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/032-contextopt.phpt b/tests/032-contextopt.phpt index e9a8d3a..159843c 100644 --- a/tests/032-contextopt.phpt +++ b/tests/032-contextopt.phpt @@ -12,14 +12,14 @@ include dirname(__FILE__) . '/zeromq_test_helper.inc'; $context = new ZMQContext(); -var_dump($context->getOpt(ZMQ::CTXOPT_MAX_SOCKETS)); +var_dump($context->getOpt(ZMQ::CTXOPT_MAX_SOCKETS) === ZMQ::CTXOPT_MAX_SOCKETS_DEFAULT); var_dump($context->setOpt(ZMQ::CTXOPT_MAX_SOCKETS, 512)); var_dump($context->getOpt(ZMQ::CTXOPT_MAX_SOCKETS)); echo "OK"; --EXPECT-- -int(1024) +bool(true) NULL int(512) OK \ No newline at end of file diff --git a/zmq.c b/zmq.c index 4210d0d..a3c5e84 100644 --- a/zmq.c +++ b/zmq.c @@ -2127,6 +2127,7 @@ PHP_MINIT_FUNCTION(zmq) #if (ZMQ_VERSION_MAJOR == 3 && ZMQ_VERSION_MINOR >= 2) || ZMQ_VERSION_MAJOR > 3 PHP_ZMQ_REGISTER_CONST_LONG("CTXOPT_MAX_SOCKETS", ZMQ_MAX_SOCKETS); + PHP_ZMQ_REGISTER_CONST_LONG("CTXOPT_MAX_SOCKETS_DEFAULT", ZMQ_MAX_SOCKETS_DFLT); #endif #undef PHP_ZMQ_REGISTER_CONST_LONG