Skip to content

Commit 2c693c7

Browse files
committed
Allow connect_timeout value of -1 and show Unlimited in phpinfo()
1 parent f54ed29 commit 2c693c7

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

Diff for: php_memcached.c

+11-2
Original file line numberDiff line numberDiff line change
@@ -329,12 +329,18 @@ PHP_INI_MH(OnUpdateSessionPrefixString)
329329
#define MEMC_INI_BOOL(key, default_value, update_fn, gkey) \
330330
STD_PHP_INI_BOOLEAN("memcached."key, default_value, PHP_INI_ALL, update_fn, memc.gkey, zend_php_memcached_globals, php_memcached_globals)
331331

332+
#define MEMC_INI_LINK(key, default_value, update_fn, gkey) \
333+
STD_PHP_INI_ENTRY_EX("memcached."key, default_value, PHP_INI_ALL, update_fn, memc.gkey, zend_php_memcached_globals, php_memcached_globals, display_link_numbers)
334+
332335
#define MEMC_SESSION_INI_ENTRY(key, default_value, update_fn, gkey) \
333336
STD_PHP_INI_ENTRY("memcached.sess_"key, default_value, PHP_INI_ALL, update_fn, session.gkey, zend_php_memcached_globals, php_memcached_globals)
334337

335338
#define MEMC_SESSION_INI_BOOL(key, default_value, update_fn, gkey) \
336339
STD_PHP_INI_BOOLEAN("memcached.sess_"key, default_value, PHP_INI_ALL, update_fn, session.gkey, zend_php_memcached_globals, php_memcached_globals)
337340

341+
#define MEMC_SESSION_INI_LINK(key, default_value, update_fn, gkey) \
342+
STD_PHP_INI_ENTRY_EX("memcached.sess_"key, default_value, PHP_INI_ALL, update_fn, session.gkey, zend_php_memcached_globals, php_memcached_globals, display_link_numbers)
343+
338344

339345
/* {{{ INI entries */
340346
PHP_INI_BEGIN()
@@ -355,7 +361,8 @@ PHP_INI_BEGIN()
355361
MEMC_SESSION_INI_BOOL ("randomize_replica_read", "0", OnUpdateBool, randomize_replica_read_enabled)
356362
MEMC_SESSION_INI_BOOL ("remove_failed_servers", "0", OnUpdateBool, remove_failed_servers_enabled)
357363
MEMC_SESSION_INI_ENTRY("server_failure_limit", "0", OnUpdateLongGEZero, server_failure_limit)
358-
MEMC_SESSION_INI_ENTRY("connect_timeout", "0", OnUpdateLongGEZero, connect_timeout)
364+
MEMC_SESSION_INI_LINK ("connect_timeout", "0", OnUpdateLong, connect_timeout)
365+
359366
MEMC_SESSION_INI_ENTRY("sasl_username", "", OnUpdateString, sasl_username)
360367
MEMC_SESSION_INI_ENTRY("sasl_password", "", OnUpdateString, sasl_password)
361368
MEMC_SESSION_INI_BOOL ("persistent", "0", OnUpdateBool, persistent_enabled)
@@ -375,14 +382,16 @@ PHP_INI_BEGIN()
375382

376383
MEMC_INI_BOOL ("default_consistent_hash", "0", OnUpdateBool, default_behavior.consistent_hash_enabled)
377384
MEMC_INI_BOOL ("default_binary_protocol", "0", OnUpdateBool, default_behavior.binary_protocol_enabled)
378-
MEMC_INI_ENTRY("default_connect_timeout", "0", OnUpdateLongGEZero, default_behavior.connect_timeout)
385+
MEMC_INI_LINK ("default_connect_timeout", "0", OnUpdateLong, default_behavior.connect_timeout)
379386

380387
PHP_INI_END()
381388
/* }}} */
382389

383390
#undef MEMC_INI_BOOL
391+
#undef MEMC_INI_LINK
384392
#undef MEMC_INI_ENTRY
385393
#undef MEMC_SESSION_INI_BOOL
394+
#undef MEMC_SESSION_INI_LINK
386395
#undef MEMC_SESSION_INI_ENTRY
387396

388397
/****************************************

0 commit comments

Comments
 (0)