[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=570bc36b587de3af3b2321d8a03f8cc88973fb00
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

570bc36 by Edward Dao (edmailbox@xxxxxxxxx):

    http2: fix dissection over TLS
    
    Previously, the http2 heuristics dissector sets a conversation dissector
    which overrides the SSL dissector, breaking SSL decryption before http2.
    This patch fixes that by checking for an active http2 session in the
    http2 heuristics dissector.
    
    Change-Id: Ibacbcde3e29bbb746ad2e394f1c10ca571b07bf5
    Reviewed-on: https://code.wireshark.org/review/7782
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  ae20651   Overhaul WSP dissector.
    adds  570bc36   http2: fix dissection over TLS


Summary of changes:
 epan/dissectors/packet-http2.c |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)