Merge pull request alibaba#527 from chobits/spdy_bugfix

SPDY: fix connection leak
jim9 · Oct 17, 2014 · 728a397 · 728a397
2 parents 57216c4 + 2998721
commit 728a397
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 1 deletion.
diff --git a/src/http/ngx_http_spdy.c b/src/http/ngx_http_spdy.c
@@ -149,6 +149,7 @@ static void ngx_http_spdy_handle_connection_handler(ngx_event_t *rev);
 static void ngx_http_spdy_keepalive_handler(ngx_event_t *rev);
 static void ngx_http_spdy_finalize_connection(ngx_http_spdy_connection_t *sc,
     ngx_int_t rc);
+static ngx_int_t ngx_http_spdy_pending(ngx_http_spdy_connection_t *sc);
 
 static void ngx_http_spdy_pool_cleanup(void *data);
 
@@ -518,7 +519,7 @@ ngx_http_spdy_send_output_queue(ngx_http_spdy_connection_t *sc)
         return NGX_ERROR; /* FIXME */
     }
 
-    if (cl) {
+    if (cl || ngx_http_spdy_pending(sc)) {
         ngx_add_timer(wev, clcf->send_timeout);
 
     } else {
@@ -558,6 +559,37 @@ ngx_http_spdy_send_output_queue(ngx_http_spdy_connection_t *sc)
 }
 
 
+static ngx_int_t
+ngx_http_spdy_pending(ngx_http_spdy_connection_t *sc)
+{
+    ngx_uint_t                 i, size;
+    ngx_http_spdy_stream_t    *stream;
+    ngx_http_spdy_srv_conf_t  *sscf;
+
+    sscf = ngx_http_get_module_srv_conf(sc->http_connection->conf_ctx,
+                                        ngx_http_spdy_module);
+
+    size = ngx_http_spdy_streams_index_size(sscf);
+
+    for (i = 0; i < size; i++) {
+        stream = sc->streams_index[i];
+
+        while (stream) {
+
+            if (stream->pending) {
+                ngx_log_debug0(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
+                               "spdy pending");
+                return 1;
+            }
+
+            stream = stream->index;
+        }
+    }
+
+    return 0;
+}
+
+
 static void
 ngx_http_spdy_handle_connection(ngx_http_spdy_connection_t *sc)
 {

diff --git a/src/http/ngx_http_spdy_filter_module.c b/src/http/ngx_http_spdy_filter_module.c
@@ -1191,6 +1191,7 @@ ngx_http_spdy_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     ngx_chain_t                *cl, *ll, *out, **ln;
     ngx_http_spdy_stream_t     *stream;
     ngx_http_spdy_out_frame_t  *frame;
+    ngx_http_spdy_connection_t *sc;
 
     stream = r->spdy_stream;
 
@@ -1205,6 +1206,12 @@ ngx_http_spdy_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "spdy body filter \"%V?%V\"", &r->uri, &r->args);
 
+    sc = stream->connection;
+
+    if (sc->connection->error || r->connection->error) {
+        return NGX_ERROR;
+    }
+
     if (in == NULL || r->header_only) {
 
         if (stream->waiting) {
@@ -1289,7 +1296,9 @@ ngx_http_spdy_v3_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     ngx_chain_t                *cl, *tl, *ll, *out, **ln;
     ngx_http_spdy_stream_t     *stream;
     ngx_http_spdy_srv_conf_t   *sscf;
+    ngx_http_core_loc_conf_t   *clcf;
     ngx_http_spdy_out_frame_t  *frame;
+    ngx_http_spdy_connection_t *sc;
 
     total = 0;
     size = 0;
@@ -1303,6 +1312,12 @@ ngx_http_spdy_v3_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "spdy body filter \"%V?%V\"", &r->uri, &r->args);
 
+    sc = stream->connection;
+
+    if (sc->connection->error || r->connection->error) {
+        return NGX_ERROR;
+    }
+
     if (in == NULL || r->header_only) {
 
         if (stream->pending && (stream->send_window_size > 0)) {
@@ -1389,6 +1404,12 @@ ngx_http_spdy_v3_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
         ngx_log_error(NGX_LOG_NOTICE, r->connection->log, 0,
                       "zero send windows size");
 
+        if (!sc->connection->write->timer_set) {
+            clcf = ngx_http_get_module_loc_conf(sc->http_connection->conf_ctx,
+                                                ngx_http_core_module);
+            ngx_add_timer(sc->connection->write, clcf->send_timeout);
+        }
+
         r->connection->buffered |= NGX_SPDY_WRITE_BUFFERED;
         return NGX_AGAIN;
     } else if (total > stream->send_window_size) {