From d8bd0031dbabdd38fe4c624d37a0f8d209268751 Mon Sep 17 00:00:00 2001
From: Vladimir Enchev <vladimir.enchev@telerik.com>
Date: Thu, 14 May 2015 11:32:33 +0300
Subject: [PATCH] http timeout fixes + test

---
 apps/tests/http-tests.ts | 14 ++++++++++++++
 http/http-request.ios.ts |  8 ++++----
 http/http.d.ts           |  2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/apps/tests/http-tests.ts b/apps/tests/http-tests.ts
index a3c0dd905..c9802c4dd 100644
--- a/apps/tests/http-tests.ts
+++ b/apps/tests/http-tests.ts
@@ -160,6 +160,20 @@ export var test_request_shouldFailIfOptionsUrlIsNotDefined = function (done) {
     });
 };
 
+export var test_request_requestShouldTimeout = function (done) {
+    var result;
+    http.request({ url: "http://10.255.255.1", method: "GET", timeout: 500 }).catch(function (e) {
+        result = e;
+        try {
+            TKUnit.assert(result instanceof Error, "Result from request().fail() should be Error! Current type is " + typeof result);
+            done(null);
+        }
+        catch (err) {
+            done(err);
+        }
+    });
+};
+
 export var test_request_responseStatusCodeShouldBeDefined = function (done) {
     var result: http.HttpResponse;
 
diff --git a/http/http-request.ios.ts b/http/http-request.ios.ts
index 88632185a..73af2e074 100644
--- a/http/http-request.ios.ts
+++ b/http/http-request.ios.ts
@@ -32,13 +32,13 @@ export function request(options: http.HttpRequestOptions): Promise<http.HttpResp
                 }
             }
 
-            if (types.isNumber(options.timeout)) {
-                urlRequest.timeoutInterval = options.timeout * 1000;
-            }
-
             if (types.isString(options.content)) {
                 urlRequest.HTTPBody = NSString.alloc().initWithString(options.content).dataUsingEncoding(4);
             }
+            
+            if (types.isNumber(options.timeout)) {
+                urlRequest.timeoutInterval = options.timeout / 1000;
+            }
 
             var dataTask = session.dataTaskWithRequestCompletionHandler(urlRequest,
                 function (data: NSData, response: NSHTTPURLResponse, error: NSError) {
diff --git a/http/http.d.ts b/http/http.d.ts
index c6ec7ba33..9afb94284 100644
--- a/http/http.d.ts
+++ b/http/http.d.ts
@@ -72,7 +72,7 @@ declare module "http" {
         content?: string;
 
          /**
-          * Gets or sets the request timeout.
+          * Gets or sets the request timeout in milliseconds.
           */
         timeout?: number;
     }