You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2013/09/30 23:10:23 UTC
[1/4] git commit: Fix Windows 8 HTMLAnchorElement return host:80
which force Basic Auth Header to replace options Auth Header
Updated Branches:
refs/heads/dev cf9b9fece -> 018c7dc20
Fix Windows 8 HTMLAnchorElement return host:80 which force Basic Auth Header to replace options Auth Header
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/714bff1e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/714bff1e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/714bff1e
Branch: refs/heads/dev
Commit: 714bff1ec2bc4a4d25a25bee18e446ecfbff8bf6
Parents: 8cfb8a2
Author: Maxime LUCE <so...@live.fr>
Authored: Wed Sep 18 03:33:13 2013 +0200
Committer: Maxime LUCE <so...@live.fr>
Committed: Wed Sep 18 03:33:13 2013 +0200
----------------------------------------------------------------------
www/windows8/FileTransferProxy.js | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/714bff1e/www/windows8/FileTransferProxy.js
----------------------------------------------------------------------
diff --git a/www/windows8/FileTransferProxy.js b/www/windows8/FileTransferProxy.js
index dd8ff62..cbfcfd7 100644
--- a/www/windows8/FileTransferProxy.js
+++ b/www/windows8/FileTransferProxy.js
@@ -73,6 +73,7 @@ module.exports = {
download:function(win, error, options) {
var source = options[0];
var target = options[1];
+ var headers = options[4] || {};
if (target === null || typeof target === undefined) {
@@ -96,6 +97,13 @@ module.exports = {
storageFolder.createFileAsync(fileName, Windows.Storage.CreationCollisionOption.generateUniqueName).then(function (storageFile) {
var uri = Windows.Foundation.Uri(source);
var downloader = new Windows.Networking.BackgroundTransfer.BackgroundDownloader();
+
+ if (headers) {
+ for (var header in headers) {
+ downloader.setRequestHeader(header, headers[header]);
+ }
+ }
+
download = downloader.createDownload(uri, storageFile);
download.startAsync().then(function () {
win(new FileEntry(storageFile.name, storageFile.path));
[4/4] git commit: Merge branch 'fix-win8' of
https://github.com/Touchit/cordova-plugin-file-transfer into dev
Posted by pu...@apache.org.
Merge branch 'fix-win8' of https://github.com/Touchit/cordova-plugin-file-transfer into dev
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/018c7dc2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/018c7dc2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/018c7dc2
Branch: refs/heads/dev
Commit: 018c7dc20c5a35851e590570624d89e68436f866
Parents: cf9b9fe 02afbec
Author: purplecabbage <pu...@gmail.com>
Authored: Mon Sep 30 14:03:05 2013 -0700
Committer: purplecabbage <pu...@gmail.com>
Committed: Mon Sep 30 14:03:05 2013 -0700
----------------------------------------------------------------------
www/FileTransfer.js | 2 +-
www/windows8/FileTransferProxy.js | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/018c7dc2/www/FileTransfer.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/018c7dc2/www/windows8/FileTransferProxy.js
----------------------------------------------------------------------
[2/4] git commit: Fix missing headers in Windows 8 Proxy
Posted by pu...@apache.org.
Fix missing headers in Windows 8 Proxy
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/e80d0788
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/e80d0788
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/e80d0788
Branch: refs/heads/dev
Commit: e80d0788a61d6150487416369ba5aa1bd4a44e7e
Parents: 714bff1
Author: Maxime LUCE <so...@live.fr>
Authored: Wed Sep 18 03:33:58 2013 +0200
Committer: Maxime LUCE <so...@live.fr>
Committed: Wed Sep 18 03:33:58 2013 +0200
----------------------------------------------------------------------
www/FileTransfer.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/e80d0788/www/FileTransfer.js
----------------------------------------------------------------------
diff --git a/www/FileTransfer.js b/www/FileTransfer.js
index 6eb9d74..57c9821 100644
--- a/www/FileTransfer.js
+++ b/www/FileTransfer.js
@@ -42,7 +42,7 @@ function getBasicAuthHeader(urlString) {
var credentials = null;
var protocol = url.protocol + "//";
- var origin = protocol + url.host;
+ var origin = protocol + url.host.replace(":" + url.port, ""); // Windows 8 (IE10) append :80 or :443 to url.host
// check whether there are the username:password credentials in the url
if (url.href.indexOf(origin) !== 0) { // credentials found
[3/4] git commit: Fix missing headers in Windows 8 upload proxy
Posted by pu...@apache.org.
Fix missing headers in Windows 8 upload proxy
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/02afbec0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/02afbec0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/02afbec0
Branch: refs/heads/dev
Commit: 02afbec042f76fab8e6fc23825a913d69aa2b23c
Parents: e80d078
Author: Maxime LUCE <so...@live.fr>
Authored: Wed Sep 18 03:43:14 2013 +0200
Committer: Maxime LUCE <so...@live.fr>
Committed: Wed Sep 18 03:43:14 2013 +0200
----------------------------------------------------------------------
www/windows8/FileTransferProxy.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/02afbec0/www/windows8/FileTransferProxy.js
----------------------------------------------------------------------
diff --git a/www/windows8/FileTransferProxy.js b/www/windows8/FileTransferProxy.js
index cbfcfd7..036b948 100644
--- a/www/windows8/FileTransferProxy.js
+++ b/www/windows8/FileTransferProxy.js
@@ -29,6 +29,7 @@ module.exports = {
upload:function(successCallback, error, options) {
var filePath = options[0];
var server = options[1];
+ var headers = options[8] || {};
var win = function (fileUploadResult) {
@@ -49,7 +50,7 @@ module.exports = {
var blob = MSApp.createBlobFromRandomAccessStream(storageFile.contentType, stream);
var formData = new FormData();
formData.append("source\";filename=\"" + storageFile.name + "\"", blob);
- WinJS.xhr({ type: "POST", url: server, data: formData }).then(function (response) {
+ WinJS.xhr({ type: "POST", url: server, data: formData, headers: headers }).then(function (response) {
var code = response.status;
storageFile.getBasicPropertiesAsync().done(function (basicProperties) {