Mercurial > hg > orthanc
comparison Resources/Patches/civetweb-1.12.patch @ 3802:6462ecaa045b
fix unit test, reorganization of OpenSSL initialization
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 02 Apr 2020 12:54:45 +0200 |
parents | 9fe1d64a748c |
children |
comparison
equal
deleted
inserted
replaced
3801:9fe1d64a748c | 3802:6462ecaa045b |
---|---|
1 diff -urEb civetweb-1.12.orig/include/civetweb.h civetweb-1.12/include/civetweb.h | 1 diff -urEb civetweb-1.12.orig/include/civetweb.h civetweb-1.12/include/civetweb.h |
2 --- civetweb-1.12.orig/include/civetweb.h 2020-04-02 10:56:55.681988632 +0200 | 2 --- civetweb-1.12.orig/include/civetweb.h 2020-04-02 12:07:20.727054140 +0200 |
3 +++ civetweb-1.12/include/civetweb.h 2020-04-02 10:57:36.413858039 +0200 | 3 +++ civetweb-1.12/include/civetweb.h 2020-04-02 12:07:42.734996559 +0200 |
4 @@ -1614,6 +1614,9 @@ | 4 @@ -1614,6 +1614,9 @@ |
5 struct mg_error_data *error); | 5 struct mg_error_data *error); |
6 #endif | 6 #endif |
7 | 7 |
8 +// Added by SJ | 8 +// Added by SJ |
10 + | 10 + |
11 #ifdef __cplusplus | 11 #ifdef __cplusplus |
12 } | 12 } |
13 #endif /* __cplusplus */ | 13 #endif /* __cplusplus */ |
14 diff -urEb civetweb-1.12.orig/src/civetweb.c civetweb-1.12/src/civetweb.c | 14 diff -urEb civetweb-1.12.orig/src/civetweb.c civetweb-1.12/src/civetweb.c |
15 --- civetweb-1.12.orig/src/civetweb.c 2020-04-02 10:56:55.685988619 +0200 | 15 --- civetweb-1.12.orig/src/civetweb.c 2020-04-02 12:07:20.731054129 +0200 |
16 +++ civetweb-1.12/src/civetweb.c 2020-04-02 11:00:31.345304121 +0200 | 16 +++ civetweb-1.12/src/civetweb.c 2020-04-02 12:07:52.250971600 +0200 |
17 @@ -20705,4 +20705,13 @@ | 17 @@ -20704,5 +20704,12 @@ |
18 return 1; | |
18 } | 19 } |
19 | |
20 | 20 |
21 +// Added by SJ | 21 +// Added by SJ |
22 +void mg_disable_keep_alive(struct mg_connection *conn) | 22 +void mg_disable_keep_alive(struct mg_connection *conn) |
23 +{ | 23 +{ |
24 + if (conn != NULL) { | 24 + if (conn != NULL) { |
25 + conn->must_close = 1; | 25 + conn->must_close = 1; |
26 + } | 26 + } |
27 +} | 27 +} |
28 + | 28 |
29 + | |
30 /* End of civetweb.c */ | 29 /* End of civetweb.c */ |