- fixed missing file "umd-tough-cookie.js“

- updated changeling - incremented version for release
- updated change log
2026-02-11 00:00:06 +08:00 · 2016-12-07 17:21:03 +01:00 · 2016-12-07 16:48:02 +01:00 · 2016-12-07 16:20:17 +01:00 · 2016-12-07 15:32:18 +01:00 · 2016-12-07 15:29:54 +01:00
39 changed files with 1252 additions and 575 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
+node_modules/**
 tags
-.zedstate
+.zedstate
+/www/umd-tough-cookie.js
--- a/.npmignore
+++ b/.npmignore
@@ -0,0 +1,2 @@
+tags
+.zedstate
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,55 @@
 # Changelog

+## v1.5.2
+
+- fixed missing file "umd-tough-cookie.js“ (caused by missing file ".npmignore")
+
+## v1.5.1
+
+- fixed case-sensitive path name of android source files ("CordovaHTTP" --> "cordovahttp")
+
+## v1.5.0
+
+- added cookie handling
+- cookies are persisted via web storage API
+
+## v1.4.0
+
+- forked from "cordova-plugin-http" v1.2.0 (see https://github.com/wymsee/cordova-HTTP)
+- added configuration for data serializer
+- added HTTP methods PUT and DELETE
+
+# Previous changelog (cordova-plugin-http)
+
+## v1.2.0
+
+- Added support for TLSv1.1 and TLSv1.2 for android versions 4.1-4.4 (API levels 16-19)
+
+### Potentially Breaking Changes that really shouldn't matter because you shouldn't be using SSLv3
+
+- Dropped SSLv3 support for all API Levels < 20.  It will now only work on API Levels 20-22.
+
+## v1.1.0
+
+- Fixed the body of errors not being returned in iOS
+- Updated AFNetworking to 3.1.0
+
+### Potentially Breaking Changes
+
+- Disable encoding get() URLS in android (Thanks to devgeeks)
+
+## v1.0.3
+
+- Fixed version number in plugin.xml
+
+## v1.0.2
+
+- Fixed bug using useBasicAuth and setHeader from angular
+
+## v1.0.1
+
+- updated README
+
 ## v1.0.0

 - Added getBasicAuthHeader function
@@ -43,4 +93,4 @@
 - Reports SSL Handshake errors rather than giving a generic error (Thanks to devgeeks)
 - Exporting http as a module (Thanks to pvsaikrishna)
 - Added Limitations section to readme (Thanks to cvillerm)
- Fixed examples (Thanks to hideov)
+- Fixed examples (Thanks to hideov)
--- a/README.md
+++ b/README.md
@@ -1,11 +1,13 @@
-cordovaHTTP
-==================
+Cordova Advanced HTTP
+=====================

 Cordova / Phonegap plugin for communicating with HTTP servers.  Supports iOS and Android.
+This is a fork of [Wymsee's Cordova-HTTP plugin](https://github.com/wymsee/cordova-HTTP).

 ## Advantages over Javascript requests

 - Background threading - all requests are done in a background thread.
+ - Handling of HTTP code 401 - read more at [Issue CB-2415](https://issues.apache.org/jira/browse/CB-2415).
 - SSL Pinning - read more at [LumberBlog](http://blog.lumberlabs.com/2012/04/why-app-developers-should-care-about.html).

 ## Updates
@@ -17,26 +19,26 @@ Please check [CHANGELOG.md](CHANGELOG.md) for details about updating to a new ve
 The plugin conforms to the Cordova plugin specification, it can be installed
 using the Cordova / Phonegap command line interface.

-    phonegap plugin add cordova-plugin-http
+    phonegap plugin add cordova-plugin-advanced-http

-    cordova plugin add cordova-plugin-http
+    cordova plugin add cordova-plugin-advanced-http

 ## Usage

-### AngularJS
+### Without AngularJS
+
+This plugin registers a global object located at `cordova.plugin.http`.
+
+### With AngularJS

 This plugin creates a cordovaHTTP service inside of a cordovaHTTP module.  You must load the module when you create your app's module.

    var app = angular.module('myApp', ['ngRoute', 'ngAnimate', 'cordovaHTTP']);
-    
+
 You can then inject the cordovaHTTP service into your controllers.  The functions can then be used identically to the examples shown below except that instead of accepting success and failure callback functions, each function returns a promise.  For more information on promises in AngularJS read the [AngularJS docs](http://docs.angularjs.org/api/ng/service/$q).  For more info on promises in general check out this article on [html5rocks](http://www.html5rocks.com/en/tutorials/es6/promises/).  Make sure that you load cordova.js or phonegap.js after AngularJS is loaded.

-### Not AngularJS

-This plugin registers a `cordovaHTTP` global on window
-
-
-## Sync Functions
+## Synchronous Functions

 ### getBasicAuthHeader
 This returns an object representing a basic HTTP Authorization header of the form `{'Authorization': 'Basic base64encodedusernameandpassword'}`
@@ -47,14 +49,29 @@ This returns an object representing a basic HTTP Authorization header of the for
 This sets up all future requests to use Basic HTTP authentication with the given username and password.

    cordovaHTTP.useBasicAuth("user", "password");
-    
+
 ### setHeader
 Set a header for all future requests.  Takes a header and a value.

    cordovaHTTP.setHeader("Header", "Value");
-    

-## Async Functions
+### setDataSerializer
+Set the data serializer which will be used for all future POST and PUT requests. Takes a string representing the name of the serializer.
+
+    cordovaHTTP.setDataSerializer("urlencoded");
+
+You can choose one of these two:
+* `urlencoded`: send data as url encoded content in body (content type "application/x-www-form-urlencoded")
+* `json`: send data as JSON encoded content in body (content type "application/json")
+
+Caution: `urlencoded` does not support serializing deep structures whereas `json` does.
+
+### clearCookies
+Clear the cookie store.
+
+    cordovaHTTP.clearCookies();
+
+## Asynchronous Functions
 These functions all take success and error callbacks as their last 2 arguments.

 ### enableSSLPinning
@@ -69,7 +86,7 @@ As an alternative, you can store your .cer files in the www/certificates folder.
    }, function() {
        console.log('error :(');
    });
-    
+
 ### acceptAllCerts
 Accept all SSL certificates.  Or disable accepting all certificates.  This defaults to false.

@@ -78,7 +95,7 @@ Accept all SSL certificates.  Or disable accepting all certificates.  This defau
    }, function() {
        console.log('error :(');
    });
-    
+
 ### validateDomainName
 Whether or not to validate the domain name in the certificate.  This defaults to true.

@@ -87,18 +104,21 @@ Whether or not to validate the domain name in the certificate.  This defaults to
    }, function() {
        console.log('error :(');
    });
-    
+
 ### post<a name="post"></a>
-Execute a POST request.  Takes a URL, parameters, and headers.
+Execute a POST request.  Takes a URL, data, and headers.

 #### success
-The success function receives a response object with 2 properties: status and data.  Status is the HTTP response code and data is the response from the server as a string. Here's a quick example:
+The success function receives a response object with 3 properties: status, data, and headers.  Status is the HTTP response code. Data is the response from the server as a string. Headers is an object with the headers.  Here's a quick example:

    {
        status: 200,
-        data: "{'id': 12, 'message': 'test'}"
+        data: "{'id': 12, 'message': 'test'}",
+        headers: {
+            "Content-Length": "247"
+        }
    }
-    
+
 Most apis will return JSON meaning you'll want to parse the data like in the example below:

    cordovaHTTP.post("https://google.com/", {
@@ -117,20 +137,23 @@ Most apis will return JSON meaning you'll want to parse the data like in the exa
    }, function(response) {
        // prints 403
        console.log(response.status);
-        
-        //prints Permission denied 
+
+        //prints Permission denied
        console.log(response.error);
    });
-    
-    
+
+
 #### failure
-The error function receives a response object with 2 properties: status and error.  Status is the HTTP response code.  Error is the error response from the server as a string.  Here's a quick example:
+The error function receives a response object with 3 properties: status, error and headers.  Status is the HTTP response code.  Error is the error response from the server as a string.  Headers is an object with the headers.  Here's a quick example:

    {
        status: 403,
-        error: "Permission denied"
+        error: "Permission denied",
+        headers: {
+            "Content-Length": "247"
+        }
    }
-    
+
 ### get
 Execute a GET request.  Takes a URL, parameters, and headers.  See the [post](#post) documentation for details on what is returned on success and failure.

@@ -142,7 +165,13 @@ Execute a GET request.  Takes a URL, parameters, and headers.  See the [post](#p
    }, function(response) {
        console.error(response.error);
    });
-    
+
+### put
+Execute a PUT request.  Takes a URL, data, and headers.  See the [post](#post) documentation for details on what is returned on success and failure.
+
+### delete
+Execute a DELETE request.  Takes a URL, parameters, and headers.  See the [post](#post) documentation for details on what is returned on success and failure.
+
 ### uploadFile
 Uploads a file saved on the device.  Takes a URL, parameters, headers, filePath, and the name of the parameter to pass the file along as.  See the [post](#post) documentation for details on what is returned on success and failure.

@@ -154,7 +183,7 @@ Uploads a file saved on the device.  Takes a URL, parameters, headers, filePath,
    }, function(response) {
        console.error(response.error);
    });
-    
+
 ### downloadFile
 Downloads a file and saves it to the device.  Takes a URL, parameters, headers, and a filePath.  See [post](#post) documentation for details on what is returned on failure.  On success this function returns a cordova [FileEntry object](http://cordova.apache.org/docs/en/3.3.0/cordova_file_file.md.html#FileEntry).

@@ -164,7 +193,7 @@ Downloads a file and saves it to the device.  Takes a URL, parameters, headers,
    }, { Authorization: "OAuth2: token" }, "file:///somepicture.jpg", function(entry) {
        // prints the filename
        console.log(entry.name);
-        
+
        // prints the filePath
        console.log(entry.fullPath);
    }, function(response) {
@@ -181,17 +210,6 @@ This plugin utilizes some awesome open source networking libraries.  These are b

 We made a few modifications to http-request.  They can be found in a separate repo here: https://github.com/wymsee/http-request

-## Current Limitations
-
-This plugin isn't equivalent to using XMLHttpRequest or Ajax calls in Javascript.
-For instance, the following features are currently not supported:
-
- cookies support (a cookie set by a request isn't sent in subsequent requests)
- read content of error responses (only the HTTP status code and message are returned)
- read returned HTTP headers (e.g. in case security tokens are returned as headers)
-
-Take this into account when using this plugin into your application.
-
 ## License

 The MIT License
--- a/package.json
+++ b/package.json
@@ -1,9 +1,13 @@
 {
-  "name": "cordova-plugin-http",
-  "version": "1.0.2",
+  "name": "cordova-plugin-advanced-http",
+  "version": "1.5.2",
  "description": "Cordova / Phonegap plugin for communicating with HTTP servers using SSL pinning",
+  "scripts": {
+    "build": "cp node_modules/umd-tough-cookie/lib/umd-tough-cookie.js www/umd-tough-cookie.js",
+    "prepublish": "npm run build"
+  },
  "cordova": {
-    "id": "cordova-plugin-http",
+    "id": "cordova-plugin-advanced-http",
    "platforms": [
      "ios",
      "android"
@@ -11,25 +15,41 @@
  },
  "repository": {
    "type": "git",
-    "url": "git+https://github.com/wymsee/cordova-HTTP.git"
+    "url": "git+https://github.com/silkimen/cordova-plugin-advanced-http.git"
  },
  "keywords": [
    "cordova",
    "device",
    "ecosystem:cordova",
    "cordova-ios",
-    "cordova-android"
+    "cordova-android",
+    "ssl",
+    "tls"
  ],
  "engines": [
    {
      "name": "cordova",
-      "version": ">=3.0.0"
+      "version": ">=4.0.0"
    }
  ],
  "author": "Wymsee",
+  "contributors": [
+    "devgeeks",
+    "EddyVerbruggen",
+    "mbektchiev",
+    "denisbabineau",
+    "andrey-tsaplin",
+    "pvsaikrishna",
+    "cvillerm",
+    "hideov",
+    "Mobisys"
+  ],
  "license": "MIT",
  "bugs": {
-    "url": "https://github.com/wymsee/cordova-HTTP/issues"
+    "url": "https://github.com/silkimen/cordova-plugin-advanced-http/issues"
  },
-  "homepage": "https://github.com/wymsee/cordova-HTTP#readme"
+  "homepage": "https://github.com/silkimen/cordova-plugin-advanced-http#readme",
+  "devDependencies": {
+    "umd-tough-cookie": "2.3.2"
+  }
 }
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,23 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
  xmlns:android="http://schemas.android.com/apk/res/android"
-  id="cordova-plugin-http"
-  version="0.2.0">
+  id="cordova-plugin-advanced-http"
+  version="1.5.2">
+
+    <name>Advanced HTTP plugin</name>

-    <name>SSL Pinning</name>
- 
    <description>
        Cordova / Phonegap plugin for communicating with HTTP servers using SSL pinning
-	</description>
+	 </description>

    <engines>
-        <engine name="cordova" version=">=3.0.0" />
+        <engine name="cordova" version=">=4.0.0" />
    </engines>

    <dependency id="cordova-plugin-file" version=">=2.0.0" />

-    <js-module src="www/cordovaHTTP.js" name="CordovaHttpPlugin">
-        <clobbers target="CordovaHttpPlugin" />
+    <js-module src="www/lodash.js" name="lodash">
+    </js-module>
+    <js-module src="www/umd-tough-cookie.js" name="tough-cookie">
+    </js-module>
+    <js-module src="www/local-storage-store.js" name="local-storage-store">
+    </js-module>
+    <js-module src="www/cookie-handler.js" name="cookie-handler">
+    </js-module>
+    <js-module src="www/angular-integration.js" name="angular-integration">
+    </js-module>
+    <js-module src="www/advanced-http.js" name="http">
+        <clobbers target="cordova.plugin.http" />
    </js-module>

    <!-- ios -->
@@ -30,7 +40,7 @@

        <header-file src="src/ios/CordovaHttpPlugin.h" />
        <source-file src="src/ios/CordovaHttpPlugin.m" />
-        
+
        <header-file src="src/ios/TextResponseSerializer.h" />
        <source-file src="src/ios/TextResponseSerializer.m" />

@@ -62,21 +72,24 @@
    <platform name="android">
        <config-file target="res/xml/config.xml" parent="/*">
            <feature name="CordovaHttpPlugin">
-                <param name="android-package" value="com.synconset.CordovaHttpPlugin"/>
+                <param name="android-package" value="com.synconset.cordovahttp.CordovaHttpPlugin"/>
            </feature>
        </config-file>

        <config-file target="AndroidManifest.xml" parent="/manifest">
            <uses-permission android:name="android.permission.INTERNET" />
        </config-file>
-        
-        <source-file src="src/android/com/synconset/CordovaHTTP/CordovaHttp.java" target-dir="src/com/synconset" />
-        <source-file src="src/android/com/synconset/CordovaHTTP/CordovaHttpGet.java" target-dir="src/com/synconset" />
-        <source-file src="src/android/com/synconset/CordovaHTTP/CordovaHttpPost.java" target-dir="src/com/synconset" />
-        <source-file src="src/android/com/synconset/CordovaHTTP/CordovaHttpHead.java" target-dir="src/com/synconset" />
-        <source-file src="src/android/com/synconset/CordovaHTTP/CordovaHttpUpload.java" target-dir="src/com/synconset" />
-        <source-file src="src/android/com/synconset/CordovaHTTP/CordovaHttpDownload.java" target-dir="src/com/synconset" />
-        <source-file src="src/android/com/synconset/CordovaHTTP/CordovaHttpPlugin.java" target-dir="src/com/synconset" />
-        <source-file src="src/android/com/synconset/CordovaHTTP/HttpRequest.java" target-dir="src/com/github/kevinsawicki/http" />
+
+        <source-file src="src/android/com/github/kevinsawicki/http/HttpRequest.java" target-dir="src/com/github/kevinsawicki/http" />
+        <source-file src="src/android/com/github/kevinsawicki/http/TLSSocketFactory.java" target-dir="src/com/github/kevinsawicki/http" />
+        <source-file src="src/android/com/synconset/cordovahttp/CordovaHttp.java" target-dir="src/com/synconset/cordovahttp" />
+        <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpDelete.java" target-dir="src/com/synconset/cordovahttp" />
+        <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpDownload.java" target-dir="src/com/synconset/cordovahttp" />
+        <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpGet.java" target-dir="src/com/synconset/cordovahttp" />
+        <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpHead.java" target-dir="src/com/synconset/cordovahttp" />
+        <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpPlugin.java" target-dir="src/com/synconset/cordovahttp" />
+        <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpPost.java" target-dir="src/com/synconset/cordovahttp" />
+        <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpPut.java" target-dir="src/com/synconset/cordovahttp" />
+        <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpUpload.java" target-dir="src/com/synconset/cordovahttp" />
    </platform>
 </plugin>
--- a/src/android/com/github/kevinsawicki/http/HttpRequest.java
+++ b/src/android/com/github/kevinsawicki/http/HttpRequest.java
@@ -259,11 +259,11 @@ public class HttpRequest {
  private static final String CRLF = "\r\n";

  private static final String[] EMPTY_STRINGS = new String[0];
-  
+
  private static SSLSocketFactory PINNED_FACTORY;

  private static SSLSocketFactory TRUSTED_FACTORY;
-  
+
  private static ArrayList<Certificate> PINNED_CERTS;

  private static HostnameVerifier TRUSTED_VERIFIER;
@@ -274,7 +274,7 @@ public class HttpRequest {
    else
      return CHARSET_UTF8;
  }
-  
+
  private static SSLSocketFactory getPinnedFactory()
      throws HttpRequestException {
    if (PINNED_FACTORY != null) {
@@ -305,7 +305,12 @@ public class HttpRequest {
      try {
        SSLContext context = SSLContext.getInstance("TLS");
        context.init(null, trustAllCerts, new SecureRandom());
-        TRUSTED_FACTORY = context.getSocketFactory();
+
+        if (android.os.Build.VERSION.SDK_INT < 20) {
+          TRUSTED_FACTORY = new TLSSocketFactory(context);
+        } else {
+          TRUSTED_FACTORY = context.getSocketFactory();
+        }
      } catch (GeneralSecurityException e) {
        IOException ioException = new IOException(
            "Security exception configuring SSL context");
@@ -424,8 +429,8 @@ public class HttpRequest {
    else
      CONNECTION_FACTORY = connectionFactory;
  }
-  
-  
+
+
  /**
  * Add a certificate to test against when using ssl pinning.
  *
@@ -436,28 +441,33 @@ public class HttpRequest {
  */
  public static void addCert(Certificate ca) throws GeneralSecurityException, IOException  {
      if (PINNED_CERTS == null) {
-          PINNED_CERTS = new ArrayList<Certificate>();
+        PINNED_CERTS = new ArrayList<Certificate>();
      }
      PINNED_CERTS.add(ca);
      String keyStoreType = KeyStore.getDefaultType();
      KeyStore keyStore = KeyStore.getInstance(keyStoreType);
      keyStore.load(null, null);
-      
+
      for (int i = 0; i < PINNED_CERTS.size(); i++) {
-          keyStore.setCertificateEntry("CA" + i, PINNED_CERTS.get(i));
+        keyStore.setCertificateEntry("CA" + i, PINNED_CERTS.get(i));
      }
-      
+
      // Create a TrustManager that trusts the CAs in our KeyStore
      String tmfAlgorithm = TrustManagerFactory.getDefaultAlgorithm();
      TrustManagerFactory tmf = TrustManagerFactory.getInstance(tmfAlgorithm);
      tmf.init(keyStore);
-      
+
      // Create an SSLContext that uses our TrustManager
      SSLContext sslContext = SSLContext.getInstance("TLS");
      sslContext.init(null, tmf.getTrustManagers(), null);
-      PINNED_FACTORY = sslContext.getSocketFactory();
+
+      if (android.os.Build.VERSION.SDK_INT < 20) {
+        PINNED_FACTORY = new TLSSocketFactory(sslContext);
+      } else {
+        PINNED_FACTORY = sslContext.getSocketFactory();
+      }
  }
-  
+
  /**
  * Add a certificate to test against when using ssl pinning.
  *
@@ -3246,7 +3256,7 @@ public class HttpRequest {
        form(entry, charset);
    return this;
  }
-  
+
  /**
   * Configure HTTPS connection to trust only certain certificates
   * <p>
@@ -3265,7 +3275,7 @@ public class HttpRequest {
    }
    return this;
  }
-  
+
  /**
   * Configure HTTPS connection to trust all certificates
   * <p>
--- a/src/android/com/github/kevinsawicki/http/TLSSocketFactory.java
+++ b/src/android/com/github/kevinsawicki/http/TLSSocketFactory.java
@@ -0,0 +1,61 @@
+package com.github.kevinsawicki.http;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+
+public class TLSSocketFactory extends SSLSocketFactory {
+
+    private SSLSocketFactory internalSSLSocketFactory;
+
+    public TLSSocketFactory(SSLContext context) {
+        internalSSLSocketFactory = context.getSocketFactory();
+    }
+
+    @Override
+    public String[] getDefaultCipherSuites() {
+        return internalSSLSocketFactory.getDefaultCipherSuites();
+    }
+
+    @Override
+    public String[] getSupportedCipherSuites() {
+        return internalSSLSocketFactory.getSupportedCipherSuites();
+    }
+
+    @Override
+    public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException {
+        return enableTLSOnSocket(internalSSLSocketFactory.createSocket(s, host, port, autoClose));
+    }
+
+    @Override
+    public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
+        return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port));
+    }
+
+    @Override
+    public Socket createSocket(String host, int port, InetAddress localHost, int localPort) throws IOException, UnknownHostException {
+        return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port, localHost, localPort));
+    }
+
+    @Override
+    public Socket createSocket(InetAddress host, int port) throws IOException {
+        return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port));
+    }
+
+    @Override
+    public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort) throws IOException {
+        return enableTLSOnSocket(internalSSLSocketFactory.createSocket(address, port, localAddress, localPort));
+    }
+
+    private Socket enableTLSOnSocket(Socket socket) {
+        if(socket != null && (socket instanceof SSLSocket)) {
+            ((SSLSocket)socket).setEnabledProtocols(new String[] {"TLSv1", "TLSv1.1", "TLSv1.2"});
+        }
+        return socket;
+    }
+}
--- a/src/android/com/synconset/cordovahttp/CordovaHttp.java
+++ b/src/android/com/synconset/cordovahttp/CordovaHttp.java
@@ -1,63 +1,60 @@
 /**
 * A HTTP plugin for Cordova / Phonegap
 */
-package com.synconset;
+package com.synconset.cordovahttp;

 import org.apache.cordova.CallbackContext;

 import org.json.JSONException;
 import org.json.JSONObject;

-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.BufferedReader;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.HostnameVerifier;
-
 import java.util.Iterator;

-import android.util.Log;
+import android.text.TextUtils;

 import com.github.kevinsawicki.http.HttpRequest;
- 
-public abstract class CordovaHttp {
+
+abstract class CordovaHttp {
    protected static final String TAG = "CordovaHTTP";
    protected static final String CHARSET = "UTF-8";
-    
+
    private static AtomicBoolean sslPinning = new AtomicBoolean(false);
    private static AtomicBoolean acceptAllCerts = new AtomicBoolean(false);
    private static AtomicBoolean validateDomainName = new AtomicBoolean(true);

    private String urlString;
-    private Map<?, ?> params;
-    private Map<String, String> headers;
+    private JSONObject params;
+    private String serializerName;
+    private JSONObject headers;
    private CallbackContext callbackContext;
-    
-    public CordovaHttp(String urlString, Map<?, ?> params, Map<String, String> headers, CallbackContext callbackContext) {
+
+    public CordovaHttp(String urlString, JSONObject params, JSONObject headers, CallbackContext callbackContext) {
        this.urlString = urlString;
        this.params = params;
+        this.serializerName = "default";
        this.headers = headers;
        this.callbackContext = callbackContext;
    }
-    
+
+    public CordovaHttp(String urlString, JSONObject params, String serializerName, JSONObject headers, CallbackContext callbackContext) {
+        this.urlString = urlString;
+        this.params = params;
+        this.serializerName = serializerName;
+        this.headers = headers;
+        this.callbackContext = callbackContext;
+    }
+
    public static void enableSSLPinning(boolean enable) {
        sslPinning.set(enable);
        if (enable) {
            acceptAllCerts.set(false);
        }
    }
-    
+
    public static void acceptAllCerts(boolean accept) {
        acceptAllCerts.set(accept);
        if (accept) {
@@ -72,19 +69,31 @@ public abstract class CordovaHttp {
    protected String getUrlString() {
        return this.urlString;
    }
-    
-    protected Map<?, ?> getParams() {
+
+    protected JSONObject getParamsObject() {
        return this.params;
    }
-    
-    protected Map<String, String> getHeaders() {
+
+    protected String getSerializerName() {
+        return this.serializerName;
+    }
+
+    protected HashMap<String, Object> getParamsMap() throws JSONException {
+        return this.getMapFromJSONObject(this.params);
+    }
+
+    protected JSONObject getHeadersObject() {
        return this.headers;
    }
-    
+
+    protected HashMap<String, String> getHeadersMap() throws JSONException {
+        return this.getStringMapFromJSONObject(this.headers);
+    }
+
    protected CallbackContext getCallbackContext() {
        return this.callbackContext;
    }
-    
+
    protected HttpRequest setupSecurity(HttpRequest request) {
        if (acceptAllCerts.get()) {
            request.trustAllCerts();
@@ -97,7 +106,7 @@ public abstract class CordovaHttp {
        }
        return request;
    }
-    
+
    protected void respondWithError(int status, String msg) {
        try {
            JSONObject response = new JSONObject();
@@ -108,21 +117,46 @@ public abstract class CordovaHttp {
            this.callbackContext.error(msg);
        }
    }
-    
+
    protected void respondWithError(String msg) {
        this.respondWithError(500, msg);
    }

    protected void addResponseHeaders(HttpRequest request, JSONObject response) throws JSONException {
        Map<String, List<String>> headers = request.headers();
-        Map<String, String> parsed_headers = new HashMap<String, String>();
+        Map<String, String> filteredHeaders = new HashMap<String, String>();
+
        for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
            String key = entry.getKey();
            List<String> value = entry.getValue();
+
            if ((key != null) && (!value.isEmpty())) {
-                parsed_headers.put(key, value.get(0));
+                filteredHeaders.put(key, TextUtils.join(", ", value));
            }
        }
-        response.put("headers", new JSONObject(parsed_headers));
+
+        response.put("headers", new JSONObject(filteredHeaders));
+    }
+
+    protected HashMap<String, String> getStringMapFromJSONObject(JSONObject object) throws JSONException {
+        HashMap<String, String> map = new HashMap<String, String>();
+        Iterator<?> i = object.keys();
+
+        while (i.hasNext()) {
+            String key = (String)i.next();
+            map.put(key, object.getString(key));
+        }
+        return map;
+    }
+
+    protected HashMap<String, Object> getMapFromJSONObject(JSONObject object) throws JSONException {
+        HashMap<String, Object> map = new HashMap<String, Object>();
+        Iterator<?> i = object.keys();
+
+        while(i.hasNext()) {
+            String key = (String)i.next();
+            map.put(key, object.get(key));
+        }
+        return map;
    }
 }
--- a/src/android/com/synconset/cordovahttp/CordovaHttpDelete.java
+++ b/src/android/com/synconset/cordovahttp/CordovaHttpDelete.java
@@ -1,47 +1,41 @@
 /**
 * A HTTP plugin for Cordova / Phonegap
 */
-package com.synconset;
+package com.synconset.cordovahttp;

-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.net.UnknownHostException;
-import java.util.Map;
-
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.HostnameVerifier;

 import javax.net.ssl.SSLHandshakeException;

 import org.apache.cordova.CallbackContext;
+
 import org.json.JSONException;
 import org.json.JSONObject;

-import android.util.Log;
-
 import com.github.kevinsawicki.http.HttpRequest;
 import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;
- 
-public class CordovaHttpGet extends CordovaHttp implements Runnable {
-    public CordovaHttpGet(String urlString, Map<?, ?> params, Map<String, String> headers, CallbackContext callbackContext) {
-        super(urlString, params, headers, callbackContext);
+
+class CordovaHttpDelete extends CordovaHttp implements Runnable {
+    public CordovaHttpDelete(String urlString, JSONObject data, JSONObject headers, CallbackContext callbackContext) {
+        super(urlString, data, headers, callbackContext);
    }
-    
+
    @Override
    public void run() {
        try {
-            HttpRequest request = HttpRequest.get(this.getUrlString(), this.getParams(), true);
+            HttpRequest request = HttpRequest.delete(this.getUrlString(), this.getParamsMap(), false);
+
            this.setupSecurity(request);
            request.acceptCharset(CHARSET);
-            request.headers(this.getHeaders());
+            request.headers(this.getHeadersMap());
+
            int code = request.code();
            String body = request.body(CHARSET);
            JSONObject response = new JSONObject();
+
            this.addResponseHeaders(request, response);
            response.put("status", code);
+
            if (code >= 200 && code < 300) {
                response.put("data", body);
                this.getCallbackContext().success(response);
@@ -61,4 +55,4 @@ public class CordovaHttpGet extends CordovaHttp implements Runnable {
            }
        }
    }
-}
+}
--- a/src/android/com/synconset/cordovahttp/CordovaHttpDownload.java
+++ b/src/android/com/synconset/cordovahttp/CordovaHttpDownload.java
@@ -1,9 +1,7 @@
 /**
 * A HTTP plugin for Cordova / Phonegap
 */
-package com.synconset;
-
-import android.util.Log;
+package com.synconset.cordovahttp;

 import com.github.kevinsawicki.http.HttpRequest;
 import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;
@@ -12,7 +10,6 @@ import java.io.File;
 import java.net.UnknownHostException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Map;

 import javax.net.ssl.SSLHandshakeException;

@@ -22,23 +19,23 @@ import org.apache.cordova.file.FileUtils;
 import org.json.JSONException;
 import org.json.JSONObject;

-public class CordovaHttpDownload extends CordovaHttp implements Runnable {
+class CordovaHttpDownload extends CordovaHttp implements Runnable {
    private String filePath;
-    
-    public CordovaHttpDownload(String urlString, Map<?, ?> params, Map<String, String> headers, CallbackContext callbackContext, String filePath) {
+
+    public CordovaHttpDownload(String urlString, JSONObject params, JSONObject headers, CallbackContext callbackContext, String filePath) {
        super(urlString, params, headers, callbackContext);
        this.filePath = filePath;
    }
-    
+
    @Override
    public void run() {
        try {
-            HttpRequest request = HttpRequest.get(this.getUrlString(), this.getParams(), true);
+            HttpRequest request = HttpRequest.get(this.getUrlString(), this.getParamsMap(), true);
            this.setupSecurity(request);
            request.acceptCharset(CHARSET);
-            request.headers(this.getHeaders());
+            request.headers(this.getHeadersMap());
            int code = request.code();
-            
+
            JSONObject response = new JSONObject();
            this.addResponseHeaders(request, response);
            response.put("status", code);
--- a/src/android/com/synconset/CordovaHTTP/CordovaHttpPost.java
+++ b/src/android/com/synconset/CordovaHTTP/CordovaHttpPost.java
@@ -1,40 +1,41 @@
 /**
 * A HTTP plugin for Cordova / Phonegap
 */
-package com.synconset;
+package com.synconset.cordovahttp;

 import java.net.UnknownHostException;
-import java.util.Map;
-
-import org.apache.cordova.CallbackContext;
-import org.json.JSONException;
-import org.json.JSONObject;

 import javax.net.ssl.SSLHandshakeException;

-import android.util.Log;
+import org.apache.cordova.CallbackContext;
+
+import org.json.JSONException;
+import org.json.JSONObject;

 import com.github.kevinsawicki.http.HttpRequest;
 import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;
- 
-public class CordovaHttpPost extends CordovaHttp implements Runnable {
-    public CordovaHttpPost(String urlString, Map<?, ?> params, Map<String, String> headers, CallbackContext callbackContext) {
+
+class CordovaHttpGet extends CordovaHttp implements Runnable {
+    public CordovaHttpGet(String urlString, JSONObject params, JSONObject headers, CallbackContext callbackContext) {
        super(urlString, params, headers, callbackContext);
    }
-    
+
    @Override
    public void run() {
        try {
-            HttpRequest request = HttpRequest.post(this.getUrlString());
+            HttpRequest request = HttpRequest.get(this.getUrlString(), this.getParamsMap(), false);
+
            this.setupSecurity(request);
            request.acceptCharset(CHARSET);
-            request.headers(this.getHeaders());
-            request.form(this.getParams());
+            request.headers(this.getHeadersMap());
+
            int code = request.code();
            String body = request.body(CHARSET);
            JSONObject response = new JSONObject();
+
            this.addResponseHeaders(request, response);
            response.put("status", code);
+
            if (code >= 200 && code < 300) {
                response.put("data", body);
                this.getCallbackContext().success(response);
@@ -44,7 +45,7 @@ public class CordovaHttpPost extends CordovaHttp implements Runnable {
            }
        } catch (JSONException e) {
            this.respondWithError("There was an error generating the response");
-        }  catch (HttpRequestException e) {
+        } catch (HttpRequestException e) {
            if (e.getCause() instanceof UnknownHostException) {
                this.respondWithError(0, "The host could not be resolved");
            } else if (e.getCause() instanceof SSLHandshakeException) {
--- a/src/android/com/synconset/cordovahttp/CordovaHttpHead.java
+++ b/src/android/com/synconset/cordovahttp/CordovaHttpHead.java
@@ -1,18 +1,9 @@
 /**
 * A HTTP plugin for Cordova / Phonegap
 */
-package com.synconset;
+package com.synconset.cordovahttp;

-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.net.UnknownHostException;
-import java.util.Map;
-
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.HostnameVerifier;

 import javax.net.ssl.SSLHandshakeException;

@@ -20,27 +11,29 @@ import org.apache.cordova.CallbackContext;
 import org.json.JSONException;
 import org.json.JSONObject;

-import android.util.Log;
-
 import com.github.kevinsawicki.http.HttpRequest;
 import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;
- 
-public class CordovaHttpHead extends CordovaHttp implements Runnable {
-    public CordovaHttpHead(String urlString, Map<?, ?> params, Map<String, String> headers, CallbackContext callbackContext) {
+
+class CordovaHttpHead extends CordovaHttp implements Runnable {
+    public CordovaHttpHead(String urlString, JSONObject params, JSONObject headers, CallbackContext callbackContext) {
        super(urlString, params, headers, callbackContext);
    }
-    
+
    @Override
    public void run() {
        try {
-            HttpRequest request = HttpRequest.head(this.getUrlString(), this.getParams(), true);
+            HttpRequest request = HttpRequest.head(this.getUrlString(), this.getParamsMap(), true);
+
            this.setupSecurity(request);
            request.acceptCharset(CHARSET);
-            request.headers(this.getHeaders());
+            request.headers(this.getHeadersMap());
+
            int code = request.code();
            JSONObject response = new JSONObject();
+
            this.addResponseHeaders(request, response);
            response.put("status", code);
+
            if (code >= 200 && code < 300) {
                // no 'body' to return for HEAD request
                this.getCallbackContext().success(response);
@@ -61,4 +54,4 @@ public class CordovaHttpHead extends CordovaHttp implements Runnable {
            }
        }
    }
-}
+}
--- a/src/android/com/synconset/cordovahttp/CordovaHttpPlugin.java
+++ b/src/android/com/synconset/cordovahttp/CordovaHttpPlugin.java
@@ -1,39 +1,26 @@
 /**
 * A HTTP plugin for Cordova / Phonegap
 */
-package com.synconset;
+package com.synconset.cordovahttp;

 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.Iterator;
-import java.util.ArrayList;
-import java.util.HashMap;

-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.HostnameVerifier;
+import java.security.GeneralSecurityException;
+
+import java.util.ArrayList;

 import org.apache.cordova.CallbackContext;
 import org.apache.cordova.CordovaInterface;
 import org.apache.cordova.CordovaPlugin;
 import org.apache.cordova.CordovaWebView;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;

 import android.content.res.AssetManager;
-import android.util.Base64;
-import android.util.Log;

 import com.github.kevinsawicki.http.HttpRequest;

@@ -47,30 +34,43 @@ public class CordovaHttpPlugin extends CordovaPlugin {

    @Override
    public boolean execute(String action, final JSONArray args, final CallbackContext callbackContext) throws JSONException {
-        if (action.equals("get")) {
+        if (action.equals("post")) {
+            String urlString = args.getString(0);
+            JSONObject params = args.getJSONObject(1);
+            String serializerName = args.getString(2);
+            JSONObject headers = args.getJSONObject(3);
+            CordovaHttpPost post = new CordovaHttpPost(urlString, params, serializerName, headers, callbackContext);
+
+            cordova.getThreadPool().execute(post);
+        } else if (action.equals("get")) {
            String urlString = args.getString(0);
            JSONObject params = args.getJSONObject(1);
            JSONObject headers = args.getJSONObject(2);
-            HashMap<?, ?> paramsMap = this.getMapFromJSONObject(params);
-            HashMap<String, String> headersMap = this.getStringMapFromJSONObject(headers);
-            CordovaHttpGet get = new CordovaHttpGet(urlString, paramsMap, headersMap, callbackContext);
+            CordovaHttpGet get = new CordovaHttpGet(urlString, params, headers, callbackContext);
+
            cordova.getThreadPool().execute(get);
+        } else if (action.equals("put")) {
+            String urlString = args.getString(0);
+            JSONObject params = args.getJSONObject(1);
+            String serializerName = args.getString(2);
+            JSONObject headers = args.getJSONObject(3);
+            CordovaHttpPut put = new CordovaHttpPut(urlString, params, serializerName, headers, callbackContext);
+
+            cordova.getThreadPool().execute(put);
+        } else if (action.equals("delete")) {
+            String urlString = args.getString(0);
+            JSONObject params = args.getJSONObject(1);
+            JSONObject headers = args.getJSONObject(2);
+            CordovaHttpDelete delete = new CordovaHttpDelete(urlString, params, headers, callbackContext);
+
+            cordova.getThreadPool().execute(delete);
        } else if (action.equals("head")) {
            String urlString = args.getString(0);
            JSONObject params = args.getJSONObject(1);
            JSONObject headers = args.getJSONObject(2);
-            HashMap<?, ?> paramsMap = this.getMapFromJSONObject(params);
-            HashMap<String, String> headersMap = this.getStringMapFromJSONObject(headers);
-            CordovaHttpHead head = new CordovaHttpHead(urlString, paramsMap, headersMap, callbackContext);
+            CordovaHttpHead head = new CordovaHttpHead(urlString, params, headers, callbackContext);
+
            cordova.getThreadPool().execute(head);
-        } else if (action.equals("post")) {
-            String urlString = args.getString(0);
-            JSONObject params = args.getJSONObject(1);
-            JSONObject headers = args.getJSONObject(2);
-            HashMap<?, ?> paramsMap = this.getMapFromJSONObject(params);
-            HashMap<String, String> headersMap = this.getStringMapFromJSONObject(headers);
-            CordovaHttpPost post = new CordovaHttpPost(urlString, paramsMap, headersMap, callbackContext);
-            cordova.getThreadPool().execute(post);
        } else if (action.equals("enableSSLPinning")) {
            try {
                boolean enable = args.getBoolean(0);
@@ -82,30 +82,30 @@ public class CordovaHttpPlugin extends CordovaPlugin {
            }
        } else if (action.equals("acceptAllCerts")) {
            boolean accept = args.getBoolean(0);
+
            CordovaHttp.acceptAllCerts(accept);
            callbackContext.success();
        } else if (action.equals("validateDomainName")) {
            boolean accept = args.getBoolean(0);
+
            CordovaHttp.validateDomainName(accept);
            callbackContext.success();
        } else if (action.equals("uploadFile")) {
            String urlString = args.getString(0);
            JSONObject params = args.getJSONObject(1);
            JSONObject headers = args.getJSONObject(2);
-            HashMap<?, ?> paramsMap = this.getMapFromJSONObject(params);
-            HashMap<String, String> headersMap = this.getStringMapFromJSONObject(headers);
            String filePath = args.getString(3);
            String name = args.getString(4);
-            CordovaHttpUpload upload = new CordovaHttpUpload(urlString, paramsMap, headersMap, callbackContext, filePath, name);
+            CordovaHttpUpload upload = new CordovaHttpUpload(urlString, params, headers, callbackContext, filePath, name);
+
            cordova.getThreadPool().execute(upload);
        } else if (action.equals("downloadFile")) {
            String urlString = args.getString(0);
            JSONObject params = args.getJSONObject(1);
            JSONObject headers = args.getJSONObject(2);
-            HashMap<?, ?> paramsMap = this.getMapFromJSONObject(params);
-            HashMap<String, String> headersMap = this.getStringMapFromJSONObject(headers);
            String filePath = args.getString(3);
-            CordovaHttpDownload download = new CordovaHttpDownload(urlString, paramsMap, headersMap, callbackContext, filePath);
+            CordovaHttpDownload download = new CordovaHttpDownload(urlString, params, headers, callbackContext, filePath);
+
            cordova.getThreadPool().execute(download);
        } else {
            return false;
@@ -149,26 +149,4 @@ public class CordovaHttpPlugin extends CordovaPlugin {
            CordovaHttp.enableSSLPinning(false);
        }
    }
-
-    private HashMap<String, String> getStringMapFromJSONObject(JSONObject object) throws JSONException {
-        HashMap<String, String> map = new HashMap<String, String>();
-        Iterator<?> i = object.keys();
-
-        while (i.hasNext()) {
-            String key = (String)i.next();
-            map.put(key, object.getString(key));
-        }
-        return map;
-    }
-
-    private HashMap<String, Object> getMapFromJSONObject(JSONObject object) throws JSONException {
-        HashMap<String, Object> map = new HashMap<String, Object>();
-        Iterator<?> i = object.keys();
-
-        while(i.hasNext()) {
-            String key = (String)i.next();
-            map.put(key, object.get(key));
-        }
-        return map;
-    }
 }
--- a/src/android/com/synconset/cordovahttp/CordovaHttpPost.java
+++ b/src/android/com/synconset/cordovahttp/CordovaHttpPost.java
@@ -0,0 +1,64 @@
+/**
+ * A HTTP plugin for Cordova / Phonegap
+ */
+package com.synconset.cordovahttp;
+
+import java.net.UnknownHostException;
+
+import org.apache.cordova.CallbackContext;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import javax.net.ssl.SSLHandshakeException;
+
+import com.github.kevinsawicki.http.HttpRequest;
+import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;
+
+class CordovaHttpPost extends CordovaHttp implements Runnable {
+    public CordovaHttpPost(String urlString, JSONObject params, String serializerName, JSONObject headers, CallbackContext callbackContext) {
+        super(urlString, params, serializerName, headers, callbackContext);
+    }
+
+    @Override
+    public void run() {
+        try {
+            HttpRequest request = HttpRequest.post(this.getUrlString());
+
+            this.setupSecurity(request);
+            request.acceptCharset(CHARSET);
+            request.headers(this.getHeadersMap());
+
+            if (new String("json").equals(this.getSerializerName())) {
+                request.contentType(request.CONTENT_TYPE_JSON, request.CHARSET_UTF8);
+                request.send(this.getParamsObject().toString());
+            } else {
+                request.form(this.getParamsMap());
+            }
+
+            int code = request.code();
+            String body = request.body(CHARSET);
+            JSONObject response = new JSONObject();
+
+            this.addResponseHeaders(request, response);
+            response.put("status", code);
+
+            if (code >= 200 && code < 300) {
+                response.put("data", body);
+                this.getCallbackContext().success(response);
+            } else {
+                response.put("error", body);
+                this.getCallbackContext().error(response);
+            }
+        } catch (JSONException e) {
+            this.respondWithError("There was an error generating the response");
+        }  catch (HttpRequestException e) {
+            if (e.getCause() instanceof UnknownHostException) {
+                this.respondWithError(0, "The host could not be resolved");
+            } else if (e.getCause() instanceof SSLHandshakeException) {
+                this.respondWithError("SSL handshake failed");
+            } else {
+                this.respondWithError("There was an error with the request");
+            }
+        }
+    }
+}
--- a/src/android/com/synconset/cordovahttp/CordovaHttpPut.java
+++ b/src/android/com/synconset/cordovahttp/CordovaHttpPut.java
@@ -0,0 +1,64 @@
+/**
+ * A HTTP plugin for Cordova / Phonegap
+ */
+package com.synconset.cordovahttp;
+
+import java.net.UnknownHostException;
+
+import org.apache.cordova.CallbackContext;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import javax.net.ssl.SSLHandshakeException;
+
+import com.github.kevinsawicki.http.HttpRequest;
+import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;
+
+class CordovaHttpPut extends CordovaHttp implements Runnable {
+    public CordovaHttpPut(String urlString, JSONObject data, String serializerName, JSONObject headers, CallbackContext callbackContext) {
+        super(urlString, data, serializerName, headers, callbackContext);
+    }
+
+    @Override
+    public void run() {
+        try {
+            HttpRequest request = HttpRequest.put(this.getUrlString());
+
+            this.setupSecurity(request);
+            request.acceptCharset(CHARSET);
+            request.headers(this.getHeadersMap());
+
+            if (new String("json").equals(this.getSerializerName())) {
+                request.contentType(request.CONTENT_TYPE_JSON, request.CHARSET_UTF8);
+                request.send(this.getParamsObject().toString());
+            } else {
+                request.form(this.getParamsMap());
+            }
+
+            int code = request.code();
+            String body = request.body(CHARSET);
+            JSONObject response = new JSONObject();
+
+            this.addResponseHeaders(request, response);
+            response.put("status", code);
+
+            if (code >= 200 && code < 300) {
+                response.put("data", body);
+                this.getCallbackContext().success(response);
+            } else {
+                response.put("error", body);
+                this.getCallbackContext().error(response);
+            }
+        } catch (JSONException e) {
+            this.respondWithError("There was an error generating the response");
+        }  catch (HttpRequestException e) {
+            if (e.getCause() instanceof UnknownHostException) {
+                this.respondWithError(0, "The host could not be resolved");
+            } else if (e.getCause() instanceof SSLHandshakeException) {
+                this.respondWithError("SSL handshake failed");
+            } else {
+                this.respondWithError("There was an error with the request");
+            }
+        }
+    }
+}
--- a/src/android/com/synconset/cordovahttp/CordovaHttpUpload.java
+++ b/src/android/com/synconset/cordovahttp/CordovaHttpUpload.java
@@ -1,57 +1,65 @@
 /**
 * A HTTP plugin for Cordova / Phonegap
 */
-package com.synconset;
+package com.synconset.cordovahttp;

 import java.io.File;
+
 import java.net.UnknownHostException;
 import java.net.URI;
 import java.net.URISyntaxException;
+
 import java.util.Iterator;
-import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;

 import org.apache.cordova.CallbackContext;
+
 import org.json.JSONException;
 import org.json.JSONObject;

 import javax.net.ssl.SSLHandshakeException;

-import android.util.Log;
 import android.webkit.MimeTypeMap;

 import com.github.kevinsawicki.http.HttpRequest;
 import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;
- 
-public class CordovaHttpUpload extends CordovaHttp implements Runnable {
+
+class CordovaHttpUpload extends CordovaHttp implements Runnable {
    private String filePath;
    private String name;
-    
-    public CordovaHttpUpload(String urlString, Map<?, ?> params, Map<String, String> headers, CallbackContext callbackContext, String filePath, String name) {
+
+    public CordovaHttpUpload(String urlString, JSONObject params, JSONObject headers, CallbackContext callbackContext, String filePath, String name) {
        super(urlString, params, headers, callbackContext);
        this.filePath = filePath;
        this.name = name;
    }
-    
+
    @Override
    public void run() {
        try {
            HttpRequest request = HttpRequest.post(this.getUrlString());
+
            this.setupSecurity(request);
            request.acceptCharset(CHARSET);
-            request.headers(this.getHeaders());
+            request.headers(this.getHeadersMap());
+
            URI uri = new URI(filePath);
-            int index = filePath.lastIndexOf('/');
-            String filename = filePath.substring(index + 1);
-            index = filePath.lastIndexOf('.');
-            String ext = filePath.substring(index + 1);
+
+            int filenameIndex = filePath.lastIndexOf('/');
+            String filename = filePath.substring(filenameIndex + 1);
+
+            int extIndex = filePath.lastIndexOf('.');
+            String ext = filePath.substring(extIndex + 1);
+
            MimeTypeMap mimeTypeMap = MimeTypeMap.getSingleton();
            String mimeType = mimeTypeMap.getMimeTypeFromExtension(ext);
+
            request.part(this.name, filename, mimeType, new File(uri));
-            
-            Set<?> set = (Set<?>)this.getParams().entrySet();
+
+            Set<?> set = (Set<?>)this.getParamsMap().entrySet();
            Iterator<?> i = set.iterator();
+
            while (i.hasNext()) {
                Entry<?, ?> e = (Entry<?, ?>)i.next();
                String key = (String)e.getKey();
@@ -65,13 +73,15 @@ public class CordovaHttpUpload extends CordovaHttp implements Runnable {
                    return;
                }
            }
-            
+
            int code = request.code();
            String body = request.body(CHARSET);
-            
+
            JSONObject response = new JSONObject();
+
            this.addResponseHeaders(request, response);
            response.put("status", code);
+
            if (code >= 200 && code < 300) {
                response.put("data", body);
                this.getCallbackContext().success(response);
--- a/src/ios/AFNetworking/AFHTTPSessionManager.h
+++ b/src/ios/AFNetworking/AFHTTPSessionManager.h
@@ -1,5 +1,5 @@
 // AFHTTPSessionManager.h
-// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
+// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -150,7 +150,7 @@ NS_ASSUME_NONNULL_BEGIN

 @param URLString The URL string used to create the request URL.
 @param parameters The parameters to be encoded according to the client request serializer.
- @param progress A block object to be executed when the download progress is updated. Note this block is called on the session queue, not the main queue.
+ @param downloadProgress A block object to be executed when the download progress is updated. Note this block is called on the session queue, not the main queue.
 @param success A block object to be executed when the task finishes successfully. This block has no return value and takes two arguments: the data task, and the response object created by the client response serializer.
 @param failure A block object to be executed when the task finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a two arguments: the data task and the error describing the network or parsing error that occurred.

@@ -158,7 +158,7 @@ NS_ASSUME_NONNULL_BEGIN
 */
 - (nullable NSURLSessionDataTask *)GET:(NSString *)URLString
                            parameters:(nullable id)parameters
-                              progress:(nullable void (^)(NSProgress *downloadProgress)) downloadProgress
+                              progress:(nullable void (^)(NSProgress *downloadProgress))downloadProgress
                               success:(nullable void (^)(NSURLSessionDataTask *task, id _Nullable responseObject))success
                               failure:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSError *error))failure;

@@ -197,7 +197,7 @@ NS_ASSUME_NONNULL_BEGIN

 @param URLString The URL string used to create the request URL.
 @param parameters The parameters to be encoded according to the client request serializer.
- @param progress A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
+ @param uploadProgress A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
 @param success A block object to be executed when the task finishes successfully. This block has no return value and takes two arguments: the data task, and the response object created by the client response serializer.
 @param failure A block object to be executed when the task finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a two arguments: the data task and the error describing the network or parsing error that occurred.

@@ -205,7 +205,7 @@ NS_ASSUME_NONNULL_BEGIN
 */
 - (nullable NSURLSessionDataTask *)POST:(NSString *)URLString
                             parameters:(nullable id)parameters
-                               progress:(nullable void (^)(NSProgress *uploadProgress)) uploadProgress
+                               progress:(nullable void (^)(NSProgress *uploadProgress))uploadProgress
                                success:(nullable void (^)(NSURLSessionDataTask *task, id _Nullable responseObject))success
                                failure:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSError *error))failure;

@@ -232,7 +232,7 @@ NS_ASSUME_NONNULL_BEGIN
 @param URLString The URL string used to create the request URL.
 @param parameters The parameters to be encoded according to the client request serializer.
 @param block A block that takes a single argument and appends data to the HTTP body. The block argument is an object adopting the `AFMultipartFormData` protocol.
- @param progress A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
+ @param uploadProgress A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
 @param success A block object to be executed when the task finishes successfully. This block has no return value and takes two arguments: the data task, and the response object created by the client response serializer.
 @param failure A block object to be executed when the task finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a two arguments: the data task and the error describing the network or parsing error that occurred.

@@ -241,7 +241,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (nullable NSURLSessionDataTask *)POST:(NSString *)URLString
                             parameters:(nullable id)parameters
              constructingBodyWithBlock:(nullable void (^)(id <AFMultipartFormData> formData))block
-                               progress:(nullable void (^)(NSProgress *uploadProgress)) uploadProgress
+                               progress:(nullable void (^)(NSProgress *uploadProgress))uploadProgress
                                success:(nullable void (^)(NSURLSessionDataTask *task, id _Nullable responseObject))success
                                failure:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSError *error))failure;

--- a/src/ios/AFNetworking/AFHTTPSessionManager.m
+++ b/src/ios/AFNetworking/AFHTTPSessionManager.m
@@ -1,5 +1,5 @@
 // AFHTTPSessionManager.m
-// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
+// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -186,12 +186,9 @@
    NSMutableURLRequest *request = [self.requestSerializer multipartFormRequestWithMethod:@"POST" URLString:[[NSURL URLWithString:URLString relativeToURL:self.baseURL] absoluteString] parameters:parameters constructingBodyWithBlock:block error:&serializationError];
    if (serializationError) {
        if (failure) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wgnu"
            dispatch_async(self.completionQueue ?: dispatch_get_main_queue(), ^{
                failure(nil, serializationError);
            });
-#pragma clang diagnostic pop
        }

        return nil;
@@ -262,12 +259,9 @@
    NSMutableURLRequest *request = [self.requestSerializer requestWithMethod:method URLString:[[NSURL URLWithString:URLString relativeToURL:self.baseURL] absoluteString] parameters:parameters error:&serializationError];
    if (serializationError) {
        if (failure) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wgnu"
            dispatch_async(self.completionQueue ?: dispatch_get_main_queue(), ^{
                failure(nil, serializationError);
            });
-#pragma clang diagnostic pop
        }

        return nil;
--- a/src/ios/AFNetworking/AFNetworkReachabilityManager.h
+++ b/src/ios/AFNetworking/AFNetworkReachabilityManager.h
@@ -1,5 +1,5 @@
 // AFNetworkReachabilityManager.h
-// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
+// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -38,7 +38,7 @@ NS_ASSUME_NONNULL_BEGIN

 Reachability can be used to determine background information about why a network operation failed, or to trigger a network operation retrying when a connection is established. It should not be used to prevent a user from initiating a network request, as it's possible that an initial request may be required to establish reachability.

- See Apple's Reachability Sample Code (https://developer.apple.com/library/ios/samplecode/reachability/)
+ See Apple's Reachability Sample Code ( https://developer.apple.com/library/ios/samplecode/reachability/ )

 @warning Instances of `AFNetworkReachabilityManager` must be started with `-startMonitoring` before reachability status can be determined.
 */
--- a/src/ios/AFNetworking/AFNetworkReachabilityManager.m
+++ b/src/ios/AFNetworking/AFNetworkReachabilityManager.m
@@ -1,5 +1,5 @@
 // AFNetworkReachabilityManager.m
-// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
+// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
--- a/src/ios/AFNetworking/AFSecurityPolicy.h
+++ b/src/ios/AFNetworking/AFSecurityPolicy.h
@@ -1,5 +1,5 @@
 // AFSecurityPolicy.h
-// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
+// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
--- a/src/ios/AFNetworking/AFSecurityPolicy.m
+++ b/src/ios/AFNetworking/AFSecurityPolicy.m
@@ -1,5 +1,5 @@
 // AFSecurityPolicy.m
-// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
+// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
--- a/src/ios/AFNetworking/AFURLRequestSerialization.h
+++ b/src/ios/AFNetworking/AFURLRequestSerialization.h
@@ -1,5 +1,5 @@
 // AFURLRequestSerialization.h
-// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
+// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
--- a/src/ios/AFNetworking/AFURLRequestSerialization.m
+++ b/src/ios/AFNetworking/AFURLRequestSerialization.m
@@ -1,5 +1,5 @@
 // AFURLRequestSerialization.m
-// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
+// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -60,10 +60,7 @@ NSString * AFPercentEscapedStringFromString(NSString *string) {
    NSMutableString *escaped = @"".mutableCopy;

    while (index < string.length) {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wgnu"
        NSUInteger length = MIN(string.length - index, batchSize);
-#pragma GCC diagnostic pop
        NSRange range = NSMakeRange(index, length);

        // To avoid breaking up character sequences such as 👴🏻👮🏽
@@ -219,8 +216,6 @@ static void *AFHTTPRequestSerializerObserverContext = &AFHTTPRequestSerializerOb
    [self setValue:[acceptLanguagesComponents componentsJoinedByString:@", "] forHTTPHeaderField:@"Accept-Language"];

    NSString *userAgent = nil;
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wgnu"
 #if TARGET_OS_IOS
    // User-Agent Header; see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.43
    userAgent = [NSString stringWithFormat:@"%@/%@ (%@; iOS %@; Scale/%0.2f)", [[NSBundle mainBundle] infoDictionary][(__bridge NSString *)kCFBundleExecutableKey] ?: [[NSBundle mainBundle] infoDictionary][(__bridge NSString *)kCFBundleIdentifierKey], [[NSBundle mainBundle] infoDictionary][@"CFBundleShortVersionString"] ?: [[NSBundle mainBundle] infoDictionary][(__bridge NSString *)kCFBundleVersionKey], [[UIDevice currentDevice] model], [[UIDevice currentDevice] systemVersion], [[UIScreen mainScreen] scale]];
@@ -230,7 +225,6 @@ static void *AFHTTPRequestSerializerObserverContext = &AFHTTPRequestSerializerOb
 #elif defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
    userAgent = [NSString stringWithFormat:@"%@/%@ (Mac OS X %@)", [[NSBundle mainBundle] infoDictionary][(__bridge NSString *)kCFBundleExecutableKey] ?: [[NSBundle mainBundle] infoDictionary][(__bridge NSString *)kCFBundleIdentifierKey], [[NSBundle mainBundle] infoDictionary][@"CFBundleShortVersionString"] ?: [[NSBundle mainBundle] infoDictionary][(__bridge NSString *)kCFBundleVersionKey], [[NSProcessInfo processInfo] operatingSystemVersionString]];
 #endif
-#pragma clang diagnostic pop
    if (userAgent) {
        if (![userAgent canBeConvertedToEncoding:NSASCIIStringEncoding]) {
            NSMutableString *mutableUserAgent = [userAgent mutableCopy];
@@ -500,7 +494,7 @@ forHTTPHeaderField:(NSString *)field
    }

    if ([self.HTTPMethodsEncodingParametersInURI containsObject:[[request HTTPMethod] uppercaseString]]) {
-        if (query) {
+        if (query && query.length > 0) {
            mutableRequest.URL = [NSURL URLWithString:[[mutableRequest.URL absoluteString] stringByAppendingFormat:mutableRequest.URL.query ? @"&%@" : @"?%@", query]];
        }
    } else {
@@ -835,14 +829,11 @@ NSTimeInterval const kAFUploadStream3GSuggestedDelay = 0.2;
@end

@implementation AFMultipartBodyStream
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wimplicit-atomic-properties"
 #if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1100)
@synthesize delegate;
 #endif
@synthesize streamStatus;
@synthesize streamError;
-#pragma clang diagnostic pop

 - (instancetype)initWithStringEncoding:(NSStringEncoding)encoding {
    self = [super init];
@@ -888,8 +879,6 @@ NSTimeInterval const kAFUploadStream3GSuggestedDelay = 0.2;

    NSInteger totalNumberOfBytesRead = 0;

-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wgnu"
    while ((NSUInteger)totalNumberOfBytesRead < MIN(length, self.numberOfBytesInPacket)) {
        if (!self.currentHTTPBodyPart || ![self.currentHTTPBodyPart hasBytesAvailable]) {
            if (!(self.currentHTTPBodyPart = [self.HTTPBodyPartEnumerator nextObject])) {
@@ -910,7 +899,6 @@ NSTimeInterval const kAFUploadStream3GSuggestedDelay = 0.2;
            }
        }
    }
-#pragma clang diagnostic pop

    return totalNumberOfBytesRead;
 }
@@ -1091,8 +1079,6 @@ typedef enum {
        return YES;
    }

-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wcovered-switch-default"
    switch (self.inputStream.streamStatus) {
        case NSStreamStatusNotOpen:
        case NSStreamStatusOpening:
@@ -1106,7 +1092,6 @@ typedef enum {
        default:
            return NO;
    }
-#pragma clang diagnostic pop
 }

 - (NSInteger)read:(uint8_t *)buffer
@@ -1151,11 +1136,8 @@ typedef enum {
           intoBuffer:(uint8_t *)buffer
            maxLength:(NSUInteger)length
 {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wgnu"
    NSRange range = NSMakeRange((NSUInteger)_phaseReadOffset, MIN([data length] - ((NSUInteger)_phaseReadOffset), length));
    [data getBytes:buffer range:range];
-#pragma clang diagnostic pop

    _phaseReadOffset += range.length;

@@ -1174,8 +1156,6 @@ typedef enum {
        return YES;
    }

-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wcovered-switch-default"
    switch (_phase) {
        case AFEncapsulationBoundaryPhase:
            _phase = AFHeaderPhase;
@@ -1195,7 +1175,6 @@ typedef enum {
            break;
    }
    _phaseReadOffset = 0;
-#pragma clang diagnostic pop

    return YES;
 }
--- a/src/ios/AFNetworking/AFURLResponseSerialization.h
+++ b/src/ios/AFNetworking/AFURLResponseSerialization.h
@@ -1,5 +1,5 @@
 // AFURLResponseSerialization.h
-// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
+// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
--- a/src/ios/AFNetworking/AFURLResponseSerialization.m
+++ b/src/ios/AFNetworking/AFURLResponseSerialization.m
@@ -1,5 +1,5 @@
 // AFURLResponseSerialization.m
-// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
+// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -115,7 +115,9 @@ static id AFJSONObjectByRemovingKeysWithNullValues(id JSONObject, NSJSONReadingO
    NSError *validationError = nil;

    if (response && [response isKindOfClass:[NSHTTPURLResponse class]]) {
-        if (self.acceptableContentTypes && ![self.acceptableContentTypes containsObject:[response MIMEType]]) {
+        if (self.acceptableContentTypes && ![self.acceptableContentTypes containsObject:[response MIMEType]] &&
+            !([response MIMEType] == nil && [data length] == 0)) {
+
            if ([data length] > 0 && [response URL]) {
                NSMutableDictionary *mutableUserInfo = [@{
                                                          NSLocalizedDescriptionKey: [NSString stringWithFormat:NSLocalizedStringFromTable(@"Request failed: unacceptable content-type: %@", @"AFNetworking", nil), [response MIMEType]],
--- a/src/ios/AFNetworking/AFURLSessionManager.h
+++ b/src/ios/AFNetworking/AFURLSessionManager.h
@@ -1,5 +1,5 @@
 // AFURLSessionManager.h
-// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
+// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -51,6 +51,7 @@
 - `URLSession:willPerformHTTPRedirection:newRequest:completionHandler:`
 - `URLSession:task:didReceiveChallenge:completionHandler:`
 - `URLSession:task:didSendBodyData:totalBytesSent:totalBytesExpectedToSend:`
+ - `URLSession:task:needNewBodyStream:`
 - `URLSession:task:didCompleteWithError:`

 ### `NSURLSessionDataDelegate`
@@ -213,13 +214,13 @@ NS_ASSUME_NONNULL_BEGIN
 Creates an `NSURLSessionDataTask` with the specified request.

 @param request The HTTP request for the request.
- @param uploadProgress A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
- @param downloadProgress A block object to be executed when the download progress is updated. Note this block is called on the session queue, not the main queue.
+ @param uploadProgressBlock A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
+ @param downloadProgressBlock A block object to be executed when the download progress is updated. Note this block is called on the session queue, not the main queue.
 @param completionHandler A block object to be executed when the task finishes. This block has no return value and takes three arguments: the server response, the response object created by that serializer, and the error that occurred, if any.
 */
 - (NSURLSessionDataTask *)dataTaskWithRequest:(NSURLRequest *)request
-                               uploadProgress:(nullable void (^)(NSProgress *uploadProgress)) uploadProgressBlock
-                             downloadProgress:(nullable void (^)(NSProgress *downloadProgress)) downloadProgressBlock
+                               uploadProgress:(nullable void (^)(NSProgress *uploadProgress))uploadProgressBlock
+                             downloadProgress:(nullable void (^)(NSProgress *downloadProgress))downloadProgressBlock
                            completionHandler:(nullable void (^)(NSURLResponse *response, id _Nullable responseObject,  NSError * _Nullable error))completionHandler;

 ///---------------------------
@@ -231,14 +232,14 @@ NS_ASSUME_NONNULL_BEGIN

 @param request The HTTP request for the request.
 @param fileURL A URL to the local file to be uploaded.
- @param progress A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
+ @param uploadProgressBlock A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
 @param completionHandler A block object to be executed when the task finishes. This block has no return value and takes three arguments: the server response, the response object created by that serializer, and the error that occurred, if any.

 @see `attemptsToRecreateUploadTasksForBackgroundSessions`
 */
 - (NSURLSessionUploadTask *)uploadTaskWithRequest:(NSURLRequest *)request
                                         fromFile:(NSURL *)fileURL
-                                         progress:(nullable void (^)(NSProgress *uploadProgress)) uploadProgressBlock
+                                         progress:(nullable void (^)(NSProgress *uploadProgress))uploadProgressBlock
                                completionHandler:(nullable void (^)(NSURLResponse *response, id _Nullable responseObject, NSError  * _Nullable error))completionHandler;

 /**
@@ -246,23 +247,23 @@ NS_ASSUME_NONNULL_BEGIN

 @param request The HTTP request for the request.
 @param bodyData A data object containing the HTTP body to be uploaded.
- @param progress A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
+ @param uploadProgressBlock A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
 @param completionHandler A block object to be executed when the task finishes. This block has no return value and takes three arguments: the server response, the response object created by that serializer, and the error that occurred, if any.
 */
 - (NSURLSessionUploadTask *)uploadTaskWithRequest:(NSURLRequest *)request
                                         fromData:(nullable NSData *)bodyData
-                                         progress:(nullable void (^)(NSProgress *uploadProgress)) uploadProgressBlock
+                                         progress:(nullable void (^)(NSProgress *uploadProgress))uploadProgressBlock
                                completionHandler:(nullable void (^)(NSURLResponse *response, id _Nullable responseObject, NSError * _Nullable error))completionHandler;

 /**
 Creates an `NSURLSessionUploadTask` with the specified streaming request.

 @param request The HTTP request for the request.
- @param progress A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
+ @param uploadProgressBlock A block object to be executed when the upload progress is updated. Note this block is called on the session queue, not the main queue.
 @param completionHandler A block object to be executed when the task finishes. This block has no return value and takes three arguments: the server response, the response object created by that serializer, and the error that occurred, if any.
 */
 - (NSURLSessionUploadTask *)uploadTaskWithStreamedRequest:(NSURLRequest *)request
-                                                 progress:(nullable void (^)(NSProgress *uploadProgress)) uploadProgressBlock
+                                                 progress:(nullable void (^)(NSProgress *uploadProgress))uploadProgressBlock
                                        completionHandler:(nullable void (^)(NSURLResponse *response, id _Nullable responseObject, NSError * _Nullable error))completionHandler;

 ///-----------------------------
@@ -273,14 +274,14 @@ NS_ASSUME_NONNULL_BEGIN
 Creates an `NSURLSessionDownloadTask` with the specified request.

 @param request The HTTP request for the request.
- @param progress A block object to be executed when the download progress is updated. Note this block is called on the session queue, not the main queue.
+ @param downloadProgressBlock A block object to be executed when the download progress is updated. Note this block is called on the session queue, not the main queue.
 @param destination A block object to be executed in order to determine the destination of the downloaded file. This block takes two arguments, the target path & the server response, and returns the desired file URL of the resulting download. The temporary file used during the download will be automatically deleted after being moved to the returned URL.
 @param completionHandler A block to be executed when a task finishes. This block has no return value and takes three arguments: the server response, the path of the downloaded file, and the error describing the network or parsing error that occurred, if any.

 @warning If using a background `NSURLSessionConfiguration` on iOS, these blocks will be lost when the app is terminated. Background sessions may prefer to use `-setDownloadTaskDidFinishDownloadingBlock:` to specify the URL for saving the downloaded file, rather than the destination block of this method.
 */
 - (NSURLSessionDownloadTask *)downloadTaskWithRequest:(NSURLRequest *)request
-                                             progress:(nullable void (^)(NSProgress *downloadProgress)) downloadProgressBlock
+                                             progress:(nullable void (^)(NSProgress *downloadProgress))downloadProgressBlock
                                          destination:(nullable NSURL * (^)(NSURL *targetPath, NSURLResponse *response))destination
                                    completionHandler:(nullable void (^)(NSURLResponse *response, NSURL * _Nullable filePath, NSError * _Nullable error))completionHandler;

@@ -288,12 +289,12 @@ NS_ASSUME_NONNULL_BEGIN
 Creates an `NSURLSessionDownloadTask` with the specified resume data.

 @param resumeData The data used to resume downloading.
- @param progress A block object to be executed when the download progress is updated. Note this block is called on the session queue, not the main queue.
+ @param downloadProgressBlock A block object to be executed when the download progress is updated. Note this block is called on the session queue, not the main queue.
 @param destination A block object to be executed in order to determine the destination of the downloaded file. This block takes two arguments, the target path & the server response, and returns the desired file URL of the resulting download. The temporary file used during the download will be automatically deleted after being moved to the returned URL.
 @param completionHandler A block to be executed when a task finishes. This block has no return value and takes three arguments: the server response, the path of the downloaded file, and the error describing the network or parsing error that occurred, if any.
 */
 - (NSURLSessionDownloadTask *)downloadTaskWithResumeData:(NSData *)resumeData
-                                                progress:(nullable void (^)(NSProgress *downloadProgress)) downloadProgressBlock
+                                                progress:(nullable void (^)(NSProgress *downloadProgress))downloadProgressBlock
                                             destination:(nullable NSURL * (^)(NSURL *targetPath, NSURLResponse *response))destination
                                       completionHandler:(nullable void (^)(NSURLResponse *response, NSURL * _Nullable filePath, NSError * _Nullable error))completionHandler;

--- a/src/ios/AFNetworking/AFURLSessionManager.m
+++ b/src/ios/AFNetworking/AFURLSessionManager.m
@@ -1,5 +1,5 @@
 // AFURLSessionManager.m
-// Copyright (c) 2011–2016 Alamofire Software Foundation (http://alamofire.org/)
+// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -85,8 +85,6 @@ static NSString * const AFURLSessionManagerLockName = @"com.alamofire.networking

 static NSUInteger const AFMaximumNumberOfAttemptsToRecreateBackgroundSessionUploadTask = 3;

-static void * AFTaskStateChangedContext = &AFTaskStateChangedContext;
-
 typedef void (^AFURLSessionDidBecomeInvalidBlock)(NSURLSession *session, NSError *error);
 typedef NSURLSessionAuthChallengeDisposition (^AFURLSessionDidReceiveAuthenticationChallengeBlock)(NSURLSession *session, NSURLAuthenticationChallenge *challenge, NSURLCredential * __autoreleasing *credential);

@@ -224,13 +222,13 @@ typedef void (^AFURLSessionTaskCompletionHandler)(NSURLResponse *response, id re
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSString *,id> *)change context:(void *)context {
    if ([object isKindOfClass:[NSURLSessionTask class]] || [object isKindOfClass:[NSURLSessionDownloadTask class]]) {
        if ([keyPath isEqualToString:NSStringFromSelector(@selector(countOfBytesReceived))]) {
-            self.downloadProgress.completedUnitCount = [change[@"new"] longLongValue];
+            self.downloadProgress.completedUnitCount = [change[NSKeyValueChangeNewKey] longLongValue];
        } else if ([keyPath isEqualToString:NSStringFromSelector(@selector(countOfBytesExpectedToReceive))]) {
-            self.downloadProgress.totalUnitCount = [change[@"new"] longLongValue];
+            self.downloadProgress.totalUnitCount = [change[NSKeyValueChangeNewKey] longLongValue];
        } else if ([keyPath isEqualToString:NSStringFromSelector(@selector(countOfBytesSent))]) {
-            self.uploadProgress.completedUnitCount = [change[@"new"] longLongValue];
+            self.uploadProgress.completedUnitCount = [change[NSKeyValueChangeNewKey] longLongValue];
        } else if ([keyPath isEqualToString:NSStringFromSelector(@selector(countOfBytesExpectedToSend))]) {
-            self.uploadProgress.totalUnitCount = [change[@"new"] longLongValue];
+            self.uploadProgress.totalUnitCount = [change[NSKeyValueChangeNewKey] longLongValue];
        }
    }
    else if ([object isEqual:self.downloadProgress]) {
@@ -251,8 +249,6 @@ typedef void (^AFURLSessionTaskCompletionHandler)(NSURLResponse *response, id re
              task:(NSURLSessionTask *)task
 didCompleteWithError:(NSError *)error
 {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wgnu"
    __strong AFURLSessionManager *manager = self.manager;

    __block id responseObject = nil;
@@ -314,7 +310,6 @@ didCompleteWithError:(NSError *)error
            });
        });
    }
-#pragma clang diagnostic pop
 }

 #pragma mark - NSURLSessionDataTaskDelegate
@@ -983,7 +978,7 @@ didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge
                    disposition = NSURLSessionAuthChallengePerformDefaultHandling;
                }
            } else {
-                disposition = NSURLSessionAuthChallengeRejectProtectionSpace;
+                disposition = NSURLSessionAuthChallengeCancelAuthenticationChallenge;
            }
        } else {
            disposition = NSURLSessionAuthChallengePerformDefaultHandling;
@@ -1030,7 +1025,7 @@ didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge
                disposition = NSURLSessionAuthChallengeUseCredential;
                credential = [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust];
            } else {
-                disposition = NSURLSessionAuthChallengeRejectProtectionSpace;
+                disposition = NSURLSessionAuthChallengeCancelAuthenticationChallenge;
            }
        } else {
            disposition = NSURLSessionAuthChallengePerformDefaultHandling;
--- a/src/ios/CordovaHttpPlugin.h
+++ b/src/ios/CordovaHttpPlugin.h
@@ -9,7 +9,9 @@
 - (void)validateDomainName:(CDVInvokedUrlCommand*)command;
 - (void)post:(CDVInvokedUrlCommand*)command;
 - (void)get:(CDVInvokedUrlCommand*)command;
+- (void)put:(CDVInvokedUrlCommand*)command;
+- (void)delete:(CDVInvokedUrlCommand*)command;
 - (void)uploadFile:(CDVInvokedUrlCommand*)command;
 - (void)downloadFile:(CDVInvokedUrlCommand*)command;

-@end
+@end
--- a/src/ios/CordovaHttpPlugin.m
+++ b/src/ios/CordovaHttpPlugin.m
@@ -19,8 +19,15 @@
    securityPolicy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone];
 }

- (void)setRequestHeaders:(NSDictionary*)headers forManager:(AFHTTPSessionManager*)manager {
+- (void)setRequestSerializer:(NSString*)serializerName forManager:(AFHTTPSessionManager*)manager {
+  if ([serializerName isEqualToString:@"json"]) {
+    manager.requestSerializer = [AFJSONRequestSerializer serializer];
+  } else {
    manager.requestSerializer = [AFHTTPRequestSerializer serializer];
+  }
+}
+
+- (void)setRequestHeaders:(NSDictionary*)headers forManager:(AFHTTPSessionManager*)manager {
    [headers enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
        [manager.requestSerializer setValue:obj forHTTPHeaderField:key];
    }];
@@ -41,7 +48,7 @@
    } else {
        securityPolicy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone];
    }
-    
+
    CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
@@ -49,9 +56,9 @@
 - (void)acceptAllCerts:(CDVInvokedUrlCommand*)command {
    CDVPluginResult* pluginResult = nil;
    bool allow = [[command.arguments objectAtIndex:0] boolValue];
-    
+
    securityPolicy.allowInvalidCertificates = allow;
-    
+
    pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
@@ -59,9 +66,9 @@
 - (void)validateDomainName:(CDVInvokedUrlCommand*)command {
    CDVPluginResult* pluginResult = nil;
    bool validate = [[command.arguments objectAtIndex:0] boolValue];
-    
+
    securityPolicy.validatesDomainName = validate;
-    
+
    pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
@@ -71,9 +78,11 @@
    manager.securityPolicy = securityPolicy;
    NSString *url = [command.arguments objectAtIndex:0];
    NSDictionary *parameters = [command.arguments objectAtIndex:1];
-    NSDictionary *headers = [command.arguments objectAtIndex:2];
+    NSString *serializerName = [command.arguments objectAtIndex:2];
+    NSDictionary *headers = [command.arguments objectAtIndex:3];
+    [self setRequestSerializer: serializerName forManager: manager];
    [self setRequestHeaders: headers forManager: manager];
-   
+
    CordovaHttpPlugin* __weak weakSelf = self;
    manager.responseSerializer = [TextResponseSerializer serializer];
    [manager POST:url parameters:parameters progress:nil success:^(NSURLSessionTask *task, id responseObject) {
@@ -85,7 +94,8 @@
    } failure:^(NSURLSessionTask *task, NSError *error) {
        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
        [self setResults: dictionary withTask: task];
-        [dictionary setObject:[error localizedDescription] forKey:@"error"];
+        NSString* errResponse = [[NSString alloc] initWithData:(NSData *)error.userInfo[AFNetworkingOperationFailingURLResponseDataErrorKey] encoding:NSUTF8StringEncoding];
+        [dictionary setObject:errResponse forKey:@"error"];
        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
    }];
@@ -97,10 +107,11 @@
    NSString *url = [command.arguments objectAtIndex:0];
    NSDictionary *parameters = [command.arguments objectAtIndex:1];
    NSDictionary *headers = [command.arguments objectAtIndex:2];
+    [self setRequestSerializer: @"default" forManager: manager];
    [self setRequestHeaders: headers forManager: manager];
-   
+
    CordovaHttpPlugin* __weak weakSelf = self;
-   
+
    manager.responseSerializer = [TextResponseSerializer serializer];
    [manager GET:url parameters:parameters progress:nil success:^(NSURLSessionTask *task, id responseObject) {
        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
@@ -111,7 +122,64 @@
    } failure:^(NSURLSessionTask *task, NSError *error) {
        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
        [self setResults: dictionary withTask: task];
-        [dictionary setObject:[error localizedDescription] forKey:@"error"];
+        NSString* errResponse = [[NSString alloc] initWithData:(NSData *)error.userInfo[AFNetworkingOperationFailingURLResponseDataErrorKey] encoding:NSUTF8StringEncoding];
+        [dictionary setObject:errResponse forKey:@"error"];
+        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
+        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    }];
+}
+
+- (void)put:(CDVInvokedUrlCommand*)command {
+    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
+    manager.securityPolicy = securityPolicy;
+    NSString *url = [command.arguments objectAtIndex:0];
+    NSDictionary *parameters = [command.arguments objectAtIndex:1];
+    NSString *serializerName = [command.arguments objectAtIndex:2];
+    NSDictionary *headers = [command.arguments objectAtIndex:3];
+    [self setRequestSerializer: serializerName forManager: manager];
+    [self setRequestHeaders: headers forManager: manager];
+
+    CordovaHttpPlugin* __weak weakSelf = self;
+    manager.responseSerializer = [TextResponseSerializer serializer];
+    [manager PUT:url parameters:parameters success:^(NSURLSessionTask *task, id responseObject) {
+        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+        [self setResults: dictionary withTask: task];
+        [dictionary setObject:responseObject forKey:@"data"];
+        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
+        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    } failure:^(NSURLSessionTask *task, NSError *error) {
+        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+        [self setResults: dictionary withTask: task];
+        NSString* errResponse = [[NSString alloc] initWithData:(NSData *)error.userInfo[AFNetworkingOperationFailingURLResponseDataErrorKey] encoding:NSUTF8StringEncoding];
+        [dictionary setObject:errResponse forKey:@"error"];
+        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
+        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    }];
+}
+
+- (void)delete:(CDVInvokedUrlCommand*)command {
+    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
+    manager.securityPolicy = securityPolicy;
+    NSString *url = [command.arguments objectAtIndex:0];
+    NSDictionary *parameters = [command.arguments objectAtIndex:1];
+    NSDictionary *headers = [command.arguments objectAtIndex:2];
+    [self setRequestSerializer: @"default" forManager: manager];
+    [self setRequestHeaders: headers forManager: manager];
+
+    CordovaHttpPlugin* __weak weakSelf = self;
+
+    manager.responseSerializer = [TextResponseSerializer serializer];
+    [manager DELETE:url parameters:parameters success:^(NSURLSessionTask *task, id responseObject) {
+        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+        [self setResults: dictionary withTask: task];
+        [dictionary setObject:responseObject forKey:@"data"];
+        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
+        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    } failure:^(NSURLSessionTask *task, NSError *error) {
+        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+        [self setResults: dictionary withTask: task];
+        NSString* errResponse = [[NSString alloc] initWithData:(NSData *)error.userInfo[AFNetworkingOperationFailingURLResponseDataErrorKey] encoding:NSUTF8StringEncoding];
+        [dictionary setObject:errResponse forKey:@"error"];
        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
    }];
@@ -124,9 +192,9 @@
    NSDictionary *parameters = [command.arguments objectAtIndex:1];
    NSDictionary *headers = [command.arguments objectAtIndex:2];
    [self setRequestHeaders: headers forManager: manager];
-    
+
    CordovaHttpPlugin* __weak weakSelf = self;
-    
+
    manager.responseSerializer = [AFHTTPResponseSerializer serializer];
    [manager HEAD:url parameters:parameters success:^(NSURLSessionTask *task) {
        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
@@ -137,7 +205,8 @@
    } failure:^(NSURLSessionTask *task, NSError *error) {
        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
        [self setResults: dictionary withTask: task];
-        [dictionary setObject:[error localizedDescription] forKey:@"error"];
+        NSString* errResponse = [[NSString alloc] initWithData:(NSData *)error.userInfo[AFNetworkingOperationFailingURLResponseDataErrorKey] encoding:NSUTF8StringEncoding];
+        [dictionary setObject:errResponse forKey:@"error"];
        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
    }];
@@ -151,11 +220,11 @@
    NSDictionary *headers = [command.arguments objectAtIndex:2];
    NSString *filePath = [command.arguments objectAtIndex: 3];
    NSString *name = [command.arguments objectAtIndex: 4];
-    
+
    NSURL *fileURL = [NSURL URLWithString: filePath];
-    
+
    [self setRequestHeaders: headers forManager: manager];
-    
+
    CordovaHttpPlugin* __weak weakSelf = self;
    manager.responseSerializer = [TextResponseSerializer serializer];
    [manager POST:url parameters:parameters constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
@@ -177,7 +246,8 @@
    } failure:^(NSURLSessionTask *task, NSError *error) {
        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
        [self setResults: dictionary withTask: task];
-        [dictionary setObject:[error localizedDescription] forKey:@"error"];
+        NSString* errResponse = [[NSString alloc] initWithData:(NSData *)error.userInfo[AFNetworkingOperationFailingURLResponseDataErrorKey] encoding:NSUTF8StringEncoding];
+        [dictionary setObject:errResponse forKey:@"error"];
        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
    }];
@@ -191,13 +261,13 @@
    NSDictionary *parameters = [command.arguments objectAtIndex:1];
    NSDictionary *headers = [command.arguments objectAtIndex:2];
    NSString *filePath = [command.arguments objectAtIndex: 3];
-   
+
    [self setRequestHeaders: headers forManager: manager];
-    
+
    if ([filePath hasPrefix:@"file://"]) {
        filePath = [filePath substringFromIndex:7];
    }
-    
+
    CordovaHttpPlugin* __weak weakSelf = self;
    manager.responseSerializer = [AFHTTPResponseSerializer serializer];
    [manager GET:url parameters:parameters progress:nil success:^(NSURLSessionTask *task, id responseObject) {
@@ -225,7 +295,7 @@
        */
        // Download response is okay; begin streaming output to file
        NSString* parentPath = [filePath stringByDeletingLastPathComponent];
-        
+
        // create parent directories if needed
        NSError *error;
        if ([[NSFileManager defaultManager] createDirectoryAtPath:parentPath withIntermediateDirectories:YES attributes:nil error:&error] == NO) {
@@ -249,7 +319,7 @@
            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
            return;
        }
-   
+
        id filePlugin = [self.commandDelegate getCommandInstance:@"File"];
        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
        [self setResults: dictionary withTask: task];
@@ -259,7 +329,8 @@
    } failure:^(NSURLSessionTask *task, NSError *error) {
        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
        [self setResults: dictionary withTask: task];
-        [dictionary setObject:[error localizedDescription] forKey:@"error"];
+        NSString* errResponse = [[NSString alloc] initWithData:(NSData *)error.userInfo[AFNetworkingOperationFailingURLResponseDataErrorKey] encoding:NSUTF8StringEncoding];
+        [dictionary setObject:errResponse forKey:@"error"];
        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
    }];
--- a/src/ios/TextResponseSerializer.m
+++ b/src/ios/TextResponseSerializer.m
@@ -1,10 +1,10 @@
 #import "TextResponseSerializer.h"

-static BOOL AFErrorOrUnderlyingErrorHasCode(NSError *error, NSInteger code) {
-    if (error.code == code) {
+static BOOL AFErrorOrUnderlyingErrorHasCodeInDomain(NSError *error, NSInteger code, NSString *domain) {
+    if ([error.domain isEqualToString:domain] && error.code == code) {
        return YES;
    } else if (error.userInfo[NSUnderlyingErrorKey]) {
-        return AFErrorOrUnderlyingErrorHasCode(error.userInfo[NSUnderlyingErrorKey], code);
+        return AFErrorOrUnderlyingErrorHasCodeInDomain(error.userInfo[NSUnderlyingErrorKey], code, domain);
    }

    return NO;
@@ -35,7 +35,7 @@ static BOOL AFErrorOrUnderlyingErrorHasCode(NSError *error, NSInteger code) {
                          error:(NSError *__autoreleasing *)error
 {
    if (![self validateResponse:(NSHTTPURLResponse *)response data:data error:error]) {
-        if (AFErrorOrUnderlyingErrorHasCode(*error, NSURLErrorCannotDecodeContentData)) {
+        if (!error || AFErrorOrUnderlyingErrorHasCodeInDomain(*error, NSURLErrorCannotDecodeContentData, AFURLResponseSerializationErrorDomain)) {
            return nil;
        }
    }
--- a/www/advanced-http.js
+++ b/www/advanced-http.js
@@ -0,0 +1,187 @@
+/*global angular*/
+
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * Modified by Andrew Stephan for Sync OnSet
+ * Modified by Sefa Ilkimen:
+ *  - added configurable params serializer
+ *
+*/
+
+/*
+ * An HTTP Plugin for PhoneGap.
+ */
+
+var pluginId = module.id.slice(0, module.id.indexOf('.'));
+var validSerializers = ['urlencoded', 'json'];
+
+var exec = require('cordova/exec');
+var angularIntegration = require(pluginId +'.angular-integration');
+var cookieHandler = require(pluginId + '.cookie-handler');
+
+// Thanks Mozilla: https://developer.mozilla.org/en-US/docs/Web/API/WindowBase64/Base64_encoding_and_decoding#The_.22Unicode_Problem.22
+function b64EncodeUnicode(str) {
+    return btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g, function (match, p1) {
+        return String.fromCharCode('0x' + p1);
+    }));
+}
+
+function mergeHeaders(globalHeaders, localHeaders) {
+    var globalKeys = Object.keys(globalHeaders);
+    var key;
+
+    for (var i = 0; i < globalKeys.length; i++) {
+        key = globalKeys[i];
+
+        if (!localHeaders.hasOwnProperty(key)) {
+            localHeaders[key] = globalHeaders[key];
+        }
+    }
+
+    return localHeaders;
+}
+
+function checkSerializer(serializer) {
+    serializer = serializer || '';
+    serializer = serializer.trim().toLowerCase();
+
+    if (validSerializers.indexOf(serializer) > -1) {
+        return serializer;
+    }
+
+    return serializer[0];
+}
+
+function resolveCookieString(headers) {
+    var keys = Object.keys(headers);
+
+    for (var i = 0; i < keys.length; ++i) {
+        if (keys[i].match(/^set-cookie$/i)) {
+            return headers[keys[i]];
+        }
+    }
+
+    return null;
+}
+
+function getSuccessHandler(url, cb) {
+    return function(response) {
+        cookieHandler.setCookieFromString(url, resolveCookieString(response.headers));
+        cb(response);
+    }
+}
+
+function getCookieHeader(url) {
+    return { Cookie: cookieHandler.getCookieString(url) };
+}
+
+var http = {
+    headers: {},
+    dataSerializer: 'urlencoded',
+    sslPinning: false,
+    getBasicAuthHeader: function (username, password) {
+        return {'Authorization': 'Basic ' + b64EncodeUnicode(username + ':' + password)};
+    },
+    useBasicAuth: function (username, password) {
+        this.headers.Authorization = 'Basic ' + b64EncodeUnicode(username + ':' + password);
+    },
+    setHeader: function (header, value) {
+        this.headers[header] = value;
+    },
+    setDataSerializer: function (serializer) {
+        this.dataSerializer = checkSerializer(serializer);
+    },
+    clearCookies: function () {
+        return cookieHandler.clearCookies();
+    },
+    enableSSLPinning: function (enable, success, failure) {
+        return exec(success, failure, 'CordovaHttpPlugin', 'enableSSLPinning', [enable]);
+    },
+    acceptAllCerts: function (allow, success, failure) {
+        return exec(success, failure, 'CordovaHttpPlugin', 'acceptAllCerts', [allow]);
+    },
+    validateDomainName: function (validate, success, failure) {
+        return exec(success, failure, 'CordovaHttpPlugin', 'validateDomainName', [validate]);
+    },
+    post: function (url, data, headers, success, failure) {
+        data = data || {};
+        headers = headers || {};
+        headers = mergeHeaders(this.headers, headers);
+        headers = mergeHeaders(getCookieHeader(url), headers);
+
+        return exec(getSuccessHandler(url, success), failure, 'CordovaHttpPlugin', 'post', [url, data, this.dataSerializer, headers]);
+    },
+    get: function (url, params, headers, success, failure) {
+        params = params || {};
+        headers = headers || {};
+        headers = mergeHeaders(this.headers, headers);
+        headers = mergeHeaders(getCookieHeader(url), headers);
+
+        return exec(getSuccessHandler(url, success), failure, 'CordovaHttpPlugin', 'get', [url, params, headers]);
+    },
+    put: function (url, data, headers, success, failure) {
+        data = data || {};
+        headers = headers || {};
+        headers = mergeHeaders(this.headers, headers);
+        headers = mergeHeaders(getCookieHeader(url), headers);
+
+        return exec(getSuccessHandler(url, success), failure, 'CordovaHttpPlugin', 'put', [url, data, this.dataSerializer, headers]);
+    },
+    delete: function (url, params, headers, success, failure) {
+        params = params || {};
+        headers = headers || {};
+        headers = mergeHeaders(this.headers, headers);
+        headers = mergeHeaders(getCookieHeader(url), headers);
+
+        return exec(getSuccessHandler(url, success), failure, 'CordovaHttpPlugin', 'delete', [url, params, headers]);
+    },
+    head: function (url, params, headers, success, failure) {
+        headers = mergeHeaders(this.headers, headers);
+        headers = mergeHeaders(getCookieHeader(url), headers);
+
+        return exec(getSuccessHandler(url, success), failure, 'CordovaHttpPlugin', 'head', [url, params, headers]);
+    },
+    uploadFile: function (url, params, headers, filePath, name, success, failure) {
+        headers = mergeHeaders(this.headers, headers);
+        headers = mergeHeaders(getCookieHeader(url), headers);
+
+        return exec(getSuccessHandler(url, success), failure, 'CordovaHttpPlugin', 'uploadFile', [url, params, headers, filePath, name]);
+    },
+    downloadFile: function (url, params, headers, filePath, success, failure) {
+        headers = mergeHeaders(this.headers, headers);
+        headers = mergeHeaders(getCookieHeader(url), headers);
+
+        var win = function (result) {
+            var entry = new (require('cordova-plugin-file.FileEntry'))();
+            entry.isDirectory = false;
+            entry.isFile = true;
+            entry.name = result.file.name;
+            entry.fullPath = result.file.fullPath;
+            entry.filesystem = new FileSystem(result.file.filesystemName || (result.file.filesystem == window.PERSISTENT ? 'persistent' : 'temporary'));
+            entry.nativeURL = result.file.nativeURL;
+            success(entry);
+        };
+
+        return exec(win, failure, 'CordovaHttpPlugin', 'downloadFile', [url, params, headers, filePath]);
+    }
+};
+
+angularIntegration.registerService(http);
+module.exports = http;
--- a/www/angular-integration.js
+++ b/www/angular-integration.js
@@ -0,0 +1,87 @@
+function registerService(http) {
+    if (typeof angular === 'undefined') return;
+
+    angular.module('cordovaHTTP', []).factory('cordovaHTTP', function ($timeout, $q) {
+        function makePromise(fn, args, async) {
+            var deferred = $q.defer();
+
+            var success = function (response) {
+                if (async) {
+                    $timeout(function () {
+                        deferred.resolve(response);
+                    });
+                } else {
+                    deferred.resolve(response);
+                }
+            };
+
+            var fail = function (response) {
+                if (async) {
+                    $timeout(function () {
+                        deferred.reject(response);
+                    });
+                } else {
+                    deferred.reject(response);
+                }
+            };
+
+            args.push(success);
+            args.push(fail);
+
+            fn.apply(http, args);
+
+            return deferred.promise;
+        }
+
+        var cordovaHTTP = {
+            getBasicAuthHeader: http.getBasicAuthHeader,
+            useBasicAuth: function (username, password) {
+                return http.useBasicAuth(username, password);
+            },
+            setHeader: function (header, value) {
+                return http.setHeader(header, value);
+            },
+            setDataSerializer: function (serializer) {
+                return http.setParamSerializer(serializer);
+            },
+            clearCookies: function () {
+                return http.clearCookies();
+            },
+            enableSSLPinning: function (enable) {
+                return makePromise(http.enableSSLPinning, [enable]);
+            },
+            acceptAllCerts: function (allow) {
+                return makePromise(http.acceptAllCerts, [allow]);
+            },
+            validateDomainName: function (validate) {
+                return makePromise(http.validateDomainName, [validate]);
+            },
+            post: function (url, data, headers) {
+                return makePromise(http.post, [url, data, headers], true);
+            },
+            get: function (url, params, headers) {
+                return makePromise(http.get, [url, params, headers], true);
+            },
+            put: function (url, data, headers) {
+                return makePromise(http.put, [url, data, headers], true);
+            },
+            delete: function (url, params, headers) {
+                return makePromise(http.delete, [url, params, headers], true);
+            },
+            head: function (url, params, headers) {
+                return makePromise(http.head, [url, params, headers], true);
+            },
+            uploadFile: function (url, params, headers, filePath, name) {
+                return makePromise(http.uploadFile, [url, params, headers, filePath, name], true);
+            },
+            downloadFile: function (url, params, headers, filePath) {
+                return makePromise(http.downloadFile, [url, params, headers, filePath], true);
+            }
+        };
+        return cordovaHTTP;
+    });
+}
+
+module.exports = {
+    registerService: registerService
+};
--- a/www/cookie-handler.js
+++ b/www/cookie-handler.js
@@ -0,0 +1,53 @@
+var pluginId = module.id.slice(0, module.id.indexOf('.'));
+var ToughCookie = require(pluginId + '.tough-cookie');
+var WebStorageCookieStore = require(pluginId + '.local-storage-store');
+
+var storage = window.localStorage;
+var storeKey = '__advancedHttpCookieStore__';
+
+var store = new WebStorageCookieStore(storage, storeKey);
+var cookieJar = new ToughCookie.CookieJar(store);
+
+module.exports = {
+    setCookieFromString: setCookieFromString,
+    getCookieString: getCookieString,
+    clearCookies: clearCookies
+}
+
+function splitCookieString(cookieStr) {
+    var cookieParts = cookieStr.split(',');
+    var splitCookies = [];
+    var processedCookie = null;
+
+    for (var i = 0; i < cookieParts.length; ++i) {
+        if (cookieParts[i].substr(-11, 8) === 'expires=') {
+            processedCookie = cookieParts[i] + ',' + cookieParts[i + 1];
+            i++;
+        } else {
+            processedCookie = cookieParts[i];
+        }
+
+        processedCookie = processedCookie.trim();
+        splitCookies.push(processedCookie);
+    }
+
+    return splitCookies;
+}
+
+function setCookieFromString(url, cookieStr) {
+    if (!cookieStr) return;
+
+    var cookies = splitCookieString(cookieStr);
+
+    for (var i = 0; i < cookies.length; ++i) {
+        cookieJar.setCookieSync(cookies[i], url);
+    }
+}
+
+function getCookieString(url) {
+    return cookieJar.getCookieStringSync(url);
+}
+
+function clearCookies() {
+    window.localStorage.removeItem(storeKey);
+}
--- a/www/cordovaHTTP.js
+++ b/www/cordovaHTTP.js
@@ -1,175 +0,0 @@
-/*global angular*/
-
-/*
- * An HTTP Plugin for PhoneGap.
- */
-
-var exec = require('cordova/exec');
-
-// Thanks Mozilla: https://developer.mozilla.org/en-US/docs/Web/API/WindowBase64/Base64_encoding_and_decoding#The_.22Unicode_Problem.22
-function b64EncodeUnicode(str) {
-    return btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g, function(match, p1) {
-        return String.fromCharCode('0x' + p1);
-    }));
-}
-
-function mergeHeaders(globalHeaders, localHeaders) {
-    var globalKeys = Object.keys(globalHeaders);
-    var key;
-    for (var i = 0; i < globalKeys.length; i++) {
-        key = globalKeys[i];
-        if (!localHeaders.hasOwnProperty(key)) {
-            localHeaders[key] = globalHeaders[key];
-        }
-    }
-    return localHeaders;
-}
-
-var http = {
-    headers: {},
-    sslPinning: false,
-    getBasicAuthHeader: function(username, password) {
-        return {'Authorization': 'Basic ' + b64EncodeUnicode(username + ':' + password)};
-    },
-    useBasicAuth: function(username, password) {
-        this.headers.Authorization = 'Basic ' + b64EncodeUnicode(username + ':' + password);
-    },
-    setHeader: function(header, value) {
-        this.headers[header] = value;
-    },
-    enableSSLPinning: function(enable, success, failure) {
-        return exec(success, failure, "CordovaHttpPlugin", "enableSSLPinning", [enable]);
-    },
-    acceptAllCerts: function(allow, success, failure) {
-        return exec(success, failure, "CordovaHttpPlugin", "acceptAllCerts", [allow]);
-    },
-    validateDomainName: function(validate, success, failure) {
-        return exec(success, failure, "CordovaHttpPlugin", "validateDomainName", [validate]);
-    },
-    post: function(url, params, headers, success, failure) {
-        headers = mergeHeaders(this.headers, headers);
-        return exec(success, failure, "CordovaHttpPlugin", "post", [url, params, headers]);
-    },
-    get: function(url, params, headers, success, failure) {
-        headers = mergeHeaders(this.headers, headers);
-        return exec(success, failure, "CordovaHttpPlugin", "get", [url, params, headers]);
-    },
-    head: function(url, params, headers, success, failure) {
-        headers = mergeHeaders(this.headers, headers);
-        return exec(success, failure, "CordovaHttpPlugin", "head", [url, params, headers]);
-    },
-    uploadFile: function(url, params, headers, filePath, name, success, failure) {
-        headers = mergeHeaders(this.headers, headers);
-        return exec(success, failure, "CordovaHttpPlugin", "uploadFile", [url, params, headers, filePath, name]);
-    },
-    downloadFile: function(url, params, headers, filePath, success, failure) {
-        /*
-         *
-         * Licensed to the Apache Software Foundation (ASF) under one
-         * or more contributor license agreements.  See the NOTICE file
-         * distributed with this work for additional information
-         * regarding copyright ownership.  The ASF licenses this file
-         * to you under the Apache License, Version 2.0 (the
-         * "License"); you may not use this file except in compliance
-         * with the License.  You may obtain a copy of the License at
-         *
-         *   http://www.apache.org/licenses/LICENSE-2.0
-         *
-         * Unless required by applicable law or agreed to in writing,
-         * software distributed under the License is distributed on an
-         * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-         * KIND, either express or implied.  See the License for the
-         * specific language governing permissions and limitations
-         * under the License.
-         *
-         * Modified by Andrew Stephan for Sync OnSet
-         *
-        */
-        headers = mergeHeaders(this.headers, headers);
-        var win = function(result) {
-            var entry = new (require('cordova-plugin-file.FileEntry'))();
-            entry.isDirectory = false;
-            entry.isFile = true;
-            entry.name = result.file.name;
-            entry.fullPath = result.file.fullPath;
-            entry.filesystem = new FileSystem(result.file.filesystemName || (result.file.filesystem == window.PERSISTENT ? 'persistent' : 'temporary'));
-            entry.nativeURL = result.file.nativeURL;
-            success(entry);
-        };
-        return exec(win, failure, "CordovaHttpPlugin", "downloadFile", [url, params, headers, filePath]);
-    }
-};
-
-module.exports = http;
-
-if (typeof angular !== "undefined") {
-    angular.module('cordovaHTTP', []).factory('cordovaHTTP', function($timeout, $q) {
-        function makePromise(fn, args, async) {
-            var deferred = $q.defer();
-            
-            var success = function(response) {
-                if (async) {
-                    $timeout(function() {
-                        deferred.resolve(response);
-                    });
-                } else {
-                    deferred.resolve(response);
-                }
-            };
-            
-            var fail = function(response) {
-                if (async) {
-                    $timeout(function() {
-                        deferred.reject(response);
-                    });
-                } else {
-                    deferred.reject(response);
-                }
-            };
-            
-            args.push(success);
-            args.push(fail);
-            
-            fn.apply(http, args);
-            
-            return deferred.promise;
-        }
-        
-        var cordovaHTTP = {
-            getBasicAuthHeader: http.getBasicAuthHeader,
-            useBasicAuth: function(username, password) {
-                return http.useBasicAuth(username, password);
-            },
-            setHeader: function(header, value) {
-                return http.setHeader(header, value);
-            },
-            enableSSLPinning: function(enable) {
-                return makePromise(http.enableSSLPinning, [enable]);
-            },
-            acceptAllCerts: function(allow) {
-                return makePromise(http.acceptAllCerts, [allow]);
-            },
-            validateDomainName: function(validate) {
-                return makePromise(http.validateDomainName, [validate]);
-            },
-            post: function(url, params, headers) {
-                return makePromise(http.post, [url, params, headers], true);
-            },
-            get: function(url, params, headers) {
-                return makePromise(http.get, [url, params, headers], true);
-            },
-            head: function(url, params, headers) {
-                return makePromise(http.head, [url, params, headers], true);
-            },
-            uploadFile: function(url, params, headers, filePath, name) {
-                return makePromise(http.uploadFile, [url, params, headers, filePath, name], true);
-            },
-            downloadFile: function(url, params, headers, filePath) {
-                return makePromise(http.downloadFile, [url, params, headers, filePath], true);
-            }
-        };
-        return cordovaHTTP;
-    });
-} else {
-    window.cordovaHTTP = http;
-}
--- a/www/local-storage-store.js
+++ b/www/local-storage-store.js
@@ -0,0 +1,183 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Exponent
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Based on "tough-cookie-web-storage-store" v1.0.0
+ * Thanks James Ide: https://github.com/exponentjs/tough-cookie-web-storage-store
+ *
+ * Modified by Sefa Ilkimen for cordova plugin integration
+ *
+ */
+
+'use strict';
+
+var pluginId = module.id.slice(0, module.id.indexOf('.'));
+var ToughCookie = require(pluginId + '.tough-cookie');
+var _ = require(pluginId + '.lodash');
+
+function WebStorageCookieStore(storage, storeKey) {
+    ToughCookie.Store.call(this);
+    this._storage = storage || window.localStorage;
+    this._storeKey = storeKey || '__cookieStore__';
+    this.synchronous = true;
+}
+
+WebStorageCookieStore.prototype = Object.create(ToughCookie.Store);
+
+WebStorageCookieStore.prototype.findCookie = function(domain, path, key, callback) {
+    var store = this._readStore();
+    var cookie = _.get(store, [domain, path, key], null);
+
+    callback(null, ToughCookie.Cookie.fromJSON(cookie));
+};
+
+WebStorageCookieStore.prototype.findCookies = function(domain, path, callback) {
+    if (!domain) {
+        callback(null, []);
+        return;
+    }
+
+    var that = this;
+    var cookies = [];
+    var store = this._readStore();
+    var domains = ToughCookie.permuteDomain(domain) || [domain];
+
+    domains.forEach(function(domain) {
+        if (!store[domain]) {
+            return;
+        }
+
+        var matchingPaths = Object.keys(store[domain]);
+
+        if (path != null) {
+            matchingPaths = matchingPaths.filter(function(cookiePath) {
+                return that._isOnPath(cookiePath, path);
+            });
+        }
+
+        matchingPaths.forEach(function(path) {
+            Array.prototype.push.apply(cookies, _.values(store[domain][path]));
+        });
+    });
+
+    cookies = cookies.map(function(cookie) {
+        return ToughCookie.Cookie.fromJSON(cookie);
+    });
+
+    callback(null, cookies);
+};
+
+/**
+ * Returns whether `cookiePath` is on the given `urlPath`
+ */
+WebStorageCookieStore.prototype._isOnPath = function(cookiePath, urlPath) {
+    if (!cookiePath) {
+        return false;
+    }
+
+    if (cookiePath === urlPath) {
+        return true;
+    }
+
+    if (urlPath.indexOf(cookiePath) !== 0) {
+        return false;
+    }
+
+    if (cookiePath[cookiePath.length - 1] !== '/' && urlPath[cookiePath.length] !== '/') {
+        return false;
+    }
+
+    return true;
+};
+
+WebStorageCookieStore.prototype.putCookie = function(cookie, callback) {
+     var store = this._readStore();
+
+     _.set(store, [cookie.domain, cookie.path, cookie.key], cookie);
+     this._writeStore(store);
+     callback(null);
+};
+
+WebStorageCookieStore.prototype.updateCookie = function(oldCookie, newCookie, callback) {
+    this.putCookie(newCookie, callback);
+};
+
+
+WebStorageCookieStore.prototype.removeCookie = function(domain, path, key, callback) {
+    var store = this._readStore();
+
+    _.unset(store, [domain, path, key]);
+    this._writeStore(store);
+    callback(null);
+};
+
+WebStorageCookieStore.prototype.removeCookies = function(domain, path, callback) {
+    var store = this._readStore();
+
+    if (path == null) {
+        _.unset(store, [domain]);
+    } else {
+        _.unset(store, [domain, path]);
+    }
+
+    this._writeStore(store);
+    callback(null);
+};
+
+WebStorageCookieStore.prototype.getAllCookies = function(callback) {
+    var cookies = [];
+    var store = this._readStore();
+
+    Object.keys(store).forEach(function(domain) {
+        Object.keys(store[domain]).forEach(function(path) {
+            Array.protype.push.apply(cookies, _.values(store[domain][path]));
+        });
+    });
+
+    cookies = cookies.map(function(cookie) {
+        return ToughCookie.Cookie.fromJSON(cookie);
+    });
+
+    cookies.sort(function(c1, c2) {
+        return (c1.creationIndex || 0) - (c2.creationIndex || 0);
+    });
+
+    callback(null, cookies);
+};
+
+WebStorageCookieStore.prototype._readStore = function() {
+    var json = this._storage.getItem(this._storeKey);
+
+    if (json !== null) {
+        try {
+            return JSON.parse(json);
+        } catch (e) { }
+    }
+
+    return {};
+};
+
+WebStorageCookieStore.prototype._writeStore = function(store) {
+    this._storage.setItem(this._storeKey, JSON.stringify(store));
+};
+
+module.exports = WebStorageCookieStore;
--- a/www/lodash.js
+++ b/www/lodash.js
@@ -0,0 +1,20 @@
+/**
+ * @license
+ * Lodash (Custom Build) lodash.com/license | Underscore.js 1.8.3 underscorejs.org/LICENSE
+ * Build: `lodash include="get,set,unset,values" exports="node"`
+ */
+;(function(){function t(t,e){for(var r=-1,n=null==t?0:t.length,o=Array(n);++r<n;)o[r]=e(t[r],r,t);return o}function e(t){return function(e){return t(e)}}function r(e,r){return t(r,function(t){return e[t]})}function n(){}function o(t){var e=-1,r=null==t?0:t.length;for(this.clear();++e<r;){var n=t[e];this.set(n[0],n[1])}}function u(t){var e=-1,r=null==t?0:t.length;for(this.clear();++e<r;){var n=t[e];this.set(n[0],n[1])}}function i(t){var e=-1,r=null==t?0:t.length;for(this.clear();++e<r;){var n=t[e];this.set(n[0],n[1]);
+}}function c(t,e){for(var r=t.length;r--;)if(m(t[r][0],e))return r;return-1}function a(t,e){e=h(e,t);for(var r=0,n=e.length;null!=t&&r<n;)t=t[j(e[r++])];return r&&r==n?t:E}function l(t){if(null==t)return t===E?"[object Undefined]":"[object Null]";t=Object(t);var e;if(nt&&nt in t){var r=Q.call(t,nt),n=t[nt];try{t[nt]=E,e=true}catch(t){}var o=Y.call(t);e&&(r?t[nt]=n:delete t[nt]),e=o}else e=Y.call(t);return e}function s(t){return w(t)&&"[object Arguments]"==l(t)}function f(t){return w(t)&&z(t.length)&&!!M[l(t)];
+}function p(e){if(typeof e=="string")return e;if(ft(e))return t(e,p)+"";if(x(e))return at?at.call(e):"";var r=e+"";return"0"==r&&1/e==-T?"-0":r}function h(t,e){var r;return ft(t)?r=t:(ft(t)?r=false:(r=typeof t,r=!("number"!=r&&"symbol"!=r&&"boolean"!=r&&null!=t&&!x(t))||(B.test(t)||!I.test(t)||null!=e&&t in Object(e))),r=r?[t]:lt(F(t))),r}function y(t,e){var r=t.__data__,n=typeof e;return("string"==n||"number"==n||"symbol"==n||"boolean"==n?"__proto__"!==e:null===e)?r[typeof e=="string"?"string":"hash"]:r.map;
+}function b(t,e){var r=null==t?E:t[e];return(!S(r)||X&&X in r?0:(O(r)?Z:L).test(g(r)))?r:E}function _(t,e){return e=null==e?9007199254740991:e,!!e&&(typeof t=="number"||R.test(t))&&-1<t&&0==t%1&&t<e}function j(t){if(typeof t=="string"||x(t))return t;var e=t+"";return"0"==e&&1/t==-T?"-0":e}function g(t){if(null!=t){try{return K.call(t)}catch(t){}return t+""}return""}function v(t){var e=null==t?0:t.length;return e?t[e-1]:E}function d(t,e){function r(){var n=arguments,o=e?e.apply(this,n):n[0],u=r.cache;
+return u.has(o)?u.get(o):(n=t.apply(this,n),r.cache=u.set(o,n)||u,n)}if(typeof t!="function"||null!=e&&typeof e!="function")throw new TypeError("Expected a function");return r.cache=new(d.Cache||i),r}function m(t,e){return t===e||t!==t&&e!==e}function A(t){return null!=t&&z(t.length)&&!O(t)}function O(t){return!!S(t)&&(t=l(t),"[object Function]"==t||"[object GeneratorFunction]"==t||"[object AsyncFunction]"==t||"[object Proxy]"==t)}function z(t){return typeof t=="number"&&-1<t&&0==t%1&&9007199254740991>=t;
+}function S(t){var e=typeof t;return null!=t&&("object"==e||"function"==e)}function w(t){return null!=t&&typeof t=="object"}function x(t){return typeof t=="symbol"||w(t)&&"[object Symbol]"==l(t)}function F(t){return null==t?"":p(t)}function $(t){if(A(t)){var e=ft(t),r=!e&&st(t),n=!e&&!r&&pt(t),o=!e&&!r&&!n&&ht(t);if(e=e||r||n||o){for(var r=t.length,u=String,i=-1,c=Array(r);++i<r;)c[i]=u(i);r=c}else r=[];var a,u=r.length;for(a in t)!Q.call(t,a)||e&&("length"==a||n&&("offset"==a||"parent"==a)||o&&("buffer"==a||"byteLength"==a||"byteOffset"==a)||_(a,u))||r.push(a);
+t=r}else if(a=t&&t.constructor,t===(typeof a=="function"&&a.prototype||H)){a=[];for(n in Object(t))Q.call(t,n)&&"constructor"!=n&&a.push(n);t=a}else t=ut(t);return t}function k(){return false}var E,T=1/0,I=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,B=/^\w*$/,P=/^\./,U=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,C=/\\(\\)?/g,L=/^\[object .+?Constructor\]$/,R=/^(?:0|[1-9]\d*)$/,M={};M["[object Float32Array]"]=M["[object Float64Array]"]=M["[object Int8Array]"]=M["[object Int16Array]"]=M["[object Int32Array]"]=M["[object Uint8Array]"]=M["[object Uint8ClampedArray]"]=M["[object Uint16Array]"]=M["[object Uint32Array]"]=true,
+M["[object Arguments]"]=M["[object Array]"]=M["[object ArrayBuffer]"]=M["[object Boolean]"]=M["[object DataView]"]=M["[object Date]"]=M["[object Error]"]=M["[object Function]"]=M["[object Map]"]=M["[object Number]"]=M["[object Object]"]=M["[object RegExp]"]=M["[object Set]"]=M["[object String]"]=M["[object WeakMap]"]=false;var N,D=typeof global=="object"&&global&&global.Object===Object&&global,V=typeof self=="object"&&self&&self.Object===Object&&self,q=D||V||Function("return this")(),G=(V=typeof exports=="object"&&exports&&!exports.nodeType&&exports)&&typeof module=="object"&&module&&!module.nodeType&&module,W=G&&G.exports===V,D=W&&D.process;
+t:{try{N=D&&D.binding&&D.binding("util");break t}catch(t){}N=void 0}N=N&&N.isTypedArray;var D=Array.prototype,H=Object.prototype,J=q["__core-js_shared__"],K=Function.prototype.toString,Q=H.hasOwnProperty,X=function(){var t=/[^.]+$/.exec(J&&J.keys&&J.keys.IE_PROTO||"");return t?"Symbol(src)_1."+t:""}(),Y=H.toString,Z=RegExp("^"+K.call(Q).replace(/[\\^$.*+?()[\]{}|]/g,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),tt=W?q.Buffer:E,W=q.Symbol,et=H.propertyIsEnumerable,rt=D.splice,nt=W?W.toStringTag:E,ot=function(){
+try{var t=b(Object,"defineProperty");return t({},"",{}),t}catch(t){}}(),D=tt?tt.isBuffer:E,ut=function(t,e){return function(r){return t(e(r))}}(Object.keys,Object),it=b(q,"Map"),ct=b(Object,"create"),at=(q=W?W.prototype:E)?q.toString:E;o.prototype.clear=function(){this.__data__=ct?ct(null):{},this.size=0},o.prototype.delete=function(t){return t=this.has(t)&&delete this.__data__[t],this.size-=t?1:0,t},o.prototype.get=function(t){var e=this.__data__;return ct?(t=e[t],"__lodash_hash_undefined__"===t?E:t):Q.call(e,t)?e[t]:E;
+},o.prototype.has=function(t){var e=this.__data__;return ct?e[t]!==E:Q.call(e,t)},o.prototype.set=function(t,e){var r=this.__data__;return this.size+=this.has(t)?0:1,r[t]=ct&&e===E?"__lodash_hash_undefined__":e,this},u.prototype.clear=function(){this.__data__=[],this.size=0},u.prototype.delete=function(t){var e=this.__data__;return t=c(e,t),!(0>t)&&(t==e.length-1?e.pop():rt.call(e,t,1),--this.size,true)},u.prototype.get=function(t){var e=this.__data__;return t=c(e,t),0>t?E:e[t][1]},u.prototype.has=function(t){
+return-1<c(this.__data__,t)},u.prototype.set=function(t,e){var r=this.__data__,n=c(r,t);return 0>n?(++this.size,r.push([t,e])):r[n][1]=e,this},i.prototype.clear=function(){this.size=0,this.__data__={hash:new o,map:new(it||u),string:new o}},i.prototype.delete=function(t){return t=y(this,t).delete(t),this.size-=t?1:0,t},i.prototype.get=function(t){return y(this,t).get(t)},i.prototype.has=function(t){return y(this,t).has(t)},i.prototype.set=function(t,e){var r=y(this,t),n=r.size;return r.set(t,e),this.size+=r.size==n?0:1,
+this};var lt=function(t){t=d(t,function(t){return 500===e.size&&e.clear(),t});var e=t.cache;return t}(function(t){var e=[];return P.test(t)&&e.push(""),t.replace(U,function(t,r,n,o){e.push(n?o.replace(C,"$1"):r||t)}),e});d.Cache=i;var st=s(function(){return arguments}())?s:function(t){return w(t)&&Q.call(t,"callee")&&!et.call(t,"callee")},ft=Array.isArray,pt=D||k,ht=N?e(N):f;n.keys=$,n.memoize=d,n.set=function(t,e,r){if(null!=t&&S(t)){e=h(e,t);for(var n=-1,o=e.length,u=o-1,i=t;null!=i&&++n<o;){var c=j(e[n]),a=r;
+if(n!=u){var l=i[c],a=E;a===E&&(a=S(l)?l:_(e[n+1])?[]:{})}var s=i,l=c,f=s[l];Q.call(s,l)&&m(f,a)&&(a!==E||l in s)||("__proto__"==l&&ot?ot(s,l,{configurable:true,enumerable:true,value:a,writable:true}):s[l]=a),i=i[c]}}return t},n.unset=function(t,e){var r;if(null==t)r=true;else{var n=t,o=r=h(e,n);if(!(2>o.length)){var u=0,i=-1,c=-1,l=o.length;for(0>u&&(u=-u>l?0:l+u),i=i>l?l:i,0>i&&(i+=l),l=u>i?0:i-u>>>0,u>>>=0,i=Array(l);++c<l;)i[c]=o[c+u];n=a(n,i)}r=j(v(r)),r=!(null!=n&&Q.call(n,r))||delete n[r]}return r;
+},n.values=function(t){return null==t?[]:r(t,$(t))},n.eq=m,n.get=function(t,e,r){return t=null==t?E:a(t,e),t===E?r:t},n.isArguments=st,n.isArray=ft,n.isArrayLike=A,n.isBuffer=pt,n.isFunction=O,n.isLength=z,n.isObject=S,n.isObjectLike=w,n.isSymbol=x,n.isTypedArray=ht,n.last=v,n.stubFalse=k,n.toString=F,n.VERSION="4.17.1",G&&((G.exports=n)._=n,V._=n)}).call(this);
--- a/zedconfig.json
+++ b/zedconfig.json
@@ -1,33 +0,0 @@
-{
-    "preferences": {
-        "tabSize": 4,
-        "wordWrap": true,
-        "useSoftTabs": true,
-        "gotoExclude": []
-    },
-    "packages": [
-        "gh:wymsee/zed-tools/mobile"
-    ],
-    "modes": {
-        "javascript": {
-             "commands": {
-                 "Tools:Check": {
-                     "options": {
-                         "globals": {
-                            "angular": true,
-                            "$": true,
-                            "device": true,
-                            "persistence": true,
-                            "moment": true,
-                            "sos": true,
-                            "LocalFileSystem": true,
-                            "Hammer": true,
-                            "AnimationFrame": true,
-                            "Bloodhound": true
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
Author	SHA1	Message	Date
Sefa Ilkimen	2c8c8a14a5	- fixed missing file "umd-tough-cookie.js“ - updated changeling - incremented version for release	2016-12-07 17:21:03 +01:00
Sefa Ilkimen	8267a02c9d	- updated change log - incremented version for release	2016-12-07 16:48:02 +01:00
Sefa Ilkimen	a1f678a886	fixed case-sensitive path for android source files	2016-12-07 16:20:17 +01:00
Sefa Ilkimen	69cf4d0939	- updated change log - incremented version for release	2016-12-07 15:32:18 +01:00
Sefa Ilkimen	d90cefcbaa	fixed handling of multiple cookies	2016-12-07 15:29:54 +01:00
Sefa Ilkimen	b3118d5ccd	removed „String.prototype.startsWith“ call to be compatible with older web view versions	2016-12-06 16:05:48 +01:00
Sefa Ilkimen	6b0f23b2d1	fixed lodash exports	2016-12-06 11:52:38 +01:00
Sefa Ilkimen	d0ece22302	Merge branch 'feature-cookie-handling'	2016-12-06 10:31:54 +01:00
Sefa Ilkimen	a6a1bcaab1	updated readme file	2016-12-06 10:29:35 +01:00
Sefa Ilkimen	4afb375971	added function for clearing cookies	2016-12-05 18:25:14 +01:00
Sefa Ilkimen	20e5bd0ee9	added local storage store for cookies	2016-12-05 17:52:20 +01:00
Sefa Ilkimen	e84d84c358	integrated „umd-tough-cookie“ for cookie handling	2016-12-05 13:19:26 +01:00
Sefa Ilkimen	955c590e42	- incremented version - updated change log and readme	2016-11-14 15:43:18 +01:00
Sefa Ilkimen	0d627b7a0d	Merge branch 'feature-put-delete-methods'	2016-11-14 15:13:55 +01:00
Sefa Ilkimen	8fc4c2b9cb	minor changes for cleanup	2016-11-14 15:13:26 +01:00
Sefa Ilkimen	a0edca1b1d	updated README	2016-11-14 14:43:24 +01:00
Sefa Ilkimen	d5b2cdaf60	implemented PUT and DELETE methods for Android and iOS	2016-11-14 13:56:54 +01:00
Sefa Ilkimen	0989de20ab	renamed param serializer to data serializer	2016-11-14 00:47:24 +01:00
Sefa Ilkimen	050ed894d6	defined www interface for http methods PUT and DELETE	2016-11-14 00:18:16 +01:00
Sefa Ilkimen	4552e9c84b	Merge branch 'feature-configurable-serializer'	2016-11-11 19:30:47 +01:00
Sefa Ilkimen	c8df1ebd8b	- implemented configurable serializer for Android - cleaned up Android source structure	2016-11-11 19:24:49 +01:00
Sefa Ilkimen	50cda6a5af	updated readme file	2016-11-11 02:22:53 +01:00
Sefa Ilkimen	4600fd0555	implemented configurable serializer for iOS	2016-11-11 01:33:29 +01:00
Sefa Ilkimen	46176500df	fixed var name	2016-11-11 01:32:16 +01:00
Sefa Ilkimen	9f515d01d8	defined www interface for configurable parameter serializer	2016-11-10 18:46:30 +01:00
Andrew Stephan	bf8ded59a2	1.2.0	2016-07-20 12:33:52 -04:00
Andrew Stephan	c531ffaa44	Merge pull request #95 from wymsee/tls Support for TLSv1.1 and TLSv1.2 for android 4.1 - 4.4	2016-07-20 12:33:41 -04:00
Andrew Stephan	0e4624f627	updated changelong	2016-07-20 12:05:11 -04:00
Andrew Stephan	9a65da55c9	only use custom factory for API Levels < 20	2016-07-20 11:55:49 -04:00
Andrew Stephan	4c26dd793e	fixed var name	2016-07-18 15:56:11 -04:00
Andrew Stephan	beae854526	updates to only allow tlsv1.1 and tlsv1.2	2016-07-18 15:42:30 -04:00
Andrew Stephan	9cd64b1d9e	1.1.0	2016-05-02 13:49:15 -04:00
Andrew Stephan	d726998e5e	Merge pull request #85 from wymsee/ios-errors updated AFNetworking and edited requests to send back the body for errors	2016-05-02 13:49:00 -04:00
Andrew Stephan	b6976bef18	README, CHANGELOG and version number updates	2016-05-02 13:48:48 -04:00
Andrew Stephan	60220a224b	updated AFNetworking and edited requests to send back the body for errors	2016-04-29 14:19:29 -04:00
Andrew Stephan	ba37200d75	updated readme with info on headers	2016-04-28 19:12:36 -04:00
Andrew Stephan	50d40e76eb	Merge pull request #8 from SpiderOak/disable-encoding-get-urls Disables encoding get() URLs by default (android)	2016-04-28 18:58:26 -04:00
Andrew Stephan	99683f1f30	1.0.3	2016-04-26 15:23:21 -04:00
Andrew Stephan	e9070461c1	updated version in plugin.xml	2016-04-26 15:23:15 -04:00
Tommy-Carlos Williams	46517ae7f2	Disables encoding get() URLs by default In our app this is leading to errors on URLs that are already properly encoded (they are being double-encoded... %20 -> %2520, etc) Feel free to ignore or close this one if you need this functionality, but since `post()` URLs were not being encoded, I thought it might have just been a default that didn't affect you one way or the other.	2014-08-20 19:05:11 +10:00