Commit bb228c27 authored by Tatsuhiro Tsujikawa's avatar Tatsuhiro Tsujikawa

Merge branch 'master' into memcached

Conflicts:
	src/shrpx_ssl.cc
parents 72cfdbc0 7152e0f6
......@@ -346,7 +346,7 @@ int ticket_key_cb(SSL *ssl, unsigned char *key_name, unsigned char *iv,
size_t i;
for (i = 0; i < keys.size(); ++i) {
auto &key = keys[0];
auto &key = keys[i];
if (std::equal(std::begin(key.data.name), std::end(key.data.name),
key_name)) {
break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment