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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=5e9b5d94c148572edf047eb715fbee5cca47ef2d
Submitter: Jeff Morriss (jeff.morriss.ws@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

5e9b5d9 by Jeff Morriss (jeff.morriss.ws@xxxxxxxxx):

    If we've seen HTTP in this conversation mark the frame as being HTTP.
    
    ... Even if it doesn't look like HTTP.  When TCP desegmentation is turned off
    the dissector will be called with frames that don't look like HTTP--but it's
    (almost certainly) still HTTP.
    
    This adjusts the changes I9f1c736baaeb86f9fab61601d79e79b4e3a16c38 and
    I2617d1e49030bd5ad85b0e818c48c01dc6fae075--hopefully without breaking the
    intent of either.
    
    Bug: 10335
    Change-Id: I925d53d4f82a01aeffa5d129e53100cc4f488561
    Reviewed-on: https://code.wireshark.org/review/15136
    Petri-Dish: Jeff Morriss <jeff.morriss.ws@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Jeff Morriss <jeff.morriss.ws@xxxxxxxxx>
    

Actions performed:

    from  057d8a8   qt: fix crash when saving RTP audio
    adds  5e9b5d9   If we've seen HTTP in this conversation mark the frame as being HTTP.


Summary of changes:
 epan/dissectors/packet-http.c |   80 ++++++++++++++++++++++++++++-------------
 1 file changed, 56 insertions(+), 24 deletions(-)