Merge branch 'upstream' into dfsg_clean20200209+dfsgdfsg_clean

1 files changed, 2 insertions, 3 deletions

diff --git a/src/c/request.c b/src/c/request.c
index 3e7ac34c..195b3cdc 100644
--- a/src/c/request.c
+++ b/src/c/request.c
@@ -11,13 +11,12 @@
 
 #include <pthread.h>
 
+#include "memmem.h"
 #include "urweb.h"
 #include "request.h"
 
 #define MAX_RETRIES 5
 
-void *urweb_memmem(const void *b1, size_t len1, const void *b2, size_t len2);
-
 static int try_rollback(uw_context ctx, int will_retry, void *logger_data, uw_logger log_error) {
   int r = uw_rollback(ctx, will_retry);
 
@@ -422,7 +421,7 @@ request_result uw_request(uw_request_context rc, uw_context ctx,
         }
       }
 
-      part = urweb_memmem(after_sub_headers, body + body_len - after_sub_headers, boundary, boundary_len);
+      part = memmem(after_sub_headers, body + body_len - after_sub_headers, boundary, boundary_len);
       if (!part) {
         log_error(logger_data, "Missing boundary after multipart payload\n");
         return FAILED;