nghttpx: Refactor handling of negotiated ALPN

src/shrpx_http2_session.cc

@@ -1425,27 +1425,25 @@ int Http2Session::connection_made() {
   if (ssl_ctx_) {
     const unsigned char *next_proto = nullptr;
     unsigned int next_proto_len = 0;
+
     SSL_get0_next_proto_negotiated(conn_.tls.ssl, &next_proto, &next_proto_len);
-    for (int i = 0; i < 2; ++i) {
-      if (next_proto) {
-        auto proto = StringRef{next_proto, next_proto_len};
-        if (LOG_ENABLED(INFO)) {
-          SSLOG(INFO, this) << "Negotiated next protocol: " << proto;
-        }
-        if (!util::check_h2_is_selected(proto)) {
-          return -1;
-        }
-        break;
-      }
 #if OPENSSL_VERSION_NUMBER >= 0x10002000L
+    if (!next_proto) {
       SSL_get0_alpn_selected(conn_.tls.ssl, &next_proto, &next_proto_len);
-#else  // OPENSSL_VERSION_NUMBER < 0x10002000L
-      break;
-#endif // OPENSSL_VERSION_NUMBER < 0x10002000L
     }
+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
+
     if (!next_proto) {
       return -1;
     }
+
+    auto proto = StringRef{next_proto, next_proto_len};
+    if (LOG_ENABLED(INFO)) {
+      SSLOG(INFO, this) << "Negotiated next protocol: " << proto;
+    }
+    if (!util::check_h2_is_selected(proto)) {
+      return -1;
+    }
   }
 
   auto &http2conf = get_config()->http2;