Mercurial > hg > orthanc
annotate Resources/Patches/civetweb-1.11.patch @ 3146:d5d11e43d0fb
fix memory leak in civetweb
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 17 Jan 2019 21:30:52 +0100 |
parents | 972cc98959a3 |
children | b7c52549595e |
rev | line source |
---|---|
3146
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
1 Only in civetweb-1.11/src: a.out |
3128
972cc98959a3
fix build of civetweb for Visual Studio 2008 and LSB
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2 diff -urEb civetweb-1.11.orig/src/civetweb.c civetweb-1.11/src/civetweb.c |
3146
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
3 --- civetweb-1.11.orig/src/civetweb.c 2019-01-17 21:09:41.852888857 +0100 |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
4 +++ civetweb-1.11/src/civetweb.c 2019-01-17 21:23:54.273424124 +0100 |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
5 @@ -59,6 +59,9 @@ |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
6 #if defined(__linux__) && !defined(_XOPEN_SOURCE) |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
7 #define _XOPEN_SOURCE 600 /* For flockfile() on Linux */ |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
8 #endif |
3128
972cc98959a3
fix build of civetweb for Visual Studio 2008 and LSB
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
9 +#if defined(__LSB_VERSION__) |
3146
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
10 +#define NEED_TIMEGM |
3128
972cc98959a3
fix build of civetweb for Visual Studio 2008 and LSB
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
11 +#endif |
3146
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
12 #if !defined(_LARGEFILE_SOURCE) |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
13 #define _LARGEFILE_SOURCE /* For fseeko(), ftello() */ |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
14 #endif |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
15 @@ -129,6 +132,12 @@ |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
16 |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
17 |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
18 /* Alternative queue is well tested and should be the new default */ |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
19 +#if defined(__LSB_VERSION__) |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
20 +/* Function "eventfd()" is not available in Linux Standard Base, can't |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
21 + * use the alternative queue */ |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
22 +#define NO_ALTERNATIVE_QUEUE |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
23 +#endif |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
24 + |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
25 #if defined(NO_ALTERNATIVE_QUEUE) |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
26 #if defined(ALTERNATIVE_QUEUE) |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
27 #error "Define ALTERNATIVE_QUEUE or NO_ALTERNATIVE_QUEUE or none, but not both" |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
28 @@ -536,6 +545,10 @@ |
3128
972cc98959a3
fix build of civetweb for Visual Studio 2008 and LSB
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
29 #if !defined(EWOULDBLOCK) |
972cc98959a3
fix build of civetweb for Visual Studio 2008 and LSB
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
30 #define EWOULDBLOCK WSAEWOULDBLOCK |
972cc98959a3
fix build of civetweb for Visual Studio 2008 and LSB
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
31 #endif /* !EWOULDBLOCK */ |
972cc98959a3
fix build of civetweb for Visual Studio 2008 and LSB
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
32 +#if !defined(ECONNRESET) |
3146
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
33 +/* This macro is not defined e.g. in Visual Studio 2008 */ |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
34 +#define ECONNRESET WSAECONNRESET |
3128
972cc98959a3
fix build of civetweb for Visual Studio 2008 and LSB
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
35 +#endif /* !ECONNRESET */ |
972cc98959a3
fix build of civetweb for Visual Studio 2008 and LSB
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
36 #define _POSIX_ |
972cc98959a3
fix build of civetweb for Visual Studio 2008 and LSB
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
37 #define INT64_FMT "I64d" |
972cc98959a3
fix build of civetweb for Visual Studio 2008 and LSB
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
38 #define UINT64_FMT "I64u" |
3146
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
39 @@ -2939,6 +2952,13 @@ |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
40 #endif |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
41 |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
42 |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
43 +#if defined(__LSB_VERSION__) |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
44 +static void |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
45 +mg_set_thread_name(const char *threadName) |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
46 +{ |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
47 + /* prctl() does not seem to be available in Linux Standard Base */ |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
48 +} |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
49 +#else |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
50 static void |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
51 mg_set_thread_name(const char *name) |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
52 { |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
53 @@ -2980,6 +3000,7 @@ |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
54 (void)prctl(PR_SET_NAME, threadName, 0, 0, 0); |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
55 #endif |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
56 } |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
57 +#endif |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
58 #else /* !defined(NO_THREAD_NAME) */ |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
59 void |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
60 mg_set_thread_name(const char *threadName) |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
61 @@ -16919,6 +16940,10 @@ |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
62 /* Message is a valid request */ |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
63 |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
64 /* Is there a "host" ? */ |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
65 + /* https://github.com/civetweb/civetweb/pull/675/commits/96e3e8c50acb4b8e0c946d02b5f880a3e62986e1 */ |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
66 + if (conn->host!=NULL) { |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
67 + mg_free((void *)conn->host); |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
68 + } |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
69 conn->host = alloc_get_host(conn); |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
70 if (!conn->host) { |
d5d11e43d0fb
fix memory leak in civetweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3128
diff
changeset
|
71 mg_snprintf(conn, |