Skip to content

Commit 1e8bbc5

Browse files
committed
remove the wrong logic to calc crc32 from form upload
1 parent 9cdd687 commit 1e8bbc5

File tree

1 file changed

+2
-16
lines changed

1 file changed

+2
-16
lines changed

qiniu/storage/form.js

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function PutExtra(fname, params, mimeType, crc32, checkCrc) {
2828
this.params = params || {};
2929
this.mimeType = mimeType || null;
3030
this.crc32 = crc32 || null;
31-
this.checkCrc = checkCrc || 0;
31+
this.checkCrc = checkCrc || 1;
3232
}
3333

3434
FormUploader.prototype.putStream = function(uploadToken, key, rsStream,
@@ -39,7 +39,7 @@ FormUploader.prototype.putStream = function(uploadToken, key, rsStream,
3939
}
4040

4141
if (!putExtra.fname) {
42-
putExtra.fname = key ? key : '?';
42+
putExtra.fname = key ? key : 'fname';
4343
}
4444

4545
rsStream.on("error", function(err) {
@@ -121,13 +121,6 @@ FormUploader.prototype.put = function(uploadToken, key, body, putExtra,
121121
rsStream.push(null);
122122

123123
putExtra = putExtra || new PutExtra();
124-
125-
if (putExtra.checkCrc == 1) {
126-
var bodyCrc32 = getCrc32(body);
127-
putExtra.crc32 = '' + parsStreameInt(bodyCrc32, 16);
128-
} else if (putExtra.checkCrc == 2 && putExtra.crc32) {
129-
putExtra.crc32 = '' + putExtra.crc32
130-
}
131124
return this.putStream(uploadToken, key, rsStream, putExtra, callbackFunc)
132125
}
133126

@@ -169,13 +162,6 @@ FormUploader.prototype.putFile = function(uploadToken, key, localFile, putExtra,
169162
putExtra = putExtra || new PutExtra();
170163
var rsStream = fs.createReadStream(localFile);
171164

172-
if (putExtra.checkCrc == 1) {
173-
var fileCrc32 = getCrc32(fs.readFileSync(localFile));
174-
putExtra.crc32 = '' + parsStreameInt(fileCrc32, 16);
175-
} else if (putExtra.checkCrc == 2 && putExtra.crc32) {
176-
putExtra.crc32 = '' + putExtra.crc32
177-
}
178-
179165
if (!putExtra.mimeType) {
180166
putExtra.mimeType = mime.lookup(localFile);
181167
}

0 commit comments

Comments
 (0)