Mercurial > hg > orthanc

annotate OrthancFramework/Resources/Patches/civetweb-1.12.patch @ 5134:6aa41d86b948

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix ModificationJob state machine
author Alain Mazy <am@osimis.io>
date Tue, 10 Jan 2023 11:46:00 +0100
parents c8c0bbaaace3
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
4228
c8c0bbaaace3 write access to webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
2 --- civetweb-1.12.orig/include/civetweb.h 2020-10-06 12:39:10.634902843 +0200
c8c0bbaaace3 write access to webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
3 +++ civetweb-1.12/include/civetweb.h 2020-10-06 12:39:30.630872089 +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
4228
c8c0bbaaace3 write access to webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
15 --- civetweb-1.12.orig/src/civetweb.c 2020-10-06 12:39:10.638902837 +0200
c8c0bbaaace3 write access to webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
16 +++ civetweb-1.12/src/civetweb.c 2020-10-06 12:41:40.110671929 +0200
c8c0bbaaace3 write access to webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
17 @@ -10525,6 +10525,11 @@
c8c0bbaaace3 write access to webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
18 /* + MicroSoft extensions
c8c0bbaaace3 write access to webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
19 * https://msdn.microsoft.com/en-us/library/aa142917.aspx */
c8c0bbaaace3 write access to webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
20
c8c0bbaaace3 write access to webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
21 + /* Added by SJ, for write access to WebDAV on Windows >= 7 */
c8c0bbaaace3 write access to webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
22 + {"LOCK", 1, 1, 0, 0, 0},
c8c0bbaaace3 write access to webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
23 + {"UNLOCK", 1, 0, 0, 0, 0},
c8c0bbaaace3 write access to webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
24 + {"PROPPATCH", 1, 1, 0, 0, 0},
c8c0bbaaace3 write access to webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
25 +
c8c0bbaaace3 write access to webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
26 /* REPORT method (RFC 3253) */
c8c0bbaaace3 write access to webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
27 {"REPORT", 1, 1, 1, 1, 1},
c8c0bbaaace3 write access to webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
28 /* REPORT method only allowed for CGI/Lua/LSP and callbacks. */
c8c0bbaaace3 write access to webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
29 @@ -20704,5 +20709,12 @@
3802
6462ecaa045b fix unit test, reorganization of OpenSSL initialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3801
diff changeset
30 return 1;
3801
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 }
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 +// Added by SJ
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 +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
35 +{
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36 + if (conn != NULL) {
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 + conn->must_close = 1;
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 + }
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 +}
3802
6462ecaa045b fix unit test, reorganization of OpenSSL initialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3801
diff changeset
40
3801
9fe1d64a748c upgrade to civetweb 1.12, error reporting if OpenSSL failure
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 /* End of civetweb.c */