From: Stefan Eissing <icing@apache.org>
Date: Thu, 8 Oct 2015 11:01:12 +0000 (+0000)
Subject: reverted r1707468 as not good enough
X-Git-Tag: 2.5.0-alpha~2741
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7002ea1e992119c340da5d07a20c1f53eaf828a0;p=apache

reverted r1707468 as not good enough

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

diff --git a/modules/http2/h2_util.c b/modules/http2/h2_util.c
index c688c84afa..c0c383797b 100644
--- a/modules/http2/h2_util.c
+++ b/modules/http2/h2_util.c
@@ -484,38 +484,19 @@ int h2_util_has_flush_or_eos(apr_bucket_brigade *bb) {
 
 int h2_util_has_eos(apr_bucket_brigade *bb, apr_size_t len)
 {
-    apr_bucket *b;
+    apr_bucket *b, *end;
     
-    if (len == 0) {
-        /* special case: this is only true, if there are only meta
-         * and an eos bucket in the brigade head.
-         */
-        for (b = APR_BRIGADE_FIRST(bb);
-             b != APR_BRIGADE_SENTINEL(bb);
-             b = APR_BUCKET_NEXT(b))
-        {
-            if (!APR_BUCKET_IS_METADATA(b) && b->length != 0) {
-                break;
-            }
-            else if (APR_BUCKET_IS_EOS(b)) {
-                return 1;
-            }
-        }
+    apr_status_t status = last_not_included(bb, len, 0, 0, &end);
+    if (status != APR_SUCCESS) {
+        return status;
     }
-    else {
-        apr_bucket *end;
-        apr_status_t status = last_not_included(bb, len, 0, 0, &end);
-        if (status != APR_SUCCESS) {
-            return status;
-        }
-        
-        for (b = APR_BRIGADE_FIRST(bb);
-             b != APR_BRIGADE_SENTINEL(bb) && b != end;
-             b = APR_BUCKET_NEXT(b))
-        {
-            if (APR_BUCKET_IS_EOS(b)) {
-                return 1;
-            }
+    
+    for (b = APR_BRIGADE_FIRST(bb);
+         b != APR_BRIGADE_SENTINEL(bb) && b != end;
+         b = APR_BUCKET_NEXT(b))
+    {
+        if (APR_BUCKET_IS_EOS(b)) {
+            return 1;
         }
     }
     return 0;
diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index 7a03865c87..7ed711ffed 100644
--- a/modules/http2/h2_version.h
+++ b/modules/http2/h2_version.h
@@ -20,7 +20,7 @@
  * @macro
  * Version number of the h2 module as c string
  */
-#define MOD_HTTP2_VERSION "1.0.0"
+#define MOD_HTTP2_VERSION "0.9.9"
 
 /**
  * @macro
@@ -28,7 +28,7 @@
  * release. This is a 24 bit number with 8 bits for major number, 8 bits
  * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
  */
-#define MOD_HTTP2_VERSION_NUM 0x010000
+#define MOD_HTTP2_VERSION_NUM 0x000909
 
 
 #endif /* mod_h2_h2_version_h */