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

[apache] / modules / http2 / h2_switch.c

diff --git a/modules/http2/h2_switch.c b/modules/http2/h2_switch.c
index 3a8567eb1b0bd9d7434c02e9366fba4cab970b3d..ef6ae29e0802c12fb25a8065c89cf112e11e36c6 100644 (file)
--- a/modules/http2/h2_switch.c
+++ b/modules/http2/h2_switch.c
@@ -185,13 +185,12 @@ static int h2_protocol_switch(conn_rec *c, request_rec *r, server_rec *s,
                 ap_log_rerror(APLOG_MARK, APLOG_DEBUG, status, r, APLOGNO(03088)
                               "session setup");
                 h2_ctx_clear(c);
-                return status;
+                return !OK;
             }
             
             h2_conn_run(ctx, c);
-            return DONE;
         }
-        return DONE;
+        return OK;
     }
     
     return DECLINED;