Follow up to r1918098 (and r1918022): Push missing changes.

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

diff --git a/modules/http2/h2.h b/modules/http2/h2.h
index 0ca72238a4d71297eebd595515ba3c87fee624dc..4d4840f4c5ffd92749d86096be53010f7da1e524 100644 (file)
--- a/modules/http2/h2.h
+++ b/modules/http2/h2.h
@@ -50,9 +50,9 @@ struct h2_stream;
 #endif
 
 #if AP_MODULE_MAGIC_AT_LEAST(20211221, 20)
-#define H2_USE_STATE_PROCESS       1
+#define H2_USE_STATE_PROCESSING 1
 #else
-#define H2_USE_STATE_PROCESS       0
+#define H2_USE_STATE_PROCESSING 0
 #endif
 
 /**

diff --git a/modules/http2/h2_session.c b/modules/http2/h2_session.c
index e5809d59ac51309fd5809defca968a0d86627707..4e601d90876b2e1ff47fbbe544b827ce0471472c 100644 (file)
--- a/modules/http2/h2_session.c
+++ b/modules/http2/h2_session.c
@@ -1762,7 +1762,7 @@ static void unblock_c1_out(h2_session *session) {
     }
 }
 
-#if H2_USE_STATE_PROCESS
+#if H2_USE_STATE_PROCESSING
 static int h2_send_flow_blocked(h2_session *session)
 {
     /* We are completely send blocked if either the connection window
@@ -1954,7 +1954,7 @@ apr_status_t h2_session_process(h2_session *session, int async,
                     break;
                 }
             }
-#if H2_USE_STATE_PROCESS
+#if H2_USE_STATE_PROCESSING
             else if (async && h2_send_flow_blocked(session)) {
                 /* On a recent HTTPD, we can return to mpm c1 monitoring,
                  * as it does not treat all connections as having KeepAlive