Rollback SPDY module and SSL config (TLSv1, TLSv1.1)

2018-06-07 09:54:00 +09:00
parent 565076d337
commit 33cd571e41
20 changed files with 5863 additions and 85 deletions
@@ -520,6 +520,12 @@ ngx_http_upstream_init(ngx_http_request_t *r)
        return;
    }
 #endif
+#if (NGX_HTTP_SPDY)
+    if (r->spdy_stream) {
+        ngx_http_upstream_init_request(r);
+        return;
+    }
+#endif

    if (c->read->timer_set) {
        ngx_del_timer(c->read);
@@ -1341,6 +1347,11 @@ ngx_http_upstream_check_broken_connection(ngx_http_request_t *r,
        return;
    }
 #endif
+#if (NGX_HTTP_SPDY)
+    if (r->spdy_stream) {
+        return;
+    }
+#endif

 #if (NGX_HAVE_KQUEUE)