view Resources/CMake/PugixmlConfiguration.cmake @ 2248:69b0f4e8a49b

Escape multipart type parameter value in Content-Type header ## Summary Multipart responses do not quote/escape the value of their type parameter (the subtype) even though it always contains at least one special character (the slash "/"), which confuses standard-compliant HTTP clients. ## Details The Content-Type header in HTTP is in RFC 7231, Section 3.1.1.5: https://tools.ietf.org/html/rfc7231#section-3.1.1.5 The section defers to the media type section (3.1.1.1) for the syntax of the media type: https://tools.ietf.org/html/rfc7231#section-3.1.1.1 This states that a parameter value can be quoted: parameter = token "=" ( token / quoted-string ) A parameter value that matches the token production can be transmitted either as a token or within a quoted-string. The quoted and unquoted values are equivalent. Tokens are defined in RFC 7230, Section 3.2.6 (via RFC 7231, appendix C): https://tools.ietf.org/html/rfc7231#appendix-C https://tools.ietf.org/html/rfc7230#section-3.2.6 Here we observe that tokens cannot contain a slash "/" character: token = 1*tchar tchar = "!" / "#" / "$" / "%" / "&" / "'" / "*" / "+" / "-" / "." / "^" / "_" / "`" / "|" / "~" / DIGIT / ALPHA ; any VCHAR, except delimiters Delimiters are chosen from the set of US-ASCII visual characters not allowed in a token (DQUOTE and "(),/:;<=>?@[\]{}"). However, the current implementation does not quote/escape the value of the type parameter: multipart/related; type=application/dicom Instead, it should be: multipart/related; type="application/dicom" All of this also seems to apply to the MIME Content-Type header definition, even though it is a little different: https://www.iana.org/assignments/message-headers https://tools.ietf.org/html/rfc2045#section-5.1 https://tools.ietf.org/html/rfc2387
author Thibault Nélis <tn@osimis.io>
date Mon, 16 Jan 2017 13:07:11 +0100
parents 8b51b133bb8b
children 4900688827a8
line wrap: on
line source

if (USE_PUGIXML)
  add_definitions(-DORTHANC_ENABLE_PUGIXML=1)

  if (STATIC_BUILD OR NOT USE_SYSTEM_PUGIXML)
    set(PUGIXML_SOURCES_DIR ${CMAKE_BINARY_DIR}/pugixml-1.4)
    set(PUGIXML_MD5 "7c56c91cfe3ecdee248a8e4892ef5781")
    set(PUGIXML_URL "http://www.orthanc-server.com/downloads/third-party/pugixml-1.4.tar.gz")

    DownloadPackage(${PUGIXML_MD5} ${PUGIXML_URL} "${PUGIXML_SOURCES_DIR}")

    include_directories(
      ${PUGIXML_SOURCES_DIR}/src
      )

    set(PUGIXML_SOURCES
      #${PUGIXML_SOURCES_DIR}/src/vlog_is_on.cc
      ${PUGIXML_SOURCES_DIR}/src/pugixml.cpp
      )

  else()
    CHECK_INCLUDE_FILE_CXX(pugixml.hpp HAVE_PUGIXML_H)
    if (NOT HAVE_PUGIXML_H)
      message(FATAL_ERROR "Please install the libpugixml-dev package")
    endif()

    link_libraries(pugixml)
  endif()

  source_group(ThirdParty\\pugixml REGULAR_EXPRESSION ${PUGIXML_SOURCES_DIR}/.*)

else()
  add_definitions(-DORTHANC_ENABLE_PUGIXML=0)
endif()