155664 2016-03-18 14:41:13 -0700 Consider to cap the size of session history data. 2025-03-18 02:38:24 -0700 1 1 1 Unclassified WebKit WebKit2 Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=289945 InRadar P2 Normal --- 1 yongjun_zhang webkit-unassigned andersca commit-queue kling mitz sam oldest_to_newest 1176310 0 yongjun_zhang 2016-03-18 14:41:13 -0700 When encode the session history to data blob, we serialize all the history entries in back/forward list. We should consider to limit the size of this data blob. 1176312 1 yongjun_zhang 2016-03-18 14:42:22 -0700 <rdar://problem/25064718> 1176383 2 274479 yongjun_zhang 2016-03-18 16:59:43 -0700 Created attachment 274479 Cap the session history data size to 2MB in iOS. 1176384 3 274480 yongjun_zhang 2016-03-18 17:02:49 -0700 Created attachment 274480 Cap the session history data size to 2MB in iOS. 1176460 4 274480 darin 2016-03-18 22:28:19 -0700 Comment on attachment 274480 Cap the session history data size to 2MB in iOS. View in context: https://bugs.webkit.org/attachment.cgi?id=274480&action=review > Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp:66 > +static const uint32_t maximumSessionStateDataSize = UINT_MAX; I would prefer std::numeric_limits<uint32_t>::max() to UINT_MAX when used here. 1176473 5 274509 yongjun_zhang 2016-03-18 23:16:31 -0700 Created attachment 274509 Address review comment before landing. 1176478 6 274509 commit-queue 2016-03-19 00:17:46 -0700 Comment on attachment 274509 Address review comment before landing. Clearing flags on attachment: 274509 Committed r198468: <http://trac.webkit.org/changeset/198468> 1176479 7 commit-queue 2016-03-19 00:17:53 -0700 All reviewed patches have been landed. Closing bug. 274479 2016-03-18 16:59:43 -0700 2016-03-18 17:02:49 -0700 Cap the session history data size to 2MB in iOS. cap_session_size.patch text/plain 4674 yongjun_zhang Y29tbWl0IDI2Y2IyOTBiM2ZmMzliOGUwMGRlYWYxYzg5ZTI4Yzc4Nzg4Y2VjMjkKQXV0aG9yOiBZ b25nanVuIFpoYW5nIDx5b25nanVuX3poYW5nQGFwcGxlLmNvbT4KRGF0ZTogICBGcmkgTWFyIDE4 IDE0OjM2OjU1IDIwMTYgLTA3MDAKCiAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTU1NjY0CiAgICBDb25zaWRlciB0byBjYXAgdGhlIHNpemUgb2Ygc2Vzc2lvbiBo aXN0b3J5IGRhdGEuCiAgICAKICAgIEluIGlPUywgaWYgdGhlIHRvdGFsIGhpc3RvcnkgZW50cmll cyBkYXRhIGV4Y2VlZHMgYSB0aHJlc2hvbGQgKDJNQiBhdCB0aGUgbW9tZW50KSwgZG9uJ3QKICAg IGFjY3VtdWxhdGUgbW9yZSBkYXRhIGludG8gdGhlIHNlc3Npb24gc3RhdGUgYmxvYi4KICAgIAog ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAgICAKICAgICogVUlQcm9jZXNzL21hYy9M ZWdhY3lTZXNzaW9uU3RhdGVDb2RpbmcuY3BwOgogICAgKFdlYktpdDo6ZW5jb2RlU2Vzc2lvbkhp c3RvcnkpOiBTdG9wIGVuY29kaW5nIGZ1cnRoZXIgaGlzdG9yeSBlbnRyaWVzIGRhdGEgaW50byBz ZXNzaW9uIHN0YXRlCiAgICAgICAgaWYgdGhlIHRvdGFsIHNpemUgZXhjZWVkIDJNQiBpbiBpT1Mu CgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nCmluZGV4IDM2ZGQ0MTcuLmFhYWNiZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NiBAQAorMjAxNi0wMy0xOCAgWW9uZ2p1biBaaGFuZyAgPHlvbmdqdW5femhhbmdAYXBwbGUuY29t PgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTU2 NjQKKyAgICAgICAgQ29uc2lkZXIgdG8gY2FwIHRoZSBzaXplIG9mIHNlc3Npb24gaGlzdG9yeSBk YXRhLgorCisgICAgICAgIE5lZWQgYSBzaG9ydCBkZXNjcmlwdGlvbiAoT09QUyEpLgorICAgICAg ICBOZWVkIHRoZSBidWcgVVJMIChPT1BTISkuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL0xlZ2FjeVNlc3Npb25TdGF0ZUNv ZGluZy5jcHA6CisgICAgICAgIChXZWJLaXQ6OmVuY29kZVNlc3Npb25IaXN0b3J5KToKKwogMjAx Ni0wMy0xOCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgUHJv dGVjdCBhZ2FpbnN0IGV4Y2Vzc2l2ZSBjYWNoZSB0cmF2ZXJzYWwKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvTGVnYWN5U2Vzc2lvblN0YXRlQ29kaW5nLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvTGVnYWN5U2Vzc2lvblN0YXRlQ29kaW5nLmNwcApp bmRleCBhMjFkNDhjLi5kZDkzN2M1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvbWFjL0xlZ2FjeVNlc3Npb25TdGF0ZUNvZGluZy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL21hYy9MZWdhY3lTZXNzaW9uU3RhdGVDb2RpbmcuY3BwCkBAIC01OSw2ICs1OSwx MyBAQCBzdGF0aWMgY29uc3QgQ0ZTdHJpbmdSZWYgc2Vzc2lvbkhpc3RvcnlFbnRyeVNob3VsZE9w ZW5FeHRlcm5hbFVSTHNQb2xpY3lLZXkgPSBDRgogLy8gU2Vzc2lvbiBoaXN0b3J5IGVudHJ5IGRh dGEuCiBjb25zdCB1aW50MzJfdCBzZXNzaW9uSGlzdG9yeUVudHJ5RGF0YVZlcnNpb24gPSAyOwog CisvLyBNYXhpbXVtIHNpemUgZm9yIHN1YmZyYW1lIHNlc3Npb24gZGF0YS4KKyNpZiBQTEFURk9S TShJT1MpCitzdGF0aWMgY29uc3QgdWludDMyX3QgbWF4aW11bVNlc3Npb25TdGF0ZURhdGFTaXpl ID0gMiAqIDEwMjQgKiAxMDI0OworI2Vsc2UKK3N0YXRpYyBjb25zdCB1aW50MzJfdCBtYXhpbXVt U2Vzc2lvblN0YXRlRGF0YVNpemUgPSBVSU5UX01BWDsKKyNlbmRpZgorCiB0ZW1wbGF0ZTx0eXBl bmFtZSBUPiB2b2lkIGlzVmFsaWRFbnVtKFQpOwogCiBjbGFzcyBIaXN0b3J5RW50cnlEYXRhRW5j b2RlciB7CkBAIC00MjEsMjIgKzQyOCwzNiBAQCBzdGF0aWMgUmV0YWluUHRyPENGRGljdGlvbmFy eVJlZj4gZW5jb2RlU2Vzc2lvbkhpc3RvcnkoY29uc3QgQmFja0ZvcndhcmRMaXN0U3RhdAogICAg ICAgICByZXR1cm4gY3JlYXRlRGljdGlvbmFyeSh7IHsgc2Vzc2lvbkhpc3RvcnlWZXJzaW9uS2V5 LCBzZXNzaW9uSGlzdG9yeVZlcnNpb25OdW1iZXIuZ2V0KCkgfSB9KTsKIAogICAgIGF1dG8gZW50 cmllcyA9IGFkb3B0Q0YoQ0ZBcnJheUNyZWF0ZU11dGFibGUoa0NGQWxsb2NhdG9yRGVmYXVsdCwg YmFja0ZvcndhcmRMaXN0U3RhdGUuaXRlbXMuc2l6ZSgpLCAma0NGVHlwZUFycmF5Q2FsbEJhY2tz KSk7CisgICAgc2l6ZV90IHRvdGFsRGF0YVNpemUgPSAwOwogCiAgICAgZm9yIChjb25zdCBhdXRv JiBpdGVtIDogYmFja0ZvcndhcmRMaXN0U3RhdGUuaXRlbXMpIHsKICAgICAgICAgYXV0byB1cmwg PSBpdGVtLnBhZ2VTdGF0ZS5tYWluRnJhbWVTdGF0ZS51cmxTdHJpbmcuY3JlYXRlQ0ZTdHJpbmco KTsKICAgICAgICAgYXV0byB0aXRsZSA9IGl0ZW0ucGFnZVN0YXRlLnRpdGxlLmNyZWF0ZUNGU3Ry aW5nKCk7CiAgICAgICAgIGF1dG8gb3JpZ2luYWxVUkwgPSBpdGVtLnBhZ2VTdGF0ZS5tYWluRnJh bWVTdGF0ZS5vcmlnaW5hbFVSTFN0cmluZy5jcmVhdGVDRlN0cmluZygpOwotICAgICAgICBhdXRv IGRhdGEgPSBlbmNvZGVTZXNzaW9uSGlzdG9yeUVudHJ5RGF0YShpdGVtLnBhZ2VTdGF0ZS5tYWlu RnJhbWVTdGF0ZSk7CisgICAgICAgIGF1dG8gZGF0YSA9IHRvdGFsRGF0YVNpemUgPD0gbWF4aW11 bVNlc3Npb25TdGF0ZURhdGFTaXplID8gZW5jb2RlU2Vzc2lvbkhpc3RvcnlFbnRyeURhdGEoaXRl bS5wYWdlU3RhdGUubWFpbkZyYW1lU3RhdGUpIDogbnVsbHB0cjsKICAgICAgICAgYXV0byBzaG91 bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5VmFsdWUgPSBzdGF0aWNfY2FzdDx1aW50NjRfdD4oaXRl bS5wYWdlU3RhdGUuc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSk7CiAgICAgICAgIGF1dG8g c2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSA9IGFkb3B0Q0YoQ0ZOdW1iZXJDcmVhdGUoa0NG QWxsb2NhdG9yRGVmYXVsdCwga0NGTnVtYmVyU0ludDY0VHlwZSwgJnNob3VsZE9wZW5FeHRlcm5h bFVSTHNQb2xpY3lWYWx1ZSkpOwogCi0gICAgICAgIGF1dG8gZW50cnlEaWN0aW9uYXJ5ID0gY3Jl YXRlRGljdGlvbmFyeSh7Ci0gICAgICAgICAgICB7IHNlc3Npb25IaXN0b3J5RW50cnlVUkxLZXks IHVybC5nZXQoKSB9LAotICAgICAgICAgICAgeyBzZXNzaW9uSGlzdG9yeUVudHJ5VGl0bGVLZXks IHRpdGxlLmdldCgpIH0sCi0gICAgICAgICAgICB7IHNlc3Npb25IaXN0b3J5RW50cnlPcmlnaW5h bFVSTEtleSwgb3JpZ2luYWxVUkwuZ2V0KCkgfSwKLSAgICAgICAgICAgIHsgc2Vzc2lvbkhpc3Rv cnlFbnRyeURhdGFLZXksIGRhdGEuZ2V0KCkgfSwKLSAgICAgICAgICAgIHsgc2Vzc2lvbkhpc3Rv cnlFbnRyeVNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3lLZXksIHNob3VsZE9wZW5FeHRlcm5h bFVSTHNQb2xpY3kuZ2V0KCkgfSwKLSAgICAgICAgfSk7CisgICAgICAgIFJldGFpblB0cjxDRkRp Y3Rpb25hcnlSZWY+IGVudHJ5RGljdGlvbmFyeTsKKworICAgICAgICBpZiAoZGF0YSkgeworICAg ICAgICAgICAgdG90YWxEYXRhU2l6ZSArPSBDRkRhdGFHZXRMZW5ndGgoZGF0YS5nZXQoKSk7CisK KyAgICAgICAgICAgIGVudHJ5RGljdGlvbmFyeSA9IGNyZWF0ZURpY3Rpb25hcnkoeworICAgICAg ICAgICAgICAgIHsgc2Vzc2lvbkhpc3RvcnlFbnRyeVVSTEtleSwgdXJsLmdldCgpIH0sCisgICAg ICAgICAgICAgICAgeyBzZXNzaW9uSGlzdG9yeUVudHJ5VGl0bGVLZXksIHRpdGxlLmdldCgpIH0s CisgICAgICAgICAgICAgICAgeyBzZXNzaW9uSGlzdG9yeUVudHJ5T3JpZ2luYWxVUkxLZXksIG9y aWdpbmFsVVJMLmdldCgpIH0sCisgICAgICAgICAgICAgICAgeyBzZXNzaW9uSGlzdG9yeUVudHJ5 RGF0YUtleSwgZGF0YS5nZXQoKSB9LAorICAgICAgICAgICAgICAgIHsgc2Vzc2lvbkhpc3RvcnlF bnRyeVNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3lLZXksIHNob3VsZE9wZW5FeHRlcm5hbFVS THNQb2xpY3kuZ2V0KCkgfSwKKyAgICAgICAgICAgIH0pOworICAgICAgICB9IGVsc2UgeworICAg ICAgICAgICAgZW50cnlEaWN0aW9uYXJ5ID0gY3JlYXRlRGljdGlvbmFyeSh7CisgICAgICAgICAg ICAgICAgeyBzZXNzaW9uSGlzdG9yeUVudHJ5VVJMS2V5LCB1cmwuZ2V0KCkgfSwKKyAgICAgICAg ICAgICAgICB7IHNlc3Npb25IaXN0b3J5RW50cnlUaXRsZUtleSwgdGl0bGUuZ2V0KCkgfSwKKyAg ICAgICAgICAgICAgICB7IHNlc3Npb25IaXN0b3J5RW50cnlPcmlnaW5hbFVSTEtleSwgb3JpZ2lu YWxVUkwuZ2V0KCkgfSwKKyAgICAgICAgICAgICAgICB7IHNlc3Npb25IaXN0b3J5RW50cnlTaG91 bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5S2V5LCBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5 LmdldCgpIH0sCisgICAgICAgICAgICB9KTsKKyAgICAgICAgfQogCiAgICAgICAgIENGQXJyYXlB cHBlbmRWYWx1ZShlbnRyaWVzLmdldCgpLCBlbnRyeURpY3Rpb25hcnkuZ2V0KCkpOwogICAgIH0K 274480 2016-03-18 17:02:49 -0700 2016-03-18 23:16:31 -0700 Cap the session history data size to 2MB in iOS. cap_session_size.patch text/plain 4865 yongjun_zhang Y29tbWl0IDZjZTQ3ZWNmNTk2N2ViNGQ0OTdlNGM5MzZmOGY4ZWMwZjM3YWEyM2QKQXV0aG9yOiBZ b25nanVuIFpoYW5nIDx5b25nanVuX3poYW5nQGFwcGxlLmNvbT4KRGF0ZTogICBGcmkgTWFyIDE4 IDE0OjM2OjU1IDIwMTYgLTA3MDAKCiAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTU1NjY0CiAgICBDb25zaWRlciB0byBjYXAgdGhlIHNpemUgb2Ygc2Vzc2lvbiBo aXN0b3J5IGRhdGEuCiAgICAKICAgIEluIGlPUywgaWYgdGhlIHRvdGFsIGhpc3RvcnkgZW50cmll cyBkYXRhIGV4Y2VlZHMgYSB0aHJlc2hvbGQgKDJNQiBhdCB0aGUgbW9tZW50KSwgZG9uJ3QKICAg IGFjY3VtdWxhdGUgbW9yZSBkYXRhIGludG8gdGhlIHNlc3Npb24gc3RhdGUgYmxvYi4KICAgIAog ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAgICAKICAgICogVUlQcm9jZXNzL21hYy9M ZWdhY3lTZXNzaW9uU3RhdGVDb2RpbmcuY3BwOgogICAgKFdlYktpdDo6ZW5jb2RlU2Vzc2lvbkhp c3RvcnkpOiBTdG9wIGVuY29kaW5nIGZ1cnRoZXIgaGlzdG9yeSBlbnRyaWVzIGRhdGEgaW50byBz ZXNzaW9uIHN0YXRlCiAgICAgICAgaWYgdGhlIHRvdGFsIHNpemUgZXhjZWVkIDJNQiBpbiBpT1Mu CgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nCmluZGV4IDM2ZGQ0MTcuLjA3YmU1YjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NyBAQAorMjAxNi0wMy0xOCAgWW9uZ2p1biBaaGFuZyAgPHlvbmdqdW5femhhbmdAYXBwbGUuY29t PgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTU2 NjQKKyAgICAgICAgQ29uc2lkZXIgdG8gY2FwIHRoZSBzaXplIG9mIHNlc3Npb24gaGlzdG9yeSBk YXRhLgorCisgICAgICAgIEluIGlPUywgaWYgdGhlIHRvdGFsIGhpc3RvcnkgZW50cmllcyBkYXRh IGV4Y2VlZHMgYSB0aHJlc2hvbGQgKDJNQiBhdCB0aGUgbW9tZW50KSwgZG9uJ3QKKyAgICAgICAg YWNjdW11bGF0ZSBtb3JlIGRhdGEgaW50byB0aGUgc2Vzc2lvbiBzdGF0ZSBibG9iLgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL21h Yy9MZWdhY3lTZXNzaW9uU3RhdGVDb2RpbmcuY3BwOgorICAgICAgICAoV2ViS2l0OjplbmNvZGVT ZXNzaW9uSGlzdG9yeSk6IFN0b3AgZW5jb2RpbmcgZnVydGhlciBoaXN0b3J5IGVudHJpZXMgZGF0 YSBpbnRvIHNlc3Npb24gc3RhdGUKKyAgICAgICAgICAgIGlmIHRoZSB0b3RhbCBzaXplIGV4Y2Vl ZCAyTUIgaW4gaU9TLgorCiAyMDE2LTAzLTE4ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxl LmNvbT4KIAogICAgICAgICBQcm90ZWN0IGFnYWluc3QgZXhjZXNzaXZlIGNhY2hlIHRyYXZlcnNh bApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNzaW9u U3RhdGVDb2RpbmcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNz aW9uU3RhdGVDb2RpbmcuY3BwCmluZGV4IGEyMWQ0OGMuLmRkOTM3YzUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvTGVnYWN5U2Vzc2lvblN0YXRlQ29kaW5nLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL0xlZ2FjeVNlc3Npb25TdGF0ZUNvZGlu Zy5jcHAKQEAgLTU5LDYgKzU5LDEzIEBAIHN0YXRpYyBjb25zdCBDRlN0cmluZ1JlZiBzZXNzaW9u SGlzdG9yeUVudHJ5U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeUtleSA9IENGCiAvLyBTZXNz aW9uIGhpc3RvcnkgZW50cnkgZGF0YS4KIGNvbnN0IHVpbnQzMl90IHNlc3Npb25IaXN0b3J5RW50 cnlEYXRhVmVyc2lvbiA9IDI7CiAKKy8vIE1heGltdW0gc2l6ZSBmb3Igc3ViZnJhbWUgc2Vzc2lv biBkYXRhLgorI2lmIFBMQVRGT1JNKElPUykKK3N0YXRpYyBjb25zdCB1aW50MzJfdCBtYXhpbXVt U2Vzc2lvblN0YXRlRGF0YVNpemUgPSAyICogMTAyNCAqIDEwMjQ7CisjZWxzZQorc3RhdGljIGNv bnN0IHVpbnQzMl90IG1heGltdW1TZXNzaW9uU3RhdGVEYXRhU2l6ZSA9IFVJTlRfTUFYOworI2Vu ZGlmCisKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IHZvaWQgaXNWYWxpZEVudW0oVCk7CiAKIGNsYXNz IEhpc3RvcnlFbnRyeURhdGFFbmNvZGVyIHsKQEAgLTQyMSwyMiArNDI4LDM2IEBAIHN0YXRpYyBS ZXRhaW5QdHI8Q0ZEaWN0aW9uYXJ5UmVmPiBlbmNvZGVTZXNzaW9uSGlzdG9yeShjb25zdCBCYWNr Rm9yd2FyZExpc3RTdGF0CiAgICAgICAgIHJldHVybiBjcmVhdGVEaWN0aW9uYXJ5KHsgeyBzZXNz aW9uSGlzdG9yeVZlcnNpb25LZXksIHNlc3Npb25IaXN0b3J5VmVyc2lvbk51bWJlci5nZXQoKSB9 IH0pOwogCiAgICAgYXV0byBlbnRyaWVzID0gYWRvcHRDRihDRkFycmF5Q3JlYXRlTXV0YWJsZShr Q0ZBbGxvY2F0b3JEZWZhdWx0LCBiYWNrRm9yd2FyZExpc3RTdGF0ZS5pdGVtcy5zaXplKCksICZr Q0ZUeXBlQXJyYXlDYWxsQmFja3MpKTsKKyAgICBzaXplX3QgdG90YWxEYXRhU2l6ZSA9IDA7CiAK ICAgICBmb3IgKGNvbnN0IGF1dG8mIGl0ZW0gOiBiYWNrRm9yd2FyZExpc3RTdGF0ZS5pdGVtcykg ewogICAgICAgICBhdXRvIHVybCA9IGl0ZW0ucGFnZVN0YXRlLm1haW5GcmFtZVN0YXRlLnVybFN0 cmluZy5jcmVhdGVDRlN0cmluZygpOwogICAgICAgICBhdXRvIHRpdGxlID0gaXRlbS5wYWdlU3Rh dGUudGl0bGUuY3JlYXRlQ0ZTdHJpbmcoKTsKICAgICAgICAgYXV0byBvcmlnaW5hbFVSTCA9IGl0 ZW0ucGFnZVN0YXRlLm1haW5GcmFtZVN0YXRlLm9yaWdpbmFsVVJMU3RyaW5nLmNyZWF0ZUNGU3Ry aW5nKCk7Ci0gICAgICAgIGF1dG8gZGF0YSA9IGVuY29kZVNlc3Npb25IaXN0b3J5RW50cnlEYXRh KGl0ZW0ucGFnZVN0YXRlLm1haW5GcmFtZVN0YXRlKTsKKyAgICAgICAgYXV0byBkYXRhID0gdG90 YWxEYXRhU2l6ZSA8PSBtYXhpbXVtU2Vzc2lvblN0YXRlRGF0YVNpemUgPyBlbmNvZGVTZXNzaW9u SGlzdG9yeUVudHJ5RGF0YShpdGVtLnBhZ2VTdGF0ZS5tYWluRnJhbWVTdGF0ZSkgOiBudWxscHRy OwogICAgICAgICBhdXRvIHNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3lWYWx1ZSA9IHN0YXRp Y19jYXN0PHVpbnQ2NF90PihpdGVtLnBhZ2VTdGF0ZS5zaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9s aWN5KTsKICAgICAgICAgYXV0byBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5ID0gYWRvcHRD RihDRk51bWJlckNyZWF0ZShrQ0ZBbGxvY2F0b3JEZWZhdWx0LCBrQ0ZOdW1iZXJTSW50NjRUeXBl LCAmc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeVZhbHVlKSk7CiAKLSAgICAgICAgYXV0byBl bnRyeURpY3Rpb25hcnkgPSBjcmVhdGVEaWN0aW9uYXJ5KHsKLSAgICAgICAgICAgIHsgc2Vzc2lv bkhpc3RvcnlFbnRyeVVSTEtleSwgdXJsLmdldCgpIH0sCi0gICAgICAgICAgICB7IHNlc3Npb25I aXN0b3J5RW50cnlUaXRsZUtleSwgdGl0bGUuZ2V0KCkgfSwKLSAgICAgICAgICAgIHsgc2Vzc2lv bkhpc3RvcnlFbnRyeU9yaWdpbmFsVVJMS2V5LCBvcmlnaW5hbFVSTC5nZXQoKSB9LAotICAgICAg ICAgICAgeyBzZXNzaW9uSGlzdG9yeUVudHJ5RGF0YUtleSwgZGF0YS5nZXQoKSB9LAotICAgICAg ICAgICAgeyBzZXNzaW9uSGlzdG9yeUVudHJ5U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeUtl eSwgc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeS5nZXQoKSB9LAotICAgICAgICB9KTsKKyAg ICAgICAgUmV0YWluUHRyPENGRGljdGlvbmFyeVJlZj4gZW50cnlEaWN0aW9uYXJ5OworCisgICAg ICAgIGlmIChkYXRhKSB7CisgICAgICAgICAgICB0b3RhbERhdGFTaXplICs9IENGRGF0YUdldExl bmd0aChkYXRhLmdldCgpKTsKKworICAgICAgICAgICAgZW50cnlEaWN0aW9uYXJ5ID0gY3JlYXRl RGljdGlvbmFyeSh7CisgICAgICAgICAgICAgICAgeyBzZXNzaW9uSGlzdG9yeUVudHJ5VVJMS2V5 LCB1cmwuZ2V0KCkgfSwKKyAgICAgICAgICAgICAgICB7IHNlc3Npb25IaXN0b3J5RW50cnlUaXRs ZUtleSwgdGl0bGUuZ2V0KCkgfSwKKyAgICAgICAgICAgICAgICB7IHNlc3Npb25IaXN0b3J5RW50 cnlPcmlnaW5hbFVSTEtleSwgb3JpZ2luYWxVUkwuZ2V0KCkgfSwKKyAgICAgICAgICAgICAgICB7 IHNlc3Npb25IaXN0b3J5RW50cnlEYXRhS2V5LCBkYXRhLmdldCgpIH0sCisgICAgICAgICAgICAg ICAgeyBzZXNzaW9uSGlzdG9yeUVudHJ5U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeUtleSwg c2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeS5nZXQoKSB9LAorICAgICAgICAgICAgfSk7Cisg ICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBlbnRyeURpY3Rpb25hcnkgPSBjcmVhdGVEaWN0 aW9uYXJ5KHsKKyAgICAgICAgICAgICAgICB7IHNlc3Npb25IaXN0b3J5RW50cnlVUkxLZXksIHVy bC5nZXQoKSB9LAorICAgICAgICAgICAgICAgIHsgc2Vzc2lvbkhpc3RvcnlFbnRyeVRpdGxlS2V5 LCB0aXRsZS5nZXQoKSB9LAorICAgICAgICAgICAgICAgIHsgc2Vzc2lvbkhpc3RvcnlFbnRyeU9y aWdpbmFsVVJMS2V5LCBvcmlnaW5hbFVSTC5nZXQoKSB9LAorICAgICAgICAgICAgICAgIHsgc2Vz c2lvbkhpc3RvcnlFbnRyeVNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3lLZXksIHNob3VsZE9w ZW5FeHRlcm5hbFVSTHNQb2xpY3kuZ2V0KCkgfSwKKyAgICAgICAgICAgIH0pOworICAgICAgICB9 CiAKICAgICAgICAgQ0ZBcnJheUFwcGVuZFZhbHVlKGVudHJpZXMuZ2V0KCksIGVudHJ5RGljdGlv bmFyeS5nZXQoKSk7CiAgICAgfQo= 274509 2016-03-18 23:16:31 -0700 2016-03-19 00:17:46 -0700 Address review comment before landing. cap_session_data_size.patch text/plain 4887 yongjun_zhang Y29tbWl0IDhkYmIwZjRlZjc1MmI5ZTA3ODM1ZmE1NDE3YjAzMTliNzhmN2VjZmYKQXV0aG9yOiBZ b25nanVuIFpoYW5nIDx5b25nanVuX3poYW5nQGFwcGxlLmNvbT4KRGF0ZTogICBGcmkgTWFyIDE4 IDE0OjM2OjU1IDIwMTYgLTA3MDAKCiAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTU1NjY0CiAgICBDb25zaWRlciB0byBjYXAgdGhlIHNpemUgb2Ygc2Vzc2lvbiBo aXN0b3J5IGRhdGEuCiAgICAKICAgIEluIGlPUywgaWYgdGhlIHRvdGFsIGhpc3RvcnkgZW50cmll cyBkYXRhIGV4Y2VlZHMgYSB0aHJlc2hvbGQgKDJNQiBhdCB0aGUgbW9tZW50KSwgZG9uJ3QKICAg IGFjY3VtdWxhdGUgbW9yZSBkYXRhIGludG8gdGhlIHNlc3Npb24gc3RhdGUgYmxvYi4KICAgIAog ICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCiAgICAKICAgICogVUlQcm9jZXNzL21hYy9MZWdh Y3lTZXNzaW9uU3RhdGVDb2RpbmcuY3BwOgogICAgKFdlYktpdDo6ZW5jb2RlU2Vzc2lvbkhpc3Rv cnkpOiBTdG9wIGVuY29kaW5nIGZ1cnRoZXIgaGlzdG9yeSBlbnRyaWVzIGRhdGEgaW50byBzZXNz aW9uIHN0YXRlCiAgICAgICAgaWYgdGhlIHRvdGFsIHNpemUgZXhjZWVkIDJNQiBpbiBpT1MuCgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nCmluZGV4IDM2ZGQ0MTcuLjU2NjIyN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBA QAorMjAxNi0wMy0xOCAgWW9uZ2p1biBaaGFuZyAgPHlvbmdqdW5femhhbmdAYXBwbGUuY29tPgor CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTU2NjQK KyAgICAgICAgQ29uc2lkZXIgdG8gY2FwIHRoZSBzaXplIG9mIHNlc3Npb24gaGlzdG9yeSBkYXRh LgorCisgICAgICAgIEluIGlPUywgaWYgdGhlIHRvdGFsIGhpc3RvcnkgZW50cmllcyBkYXRhIGV4 Y2VlZHMgYSB0aHJlc2hvbGQgKDJNQiBhdCB0aGUgbW9tZW50KSwgZG9uJ3QKKyAgICAgICAgYWNj dW11bGF0ZSBtb3JlIGRhdGEgaW50byB0aGUgc2Vzc2lvbiBzdGF0ZSBibG9iLgorCisgICAgICAg IFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgICogVUlQcm9jZXNzL21hYy9MZWdh Y3lTZXNzaW9uU3RhdGVDb2RpbmcuY3BwOgorICAgICAgICAoV2ViS2l0OjplbmNvZGVTZXNzaW9u SGlzdG9yeSk6IFN0b3AgZW5jb2RpbmcgZnVydGhlciBoaXN0b3J5IGVudHJpZXMgZGF0YSBpbnRv IHNlc3Npb24gc3RhdGUKKyAgICAgICAgICAgIGlmIHRoZSB0b3RhbCBzaXplIGV4Y2VlZCAyTUIg aW4gaU9TLgorCiAyMDE2LTAzLTE4ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4K IAogICAgICAgICBQcm90ZWN0IGFnYWluc3QgZXhjZXNzaXZlIGNhY2hlIHRyYXZlcnNhbApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNzaW9uU3RhdGVD b2RpbmcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNzaW9uU3Rh dGVDb2RpbmcuY3BwCmluZGV4IGEyMWQ0OGMuLjQ1ZGI3MGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9tYWMvTGVnYWN5U2Vzc2lvblN0YXRlQ29kaW5nLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL0xlZ2FjeVNlc3Npb25TdGF0ZUNvZGluZy5jcHAK QEAgLTU5LDYgKzU5LDEzIEBAIHN0YXRpYyBjb25zdCBDRlN0cmluZ1JlZiBzZXNzaW9uSGlzdG9y eUVudHJ5U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeUtleSA9IENGCiAvLyBTZXNzaW9uIGhp c3RvcnkgZW50cnkgZGF0YS4KIGNvbnN0IHVpbnQzMl90IHNlc3Npb25IaXN0b3J5RW50cnlEYXRh VmVyc2lvbiA9IDI7CiAKKy8vIE1heGltdW0gc2l6ZSBmb3Igc3ViZnJhbWUgc2Vzc2lvbiBkYXRh LgorI2lmIFBMQVRGT1JNKElPUykKK3N0YXRpYyBjb25zdCB1aW50MzJfdCBtYXhpbXVtU2Vzc2lv blN0YXRlRGF0YVNpemUgPSAyICogMTAyNCAqIDEwMjQ7CisjZWxzZQorc3RhdGljIGNvbnN0IHVp bnQzMl90IG1heGltdW1TZXNzaW9uU3RhdGVEYXRhU2l6ZSA9IHN0ZDo6bnVtZXJpY19saW1pdHM8 dWludDMyX3Q+OjptYXgoKTsKKyNlbmRpZgorCiB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiB2b2lkIGlz VmFsaWRFbnVtKFQpOwogCiBjbGFzcyBIaXN0b3J5RW50cnlEYXRhRW5jb2RlciB7CkBAIC00MjEs MjIgKzQyOCwzNiBAQCBzdGF0aWMgUmV0YWluUHRyPENGRGljdGlvbmFyeVJlZj4gZW5jb2RlU2Vz c2lvbkhpc3RvcnkoY29uc3QgQmFja0ZvcndhcmRMaXN0U3RhdAogICAgICAgICByZXR1cm4gY3Jl YXRlRGljdGlvbmFyeSh7IHsgc2Vzc2lvbkhpc3RvcnlWZXJzaW9uS2V5LCBzZXNzaW9uSGlzdG9y eVZlcnNpb25OdW1iZXIuZ2V0KCkgfSB9KTsKIAogICAgIGF1dG8gZW50cmllcyA9IGFkb3B0Q0Yo Q0ZBcnJheUNyZWF0ZU11dGFibGUoa0NGQWxsb2NhdG9yRGVmYXVsdCwgYmFja0ZvcndhcmRMaXN0 U3RhdGUuaXRlbXMuc2l6ZSgpLCAma0NGVHlwZUFycmF5Q2FsbEJhY2tzKSk7CisgICAgc2l6ZV90 IHRvdGFsRGF0YVNpemUgPSAwOwogCiAgICAgZm9yIChjb25zdCBhdXRvJiBpdGVtIDogYmFja0Zv cndhcmRMaXN0U3RhdGUuaXRlbXMpIHsKICAgICAgICAgYXV0byB1cmwgPSBpdGVtLnBhZ2VTdGF0 ZS5tYWluRnJhbWVTdGF0ZS51cmxTdHJpbmcuY3JlYXRlQ0ZTdHJpbmcoKTsKICAgICAgICAgYXV0 byB0aXRsZSA9IGl0ZW0ucGFnZVN0YXRlLnRpdGxlLmNyZWF0ZUNGU3RyaW5nKCk7CiAgICAgICAg IGF1dG8gb3JpZ2luYWxVUkwgPSBpdGVtLnBhZ2VTdGF0ZS5tYWluRnJhbWVTdGF0ZS5vcmlnaW5h bFVSTFN0cmluZy5jcmVhdGVDRlN0cmluZygpOwotICAgICAgICBhdXRvIGRhdGEgPSBlbmNvZGVT ZXNzaW9uSGlzdG9yeUVudHJ5RGF0YShpdGVtLnBhZ2VTdGF0ZS5tYWluRnJhbWVTdGF0ZSk7Cisg ICAgICAgIGF1dG8gZGF0YSA9IHRvdGFsRGF0YVNpemUgPD0gbWF4aW11bVNlc3Npb25TdGF0ZURh dGFTaXplID8gZW5jb2RlU2Vzc2lvbkhpc3RvcnlFbnRyeURhdGEoaXRlbS5wYWdlU3RhdGUubWFp bkZyYW1lU3RhdGUpIDogbnVsbHB0cjsKICAgICAgICAgYXV0byBzaG91bGRPcGVuRXh0ZXJuYWxV UkxzUG9saWN5VmFsdWUgPSBzdGF0aWNfY2FzdDx1aW50NjRfdD4oaXRlbS5wYWdlU3RhdGUuc2hv dWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSk7CiAgICAgICAgIGF1dG8gc2hvdWxkT3BlbkV4dGVy bmFsVVJMc1BvbGljeSA9IGFkb3B0Q0YoQ0ZOdW1iZXJDcmVhdGUoa0NGQWxsb2NhdG9yRGVmYXVs dCwga0NGTnVtYmVyU0ludDY0VHlwZSwgJnNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3lWYWx1 ZSkpOwogCi0gICAgICAgIGF1dG8gZW50cnlEaWN0aW9uYXJ5ID0gY3JlYXRlRGljdGlvbmFyeSh7 Ci0gICAgICAgICAgICB7IHNlc3Npb25IaXN0b3J5RW50cnlVUkxLZXksIHVybC5nZXQoKSB9LAot ICAgICAgICAgICAgeyBzZXNzaW9uSGlzdG9yeUVudHJ5VGl0bGVLZXksIHRpdGxlLmdldCgpIH0s Ci0gICAgICAgICAgICB7IHNlc3Npb25IaXN0b3J5RW50cnlPcmlnaW5hbFVSTEtleSwgb3JpZ2lu YWxVUkwuZ2V0KCkgfSwKLSAgICAgICAgICAgIHsgc2Vzc2lvbkhpc3RvcnlFbnRyeURhdGFLZXks IGRhdGEuZ2V0KCkgfSwKLSAgICAgICAgICAgIHsgc2Vzc2lvbkhpc3RvcnlFbnRyeVNob3VsZE9w ZW5FeHRlcm5hbFVSTHNQb2xpY3lLZXksIHNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3kuZ2V0 KCkgfSwKLSAgICAgICAgfSk7CisgICAgICAgIFJldGFpblB0cjxDRkRpY3Rpb25hcnlSZWY+IGVu dHJ5RGljdGlvbmFyeTsKKworICAgICAgICBpZiAoZGF0YSkgeworICAgICAgICAgICAgdG90YWxE YXRhU2l6ZSArPSBDRkRhdGFHZXRMZW5ndGgoZGF0YS5nZXQoKSk7CisKKyAgICAgICAgICAgIGVu dHJ5RGljdGlvbmFyeSA9IGNyZWF0ZURpY3Rpb25hcnkoeworICAgICAgICAgICAgICAgIHsgc2Vz c2lvbkhpc3RvcnlFbnRyeVVSTEtleSwgdXJsLmdldCgpIH0sCisgICAgICAgICAgICAgICAgeyBz ZXNzaW9uSGlzdG9yeUVudHJ5VGl0bGVLZXksIHRpdGxlLmdldCgpIH0sCisgICAgICAgICAgICAg ICAgeyBzZXNzaW9uSGlzdG9yeUVudHJ5T3JpZ2luYWxVUkxLZXksIG9yaWdpbmFsVVJMLmdldCgp IH0sCisgICAgICAgICAgICAgICAgeyBzZXNzaW9uSGlzdG9yeUVudHJ5RGF0YUtleSwgZGF0YS5n ZXQoKSB9LAorICAgICAgICAgICAgICAgIHsgc2Vzc2lvbkhpc3RvcnlFbnRyeVNob3VsZE9wZW5F eHRlcm5hbFVSTHNQb2xpY3lLZXksIHNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3kuZ2V0KCkg fSwKKyAgICAgICAgICAgIH0pOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgZW50cnlE aWN0aW9uYXJ5ID0gY3JlYXRlRGljdGlvbmFyeSh7CisgICAgICAgICAgICAgICAgeyBzZXNzaW9u SGlzdG9yeUVudHJ5VVJMS2V5LCB1cmwuZ2V0KCkgfSwKKyAgICAgICAgICAgICAgICB7IHNlc3Np b25IaXN0b3J5RW50cnlUaXRsZUtleSwgdGl0bGUuZ2V0KCkgfSwKKyAgICAgICAgICAgICAgICB7 IHNlc3Npb25IaXN0b3J5RW50cnlPcmlnaW5hbFVSTEtleSwgb3JpZ2luYWxVUkwuZ2V0KCkgfSwK KyAgICAgICAgICAgICAgICB7IHNlc3Npb25IaXN0b3J5RW50cnlTaG91bGRPcGVuRXh0ZXJuYWxV UkxzUG9saWN5S2V5LCBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LmdldCgpIH0sCisgICAg ICAgICAgICB9KTsKKyAgICAgICAgfQogCiAgICAgICAgIENGQXJyYXlBcHBlbmRWYWx1ZShlbnRy aWVzLmdldCgpLCBlbnRyeURpY3Rpb25hcnkuZ2V0KCkpOwogICAgIH0K