mod_http2: improved resume/response/window update handling on master connection

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1744712 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 19 deletions

diff --git a/modules/http2/h2_util.c b/modules/http2/h2_util.c
index 4cfa1649e4..a0f82ac057 100644
--- a/modules/http2/h2_util.c
+++ b/modules/http2/h2_util.c
@@ -682,11 +682,6 @@ static apr_status_t last_not_included(apr_bucket_brigade *bb,
                 /* included */
             }
             else {
-                if (maxlen == 0) {
-                    *pend = b;
-                    return status;
-                }
-                
                 if (b->length == ((apr_size_t)-1)) {
                     const char *ign;
                     apr_size_t ilen;
@@ -696,6 +691,11 @@ static apr_status_t last_not_included(apr_bucket_brigade *bb,
                     }
                 }
                 
+                if (maxlen == 0 && b->length > 0) {
+                    *pend = b;
+                    return status;
+                }
+                
                 if (same_alloc && APR_BUCKET_IS_FILE(b)) {
                     /* we like it move it, always */
                 }
@@ -832,20 +832,6 @@ int h2_util_has_eos(apr_bucket_brigade *bb, apr_off_t len)
     return 0;
 }
 
-int h2_util_bb_has_data(apr_bucket_brigade *bb)
-{
-    apr_bucket *b;
-    for (b = APR_BRIGADE_FIRST(bb);
-         b != APR_BRIGADE_SENTINEL(bb);
-         b = APR_BUCKET_NEXT(b))
-    {
-        if (!AP_BUCKET_IS_EOR(b)) {
-            return 1;
-        }
-    }
-    return 0;
-}
-
 apr_status_t h2_util_bb_avail(apr_bucket_brigade *bb, 
                               apr_off_t *plen, int *peos)
 {