From ade917e19c1a2f370c56512f793690a84ded0675 Mon Sep 17 00:00:00 2001
From: Alexander Kozlov <Alexander.Kozlov@adform.com>
Date: Tue, 17 May 2016 13:00:00 +0300
Subject: [PATCH 1/3] SSP-933 URL parameter fix for HB solution

Task-Url: https://adform.atlassian.net/browse/SSP-933
---
 src/adapters/adform.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/adapters/adform.js b/src/adapters/adform.js
index 17e4f021137..78382f2628e 100644
--- a/src/adapters/adform.js
+++ b/src/adapters/adform.js
@@ -41,20 +41,31 @@ function AdformAdapter() {
 
     function formRequestUrl(reqData) {
         var key;
-        var url = [];
+        var url = [],
+        	urlWithoutEncode = [];
 
         var validProps = [
             'mid', 'inv', 'pdom', 'mname', 'mkw', 'mkv', 'cat', 'bcat', 'bcatrt', 'adv', 'advt', 'cntr', 'cntrt', 'maxp',
             'minp', 'sminp', 'w', 'h', 'pb', 'pos', 'cturl', 'iturl', 'cttype', 'hidedomain', 'cdims', 'test'
         ];
 
+        var validPropsWithoutEncode = [
+            'url'
+        ];
+
         for (var i = 0, l = validProps.length; i < l; i++) {
             key = validProps[i];
             if (reqData.hasOwnProperty(key))
                 url.push(key, '=', reqData[key], '&');
         }
 
-        return encode64(url.join(''));
+        for (var i = 0, l = validPropsWithoutEncode.length; i < l; i++) {
+            key = validPropsWithoutEncode[i];
+            if (reqData.hasOwnProperty(key))
+            	urlWithoutEncode.push(key, '=', reqData[key], '&');
+        }
+
+        return encode64(url.join(''))+urlWithoutEncode.join('');
     }
 
     function handleCallback(bids) {

From 95e0da081dd534633e6106e173cc6b2ab2fa7bc7 Mon Sep 17 00:00:00 2001
From: Alexander Kozlov <Alexander.Kozlov@adform.com>
Date: Tue, 17 May 2016 16:35:22 +0300
Subject: [PATCH 2/3] SSP-933 URL parameter fix for HB solution

Task-Url: https://adform.atlassian.net/browse/SSP-933
---
 src/adapters/adform.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/adapters/adform.js b/src/adapters/adform.js
index 78382f2628e..27295fc00b2 100644
--- a/src/adapters/adform.js
+++ b/src/adapters/adform.js
@@ -26,7 +26,7 @@ function AdformAdapter() {
                 request.unshift('//' + adxDomain + '/adx/?rp=4');
             }
 
-            request.push(formRequestUrl(bid.params));
+            request = request.concat( formRequestUrl(bid.params) );
         }
 
         if (noDomain) {
@@ -42,6 +42,7 @@ function AdformAdapter() {
     function formRequestUrl(reqData) {
         var key;
         var url = [],
+        	params = [],
         	urlWithoutEncode = [];
 
         var validProps = [
@@ -49,23 +50,25 @@ function AdformAdapter() {
             'minp', 'sminp', 'w', 'h', 'pb', 'pos', 'cturl', 'iturl', 'cttype', 'hidedomain', 'cdims', 'test'
         ];
 
-        var validPropsWithoutEncode = [
+        var validPropsWithURIEncode = [
             'url'
         ];
 
         for (var i = 0, l = validProps.length; i < l; i++) {
             key = validProps[i];
-            if (reqData.hasOwnProperty(key))
+            if (reqData.hasOwnProperty(key)) {
                 url.push(key, '=', reqData[key], '&');
+            }
         }
+        params.push( encode64(url.join('')) );
 
-        for (var i = 0, l = validPropsWithoutEncode.length; i < l; i++) {
-            key = validPropsWithoutEncode[i];
-            if (reqData.hasOwnProperty(key))
-            	urlWithoutEncode.push(key, '=', reqData[key], '&');
+        for (var i = 0, l = validPropsWithURIEncode.length; i < l; i++) {
+            key = validPropsWithURIEncode[i];
+            if (reqData.hasOwnProperty(key)) {
+            	params.push( [key, '=', encodeURIComponent( reqData[key] )].join('') );
+            }
         }
-
-        return encode64(url.join(''))+urlWithoutEncode.join('');
+        return params;
     }
 
     function handleCallback(bids) {

From 5ea2b170e9e2172bdb658f0727bb670b94eb859c Mon Sep 17 00:00:00 2001
From: Alexander Kozlov <Alexander.Kozlov@adform.com>
Date: Tue, 17 May 2016 16:43:21 +0300
Subject: [PATCH 3/3] SSP-933

Fix
---
 src/adapters/adform.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/adapters/adform.js b/src/adapters/adform.js
index 27295fc00b2..92c37295348 100644
--- a/src/adapters/adform.js
+++ b/src/adapters/adform.js
@@ -42,8 +42,7 @@ function AdformAdapter() {
     function formRequestUrl(reqData) {
         var key;
         var url = [],
-        	params = [],
-        	urlWithoutEncode = [];
+        	params = [];
 
         var validProps = [
             'mid', 'inv', 'pdom', 'mname', 'mkw', 'mkv', 'cat', 'bcat', 'bcatrt', 'adv', 'advt', 'cntr', 'cntrt', 'maxp',