Merge branch 'master' into memcached

Conflicts: src/shrpx_ssl.cc
2015-07-27 21:16:02 +09:00 · 2015-07-27 21:16:02 +09:00 · bb228c27de
parent 72cfdbc0fa 7152e0f6b8
commit bb228c27de
1 changed files with 1 additions and 1 deletions
--- a/src/shrpx_ssl.cc
+++ b/src/shrpx_ssl.cc
@ -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;