Merge branch 'upstream' into dev

1 files changed, 3 insertions, 3 deletions

diff --git a/includes/http.h b/includes/http.h
index 2ad7ccc..af0971c 100755
--- a/includes/http.h
+++ b/includes/http.h
@@ -24,10 +24,10 @@ void http_init(char *proxy);
 void http_done(void);
 
 char *http_simple_get(char *uri, int *ret, int *len);
-char *http_auth_get(char *uri, char *user, char *pass, int *ret, int *len);
+char *http_auth_get(char *uri, char *user, char *pass, char * session_id, int *ret, int *len);
 char *http_simple_post(char *uri, char *data, int dlen, int *ret, int *len);
 
-void http_auth_headers(void *ctx, char *user, char *pass);
+void http_auth_headers(void *ctx, char *user, char *pass, char * session_id);
 
 void *http_async_req_start(void *ctx, char *uri, char *data, int dlen, int keep);
 void http_async_add_header(void *ctx, char *name, char *data);
@@ -36,7 +36,7 @@ void http_async_get_length(void *ctx, int *total, int *done);
 char *http_async_req_stop(void *ctx, int *ret, int *len);
 void http_async_req_close(void *ctx);
 
-char *http_multipart_post(char *uri, char **names, char **parts, int *plens, char *user, char *pass, int *ret, int *len);
+char *http_multipart_post(char *uri, char **names, char **parts, int *plens, char *user, char *pass, char * session_id, int *ret, int *len);
 
 char *http_ret_text(int ret);