Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 15:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1308994 - Use encodeURIComponent on sync upload batch id, and fix configuration checking r=markh

Browse Source 
MozReview-Commit-ID: 1OqryC5oQOj

--HG--
extra : rebase_source : a82822bbe49ff7cfb46ec719cb4499666cac134c
This commit is contained in:
Thom Chiovoloni 2016-10-10 14:02:13 -04:00
parent 80c9bf152c
commit 27428f453d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
services/sync/modules/record.js
View File

@ -558,7 +558,7 @@ Collection.prototype = {
if (this.limit > 0 && this.limit != Infinity)
args.push("limit=" + this.limit);
if (this._batch)
args.push("batch=" + this._batch);
args.push("batch=" + encodeURIComponent(this._batch));
if (this._commit)
args.push("commit=true");
@ -676,9 +676,9 @@ Collection.prototype = {
// Handle config edge cases
if (config.max_post_records <= 0) { config.max_post_records = MAX_UPLOAD_RECORDS; }
if (config.max_batch_records <= 0) { config.max_post_records = Infinity; }
if (config.max_post_bytes <= 0) { config.max_post_records = MAX_UPLOAD_BYTES; }
if (config.max_batch_bytes <= 0) { config.max_post_records = Infinity; }
if (config.max_batch_records <= 0) { config.max_batch_records = Infinity; }
if (config.max_post_bytes <= 0) { config.max_post_bytes = MAX_UPLOAD_BYTES; }
if (config.max_batch_bytes <= 0) { config.max_batch_bytes = Infinity; }
// Max size of BSO payload is 256k. This assumes at most 4k of overhead,
// which sounds like plenty. If the server says it can't handle this, we