fix zone callback error

fix resume upload progress callback

Author: jemygraw

examples/resume_upload_simple.js

@@ -22,8 +22,10 @@ putExtra.params = {
   "x:age": 27,
 }
 putExtra.fname = 'testfile.mp4';
-// 这个上传进度记录文件的名字需要和上传的文件相关联，不可以多个文件共享一个记录文件
 putExtra.resumeRecordFile = 'progress.log';
+putExtra.progressCallback = function(uploadBytes, totalBytes) {
+  console.log("progress:" + uploadBytes + "(" + totalBytes + ")");
+}
 
 //file
 resumeUploader.putFile(uploadToken, null, localFile, putExtra, function(respErr,

qiniu/storage/resume.js

@@ -18,7 +18,7 @@ function ResumeUploader(config) {
 // @params params                     额外参数设置，参数名称必须以x:开头
 // @param mimeType                    指定文件的mimeType
 // @param resumeRecordFile            断点续传的已上传的部分信息记录文件
-// @param progressCallback(BlkputRet) 上传进度回调
+// @param progressCallback(uploadBytes, totalBytes) 上传进度回调
 function PutExtra(fname, params, mimeType, resumeRecordFile, progressCallback) {
   this.fname = fname || '';
   this.params = params || {};
@@ -167,7 +167,7 @@ function putReq(config, uploadToken, key, rsStream, rsStreamLen, putExtra,
             finishedCtxList.push(blkputRet.ctx);
             finishedBlkPutRets.push(blkputRet);
             if (putExtra.progressCallback) {
-              putExtra.progressCallback(blkputRet);
+              putExtra.progressCallback(readLen, fileSize);
             }
             if (putExtra.resumeRecordFile) {
               var contents = JSON.stringify(finishedBlkPutRets);

qiniu/zone.js

@@ -53,11 +53,11 @@ exports.Zone_na0 = new conf.Zone([
 
 
 exports.getZoneInfo = function(accessKey, bucket, callbackFunc) {
-  var apiAddr = util.format('http://uc.qbox.me/v2/query?ak=%s&bucket=%s',
+  var apiAddr = util.format('https://uc.qbox.me/v2/query?ak=%s&bucket=%s',
     accessKey, bucket);
   urllib.request(apiAddr, function(respErr, respData, respInfo) {
     if (respErr) {
-      callback(respErr, null, null);
+      callbackFunc(respErr, null, null);
       return;
     }