Wireshark-commits: [Wireshark-commits] master-2.6 0123293: media_type: Default decode application/o

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 25 May 2018 10:26:18 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=01232935a476e1b37a09e676c4338429c12c72b0
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-2.6
Repository: wireshark

Commits:

0123293 by Stig Bjørlykke (stig@xxxxxxxxxxxxx):

    media_type: Default decode application/octet-stream as data
    
    Remove registering media_type application/octet-stream from both
    thread and uasip because the settings will interfere each other.
    
    Enable decoding as for media_type instead.
    
    Bug: 14729
    Change-Id: I58c527977fe4713418219fc3126ce7a93c4bb641
    Reviewed-on: https://code.wireshark.org/review/27789
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 0362891ecfaba58b1e82fe9e5c579396f81c28bb)
    Reviewed-on: https://code.wireshark.org/review/27798
    Petri-Dish: Anders Broman <a.broman58@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  224bd77   Asciidoctor: Remove underscores from macro names.
    adds  0123293   media_type: Default decode application/octet-stream as data


Summary of changes:
 epan/dissectors/packet-data.c   | 11 ++++++++++-
 epan/dissectors/packet-thread.c | 16 ++++------------
 epan/dissectors/packet-uasip.c  | 10 +++-------
 3 files changed, 17 insertions(+), 20 deletions(-)