Skip to content

Commit 7454211

Browse files
committed
Fix version access for libmemcached older than 1.0.8.
1 parent 09791df commit 7454211

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

php_memcached.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2642,10 +2642,17 @@ static memcached_return php_memc_do_version_callback(const memcached_st *ptr, me
26422642
struct callbackContext* context = (struct callbackContext*) in_context;
26432643

26442644
hostport_len = spprintf(&hostport, 0, "%s:%d", memcached_server_name(instance), memcached_server_port(instance));
2645+
#if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX >= 0x01000008
26452646
version_len = snprintf(version, sizeof(version), "%d.%d.%d",
26462647
memcached_server_major_version(instance),
26472648
memcached_server_minor_version(instance),
26482649
memcached_server_micro_version(instance));
2650+
#else
2651+
version_len = snprintf(version, sizeof(version), "%d.%d.%d",
2652+
instance->major_version,
2653+
instance->minor_version,
2654+
instance->micro_version);
2655+
#endif
26492656

26502657
add_assoc_stringl_ex(context->return_value, hostport, hostport_len+1, version, version_len, 1);
26512658
efree(hostport);

0 commit comments

Comments
 (0)