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

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

Commits:

7cb745f by Peter Wu (peter@xxxxxxxxxxxxx):

    HTTP: really choose the correct server port for tunnels
    
    The very first message after a 200 OK response to a CONNECT request
    likely originates from the client. So assume that this destination is
    actually the server.
    
    This reduces the probability of address and port collisions. Previously
    the proxy port (e.g. 3128) and server port (443) identified each
    conversation, now it will use the client and server port instead.
    
    Bug: 15043
    Change-Id: Ib73f370334873efd773ac6b49e2db57146bc20b0
    Fixes: v2.9.0rc0-1420-g2f126db3fe ("HTTP: set correct server port for tunnels")
    Reviewed-on: https://code.wireshark.org/review/29110
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 1d4bb22a225285a1fb088d0970499131d242d098)
    Reviewed-on: https://code.wireshark.org/review/29119
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    

Actions performed:

    from  1aa86d7   Move get_iface_display_name() to ui/iface_lists.c.
     add  7cb745f   HTTP: really choose the correct server port for tunnels


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