Mercurial > hg > orthanc
annotate Resources/Patches/libp11-0.4.0.patch @ 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 | d46746607ae0 |
children | cc6d4edfe8fe |
rev | line source |
---|---|
2026 | 1 diff -urEb libp11-0.4.0.orig/src/atfork.c libp11-0.4.0/src/atfork.c |
2 --- libp11-0.4.0.orig/src/atfork.c 2016-06-20 13:38:43.845575107 +0200 | |
3 +++ libp11-0.4.0/src/atfork.c 2016-06-20 13:46:52.969575591 +0200 | |
4 @@ -25,7 +25,7 @@ | |
5 #include <sys/stat.h> | |
6 #include <sys/types.h> | |
7 #include <unistd.h> | |
8 -#include <atfork.h> | |
9 +#include "atfork.h" | |
10 | |
11 #ifdef __sun | |
12 # pragma fini(lib_deinit) | |
13 diff -urEb libp11-0.4.0.orig/src/engine.h libp11-0.4.0/src/engine.h | |
14 --- libp11-0.4.0.orig/src/engine.h 2016-06-20 13:38:43.845575107 +0200 | |
15 +++ libp11-0.4.0/src/engine.h 2016-06-20 13:46:27.421575566 +0200 | |
16 @@ -29,7 +29,7 @@ | |
17 #define _ENGINE_PKCS11_H | |
18 | |
19 #ifndef _WIN32 | |
20 -#include "config.h" | |
21 +//#include "config.h" | |
22 #endif | |
23 | |
24 #include "libp11.h" | |
25 diff -urEb libp11-0.4.0.orig/src/libp11-int.h libp11-0.4.0/src/libp11-int.h | |
26 --- libp11-0.4.0.orig/src/libp11-int.h 2016-06-20 13:38:43.845575107 +0200 | |
27 +++ libp11-0.4.0/src/libp11-int.h 2016-06-20 13:46:27.421575566 +0200 | |
28 @@ -20,7 +20,7 @@ | |
29 #define _LIBP11_INT_H | |
30 | |
31 #ifndef _WIN32 | |
32 -#include "config.h" | |
33 +//#include "config.h" | |
34 #endif | |
35 | |
36 #include "libp11.h" |