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 2021/10/13 13:29:28 UTC

svn commit: r1894192 - /httpd/httpd/trunk/modules/http2/h2_session.c

Author: icing
Date: Wed Oct 13 13:29:28 2021
New Revision: 1894192

URL: http://svn.apache.org/viewvc?rev=1894192&view=rev
Log:
  * mod_http2: I regret my decision to have removed nghttp2 feature checks...


Modified:
    httpd/httpd/trunk/modules/http2/h2_session.c

Modified: httpd/httpd/trunk/modules/http2/h2_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_session.c?rev=1894192&r1=1894191&r2=1894192&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_session.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_session.c Wed Oct 13 13:29:28 2021
@@ -602,6 +602,7 @@ static int on_frame_send_cb(nghttp2_sess
     return 0;
 }
 
+#ifdef H2_NG2_INVALID_HEADER_CB
 static int on_invalid_header_cb(nghttp2_session *ngh2,
                                 const nghttp2_frame *frame, 
                                 const uint8_t *name, size_t namelen, 
@@ -622,6 +623,7 @@ static int on_invalid_header_cb(nghttp2_
     }
     return 0;
 }
+#endif
 
 static ssize_t select_padding_cb(nghttp2_session *ngh2, 
                                  const nghttp2_frame *frame, 
@@ -676,7 +678,9 @@ static apr_status_t init_callbacks(conn_
     NGH2_SET_CALLBACK(*pcb, on_header, on_header_cb);
     NGH2_SET_CALLBACK(*pcb, send_data, on_send_data_cb);
     NGH2_SET_CALLBACK(*pcb, on_frame_send, on_frame_send_cb);
+#ifdef H2_NG2_INVALID_HEADER_CB
     NGH2_SET_CALLBACK(*pcb, on_invalid_header, on_invalid_header_cb);
+#endif
     NGH2_SET_CALLBACK(*pcb, select_padding, select_padding_cb);
     return APR_SUCCESS;
 }