Mercurial > hg > orthanc
annotate OrthancFramework/Resources/Patches/civetweb-1.14.patch @ 5519:2c5eb1ef26a0 pg-transactions
removed unused method IDatabaseWrapper::ITransaction::GetDatabaseCapabilities()
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 30 Jan 2024 09:21:41 +0100 |
parents | fddb5d8d0021 |
children |
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 |
5357
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
2 --- civetweb-1.14.orig/src/civetweb.c 2023-07-06 15:48:01.163703913 +0200 |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
3 +++ civetweb-1.14/src/civetweb.c 2023-07-06 15:48:51.207843938 +0200 |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
4 @@ -567,7 +567,7 @@ |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
5 #if (_MSC_VER < 1300) |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
6 #define STRX(x) #x |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
7 #define STR(x) STRX(x) |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
8 -#define __func__ __FILE__ ":" STR(__LINE__) |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
9 +#define __func__ __ORTHANC_FILE__ ":" STR(__LINE__) |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
10 #define strtoull(x, y, z) ((unsigned __int64)_atoi64(x)) |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
11 #define strtoll(x, y, z) (_atoi64(x)) |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
12 #else |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
13 @@ -1450,14 +1450,14 @@ |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
14 } |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
15 |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
16 |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
17 -#define mg_malloc(a) mg_malloc_ex(a, NULL, __FILE__, __LINE__) |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
18 -#define mg_calloc(a, b) mg_calloc_ex(a, b, NULL, __FILE__, __LINE__) |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
19 -#define mg_realloc(a, b) mg_realloc_ex(a, b, NULL, __FILE__, __LINE__) |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
20 -#define mg_free(a) mg_free_ex(a, __FILE__, __LINE__) |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
21 - |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
22 -#define mg_malloc_ctx(a, c) mg_malloc_ex(a, c, __FILE__, __LINE__) |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
23 -#define mg_calloc_ctx(a, b, c) mg_calloc_ex(a, b, c, __FILE__, __LINE__) |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
24 -#define mg_realloc_ctx(a, b, c) mg_realloc_ex(a, b, c, __FILE__, __LINE__) |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
25 +#define mg_malloc(a) mg_malloc_ex(a, NULL, __ORTHANC_FILE__, __LINE__) |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
26 +#define mg_calloc(a, b) mg_calloc_ex(a, b, NULL, __ORTHANC_FILE__, __LINE__) |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
27 +#define mg_realloc(a, b) mg_realloc_ex(a, b, NULL, __ORTHANC_FILE__, __LINE__) |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
28 +#define mg_free(a) mg_free_ex(a, __ORTHANC_FILE__, __LINE__) |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
29 + |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
30 +#define mg_malloc_ctx(a, c) mg_malloc_ex(a, c, __ORTHANC_FILE__, __LINE__) |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
31 +#define mg_calloc_ctx(a, b, c) mg_calloc_ex(a, b, c, __ORTHANC_FILE__, __LINE__) |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
32 +#define mg_realloc_ctx(a, b, c) mg_realloc_ex(a, b, c, __ORTHANC_FILE__, __LINE__) |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
33 |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
34 |
fddb5d8d0021
Prevent the leak of the full path of the source files in the binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4701
diff
changeset
|
35 #else /* USE_SERVER_STATS */ |
4701
68635d365a27
patch for compatibility of civetweb 1.14 with openssl 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
36 @@ -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
|
37 #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
|
38 #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
|
39 #endif |
68635d365a27
patch for compatibility of civetweb 1.14 with openssl 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
40 +#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
|
41 #else |
68635d365a27
patch for compatibility of civetweb 1.14 with openssl 3.0.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
42 #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
|
43 #if !defined(OPENSSL_API_1_1) |