Merge branch 'dev/in-webkit-downloads' into experimental

Conflicts:
	README

1 files changed, 11 insertions, 1 deletions

diff --git a/README b/README
index 331b040..d05ecd4 100644
--- a/README
+++ b/README
@@ -305,6 +305,9 @@ file).
   - `data`: The cookie data. Only included for "PUT" requests.
 * `scheme_handler`: handler to execute for each URI navigated to - the
   navigation request will be ignored if handler prints "USED\n"
+* `download_handler`: executed when a download is started. the handler script
+  should print a path that the download should be saved to, or print nothing
+  to cancel the download.
 * `fifo_dir`: location to store FIFOs.
 * `socket_dir`: location to store sockets.
 * `http_debug`: HTTP debug mode (value 0-3).
@@ -494,9 +497,16 @@ access to the following environment variables:
 These variables are also available as positional arguments `$1` through `$7`,
 but this is deprecated and will be removed.
 
-Handler scripts (`cookie_handler`, `scheme_handler` and
+Handler scripts (`download_handler`, `cookie_handler`, `scheme_handler` and
 `authentication_handler`) are called with special arguments:
 
+* download handler
+
+  - `$8 url`: The URL of the item to be downloaded.
+  - `$9 suggested_filename`: A filename suggested by the server or based on the URL.
+  - `$10 content_type`: The mimetype of the file to be downloaded.
+  - `$11 total_size`: The size of the file to be downloaded in bytes. This may be inaccurate.
+
 * cookie handler
 
   - `$8 GET/PUT`: Whether a cookie should be sent to the server (`GET`) or