Mercurial > hg > orthanc

annotate Resources/Patches/civetweb-1.12.patch @ 4064:7176ebf08765

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Semaphore: allow acquiring/releasing multiple resources
author Alain Mazy
date Thu, 11 Jun 2020 16:42:27 +0200
parents 6462ecaa045b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3801
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 diff -urEb civetweb-1.12.orig/include/civetweb.h civetweb-1.12/include/civetweb.h
3802
6462ecaa045b fix unit test, reorganization of OpenSSL initialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3801
diff changeset
2 --- civetweb-1.12.orig/include/civetweb.h 2020-04-02 12:07:20.727054140 +0200
6462ecaa045b fix unit test, reorganization of OpenSSL initialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3801
diff changeset
3 +++ civetweb-1.12/include/civetweb.h 2020-04-02 12:07:42.734996559 +0200
3801
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 @@ -1614,6 +1614,9 @@
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 struct mg_error_data *error);
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 #endif
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 +// Added by SJ
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 +CIVETWEB_API void mg_disable_keep_alive(struct mg_connection *conn);
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 +
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 #ifdef __cplusplus
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 }
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 #endif /* __cplusplus */
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 diff -urEb civetweb-1.12.orig/src/civetweb.c civetweb-1.12/src/civetweb.c
3802
6462ecaa045b fix unit test, reorganization of OpenSSL initialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3801
diff changeset
15 --- civetweb-1.12.orig/src/civetweb.c 2020-04-02 12:07:20.731054129 +0200
6462ecaa045b fix unit test, reorganization of OpenSSL initialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3801
diff changeset
16 +++ civetweb-1.12/src/civetweb.c 2020-04-02 12:07:52.250971600 +0200
6462ecaa045b fix unit test, reorganization of OpenSSL initialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3801
diff changeset
17 @@ -20704,5 +20704,12 @@
6462ecaa045b fix unit test, reorganization of OpenSSL initialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3801
diff changeset
18 return 1;
3801
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 }
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 +// Added by SJ
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 +void mg_disable_keep_alive(struct mg_connection *conn)
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 +{
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 + if (conn != NULL) {
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 + conn->must_close = 1;
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 + }
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 +}
3802
6462ecaa045b fix unit test, reorganization of OpenSSL initialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3801
diff changeset
28
3801
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 /* End of civetweb.c */