Mercurial > hg > orthanc

annotate OrthancFramework/Resources/Patches/civetweb-1.14.patch @ 4793:fc2ba1ce6538

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new configuration 'DicomThreadsCount'
author Alain Mazy <am@osimis.io>
date Thu, 30 Sep 2021 15:03:35 +0200
parents 68635d365a27
children fddb5d8d0021
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4701
68635d365a27 patch for compatibility of civetweb 1.14 with openssl 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 diff -urEb civetweb-1.14.orig/src/civetweb.c civetweb-1.14/src/civetweb.c
68635d365a27 patch for compatibility of civetweb 1.14 with openssl 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 --- civetweb-1.14.orig/src/civetweb.c 2021-06-21 17:42:52.343136123 +0200
68635d365a27 patch for compatibility of civetweb 1.14 with openssl 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 +++ civetweb-1.14/src/civetweb.c 2021-06-21 17:43:11.623158128 +0200
68635d365a27 patch for compatibility of civetweb 1.14 with openssl 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 @@ -1774,6 +1774,7 @@
68635d365a27 patch for compatibility of civetweb 1.14 with openssl 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 #if !defined(OPENSSL_API_3_0)
68635d365a27 patch for compatibility of civetweb 1.14 with openssl 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 #define OPENSSL_API_3_0
68635d365a27 patch for compatibility of civetweb 1.14 with openssl 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 #endif
68635d365a27 patch for compatibility of civetweb 1.14 with openssl 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 +#define OPENSSL_REMOVE_THREAD_STATE()
68635d365a27 patch for compatibility of civetweb 1.14 with openssl 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 #else
68635d365a27 patch for compatibility of civetweb 1.14 with openssl 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 #if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
68635d365a27 patch for compatibility of civetweb 1.14 with openssl 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 #if !defined(OPENSSL_API_1_1)