Sebastien Jodogne pushed to branch master at Debian Med / orthanc
Commits: 400b1d4b by jodogne-guest at 2020-09-21T11:32:41+02:00 Detect the presence of a performance patch in civetweb - - - - - a59c0485 by jodogne-guest at 2020-09-21T11:45:31+02:00 Upload to unstable - - - - - 3 changed files: - debian/changelog - + debian/patches/civetweb-performance - + debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +orthanc (1.7.4+dfsg-2) unstable; urgency=medium + + * Detect the presence of a performance patch in civetweb + + -- Sebastien Jodogne <[email protected]> Mon, 21 Sep 2020 11:31:16 +0200 + orthanc (1.7.4+dfsg-1) unstable; urgency=medium * New upstream version ===================================== debian/patches/civetweb-performance ===================================== @@ -0,0 +1,44 @@ +Description: Detect the presence of the mg_disable_keep_alive() patch in civetweb +Author: Sebastien Jodogne <[email protected]> +Forwarded: yes +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: Orthanc-1.7.4/OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake +=================================================================== +--- Orthanc-1.7.4.orig/OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake ++++ Orthanc-1.7.4/OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake +@@ -93,20 +93,29 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_CIVET + else() + CHECK_INCLUDE_FILE_CXX(civetweb.h HAVE_CIVETWEB_H) + if (NOT HAVE_CIVETWEB_H) +- message(FATAL_ERROR "Please install the libcivetweb-devel package") ++ message(FATAL_ERROR "Please install the libcivetweb-dev package") + endif() + + cmake_reset_check_state() + set(CMAKE_REQUIRED_LIBRARIES dl pthread) + CHECK_LIBRARY_EXISTS(civetweb mg_start "" HAVE_CIVETWEB_LIB) + if (NOT HAVE_CIVETWEB_LIB) +- message(FATAL_ERROR "Please install the libcivetweb-devel package") ++ message(FATAL_ERROR "Please install the libcivetweb-dev package") + endif() + + link_libraries(civetweb) + unset(CMAKE_REQUIRED_LIBRARIES) + +- add_definitions( +- -DCIVETWEB_HAS_DISABLE_KEEP_ALIVE=0 +- ) ++ # Check whether the system distribution of civetweb contains the ++ # patch "../Patches/civetweb-1.12.patch" that allows to disable ++ # keep-alive on selected HTTP connections. This is useful to speed ++ # up multipart transfers, as encountered in DICOMweb. ++ CHECK_LIBRARY_EXISTS(civetweb mg_disable_keep_alive "" CIVETWEB_HAS_DISABLE_KEEP_ALIVE) ++ if (CIVETWEB_HAS_DISABLE_KEEP_ALIVE) ++ add_definitions(-DCIVETWEB_HAS_DISABLE_KEEP_ALIVE=1) ++ message("Performance: Your system-wide distribution of civetweb is configured for best performance") ++ else() ++ message(WARNING "Performance: Your system-wide distribution of civetweb does not feature the mg_disable_keep_alive() function") ++ add_definitions(-DCIVETWEB_HAS_DISABLE_KEEP_ALIVE=0) ++ endif() + endif() ===================================== debian/patches/series ===================================== @@ -0,0 +1 @@ +civetweb-performance View it on GitLab: https://salsa.debian.org/med-team/orthanc/-/compare/75e5ce0c1122ecffa64248410e6e1ffeaad3a1a7...a59c0485d8fdaedd9713e436d463351798124eec -- View it on GitLab: https://salsa.debian.org/med-team/orthanc/-/compare/75e5ce0c1122ecffa64248410e6e1ffeaad3a1a7...a59c0485d8fdaedd9713e436d463351798124eec You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
