Merge remote-tracking branch 'wolfviking/incoming' into incoming

Conflicts:
	AUTHORS
	src/library_browser.js
	system/include/emscripten/emscripten.h

1 files changed, 16 insertions, 0 deletions

diff --git a/system/include/emscripten/emscripten.h b/system/include/emscripten/emscripten.h
index 70938fb0..f87e4988 100644
--- a/system/include/emscripten/emscripten.h
+++ b/system/include/emscripten/emscripten.h
@@ -212,6 +212,22 @@ void emscripten_async_wget(const char* url, const char* file, void (*onload)(con
 void emscripten_async_wget_data(const char* url, void *arg, void (*onload)(void*, void*, int), void (*onerror)(void*));
 
 /*
+ * More feature-complete version of emscripten_async_wget.
+ * Load file from url in asynchronous way. 
+ * The requestype is 'GET' or 'POST',
+ * If is post request, param is the post parameter 
+ * like key=value&key2=value2.
+ * The param 'arg' is a pointer will be pass to the callback
+ * When file is ready then 'onload' callback will called.
+ * During the download 'onprogress' callback will called.
+ * If any error occurred 'onerror' will called.
+ * The callbacks are called with an object pointer give in parameter 
+ * and file if is a success, the progress value during progress
+ * and http status code if is an error.
+ */
+void emscripten_async_wget2(const char* url, const char* file,  const char* requesttype, const char* param, void *arg, void (*onload)(void*, const char*), void (*onerror)(void*, int), void (*onprogress)(void*, int));
+
+/*
  * Prepare a file in asynchronous way. This does just the
  * preparation part of emscripten_async_wget, that is, it
  * works on file data already present, and asynchronously