Wireshark-commits: [Wireshark-commits] master-2.0 1ee68b6: http: set conv dissector from when heuri

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 1 Apr 2016 04:37:41 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=1ee68b68f4be13d85cca67494b42c26ad756cad3
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

1ee68b6 by Peter Wu (peter@xxxxxxxxxxxxx):

    http: set conv dissector from when heuristics succeeded
    
    When a conversation starts with SSL (Client Hello) but gets a HTTP
    response back, then the first SSL request should be preserved.
    
    Bug: 12132
    Change-Id: I3f9b5c8828bc5c6680945d7cf71740584dd463ab
    Reviewed-on: https://code.wireshark.org/review/14726
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit a859793b0de77b7f880cfd4bd251884164774187)
    Reviewed-on: https://code.wireshark.org/review/14742
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  6c9fc36   ieee80211: fix deep recursion
    adds  1ee68b6   http: set conv dissector from when heuristics succeeded


Summary of changes:
 epan/dissectors/packet-http.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)