httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1707479 - in /httpd/httpd/trunk/modules/http2: h2_util.c h2_version.h
Date Thu, 08 Oct 2015 11:01:12 GMT
Author: icing
Date: Thu Oct  8 11:01:12 2015
New Revision: 1707479

URL: http://svn.apache.org/viewvc?rev=1707479&view=rev
Log:
reverted r1707468 as not good enough

Modified:
    httpd/httpd/trunk/modules/http2/h2_util.c
    httpd/httpd/trunk/modules/http2/h2_version.h

Modified: httpd/httpd/trunk/modules/http2/h2_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_util.c?rev=1707479&r1=1707478&r2=1707479&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_util.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_util.c Thu Oct  8 11:01:12 2015
@@ -484,38 +484,19 @@ int h2_util_has_flush_or_eos(apr_bucket_
 
 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;

Modified: httpd/httpd/trunk/modules/http2/h2_version.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_version.h?rev=1707479&r1=1707478&r2=1707479&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_version.h (original)
+++ httpd/httpd/trunk/modules/http2/h2_version.h Thu Oct  8 11:01:12 2015
@@ -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 */



Mime
View raw message