diff --git a/deps/Makefile b/deps/Makefile index 87d2a20e8..6f313cc44 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -133,7 +133,7 @@ curl: curl/curl/lib/.libs/libcurl.a libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a: cd libmicrohttpd && rm -rf libmicrohttpd-*/ || true cd libmicrohttpd && tar -zxf libmicrohttpd-*.tar.gz -# cd libmicrohttpd/libmicrohttpd && patch src/microhttpd/connection.c < ../connection.c-snprintf-overflow.patch + cd libmicrohttpd && ln -fsT libmicrohttpd-*/ libmicrohttpd cd libmicrohttpd/libmicrohttpd && ./configure --enable-https && CC=${CC} CXX=${CXX} ${MAKE} microhttpd: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a diff --git a/deps/libmicrohttpd/connection.c-snprintf-overflow.patch b/deps/libmicrohttpd/connection.c-snprintf-overflow.patch deleted file mode 100644 index af08efccc..000000000 --- a/deps/libmicrohttpd/connection.c-snprintf-overflow.patch +++ /dev/null @@ -1,20 +0,0 @@ -@@ -1582,11 +1582,18 @@ - MHD_HTTP_HEADER_CONNECTION))) && - (MHD_str_equal_caseless_ (pos->value, - "Keep-Alive")) ) ) ) -- off += MHD_snprintf_ (&data[off], -+ { -+ int n = MHD_snprintf_ (&data[off], - size - off, - "%s: %s\r\n", - pos->header, - pos->value); -+ if (n < 0 || n >= size - off) -+ { -+ break; -+ } -+ off += n; -+ } - } - if (MHD_CONNECTION_FOOTERS_RECEIVED == connection->state) - { diff --git a/deps/libmicrohttpd/libmicrohttpd b/deps/libmicrohttpd/libmicrohttpd index d0577227c..a90bc4faa 120000 --- a/deps/libmicrohttpd/libmicrohttpd +++ b/deps/libmicrohttpd/libmicrohttpd @@ -1 +1 @@ -libmicrohttpd-0.9.77 \ No newline at end of file +libmicrohttpd-1.0.1/ \ No newline at end of file diff --git a/deps/libmicrohttpd/libmicrohttpd-0.9.77.tar.gz b/deps/libmicrohttpd/libmicrohttpd-0.9.77.tar.gz deleted file mode 100644 index f9643b1cc..000000000 Binary files a/deps/libmicrohttpd/libmicrohttpd-0.9.77.tar.gz and /dev/null differ diff --git a/deps/libmicrohttpd/libmicrohttpd-1.0.1.tar.gz b/deps/libmicrohttpd/libmicrohttpd-1.0.1.tar.gz new file mode 100644 index 000000000..08eeb101f Binary files /dev/null and b/deps/libmicrohttpd/libmicrohttpd-1.0.1.tar.gz differ