From 281d231a5dc39fac5c8c5047668fb6d51632a660 Mon Sep 17 00:00:00 2001
From: cpascal <cpascal@cpascal.net>
Date: Mon, 19 Jan 2015 10:50:42 +0900
Subject: [PATCH] Fixed inconsistent time-scale in Httpclient.

---
 cocos/network/HttpClient-android.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cocos/network/HttpClient-android.cpp b/cocos/network/HttpClient-android.cpp
index 6df176b9f9..a8d1932027 100644
--- a/cocos/network/HttpClient-android.cpp
+++ b/cocos/network/HttpClient-android.cpp
@@ -577,7 +577,7 @@ private:
         if(nullptr == instnace)
             return false;
 
-        setReadAndConnectTimeout(instnace->getTimeoutForRead(), instnace->getTimeoutForConnect());
+        setReadAndConnectTimeout(instnace->getTimeoutForRead() * 1000, instnace->getTimeoutForConnect() * 1000);
 
         setVerifySSL();
 
@@ -851,8 +851,8 @@ void HttpClient::setSSLVerification(const std::string& caFile)
 }
 
 HttpClient::HttpClient()
-: _timeoutForConnect(30*1000)
-, _timeoutForRead(60*1000)
+: _timeoutForConnect(30)
+, _timeoutForRead(60)
 {
 }