*) mod_http2: update to version 2.0.39

     Remove streams own memory allocator after reports of memory problems
     with third party modules.

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

diff --git a/changes-entries/h2_v2.0.39.txt b/changes-entries/h2_v2.0.39.txt
new file mode 100644 (file)
index 0000000..fee91c5
--- /dev/null
+++ b/changes-entries/h2_v2.0.39.txt
@@ -0,0 +1,4 @@
+  *) mod_http2: update to version 2.0.39
+     Remove streams own memory allocator after reports of memory problems
+     with third party modules.
+     [Stefan Eissing]

diff --git a/modules/http2/h2_session.c b/modules/http2/h2_session.c
index 2f921500db755cd29a35617308a1efd07df01ead..dda6c77178b89437bb89ca97525ced273bcdf090 100644 (file)
--- a/modules/http2/h2_session.c
+++ b/modules/http2/h2_session.c
@@ -111,29 +111,13 @@ static void cleanup_unprocessed_streams(h2_session *session)
     h2_mplx_c1_streams_do(session->mplx, rst_unprocessed_stream, session);
 }
 
-/* APR callback invoked if allocation fails. */
-static int abort_on_oom(int retcode)
-{
-    ap_abort_on_oom();
-    return retcode; /* unreachable, hopefully. */
-}
-
 static h2_stream *h2_session_open_stream(h2_session *session, int stream_id,
                                          int initiated_on)
 {
     h2_stream * stream;
-    apr_allocator_t *allocator;
     apr_pool_t *stream_pool;
-    apr_status_t rv;
-
-    rv = apr_allocator_create(&allocator);
-    if (rv != APR_SUCCESS)
-      return NULL;
 
-    apr_allocator_max_free_set(allocator, ap_max_mem_free);
-    apr_pool_create_ex(&stream_pool, session->pool, NULL, allocator);
-    apr_allocator_owner_set(allocator, stream_pool);
-    apr_pool_abort_set(abort_on_oom, stream_pool);
+    apr_pool_create(&stream_pool, session->pool);
     apr_pool_tag(stream_pool, "h2_stream");
 
     stream = h2_stream_create(stream_id, stream_pool, session, 

diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index 0cccbca89c8456c3f37f101f1b6cbb81694464e5..077e778e1269013f1bf3f34547999162e998fb58 100644 (file)
--- a/modules/http2/h2_version.h
+++ b/modules/http2/h2_version.h
@@ -27,7 +27,7 @@
  * @macro
  * Version number of the http2 module as c string
  */
-#define MOD_HTTP2_VERSION "2.0.38"
+#define MOD_HTTP2_VERSION "2.0.39"
 
 /**
  * @macro
@@ -35,7 +35,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 0x020026
+#define MOD_HTTP2_VERSION_NUM 0x020027
 
 
 #endif /* mod_h2_h2_version_h */