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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8daac4af93a6676a240dd39e601e30e47be5352f
Submitter: Peter Wu (peter@xxxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

8daac4a by Peter Wu (peter@xxxxxxxxxxxxx):

    spdy: do not overwrite HTTPS registration
    
    Setting a zero port still allows it for selection in the UAT dialog
    while not breaking HTTPS dissection.
    
    (In theory the UAT setting would work. In practice it would still call
    ssl_dissector_add and take over the SSL registration for all tcp/443
    traffic. On removal with ssl_dissector_remove, the HTTPS port is not
    added back again until a restart (or until the HTTPS ports list is
    changed from the default) because the spdy registration overwrites the
    HTTP one...)
    
    Also note that NPN detection for SPDY is not implemented, only ALPN
    detection is supported.
    
    Bug: 10984
    Change-Id: I6e84aa6408abf40bb860abee4845731ce55ce254
    Reviewed-on: https://code.wireshark.org/review/10517
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    (cherry picked from commit bb7f7d32688abcbc05e954bf380d5759a0b9bf47)
    Reviewed-on: https://code.wireshark.org/review/11422
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Peter Wu <peter@xxxxxxxxxxxxx>
    

Actions performed:

    from  3690d13   EtherCAT: wrong display name
    adds  8daac4a   spdy: do not overwrite HTTPS registration


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