Wireshark-commits: [Wireshark-commits] master b1cc056: Remove nghttp2 code and use system' nghttp2
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 13 Oct 2016 19:26:33 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=b1cc056b12702435f6ebdc6ba0a8e17a41e159a0
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

b1cc056 by Balint Reczey (balint@xxxxxxxxxxxxxxx):

    Remove nghttp2 code and use system' nghttp2
    
    Update debian, macos (setup / homebrew) download script
    Update testsuite (don't try HPACK when build without nghttp2)
    
    Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112
    Reviewed-on: https://code.wireshark.org/review/17347
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  ad0a016   Qt+macOS: Fix the default font name.
    adds  b1cc056   Remove nghttp2 code and use system' nghttp2


Summary of changes:
 CMakeLists.txt                         |   12 +-
 acinclude.m4                           |   28 +
 cmake/modules/FindNGHTTP2.cmake        |   55 +
 cmakeconfig.h.in                       |    3 +
 configure.ac                           |   33 +-
 debian/control                         |    2 +-
 epan/CMakeLists.txt                    |    9 +-
 epan/Makefile.am                       |    5 +-
 epan/dissectors/packet-http2.c         |   44 +-
 epan/epan.c                            |   11 +
 epan/nghttp2/.editorconfig             |    8 -
 epan/nghttp2/CMakeLists.txt            |   65 -
 epan/nghttp2/Makefile.am               |   73 -
 epan/nghttp2/README.nghttp2            |   54 -
 epan/nghttp2/nghttp2.h                 | 4966 ------------------------------
 epan/nghttp2/nghttp2_buf.c             |  494 ---
 epan/nghttp2/nghttp2_buf.h             |  388 ---
 epan/nghttp2/nghttp2_hd.c              | 2362 ---------------
 epan/nghttp2/nghttp2_hd.h              |  430 ---
 epan/nghttp2/nghttp2_hd_huffman.c      |  202 --
 epan/nghttp2/nghttp2_hd_huffman.h      |   77 -
 epan/nghttp2/nghttp2_hd_huffman_data.c | 5152 --------------------------------
 epan/nghttp2/nghttp2_helper.c          |  488 ---
 epan/nghttp2/nghttp2_helper.h          |  106 -
 epan/nghttp2/nghttp2_int.h             |   58 -
 epan/nghttp2/nghttp2_mem.c             |   65 -
 epan/nghttp2/nghttp2_mem.h             |   45 -
 epan/nghttp2/nghttp2_rcbuf.c           |   99 -
 epan/nghttp2/nghttp2_rcbuf.h           |   80 -
 epan/nghttp2/nghttp2ver.h              |   42 -
 macosx-setup.sh                        |   53 +
 packaging/nsis/CMakeLists.txt          |    4 +-
 packaging/rpm/SPECS/wireshark.spec.in  |   10 +
 packaging/wix/CMakeLists.txt           |    8 +-
 test/config.sh                         |    4 +
 test/suite-decryption.sh               |    4 +
 tools/debian-setup.sh                  |    1 +
 tools/install_rpms_for_devel.sh        |    2 +-
 tools/macos-setup-brew.sh              |    2 +-
 tools/win-setup.ps1                    |    3 +
 40 files changed, 270 insertions(+), 15277 deletions(-)
 create mode 100644 cmake/modules/FindNGHTTP2.cmake
 delete mode 100644 epan/nghttp2/.editorconfig
 delete mode 100644 epan/nghttp2/CMakeLists.txt
 delete mode 100644 epan/nghttp2/Makefile.am
 delete mode 100644 epan/nghttp2/README.nghttp2
 delete mode 100644 epan/nghttp2/nghttp2.h
 delete mode 100644 epan/nghttp2/nghttp2_buf.c
 delete mode 100644 epan/nghttp2/nghttp2_buf.h
 delete mode 100644 epan/nghttp2/nghttp2_hd.c
 delete mode 100644 epan/nghttp2/nghttp2_hd.h
 delete mode 100644 epan/nghttp2/nghttp2_hd_huffman.c
 delete mode 100644 epan/nghttp2/nghttp2_hd_huffman.h
 delete mode 100644 epan/nghttp2/nghttp2_hd_huffman_data.c
 delete mode 100644 epan/nghttp2/nghttp2_helper.c
 delete mode 100644 epan/nghttp2/nghttp2_helper.h
 delete mode 100644 epan/nghttp2/nghttp2_int.h
 delete mode 100644 epan/nghttp2/nghttp2_mem.c
 delete mode 100644 epan/nghttp2/nghttp2_mem.h
 delete mode 100644 epan/nghttp2/nghttp2_rcbuf.c
 delete mode 100644 epan/nghttp2/nghttp2_rcbuf.h
 delete mode 100644 epan/nghttp2/nghttp2ver.h