httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1786715 - in /httpd/httpd/trunk: CHANGES modules/http2/h2_session.c modules/http2/h2_version.h
Date Mon, 13 Mar 2017 15:54:59 GMT
Author: icing
Date: Mon Mar 13 15:54:59 2017
New Revision: 1786715

URL: http://svn.apache.org/viewvc?rev=1786715&view=rev
Log:
update after backport

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/http2/h2_session.c
    httpd/httpd/trunk/modules/http2/h2_version.h

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1786715&r1=1786714&r2=1786715&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Mar 13 15:54:59 2017
@@ -1,23 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_http2: moving session cleanup to pre_close hook to avoid races with
-     modules already shut down and slave connections still operating.
-     [Stefan Eissing]
-
   *) Add <IfDirective> and <IfSection> directives.  [Joe Orton]
 
-  *) mod_http2: stream timeouts now change to vhost values once the request
-     is parsed and processing starts. Initial values are taken from base
-     server or SNI host as before. [Stefan Eissing]
-     
-  *) mod_proxy_http2: fixed retry behaviour when frontend connection uses 
-     http/1.1. [Stefan Eissing]
-     
-  *) mod_http2: separate mutex instances for each bucket beam, resulting in 
-     less lock contention. input beams only created when necessary.
-     [Stefan Eissing]
-     
   *) mod_syslog: Support use of optional "tag" in syslog entries.
      PR 60525. [Ben Rubson <ben.rubson gmail.com>, Jim Jagielski]
 

Modified: httpd/httpd/trunk/modules/http2/h2_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_session.c?rev=1786715&r1=1786714&r2=1786715&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_session.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_session.c Mon Mar 13 15:54:59 2017
@@ -730,7 +730,7 @@ static apr_status_t session_pool_cleanup
          * data which has, at this time, already been freed. An example
          * is mod_ssl that uses request hooks. */
         ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, c,
-                      H2_SSSN_LOG(APLOGNO(10020) session, 
+                      H2_SSSN_LOG(APLOGNO(10020), session, 
                       "session cleanup triggered by pool cleanup. "
                       "this should have happened earlier already."));
         return session_cleanup(session, "pool cleanup");

Modified: httpd/httpd/trunk/modules/http2/h2_version.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_version.h?rev=1786715&r1=1786714&r2=1786715&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_version.h (original)
+++ httpd/httpd/trunk/modules/http2/h2_version.h Mon Mar 13 15:54:59 2017
@@ -26,7 +26,7 @@
  * @macro
  * Version number of the http2 module as c string
  */
-#define MOD_HTTP2_VERSION "1.9.3-DEV"
+#define MOD_HTTP2_VERSION "1.9.4-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 0x010903
+#define MOD_HTTP2_VERSION_NUM 0x010904
 
 
 #endif /* mod_h2_h2_version_h */



Mime
View raw message