diff options
author | Benjamin Barenblat <bbaren@mit.edu> | 2016-08-05 20:06:17 -0400 |
---|---|---|
committer | Benjamin Barenblat <bbaren@mit.edu> | 2016-08-05 20:06:17 -0400 |
commit | c921d0df325c803fed8c7742eb088cb3d030d541 (patch) | |
tree | 16d374660aa9adb92c2f08317a20d61ae995ef9a /src/c/request.c | |
parent | a3e471e933945dcfb54873cb20c691a193b55671 (diff) | |
parent | bd6f549a527856db3878f1586c6666646a45d8ee (diff) |
Merge branch 'upstream' into dfsg_clean20160805+dfsg
Diffstat (limited to 'src/c/request.c')
-rw-r--r-- | src/c/request.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/c/request.c b/src/c/request.c index cad84cb2..a7f23851 100644 --- a/src/c/request.c +++ b/src/c/request.c @@ -16,7 +16,7 @@ #define MAX_RETRIES 5 -void *memmem(const void *b1, size_t len1, const void *b2, size_t len2); +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); @@ -418,7 +418,7 @@ request_result uw_request(uw_request_context rc, uw_context ctx, } } - part = memmem(after_sub_headers, body + body_len - after_sub_headers, boundary, boundary_len); + part = urweb_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; |