Skip to content

Commit bf8d61d

Browse files
committed
Added memcached.sess_prefix for --SERVER= connection string
1 parent 9efe90f commit bf8d61d

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

Diff for: php_memcached_session.c

+8-11
Original file line numberDiff line numberDiff line change
@@ -154,16 +154,6 @@ PS_OPEN_FUNC(memcached)
154154
status = memcached_server_push(memc_sess->memc_sess, servers);
155155
memcached_server_list_free(servers);
156156

157-
if (MEMC_G(sess_prefix) && MEMC_G(sess_prefix)[0] != 0 && memcached_callback_set(memc_sess->memc_sess, MEMCACHED_CALLBACK_PREFIX_KEY, MEMC_G(sess_prefix)) != MEMCACHED_SUCCESS) {
158-
PS_SET_MOD_DATA(NULL);
159-
if (plist_key) {
160-
efree(plist_key);
161-
}
162-
memcached_free(memc_sess->memc_sess);
163-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "bad memcached key prefix in memcached.sess_prefix");
164-
return FAILURE;
165-
}
166-
167157
if (status == MEMCACHED_SUCCESS) {
168158
goto success;
169159
}
@@ -211,6 +201,13 @@ PS_OPEN_FUNC(memcached)
211201
return FAILURE;
212202
}
213203
}
204+
205+
if (MEMC_G(sess_prefix) && MEMC_G(sess_prefix)[0] != 0 ) {
206+
if (memcached_callback_set(memc_sess->memc_sess, MEMCACHED_CALLBACK_PREFIX_KEY, MEMC_G(sess_prefix)) != MEMCACHED_SUCCESS) {
207+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "bad memcached key prefix in memcached.sess_prefix");
208+
return FAILURE;
209+
}
210+
}
214211
#ifdef HAVE_MEMCACHED_SASL
215212
if (MEMC_G(use_sasl)) {
216213
/*
@@ -334,7 +331,7 @@ PS_READ_FUNC(memcached)
334331
} else if (status == MEMCACHED_NOTFOUND) {
335332
/* this is okey, session may not be in memcached yet */
336333
return FAILURE;
337-
} else {
334+
} else {
338335
php_error_docref(NULL TSRMLS_CC, E_WARNING, "error getting session from memcached: %s", memcached_last_error_message(memc_sess->memc_sess));
339336
return FAILURE;
340337
}

0 commit comments

Comments
 (0)