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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=02c6742ae7dffebdffc3623fac8c5091f4b72fda
Submitter: "Peter Wu <peter@xxxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

02c6742 by Peter Wu (peter@xxxxxxxxxxxxx):

    HTTP: set correct server port for tunnels
    
    The server port must be set or else http_payload_subdissector will
    assume two independent flows originating from the client. For example,
    client 50813 connects through proxy server 3128 to server 443.
    Previously it would result in three conversations: 50813<->3128 (proxy),
    50813->443, 3128->443. Now it will see 50813<->3128 and 3128<->443 and
    TLS decryption will work again.
    
    Bug: 15042
    Change-Id: I50bcef568be320b6512ee6fc5a09d2838d2f7a9a
    Reviewed-on: https://code.wireshark.org/review/29046
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 2f126db3fea715428b43c346d98cad1a8b3a88d6)
    Reviewed-on: https://code.wireshark.org/review/29054
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    

Actions performed:

    from  f9e8b0f   Qt: fix crash on switching profiles
     add  02c6742   HTTP: set correct server port for tunnels


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