Mercurial > hg > orthanc
comparison Resources/Patches/civetweb-1.11.patch @ 3154:6e8822be2f08
Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive)
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 21 Jan 2019 12:09:04 +0100 |
parents | b7c52549595e |
children |
comparison
equal
deleted
inserted
replaced
3153:706b60e7ee1e | 3154:6e8822be2f08 |
---|---|
1 diff -urEb civetweb-1.11.orig/include/civetweb.h civetweb-1.11/include/civetweb.h | |
2 --- civetweb-1.11.orig/include/civetweb.h 2019-01-17 21:09:41.844888908 +0100 | |
3 +++ civetweb-1.11/include/civetweb.h 2019-01-21 12:05:08.138998659 +0100 | |
4 @@ -1507,6 +1507,10 @@ | |
5 #endif | |
6 | |
7 | |
8 +// Added by SJ | |
9 +CIVETWEB_API void mg_disable_keep_alive(struct mg_connection *conn); | |
10 + | |
11 + | |
12 #ifdef __cplusplus | |
13 } | |
14 #endif /* __cplusplus */ | |
1 diff -urEb civetweb-1.11.orig/src/civetweb.c civetweb-1.11/src/civetweb.c | 15 diff -urEb civetweb-1.11.orig/src/civetweb.c civetweb-1.11/src/civetweb.c |
2 --- civetweb-1.11.orig/src/civetweb.c 2019-01-17 21:09:41.852888857 +0100 | 16 --- civetweb-1.11.orig/src/civetweb.c 2019-01-17 21:09:41.852888857 +0100 |
3 +++ civetweb-1.11/src/civetweb.c 2019-01-17 21:23:54.273424124 +0100 | 17 +++ civetweb-1.11/src/civetweb.c 2019-01-21 12:06:35.826868284 +0100 |
4 @@ -59,6 +59,9 @@ | 18 @@ -59,6 +59,9 @@ |
5 #if defined(__linux__) && !defined(_XOPEN_SOURCE) | 19 #if defined(__linux__) && !defined(_XOPEN_SOURCE) |
6 #define _XOPEN_SOURCE 600 /* For flockfile() on Linux */ | 20 #define _XOPEN_SOURCE 600 /* For flockfile() on Linux */ |
7 #endif | 21 #endif |
8 +#if defined(__LSB_VERSION__) | 22 +#if defined(__LSB_VERSION__) |
66 + mg_free((void *)conn->host); | 80 + mg_free((void *)conn->host); |
67 + } | 81 + } |
68 conn->host = alloc_get_host(conn); | 82 conn->host = alloc_get_host(conn); |
69 if (!conn->host) { | 83 if (!conn->host) { |
70 mg_snprintf(conn, | 84 mg_snprintf(conn, |
85 @@ -19857,4 +19882,13 @@ | |
86 } | |
87 | |
88 | |
89 +// Added by SJ | |
90 +void mg_disable_keep_alive(struct mg_connection *conn) | |
91 +{ | |
92 + if (conn != NULL) { | |
93 + conn->must_close = 1; | |
94 + } | |
95 +} | |
96 + | |
97 + | |
98 /* End of civetweb.c */ |