You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2015/09/04 12:25:31 UTC
svn commit: r1701204 - in /httpd/httpd/trunk/modules/http2: h2_h2.c
h2_to_h1.c h2_version.h
Author: icing
Date: Fri Sep 4 10:25:31 2015
New Revision: 1701204
URL: http://svn.apache.org/r1701204
Log:
mod_h2 version bump, more c89 goodiness
Modified:
httpd/httpd/trunk/modules/http2/h2_h2.c
httpd/httpd/trunk/modules/http2/h2_to_h1.c
httpd/httpd/trunk/modules/http2/h2_version.h
Modified: httpd/httpd/trunk/modules/http2/h2_h2.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_h2.c?rev=1701204&r1=1701203&r2=1701204&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_h2.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_h2.c Fri Sep 4 10:25:31 2015
@@ -123,19 +123,7 @@ int h2_h2_remove_timeout(conn_rec* c)
{
h2_ctx *ctx = h2_ctx_get(c);
- if (h2_ctx_is_task(ctx)) {
- /* cleanup on task connections */
- /* we once removed the reqtimeout filter on task connections,
- * but timeouts here might have been a side effect of other things.
- * Ideally mod_reqtimeout would do its work on task connections
- * as it basically is a HTTP/1.1 request/response and it's made
- * for that.
- * So, let the filter stay for now and see if we ever encounter
- * unexpected timeouts on tasks again.
- */
- //ap_remove_input_filter_byhandle(c->input_filters, "reqtimeout");
- }
- else if (h2_ctx_is_active(ctx)) {
+ if (h2_ctx_is_active(ctx) && !h2_ctx_is_task(ctx)) {
/* cleanup on master h2 connections */
ap_remove_input_filter_byhandle(c->input_filters, "reqtimeout");
}
Modified: httpd/httpd/trunk/modules/http2/h2_to_h1.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_to_h1.c?rev=1701204&r1=1701203&r2=1701204&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_to_h1.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_to_h1.c Fri Sep 4 10:25:31 2015
@@ -114,7 +114,7 @@ apr_status_t h2_to_h1_add_header(h2_to_h
|| H2_HD_MATCH_LIT("proxy-connection", name, nlen)
|| H2_HD_MATCH_LIT("keep-alive", name, nlen)
|| H2_HD_MATCH_LIT("http2-settings", name, nlen)) {
- // ignore these.
+ /* ignore these. */
return APR_SUCCESS;
}
else if (H2_HD_MATCH_LIT("cookie", name, nlen)) {
Modified: httpd/httpd/trunk/modules/http2/h2_version.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_version.h?rev=1701204&r1=1701203&r2=1701204&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_version.h (original)
+++ httpd/httpd/trunk/modules/http2/h2_version.h Fri Sep 4 10:25:31 2015
@@ -20,7 +20,7 @@
* @macro
* Version number of the h2 module as c string
*/
-#define MOD_H2_VERSION "0.9.6"
+#define MOD_H2_VERSION "0.9.7"
/**
* @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_H2_VERSION_NUM 0x000906
+#define MOD_H2_VERSION_NUM 0x000907
#endif /* mod_h2_h2_version_h */