Imported Upstream version 2.4.23upstream

1 files changed, 2 insertions, 31 deletions

diff --git a/modules/http2/mod_http2.dep b/modules/http2/mod_http2.dep
index 8b8ebe6e..6e1a2b1e 100644
--- a/modules/http2/mod_http2.dep
+++ b/modules/http2/mod_http2.dep
@@ -103,7 +103,6 @@
 	".\h2.h"\
 	".\h2_bucket_eoc.h"\
 	".\h2_conn_io.h"\
-	".\h2_io.h"\
 	".\h2_mplx.h"\
 	".\h2_private.h"\
 	".\h2_session.h"\
@@ -154,7 +153,6 @@
 	"..\..\srclib\apr\include\apr_want.h"\
 	".\h2.h"\
 	".\h2_bucket_eos.h"\
-	".\h2_io.h"\
 	".\h2_mplx.h"\
 	".\h2_private.h"\
 	".\h2_stream.h"\
@@ -279,7 +277,6 @@
 	".\h2_ctx.h"\
 	".\h2_filter.h"\
 	".\h2_h2.h"\
-	".\h2_io.h"\
 	".\h2_mplx.h"\
 	".\h2_private.h"\
 	".\h2_session.h"\
@@ -453,7 +450,6 @@
 	".\h2_conn_io.h"\
 	".\h2_ctx.h"\
 	".\h2_filter.h"\
-	".\h2_io.h"\
 	".\h2_mplx.h"\
 	".\h2_private.h"\
 	".\h2_push.h"\
@@ -523,7 +519,6 @@
 	".\h2_private.h"\
 	".\h2_response.h"\
 	".\h2_task.h"\
-	".\h2_task_output.h"\
 	".\h2_util.h"\
 	
 
@@ -584,7 +579,6 @@
 	".\h2_conn_io.h"\
 	".\h2_ctx.h"\
 	".\h2_h2.h"\
-	".\h2_io.h"\
 	".\h2_private.h"\
 	".\h2_request.h"\
 	".\h2_session.h"\
@@ -602,7 +596,6 @@
 	"..\..\srclib\apr\include\apr_pools.h"\
 	"..\..\srclib\apr\include\apr_thread_mutex.h"\
 	"..\..\srclib\apr\include\apr_want.h"\
-	".\h2_int_queue.h"\
 	
 
 ./h2_io.c : \
@@ -652,7 +645,6 @@
 	"..\..\srclib\apr\include\apr_want.h"\
 	".\h2.h"\
 	".\h2_h2.h"\
-	".\h2_io.h"\
 	".\h2_mplx.h"\
 	".\h2_private.h"\
 	".\h2_request.h"\
@@ -704,7 +696,6 @@
 	"..\..\srclib\apr\include\apr_time.h"\
 	"..\..\srclib\apr\include\apr_user.h"\
 	"..\..\srclib\apr\include\apr_want.h"\
-	".\h2_io.h"\
 	".\h2_io_set.h"\
 	".\h2_private.h"\
 	
@@ -758,9 +749,6 @@
 	".\h2_conn.h"\
 	".\h2_ctx.h"\
 	".\h2_h2.h"\
-	".\h2_int_queue.h"\
-	".\h2_io.h"\
-	".\h2_io_set.h"\
 	".\h2_mplx.h"\
 	".\h2_ngn_shed.h"\
 	".\h2_private.h"\
@@ -768,8 +756,6 @@
 	".\h2_response.h"\
 	".\h2_stream.h"\
 	".\h2_task.h"\
-	".\h2_task_input.h"\
-	".\h2_task_output.h"\
 	".\h2_util.h"\
 	".\h2_worker.h"\
 	".\h2_workers.h"\
@@ -825,15 +811,12 @@
 	".\h2_conn.h"\
 	".\h2_ctx.h"\
 	".\h2_h2.h"\
-	".\h2_int_queue.h"\
-	".\h2_io.h"\
 	".\h2_mplx.h"\
 	".\h2_ngn_shed.h"\
 	".\h2_private.h"\
 	".\h2_request.h"\
 	".\h2_response.h"\
 	".\h2_task.h"\
-	".\h2_task_output.h"\
 	".\h2_util.h"\
 	".\mod_http2.h"\
 	
@@ -884,7 +867,6 @@
 	".\h2.h"\
 	".\h2_conn_io.h"\
 	".\h2_h2.h"\
-	".\h2_io.h"\
 	".\h2_private.h"\
 	".\h2_push.h"\
 	".\h2_request.h"\
@@ -1068,7 +1050,6 @@
 	".\h2_filter.h"\
 	".\h2_from_h1.h"\
 	".\h2_h2.h"\
-	".\h2_io.h"\
 	".\h2_mplx.h"\
 	".\h2_private.h"\
 	".\h2_push.h"\
@@ -1132,7 +1113,6 @@
 	".\h2_ctx.h"\
 	".\h2_filter.h"\
 	".\h2_h2.h"\
-	".\h2_io.h"\
 	".\h2_mplx.h"\
 	".\h2_private.h"\
 	".\h2_push.h"\
@@ -1141,7 +1121,6 @@
 	".\h2_session.h"\
 	".\h2_stream.h"\
 	".\h2_task.h"\
-	".\h2_task_input.h"\
 	".\h2_util.h"\
 	
 
@@ -1266,15 +1245,12 @@
 	".\h2_ctx.h"\
 	".\h2_from_h1.h"\
 	".\h2_h2.h"\
-	".\h2_io.h"\
 	".\h2_mplx.h"\
 	".\h2_private.h"\
 	".\h2_request.h"\
 	".\h2_session.h"\
 	".\h2_stream.h"\
 	".\h2_task.h"\
-	".\h2_task_input.h"\
-	".\h2_task_output.h"\
 	".\h2_worker.h"\
 	
 
@@ -1324,14 +1300,12 @@
 	".\h2.h"\
 	".\h2_conn.h"\
 	".\h2_conn_io.h"\
-	".\h2_io.h"\
 	".\h2_mplx.h"\
 	".\h2_private.h"\
 	".\h2_request.h"\
 	".\h2_session.h"\
 	".\h2_stream.h"\
 	".\h2_task.h"\
-	".\h2_task_input.h"\
 	".\h2_util.h"\
 	
 
@@ -1348,6 +1322,7 @@
 	"..\..\include\http_connection.h"\
 	"..\..\include\http_core.h"\
 	"..\..\include\http_log.h"\
+	"..\..\include\http_request.h"\
 	"..\..\include\httpd.h"\
 	"..\..\include\os.h"\
 	"..\..\include\util_cfgtree.h"\
@@ -1383,7 +1358,6 @@
 	".\h2_conn.h"\
 	".\h2_conn_io.h"\
 	".\h2_from_h1.h"\
-	".\h2_io.h"\
 	".\h2_mplx.h"\
 	".\h2_private.h"\
 	".\h2_request.h"\
@@ -1391,7 +1365,6 @@
 	".\h2_session.h"\
 	".\h2_stream.h"\
 	".\h2_task.h"\
-	".\h2_task_output.h"\
 	".\h2_util.h"\
 	
 
@@ -1499,7 +1472,6 @@
 	".\h2_conn.h"\
 	".\h2_ctx.h"\
 	".\h2_h2.h"\
-	".\h2_io.h"\
 	".\h2_mplx.h"\
 	".\h2_private.h"\
 	".\h2_task.h"\
@@ -1559,7 +1531,6 @@
 	"..\..\srclib\apr\include\apr_user.h"\
 	"..\..\srclib\apr\include\apr_want.h"\
 	".\h2.h"\
-	".\h2_io.h"\
 	".\h2_mplx.h"\
 	".\h2_private.h"\
 	".\h2_task.h"\
@@ -1614,6 +1585,7 @@
 	"..\..\srclib\apr\include\apr_proc_mutex.h"\
 	"..\..\srclib\apr\include\apr_ring.h"\
 	"..\..\srclib\apr\include\apr_shm.h"\
+	"..\..\srclib\apr\include\apr_strings.h"\
 	"..\..\srclib\apr\include\apr_tables.h"\
 	"..\..\srclib\apr\include\apr_thread_mutex.h"\
 	"..\..\srclib\apr\include\apr_thread_proc.h"\
@@ -1628,7 +1600,6 @@
 	".\h2_ctx.h"\
 	".\h2_filter.h"\
 	".\h2_h2.h"\
-	".\h2_io.h"\
 	".\h2_mplx.h"\
 	".\h2_push.h"\
 	".\h2_request.h"\