[med-svn] [Git][med-team/civetweb][master] 2 commits: Upgraded "debian/patches/webdav-uploads" for civetweb 1.13

[Sebastien Jodogne]

Sebastien Jodogne pushed to branch master at Debian Med / civetweb


Commits:
f7738094 by jodogne-guest at 2020-10-27T13:41:50+01:00
Upgraded "debian/patches/webdav-uploads" for civetweb 1.13

- - - - -
d96bb5de by jodogne-guest at 2020-10-27T13:45:20+01:00
Upload to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/patches/webdav-uploads


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+civetweb (1.13+dfsg-2) unstable; urgency=medium
+
+  * Upgraded "debian/patches/webdav-uploads" for civetweb 1.13
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Tue, 27 Oct 2020 13:40:23 +0100
+
 civetweb (1.13+dfsg-1) unstable; urgency=medium
 
   * New upstream version


=====================================
debian/patches/webdav-uploads
=====================================
@@ -1,12 +1,12 @@
 Description: Introduce function for performance of keep-alive and to allow WebDAV uploads
-Origin: https://hg.orthanc-server.com/orthanc/file/Orthanc-1.8.0/OrthancFramework/Resources/Patches/civetweb-1.12.patch
+Origin: https://hg.orthanc-server.com/orthanc/file/default/OrthancFramework/Resources/Patches/civetweb-1.13.patch
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: civetweb-1.12/include/civetweb.h
+Index: civetweb-1.13/include/civetweb.h
 ===================================================================
---- civetweb-1.12.orig/include/civetweb.h
-+++ civetweb-1.12/include/civetweb.h
-@@ -1614,6 +1614,9 @@ CIVETWEB_API int mg_start_domain2(struct
+--- civetweb-1.13.orig/include/civetweb.h
++++ civetweb-1.13/include/civetweb.h
+@@ -1695,6 +1695,9 @@ CIVETWEB_API int mg_start_domain2(struct
                                    struct mg_error_data *error);
  #endif
  
@@ -16,11 +16,11 @@ Index: civetweb-1.12/include/civetweb.h
  #ifdef __cplusplus
  }
  #endif /* __cplusplus */
-Index: civetweb-1.12/src/civetweb.c
+Index: civetweb-1.13/src/civetweb.c
 ===================================================================
---- civetweb-1.12.orig/src/civetweb.c
-+++ civetweb-1.12/src/civetweb.c
-@@ -10525,6 +10525,11 @@ static struct mg_http_method_info http_m
+--- civetweb-1.13.orig/src/civetweb.c
++++ civetweb-1.13/src/civetweb.c
+@@ -10876,6 +10876,11 @@ static const struct mg_http_method_info
      /* + MicroSoft extensions
       * https://msdn.microsoft.com/en-us/library/aa142917.aspx */
  
@@ -32,10 +32,10 @@ Index: civetweb-1.12/src/civetweb.c
      /* REPORT method (RFC 3253) */
      {"REPORT", 1, 1, 1, 1, 1},
      /* REPORT method only allowed for CGI/Lua/LSP and callbacks. */
-@@ -20704,5 +20709,12 @@ mg_exit_library(void)
- 	return 1;
+@@ -21287,4 +21292,12 @@ mg_exit_library(void)
  }
  
+ 
 +// Added by SJ
 +void mg_disable_keep_alive(struct mg_connection *conn)
 +{
@@ -43,5 +43,5 @@ Index: civetweb-1.12/src/civetweb.c
 +    conn->must_close = 1;
 +  }
 +}
- 
++ 
  /* End of civetweb.c */



View it on GitLab: https://salsa.debian.org/med-team/civetweb/-/compare/2fc27860f10c8e093b4a98193dc552ee9d50db1a...d96bb5de3c301c4e688523fe26870022bbc377ea

-- 
View it on GitLab: https://salsa.debian.org/med-team/civetweb/-/compare/2fc27860f10c8e093b4a98193dc552ee9d50db1a...d96bb5de3c301c4e688523fe26870022bbc377ea
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20201027/15b62480/attachment-0001.html>