On the trunk:

mod_http2: update after backport

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

diff --git a/CHANGES b/CHANGES
index 826184ea1aac33c416ff8eca2dc6a35154c27bc8..014d4ed4156b9e7befa2e37f6343fc77da352ff9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,19 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_http2: not counting file buckets again stream max buffer limits. 
-     Effectively transfering static files in one step from slave to master 
-     connection. [Stefan Eissing]
-    
-  *) mod_http2: comforting ap_check_pipeline() on slave connections
-     to facilitate reuse (see https://github.com/icing/mod_h2/issues/128).
-     [Stefan Eissing, reported by Armin Abfalterer]
-     
-  *) mod_http2: http/2 streams now with state handling/transitions as defined
-     in RFC7540. Stream cleanup/connection shutdown reworked to become easier
-     to understand/maintain/debug. Added many asserts on state and cleanup 
-     transitions. [Stefan Eissing]
-     
   *) mod_proxy_fcgi: Add ProxyFCGISetEnvIf to fixup CGI environment
      variables just before invoking the FastCGI. [Eric Covener,
      Jacob Champion]

diff --git a/modules/http2/h2_conn_io.c b/modules/http2/h2_conn_io.c
index 81cd65a4b099b177c132ca7b479b4ff9be3d8fbd..a526d11286ce6d75984f849909161091dd4b6d76 100644 (file)
--- a/modules/http2/h2_conn_io.c
+++ b/modules/http2/h2_conn_io.c
@@ -117,8 +117,8 @@ static void h2_conn_io_bb_log(conn_rec *c, int stream_id, int level,
         line = *buffer? buffer : "(empty)";
     }
     /* Intentional no APLOGNO */
-    ap_log_cerror(APLOG_MARK, level, 0, c, "h2_session(%s)-%s: %s", 
-                  c->log_id, tag, line);
+    ap_log_cerror(APLOG_MARK, level, 0, c, "h2_session(%ld)-%s: %s", 
+                  c->id, tag, line);
 
 }
 

diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index 9ab0ad5eb3a7cbf8ba3ab194a94a274f81665f0b..244285d9776ad572d48abf037d6078e4ba17790c 100644 (file)
--- a/modules/http2/h2_version.h
+++ b/modules/http2/h2_version.h
@@ -26,7 +26,7 @@
  * @macro
  * Version number of the http2 module as c string
  */
-#define MOD_HTTP2_VERSION "1.9.0-DEV"
+#define MOD_HTTP2_VERSION "1.9.1-DEV"
 
 /**
  * @macro
@@ -34,7 +34,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 0x010900
+#define MOD_HTTP2_VERSION_NUM 0x010901
 
 
 #endif /* mod_h2_h2_version_h */