Merging upstream version 4.2.5.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 8 insertions, 0 deletions

diff --git a/epan/dissectors/packet-http2.h b/epan/dissectors/packet-http2.h
index f3b961de..e7d188ba 100644
--- a/epan/dissectors/packet-http2.h
+++ b/epan/dissectors/packet-http2.h
@@ -41,6 +41,14 @@ int dissect_http2_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
  * @param the_other_direction  FALSE means from current direction stream, TRUE from the other.
  * @return  NULL if header was not found. Or header value. Note: the value is allocated
  *          by pinfo->pool.
+ * @note The returned field value is decoded from US-ASCII and characters outside
+ * that range, i.e. obs-text, are replaced with UTF-8 REPLACEMENT CHARACTERS.
+ * Dissectors may need to perform additional decoding (e.g., percent decoding or
+ * the more robust decoding per RFC 8187.)
+ * @warning Don't call this if HTTP but not HTTP/2 is present in the packet
+ * (e.g. test with proto_is_frame_protocol() first). This ultimately calls
+ * get_http2_session, creating a HTTP/2 session on the current conversation,
+ * which can confuse the HTTP dissector. (This should be fixed.)
  */
 const gchar* http2_get_header_value(packet_info *pinfo, const gchar* name, gboolean the_other_direction);