Merge r1818804, r1818951, r1818958, r1818960, r1819027, r1819214, r1820035 from trunk:

[apache] / modules / http2 / h2_h2.c

diff --git a/modules/http2/h2_h2.c b/modules/http2/h2_h2.c
index 8487e413f4b44db1daa6b4ef3d64983baaff6cd4..f206beb7886ca0a4e91c48a91927159fa3feacdc 100644 (file)
--- a/modules/http2/h2_h2.c
+++ b/modules/http2/h2_h2.c
@@ -669,10 +669,11 @@ int h2_h2_process_conn(conn_rec* c)
             ap_log_cerror(APLOG_MARK, APLOG_TRACE1, status, c, "conn_setup");
             if (status != APR_SUCCESS) {
                 h2_ctx_clear(c);
-                return status;
+                return !OK;
             }
         }
-        return h2_conn_run(ctx, c);
+        h2_conn_run(ctx, c);
+        return OK;
     }
     
     ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, c, "h2_h2, declined");