Merge pull request #3156 from MilhouseVH/le90_libmicrohttpd_0.9.61

web: update to libmicrohttpd-0.9.61/curl-7.62.0

packages/web/curl/package.mk

@@ -11,8 +11,8 @@
 #   there: http://forum.xbmc.org/showthread.php?tid=177557
 
 PKG_NAME="curl"
-PKG_VERSION="7.61.1"
-PKG_SHA256="a308377dbc9a16b2e994abd55455e5f9edca4e31666f8f8fcfe7a1a4aea419b9"
+PKG_VERSION="7.62.0"
+PKG_SHA256="7802c54076500be500b171fde786258579d60547a3a35b8c5a23d8c88e8f9620"
 PKG_LICENSE="MIT"
 PKG_SITE="http://curl.haxx.se"
 PKG_URL="http://curl.haxx.se/download/$PKG_NAME-$PKG_VERSION.tar.bz2"

packages/web/libmicrohttpd/package.mk

@@ -1,9 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libmicrohttpd"
-PKG_VERSION="0.9.55"
-PKG_SHA256="0c1cab8dc9f2588bd3076a28f77a7f8de9560cbf2d80e53f9a8696ada80ed0f8"
+PKG_VERSION="0.9.61"
+PKG_SHA256="dbc469b4a930a79e61f67dc69c665317d44d9d8eb8378d1bd715775ea849d435"
 PKG_LICENSE="LGPLv2.1"
 PKG_SITE="http://www.gnu.org/software/libmicrohttpd/"
 PKG_URL="http://ftpmirror.gnu.org/libmicrohttpd/$PKG_NAME-$PKG_VERSION.tar.gz"

packages/web/libmicrohttpd/patches/libmicrohttpd-001-remove-extra-unescape-PR14991.patch

@@ -0,0 +1,15 @@
+diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
+index abc622e..cd4e825 100644
+--- a/src/microhttpd/connection.c
++++ b/src/microhttpd/connection.c
+@@ -2307,10 +2307,6 @@ parse_initial_message_line (struct MHD_Connection *connection,
+ 			    &connection_add_header,
+ 			    &unused_num_headers);
+     }
+-  if (NULL != uri)
+-    daemon->unescape_callback (daemon->unescape_callback_cls,
+-                               connection,
+-                               uri);
+   connection->url = curi;
+   return MHD_YES;
+ }