39078 2010-05-13 11:20:10 -0700 Track state for whether a ResourceRequest is fetched via TLS/NPN 2010-05-16 11:02:08 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 39176 1 mbelshe mbelshe abarth commit-queue eric kbr webkit.review.bot oldest_to_newest 225395 0 mbelshe 2010-05-13 11:20:10 -0700 This is part of measuring effectiveness of SPDY; we plan to look at requests which are fetched using the TLS/NPN mechanism so that we can evaluate performance. 225402 1 56001 mbelshe 2010-05-13 11:28:39 -0700 Created attachment 56001 initial patch 225403 2 56002 mbelshe 2010-05-13 11:30:27 -0700 Created attachment 56002 patch fixing tabs in changelog 225848 3 56002 dglazkov 2010-05-14 08:42:33 -0700 Comment on attachment 56002 patch fixing tabs in changelog ok. 226191 4 56002 commit-queue 2010-05-15 01:03:05 -0700 Comment on attachment 56002 patch fixing tabs in changelog Rejecting patch 56002 from commit-queue. Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Dimitri Glazkov', u'--force']" exit_code: 1 Last 500 characters of output: network/chromium/ResourceResponse.h Hunk #1 FAILED at 36. Hunk #2 succeeded at 96 (offset 8 lines). Hunk #3 FAILED at 104. 2 out of 3 hunks FAILED -- saving rejects to file WebCore/platform/network/chromium/ResourceResponse.h.rej patching file WebKit/chromium/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebKit/chromium/public/WebURLResponse.h Hunk #1 succeeded at 126 (offset 3 lines). patching file WebKit/chromium/src/WebURLResponse.cpp Hunk #1 succeeded at 277 (offset 10 lines). Full output: http://webkit-commit-queue.appspot.com/results/2296098 226371 5 56170 abarth 2010-05-15 18:19:54 -0700 Created attachment 56170 Manually merged 226372 6 abarth 2010-05-15 18:20:38 -0700 This doesn't actually need to be reviewed again. I just want the cr-linux EWS bot to run to make sure I did the merge right. Also, this patch is missing a ChangeLog in the WebCore directory. 226381 7 56170 abarth 2010-05-15 18:49:51 -0700 Comment on attachment 56170 Manually merged Looks like I did the merge ok. Let's try to land. 226455 8 56170 commit-queue 2010-05-16 01:58:31 -0700 Comment on attachment 56170 Manually merged Clearing flags on attachment: 56170 Committed r59574: <http://trac.webkit.org/changeset/59574> 226456 9 commit-queue 2010-05-16 01:58:36 -0700 All reviewed patches have been landed. Closing bug. 226460 10 webkit.review.bot 2010-05-16 02:38:55 -0700 http://trac.webkit.org/changeset/59574 might have broken Chromium Win Release 226468 11 abarth 2010-05-16 06:38:25 -0700 (In reply to comment #10) > http://trac.webkit.org/changeset/59574 might have broken Chromium Win Release The compile error is something about trouble linking with WebGL. Not sure how that's related to this patch. 226471 12 abarth 2010-05-16 06:41:52 -0700 I'm rolling this out to see if that fixes cr-win. I'm skeptical that it will. 226478 13 56170 abarth 2010-05-16 07:39:03 -0700 Comment on attachment 56170 Manually merged Rollout didn't help. Putting this back on the queue. It's possible the bot needs to be kicked or the earlier change to DEPS is the problem. 226489 14 eric 2010-05-16 10:05:18 -0700 I suspect the break may be related to earlier webgl renames from this week. I think this change just triggered a fuller-rebuil and exposed a error missed before due to build system failure. There is a known issue with the win gyp build that it doesn't notice feature define changes. We could have hit that. Thanks Adam for the quick fix attempt. This change will automatically reland once the tree regreens 226492 15 eric 2010-05-16 10:12:57 -0700 I think the real culprit was http://trac.webkit.org/changeset/59571 226501 16 eric 2010-05-16 10:43:06 -0700 I believe the build system bug in question is https://bugs.webkit.org/show_bug.cgi?id=38926. 226507 17 56170 eric 2010-05-16 11:02:01 -0700 Comment on attachment 56170 Manually merged Clearing flags on attachment: 56170 Committed r59579: <http://trac.webkit.org/changeset/59579> 226508 18 eric 2010-05-16 11:02:08 -0700 All reviewed patches have been landed. Closing bug. 56001 2010-05-13 11:28:39 -0700 2010-05-13 11:30:27 -0700 initial patch 39078.patch text/plain 6832 mbelshe SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlc3BvbnNl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291 cmNlUmVzcG9uc2UuaAkocmV2aXNpb24gNTkzNTEpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvY2hyb21pdW0vUmVzb3VyY2VSZXNwb25zZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNiw1NyAr MzYsNDQgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIGNsYXNzIFJlc291cmNlUmVzcG9uc2Ug OiBwdWJsaWMgUmVzb3VyY2VSZXNwb25zZUJhc2UgewogICAgIHB1YmxpYzoKICAgICAgICAgUmVz b3VyY2VSZXNwb25zZSgpCi0gICAgICAgICAgICA6IG1faXNDb250ZW50RmlsdGVyZWQoZmFsc2Up Ci0gICAgICAgICAgICAsIG1fYXBwQ2FjaGVJRCgwKQotICAgICAgICAgICAgLCBtX3dhc0ZldGNo ZWRWaWFTUERZKGZhbHNlKQorICAgICAgICAgICAgOiBtX2FwcENhY2hlSUQoMCkKKyAgICAgICAg ICAgICwgbV9pc0NvbnRlbnRGaWx0ZXJlZChmYWxzZSkKICAgICAgICAgICAgICwgbV9pc011bHRp cGFydFBheWxvYWQoZmFsc2UpCisgICAgICAgICAgICAsIG1fd2FzRmV0Y2hlZFZpYVNQRFkoZmFs c2UpCisgICAgICAgICAgICAsIG1fd2FzTnBuTmVnb3RpYXRlZChmYWxzZSkKICAgICAgICAgewog ICAgICAgICB9CiAKICAgICAgICAgUmVzb3VyY2VSZXNwb25zZShjb25zdCBLVVJMJiB1cmwsIGNv bnN0IFN0cmluZyYgbWltZVR5cGUsIGxvbmcgbG9uZyBleHBlY3RlZExlbmd0aCwgY29uc3QgU3Ry aW5nJiB0ZXh0RW5jb2RpbmdOYW1lLCBjb25zdCBTdHJpbmcmIGZpbGVuYW1lKQogICAgICAgICAg ICAgOiBSZXNvdXJjZVJlc3BvbnNlQmFzZSh1cmwsIG1pbWVUeXBlLCBleHBlY3RlZExlbmd0aCwg dGV4dEVuY29kaW5nTmFtZSwgZmlsZW5hbWUpCi0gICAgICAgICAgICAsIG1faXNDb250ZW50Rmls dGVyZWQoZmFsc2UpCiAgICAgICAgICAgICAsIG1fYXBwQ2FjaGVJRCgwKQotICAgICAgICAgICAg LCBtX3dhc0ZldGNoZWRWaWFTUERZKGZhbHNlKQorICAgICAgICAgICAgLCBtX2lzQ29udGVudEZp bHRlcmVkKGZhbHNlKQogICAgICAgICAgICAgLCBtX2lzTXVsdGlwYXJ0UGF5bG9hZChmYWxzZSkK KyAgICAgICAgICAgICwgbV93YXNGZXRjaGVkVmlhU1BEWShmYWxzZSkKKyAgICAgICAgICAgICwg bV93YXNOcG5OZWdvdGlhdGVkKGZhbHNlKQogICAgICAgICB7CiAgICAgICAgIH0KIAogICAgICAg ICBjb25zdCBDU3RyaW5nJiBnZXRTZWN1cml0eUluZm8oKSBjb25zdCB7IHJldHVybiBtX3NlY3Vy aXR5SW5mbzsgfQotICAgICAgICB2b2lkIHNldFNlY3VyaXR5SW5mbyhjb25zdCBDU3RyaW5nJiBz ZWN1cml0eUluZm8pCi0gICAgICAgIHsKLSAgICAgICAgICAgIG1fc2VjdXJpdHlJbmZvID0gc2Vj dXJpdHlJbmZvOwotICAgICAgICB9Ci0KLSAgICAgICAgYm9vbCBpc0NvbnRlbnRGaWx0ZXJlZCgp IGNvbnN0IHsgcmV0dXJuIG1faXNDb250ZW50RmlsdGVyZWQ7IH0KLSAgICAgICAgdm9pZCBzZXRJ c0NvbnRlbnRGaWx0ZXJlZChib29sIGlzQ29udGVudEZpbHRlcmVkKQotICAgICAgICB7Ci0gICAg ICAgICAgICBtX2lzQ29udGVudEZpbHRlcmVkID0gaXNDb250ZW50RmlsdGVyZWQ7Ci0gICAgICAg IH0KKyAgICAgICAgdm9pZCBzZXRTZWN1cml0eUluZm8oY29uc3QgQ1N0cmluZyYgc2VjdXJpdHlJ bmZvKSB7IG1fc2VjdXJpdHlJbmZvID0gc2VjdXJpdHlJbmZvOyB9CiAKICAgICAgICAgbG9uZyBs b25nIGFwcENhY2hlSUQoKSBjb25zdCB7IHJldHVybiBtX2FwcENhY2hlSUQ7IH0KLSAgICAgICAg dm9pZCBzZXRBcHBDYWNoZUlEKGxvbmcgbG9uZyBpZCkKLSAgICAgICAgewotICAgICAgICAgICAg bV9hcHBDYWNoZUlEID0gaWQ7Ci0gICAgICAgIH0KKyAgICAgICAgdm9pZCBzZXRBcHBDYWNoZUlE KGxvbmcgbG9uZyBpZCkgeyBtX2FwcENhY2hlSUQgPSBpZDsgfQogCiAgICAgICAgIGNvbnN0IEtV UkwmIGFwcENhY2hlTWFuaWZlc3RVUkwoKSBjb25zdCB7IHJldHVybiBtX2FwcENhY2hlTWFuaWZl c3RVUkw7IH0KLSAgICAgICAgdm9pZCBzZXRBcHBDYWNoZU1hbmlmZXN0VVJMKGNvbnN0IEtVUkwm IHVybCkKLSAgICAgICAgewotICAgICAgICAgICAgbV9hcHBDYWNoZU1hbmlmZXN0VVJMID0gdXJs OwotICAgICAgICB9CisgICAgICAgIHZvaWQgc2V0QXBwQ2FjaGVNYW5pZmVzdFVSTChjb25zdCBL VVJMJiB1cmwpIHsgbV9hcHBDYWNoZU1hbmlmZXN0VVJMID0gdXJsOyB9CiAKLSAgICAgICAgYm9v bCB3YXNGZXRjaGVkVmlhU1BEWSgpIGNvbnN0IHsgcmV0dXJuIG1fd2FzRmV0Y2hlZFZpYVNQRFk7 IH0KLSAgICAgICAgdm9pZCBzZXRXYXNGZXRjaGVkVmlhU1BEWShib29sIHZhbHVlKQotICAgICAg ICB7Ci0gICAgICAgICAgICBtX3dhc0ZldGNoZWRWaWFTUERZID0gdmFsdWU7Ci0gICAgICAgIH0K KyAgICAgICAgYm9vbCBpc0NvbnRlbnRGaWx0ZXJlZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNDb250 ZW50RmlsdGVyZWQ7IH0KKyAgICAgICAgdm9pZCBzZXRJc0NvbnRlbnRGaWx0ZXJlZChib29sIHZh bHVlKSB7IG1faXNDb250ZW50RmlsdGVyZWQgPSB2YWx1ZTsgfQogCiAgICAgICAgIGJvb2wgaXNN dWx0aXBhcnRQYXlsb2FkKCkgY29uc3QgeyByZXR1cm4gbV9pc011bHRpcGFydFBheWxvYWQ7IH0K LSAgICAgICAgdm9pZCBzZXRJc011bHRpcGFydFBheWxvYWQoYm9vbCB2YWx1ZSkKLSAgICAgICAg ewotICAgICAgICAgICAgbV9pc011bHRpcGFydFBheWxvYWQgPSB2YWx1ZTsKLSAgICAgICAgfQor ICAgICAgICB2b2lkIHNldElzTXVsdGlwYXJ0UGF5bG9hZChib29sIHZhbHVlKSB7IG1faXNNdWx0 aXBhcnRQYXlsb2FkID0gdmFsdWU7IH0KKworICAgICAgICBib29sIHdhc0ZldGNoZWRWaWFTUERZ KCkgY29uc3QgeyByZXR1cm4gbV93YXNGZXRjaGVkVmlhU1BEWTsgfQorICAgICAgICB2b2lkIHNl dFdhc0ZldGNoZWRWaWFTUERZKGJvb2wgdmFsdWUpIHsgbV93YXNGZXRjaGVkVmlhU1BEWSA9IHZh bHVlOyB9CisKKyAgICAgICAgYm9vbCB3YXNOcG5OZWdvdGlhdGVkKCkgY29uc3QgeyByZXR1cm4g bV93YXNOcG5OZWdvdGlhdGVkOyB9CisgICAgICAgIHZvaWQgc2V0V2FzTnBuTmVnb3RpYXRlZChi b29sIHZhbHVlKSB7IG1fd2FzTnBuTmVnb3RpYXRlZCA9IHZhbHVlOyB9CiAKICAgICBwcml2YXRl OgogICAgICAgICBmcmllbmQgY2xhc3MgUmVzb3VyY2VSZXNwb25zZUJhc2U7CkBAIC0xMDEsMTAg Kzg4LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQo KTsKICAgICAgICAgfQogCi0gICAgICAgIC8vIFdoZXRoZXIgdGhlIGNvbnRlbnRzIGZvciB0aGlz IHJlc3BvbnNlIGhhcyBiZWVuIGFsdGVyZWQvYmxvY2tlZCAodXN1YWxseQotICAgICAgICAvLyBm b3Igc2VjdXJpdHkgcmVhc29ucy4KLSAgICAgICAgYm9vbCBtX2lzQ29udGVudEZpbHRlcmVkOwot CiAgICAgICAgIC8vIFRoZSBpZCBvZiB0aGUgYXBwY2FjaGUgdGhpcyByZXNwb25zZSB3YXMgcmV0 cmlldmVkIGZyb20sIG9yIHplcm8gaWYKICAgICAgICAgLy8gdGhlIHJlc3BvbnNlIHdhcyBub3Qg cmV0cmlldmVkIGZyb20gYW4gYXBwY2FjaGUuCiAgICAgICAgIGxvbmcgbG9uZyBtX2FwcENhY2hl SUQ7CkBAIC0xMTMsMTAgKzk2LDE4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgLy8g Tm90ZTogb25seSB2YWxpZCBmb3IgbWFpbiByZXNvdXJjZSByZXNwb25zZXMuCiAgICAgICAgIEtV UkwgbV9hcHBDYWNoZU1hbmlmZXN0VVJMOwogCi0gICAgICAgIGJvb2wgbV93YXNGZXRjaGVkVmlh U1BEWTsKKyAgICAgICAgLy8gV2hldGhlciB0aGUgY29udGVudHMgZm9yIHRoaXMgcmVzcG9uc2Ug aGFzIGJlZW4gYWx0ZXJlZC9ibG9ja2VkICh1c3VhbGx5CisgICAgICAgIC8vIGZvciBzZWN1cml0 eSByZWFzb25zLgorICAgICAgICBib29sIG1faXNDb250ZW50RmlsdGVyZWQ7CiAKICAgICAgICAg Ly8gU2V0IHRvIHRydWUgaWYgdGhpcyBpcyBwYXJ0IG9mIGEgbXVsdGlwYXJ0IHJlc3BvbnNlLgog ICAgICAgICBib29sIG1faXNNdWx0aXBhcnRQYXlsb2FkOworCisgICAgICAgIC8vIFdhcyB0aGUg cmVzb3VyY2UgZmV0Y2hlZCBvdmVyIFNQRFkuICBTZWUgaHR0cDovL2Rldi5jaHJvbWl1bS5vcmcv c3BkeQorICAgICAgICBib29sIG1fd2FzRmV0Y2hlZFZpYVNQRFk7CisKKyAgICAgICAgLy8gV2Fz IHRoZSByZXNvdXJjZSBmZXRjaGVkIG92ZXIgYSBjaGFubmVsIHdoaWNoIHVzZWQgVExTL05leHQt UHJvdG9jb2wtTmVnb3RpYXRpb24gKGFsc28gU1BEWSByZWxhdGVkKS4KKyAgICAgICAgYm9vbCBt X3dhc05wbk5lZ290aWF0ZWQ7CiAgICAgfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRl eDogV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA1OTM3NCkKKysrIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0wNS0xMyAgTWlrZSBCZWxz aGUgIDxtYmVsc2hlQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJp IEdsYXprb3YuCisKKyAgICAgICAgQWRkIGEgZmxhZyB0byB0aGUgUmVzb3VyY2VSZXNwb25zZSBm b3IgdHJhY2tpbmcgaWYgYSByZXF1ZXN0IHdhcworCWZldGNoZWQgdmlhIHRoZSBUTFMvTmV4dC1Q cm90b2NvbC1OZWdvdGlhdGlvbiBtZWNoYW5pc20uCisKKwlBbHNvIGNsZWFuZWQgdXAgdGhlIHN0 eWxlIGluIFJlc291cmNlUmVzcG9uc2UgdG8gZ3JvdXAgdGhlIGZsYWdzCisJdG9nZXRoZXIgKGFu ZCBhbHBoYWJldGljYWxseSkgYW5kIGhvcGVmdWxseSBpbXByb3ZlIHJlYWRhYmlsaXR5IG9mCisJ dGhlIGZpbGUuCisKKwlodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzkw NzgKKworICAgICAgICAqIHB1YmxpYy9XZWJVUkxSZXNwb25zZS5oOgorICAgICAgICAqIHNyYy9X ZWJVUkxSZXNwb25zZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlVSTFJlc3BvbnNlOjp3YXNO cG5OZWdvdGlhdGVkKToKKyAgICAgICAgKFdlYktpdDo6V2ViVVJMUmVzcG9uc2U6OnNldFdhc05w bk5lZ290aWF0ZWQpOgorCiAyMDEwLTA1LTEzICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRza3kuCkluZGV4 OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlVSTFJlc3BvbnNlLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVUkxSZXNwb25zZS5oCShyZXZpc2lvbiA1OTM1MSkK KysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVVJMUmVzcG9uc2UuaAkod29ya2luZyBjb3B5 KQpAQCAtMTIzLDYgKzEyMywxMSBAQCBwdWJsaWM6CiAgICAgV0VCS0lUX0FQSSBib29sIHdhc0Zl dGNoZWRWaWFTUERZKCkgY29uc3Q7CiAgICAgV0VCS0lUX0FQSSB2b2lkIHNldFdhc0ZldGNoZWRW aWFTUERZKGJvb2wpOwogCisgICAgLy8gRmxhZyB3aGV0aGVyIHRoaXMgcmVxdWVzdCB3YXMgbG9h ZGVkIGFmdGVyIHRoZSBUTFMvTmV4dC1Qcm90b2NvbC1OZWdvdGlhdGlvbiB3YXMgdXNlZC4KKyAg ICAvLyBUaGlzIGlzIHJlbGF0ZWQgdG8gU1BEWS4KKyAgICBXRUJLSVRfQVBJIGJvb2wgd2FzTnBu TmVnb3RpYXRlZCgpIGNvbnN0OworICAgIFdFQktJVF9BUEkgdm9pZCBzZXRXYXNOcG5OZWdvdGlh dGVkKGJvb2wpOworCiAgICAgLy8gRmxhZyB3aGV0aGVyIHRoaXMgcmVxdWVzdCBpcyBwYXJ0IG9m IGEgbXVsdGlwYXJ0IHJlc3BvbnNlLgogICAgIFdFQktJVF9BUEkgYm9vbCBpc011bHRpcGFydFBh eWxvYWQoKSBjb25zdDsKICAgICBXRUJLSVRfQVBJIHZvaWQgc2V0SXNNdWx0aXBhcnRQYXlsb2Fk KGJvb2wpOwpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVUkxSZXNwb25zZS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVUkxSZXNwb25zZS5jcHAJKHJldmlz aW9uIDU5MzUxKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVUkxSZXNwb25zZS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTI2Nyw2ICsyNjcsMTYgQEAgdm9pZCBXZWJVUkxSZXNwb25zZTo6c2V0 V2FzRmV0Y2hlZFZpYVNQRAogICAgIG1fcHJpdmF0ZS0+bV9yZXNvdXJjZVJlc3BvbnNlLT5zZXRX YXNGZXRjaGVkVmlhU1BEWSh2YWx1ZSk7CiB9CiAKK2Jvb2wgV2ViVVJMUmVzcG9uc2U6Ondhc05w bk5lZ290aWF0ZWQoKSBjb25zdAoreworICAgIHJldHVybiBtX3ByaXZhdGUtPm1fcmVzb3VyY2VS ZXNwb25zZS0+d2FzTnBuTmVnb3RpYXRlZCgpOworfQorCit2b2lkIFdlYlVSTFJlc3BvbnNlOjpz ZXRXYXNOcG5OZWdvdGlhdGVkKGJvb2wgdmFsdWUpCit7CisgICAgbV9wcml2YXRlLT5tX3Jlc291 cmNlUmVzcG9uc2UtPnNldFdhc05wbk5lZ290aWF0ZWQodmFsdWUpOworfQorCiBib29sIFdlYlVS TFJlc3BvbnNlOjppc011bHRpcGFydFBheWxvYWQoKSBjb25zdAogewogICAgIHJldHVybiBtX3By aXZhdGUtPm1fcmVzb3VyY2VSZXNwb25zZS0+aXNNdWx0aXBhcnRQYXlsb2FkKCk7Cg== 56002 2010-05-13 11:30:27 -0700 2010-05-15 18:19:50 -0700 patch fixing tabs in changelog 39078.patch text/plain 6923 mbelshe SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlc3BvbnNl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291 cmNlUmVzcG9uc2UuaCAgICAgICAgKHJldmlzaW9uIDU5MzUxKQorKysgV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2UuaCAgICAgICAgKHdvcmtpbmcgY29w eSkKQEAgLTM2LDU3ICszNiw0NCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgY2xhc3MgUmVz b3VyY2VSZXNwb25zZSA6IHB1YmxpYyBSZXNvdXJjZVJlc3BvbnNlQmFzZSB7CiAgICAgcHVibGlj OgogICAgICAgICBSZXNvdXJjZVJlc3BvbnNlKCkKLSAgICAgICAgICAgIDogbV9pc0NvbnRlbnRG aWx0ZXJlZChmYWxzZSkKLSAgICAgICAgICAgICwgbV9hcHBDYWNoZUlEKDApCi0gICAgICAgICAg ICAsIG1fd2FzRmV0Y2hlZFZpYVNQRFkoZmFsc2UpCisgICAgICAgICAgICA6IG1fYXBwQ2FjaGVJ RCgwKQorICAgICAgICAgICAgLCBtX2lzQ29udGVudEZpbHRlcmVkKGZhbHNlKQogICAgICAgICAg ICAgLCBtX2lzTXVsdGlwYXJ0UGF5bG9hZChmYWxzZSkKKyAgICAgICAgICAgICwgbV93YXNGZXRj aGVkVmlhU1BEWShmYWxzZSkKKyAgICAgICAgICAgICwgbV93YXNOcG5OZWdvdGlhdGVkKGZhbHNl KQogICAgICAgICB7CiAgICAgICAgIH0KIAogICAgICAgICBSZXNvdXJjZVJlc3BvbnNlKGNvbnN0 IEtVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgbG9uZyBsb25nIGV4cGVjdGVkTGVu Z3RoLCBjb25zdCBTdHJpbmcmIHRleHRFbmNvZGluZ05hbWUsIGNvbnN0IFN0cmluZyYgZmlsZW5h bWUpCiAgICAgICAgICAgICA6IFJlc291cmNlUmVzcG9uc2VCYXNlKHVybCwgbWltZVR5cGUsIGV4 cGVjdGVkTGVuZ3RoLCB0ZXh0RW5jb2RpbmdOYW1lLCBmaWxlbmFtZSkKLSAgICAgICAgICAgICwg bV9pc0NvbnRlbnRGaWx0ZXJlZChmYWxzZSkKICAgICAgICAgICAgICwgbV9hcHBDYWNoZUlEKDAp Ci0gICAgICAgICAgICAsIG1fd2FzRmV0Y2hlZFZpYVNQRFkoZmFsc2UpCisgICAgICAgICAgICAs IG1faXNDb250ZW50RmlsdGVyZWQoZmFsc2UpCiAgICAgICAgICAgICAsIG1faXNNdWx0aXBhcnRQ YXlsb2FkKGZhbHNlKQorICAgICAgICAgICAgLCBtX3dhc0ZldGNoZWRWaWFTUERZKGZhbHNlKQor ICAgICAgICAgICAgLCBtX3dhc05wbk5lZ290aWF0ZWQoZmFsc2UpCiAgICAgICAgIHsKICAgICAg ICAgfQogCiAgICAgICAgIGNvbnN0IENTdHJpbmcmIGdldFNlY3VyaXR5SW5mbygpIGNvbnN0IHsg cmV0dXJuIG1fc2VjdXJpdHlJbmZvOyB9Ci0gICAgICAgIHZvaWQgc2V0U2VjdXJpdHlJbmZvKGNv bnN0IENTdHJpbmcmIHNlY3VyaXR5SW5mbykKLSAgICAgICAgewotICAgICAgICAgICAgbV9zZWN1 cml0eUluZm8gPSBzZWN1cml0eUluZm87Ci0gICAgICAgIH0KLQotICAgICAgICBib29sIGlzQ29u dGVudEZpbHRlcmVkKCkgY29uc3QgeyByZXR1cm4gbV9pc0NvbnRlbnRGaWx0ZXJlZDsgfQotICAg ICAgICB2b2lkIHNldElzQ29udGVudEZpbHRlcmVkKGJvb2wgaXNDb250ZW50RmlsdGVyZWQpCi0g ICAgICAgIHsKLSAgICAgICAgICAgIG1faXNDb250ZW50RmlsdGVyZWQgPSBpc0NvbnRlbnRGaWx0 ZXJlZDsKLSAgICAgICAgfQorICAgICAgICB2b2lkIHNldFNlY3VyaXR5SW5mbyhjb25zdCBDU3Ry aW5nJiBzZWN1cml0eUluZm8pIHsgbV9zZWN1cml0eUluZm8gPSBzZWN1cml0eUluZm87IH0KIAog ICAgICAgICBsb25nIGxvbmcgYXBwQ2FjaGVJRCgpIGNvbnN0IHsgcmV0dXJuIG1fYXBwQ2FjaGVJ RDsgfQotICAgICAgICB2b2lkIHNldEFwcENhY2hlSUQobG9uZyBsb25nIGlkKQotICAgICAgICB7 Ci0gICAgICAgICAgICBtX2FwcENhY2hlSUQgPSBpZDsKLSAgICAgICAgfQorICAgICAgICB2b2lk IHNldEFwcENhY2hlSUQobG9uZyBsb25nIGlkKSB7IG1fYXBwQ2FjaGVJRCA9IGlkOyB9CiAKICAg ICAgICAgY29uc3QgS1VSTCYgYXBwQ2FjaGVNYW5pZmVzdFVSTCgpIGNvbnN0IHsgcmV0dXJuIG1f YXBwQ2FjaGVNYW5pZmVzdFVSTDsgfQotICAgICAgICB2b2lkIHNldEFwcENhY2hlTWFuaWZlc3RV UkwoY29uc3QgS1VSTCYgdXJsKQotICAgICAgICB7Ci0gICAgICAgICAgICBtX2FwcENhY2hlTWFu aWZlc3RVUkwgPSB1cmw7Ci0gICAgICAgIH0KKyAgICAgICAgdm9pZCBzZXRBcHBDYWNoZU1hbmlm ZXN0VVJMKGNvbnN0IEtVUkwmIHVybCkgeyBtX2FwcENhY2hlTWFuaWZlc3RVUkwgPSB1cmw7IH0K IAotICAgICAgICBib29sIHdhc0ZldGNoZWRWaWFTUERZKCkgY29uc3QgeyByZXR1cm4gbV93YXNG ZXRjaGVkVmlhU1BEWTsgfQotICAgICAgICB2b2lkIHNldFdhc0ZldGNoZWRWaWFTUERZKGJvb2wg dmFsdWUpCi0gICAgICAgIHsKLSAgICAgICAgICAgIG1fd2FzRmV0Y2hlZFZpYVNQRFkgPSB2YWx1 ZTsKLSAgICAgICAgfQorICAgICAgICBib29sIGlzQ29udGVudEZpbHRlcmVkKCkgY29uc3QgeyBy ZXR1cm4gbV9pc0NvbnRlbnRGaWx0ZXJlZDsgfQorICAgICAgICB2b2lkIHNldElzQ29udGVudEZp bHRlcmVkKGJvb2wgdmFsdWUpIHsgbV9pc0NvbnRlbnRGaWx0ZXJlZCA9IHZhbHVlOyB9CiAKICAg ICAgICAgYm9vbCBpc011bHRpcGFydFBheWxvYWQoKSBjb25zdCB7IHJldHVybiBtX2lzTXVsdGlw YXJ0UGF5bG9hZDsgfQotICAgICAgICB2b2lkIHNldElzTXVsdGlwYXJ0UGF5bG9hZChib29sIHZh bHVlKQotICAgICAgICB7Ci0gICAgICAgICAgICBtX2lzTXVsdGlwYXJ0UGF5bG9hZCA9IHZhbHVl OwotICAgICAgICB9CisgICAgICAgIHZvaWQgc2V0SXNNdWx0aXBhcnRQYXlsb2FkKGJvb2wgdmFs dWUpIHsgbV9pc011bHRpcGFydFBheWxvYWQgPSB2YWx1ZTsgfQorCisgICAgICAgIGJvb2wgd2Fz RmV0Y2hlZFZpYVNQRFkoKSBjb25zdCB7IHJldHVybiBtX3dhc0ZldGNoZWRWaWFTUERZOyB9Cisg ICAgICAgIHZvaWQgc2V0V2FzRmV0Y2hlZFZpYVNQRFkoYm9vbCB2YWx1ZSkgeyBtX3dhc0ZldGNo ZWRWaWFTUERZID0gdmFsdWU7IH0KKworICAgICAgICBib29sIHdhc05wbk5lZ290aWF0ZWQoKSBj b25zdCB7IHJldHVybiBtX3dhc05wbk5lZ290aWF0ZWQ7IH0KKyAgICAgICAgdm9pZCBzZXRXYXNO cG5OZWdvdGlhdGVkKGJvb2wgdmFsdWUpIHsgbV93YXNOcG5OZWdvdGlhdGVkID0gdmFsdWU7IH0K IAogICAgIHByaXZhdGU6CiAgICAgICAgIGZyaWVuZCBjbGFzcyBSZXNvdXJjZVJlc3BvbnNlQmFz ZTsKQEAgLTEwMSwxMCArODgsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICBu b3RJbXBsZW1lbnRlZCgpOwogICAgICAgICB9CiAKLSAgICAgICAgLy8gV2hldGhlciB0aGUgY29u dGVudHMgZm9yIHRoaXMgcmVzcG9uc2UgaGFzIGJlZW4gYWx0ZXJlZC9ibG9ja2VkICh1c3VhbGx5 Ci0gICAgICAgIC8vIGZvciBzZWN1cml0eSByZWFzb25zLgotICAgICAgICBib29sIG1faXNDb250 ZW50RmlsdGVyZWQ7Ci0KICAgICAgICAgLy8gVGhlIGlkIG9mIHRoZSBhcHBjYWNoZSB0aGlzIHJl c3BvbnNlIHdhcyByZXRyaWV2ZWQgZnJvbSwgb3IgemVybyBpZgogICAgICAgICAvLyB0aGUgcmVz cG9uc2Ugd2FzIG5vdCByZXRyaWV2ZWQgZnJvbSBhbiBhcHBjYWNoZS4KICAgICAgICAgbG9uZyBs b25nIG1fYXBwQ2FjaGVJRDsKQEAgLTExMywxMCArOTYsMTggQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogICAgICAgICAvLyBOb3RlOiBvbmx5IHZhbGlkIGZvciBtYWluIHJlc291cmNlIHJlc3BvbnNl cy4KICAgICAgICAgS1VSTCBtX2FwcENhY2hlTWFuaWZlc3RVUkw7CiAKLSAgICAgICAgYm9vbCBt X3dhc0ZldGNoZWRWaWFTUERZOworICAgICAgICAvLyBXaGV0aGVyIHRoZSBjb250ZW50cyBmb3Ig dGhpcyByZXNwb25zZSBoYXMgYmVlbiBhbHRlcmVkL2Jsb2NrZWQgKHVzdWFsbHkKKyAgICAgICAg Ly8gZm9yIHNlY3VyaXR5IHJlYXNvbnMuCisgICAgICAgIGJvb2wgbV9pc0NvbnRlbnRGaWx0ZXJl ZDsKIAogICAgICAgICAvLyBTZXQgdG8gdHJ1ZSBpZiB0aGlzIGlzIHBhcnQgb2YgYSBtdWx0aXBh cnQgcmVzcG9uc2UuCiAgICAgICAgIGJvb2wgbV9pc011bHRpcGFydFBheWxvYWQ7CisKKyAgICAg ICAgLy8gV2FzIHRoZSByZXNvdXJjZSBmZXRjaGVkIG92ZXIgU1BEWS4gIFNlZSBodHRwOi8vZGV2 LmNocm9taXVtLm9yZy9zcGR5CisgICAgICAgIGJvb2wgbV93YXNGZXRjaGVkVmlhU1BEWTsKKwor ICAgICAgICAvLyBXYXMgdGhlIHJlc291cmNlIGZldGNoZWQgb3ZlciBhIGNoYW5uZWwgd2hpY2gg dXNlZCBUTFMvTmV4dC1Qcm90b2NvbC1OZWdvdGlhdGlvbiAoYWxzbyBTUERZIHJlbGF0ZWQpLgor ICAgICAgICBib29sIG1fd2FzTnBuTmVnb3RpYXRlZDsKICAgICB9OwogCiB9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgICAgICAgIChyZXZpc2lvbiA1OTM3NCkKKysrIFdl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgICAgICAgICh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MjEgQEAKKzIwMTAtMDUtMTMgIE1pa2UgQmVsc2hlICA8bWJlbHNoZUBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgorCisgICAgICAgIEFkZCBhIGZs YWcgdG8gdGhlIFJlc291cmNlUmVzcG9uc2UgZm9yIHRyYWNraW5nIGlmIGEgcmVxdWVzdCB3YXMK KyAgICAgICAgZmV0Y2hlZCB2aWEgdGhlIFRMUy9OZXh0LVByb3RvY29sLU5lZ290aWF0aW9uIG1l Y2hhbmlzbS4KKworICAgICAgICBBbHNvIGNsZWFuZWQgdXAgdGhlIHN0eWxlIGluIFJlc291cmNl UmVzcG9uc2UgdG8gZ3JvdXAgdGhlIGZsYWdzCisgICAgICAgIHRvZ2V0aGVyIChhbmQgYWxwaGFi ZXRpY2FsbHkpIGFuZCBob3BlZnVsbHkgaW1wcm92ZSByZWFkYWJpbGl0eSBvZgorICAgICAgICB0 aGUgZmlsZS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MzkwNzgKKworICAgICAgICAqIHB1YmxpYy9XZWJVUkxSZXNwb25zZS5oOgorICAgICAgICAq IHNyYy9XZWJVUkxSZXNwb25zZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlVSTFJlc3BvbnNl Ojp3YXNOcG5OZWdvdGlhdGVkKToKKyAgICAgICAgKFdlYktpdDo6V2ViVVJMUmVzcG9uc2U6OnNl dFdhc05wbk5lZ290aWF0ZWQpOgorCiAyMDEwLTA1LTEzICBQYXZlbCBGZWxkbWFuICA8cGZlbGRt YW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRza3ku CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlVSTFJlc3BvbnNlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVUkxSZXNwb25zZS5oICAgICAgICAocmV2 aXNpb24gNTkzNTEpCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlVSTFJlc3BvbnNlLmgg ICAgICAgICh3b3JraW5nIGNvcHkpCkBAIC0xMjMsNiArMTIzLDExIEBAIHB1YmxpYzoKICAgICBX RUJLSVRfQVBJIGJvb2wgd2FzRmV0Y2hlZFZpYVNQRFkoKSBjb25zdDsKICAgICBXRUJLSVRfQVBJ IHZvaWQgc2V0V2FzRmV0Y2hlZFZpYVNQRFkoYm9vbCk7CiAKKyAgICAvLyBGbGFnIHdoZXRoZXIg dGhpcyByZXF1ZXN0IHdhcyBsb2FkZWQgYWZ0ZXIgdGhlIFRMUy9OZXh0LVByb3RvY29sLU5lZ290 aWF0aW9uIHdhcyB1c2VkLgorICAgIC8vIFRoaXMgaXMgcmVsYXRlZCB0byBTUERZLgorICAgIFdF QktJVF9BUEkgYm9vbCB3YXNOcG5OZWdvdGlhdGVkKCkgY29uc3Q7CisgICAgV0VCS0lUX0FQSSB2 b2lkIHNldFdhc05wbk5lZ290aWF0ZWQoYm9vbCk7CisKICAgICAvLyBGbGFnIHdoZXRoZXIgdGhp cyByZXF1ZXN0IGlzIHBhcnQgb2YgYSBtdWx0aXBhcnQgcmVzcG9uc2UuCiAgICAgV0VCS0lUX0FQ SSBib29sIGlzTXVsdGlwYXJ0UGF5bG9hZCgpIGNvbnN0OwogICAgIFdFQktJVF9BUEkgdm9pZCBz ZXRJc011bHRpcGFydFBheWxvYWQoYm9vbCk7CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dl YlVSTFJlc3BvbnNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlVS TFJlc3BvbnNlLmNwcCAgICAgICAgKHJldmlzaW9uIDU5MzUxKQorKysgV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJVUkxSZXNwb25zZS5jcHAgICAgICAgICh3b3JraW5nIGNvcHkpCkBAIC0yNjcsNiAr MjY3LDE2IEBAIHZvaWQgV2ViVVJMUmVzcG9uc2U6OnNldFdhc0ZldGNoZWRWaWFTUEQKICAgICBt X3ByaXZhdGUtPm1fcmVzb3VyY2VSZXNwb25zZS0+c2V0V2FzRmV0Y2hlZFZpYVNQRFkodmFsdWUp OwogfQogCitib29sIFdlYlVSTFJlc3BvbnNlOjp3YXNOcG5OZWdvdGlhdGVkKCkgY29uc3QKK3sK KyAgICByZXR1cm4gbV9wcml2YXRlLT5tX3Jlc291cmNlUmVzcG9uc2UtPndhc05wbk5lZ290aWF0 ZWQoKTsKK30KKwordm9pZCBXZWJVUkxSZXNwb25zZTo6c2V0V2FzTnBuTmVnb3RpYXRlZChib29s IHZhbHVlKQoreworICAgIG1fcHJpdmF0ZS0+bV9yZXNvdXJjZVJlc3BvbnNlLT5zZXRXYXNOcG5O ZWdvdGlhdGVkKHZhbHVlKTsKK30KKwogYm9vbCBXZWJVUkxSZXNwb25zZTo6aXNNdWx0aXBhcnRQ YXlsb2FkKCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9wcml2YXRlLT5tX3Jlc291cmNlUmVzcG9u c2UtPmlzTXVsdGlwYXJ0UGF5bG9hZCgpOwo= 56170 2010-05-15 18:19:54 -0700 2010-05-16 11:02:01 -0700 Manually merged bug-39078-20100515181953.patch text/plain 7469 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJl c3BvbnNlLmggYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXNw b25zZS5oCmluZGV4IDMzZjJiYTJiNzE3MTNhYTFjYjgzMWQ3OWJkNjkwNGZlNjg0MmE2Y2QuLjg0 MDBjZTU4NTZkMWM2MmFhYzA1OTRmYjk3MWQzZjdjN2MzYWJjMzcgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlc3BvbnNlLmgKKysrIGIvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2UuaApAQCAtMzYs NjUgKzM2LDQ5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBjbGFzcyBSZXNvdXJjZVJlc3Bv bnNlIDogcHVibGljIFJlc291cmNlUmVzcG9uc2VCYXNlIHsKICAgICBwdWJsaWM6CiAgICAgICAg IFJlc291cmNlUmVzcG9uc2UoKQotICAgICAgICAgICAgOiBtX2lzQ29udGVudEZpbHRlcmVkKGZh bHNlKQotICAgICAgICAgICAgLCBtX2FwcENhY2hlSUQoMCkKLSAgICAgICAgICAgICwgbV93YXNG ZXRjaGVkVmlhU1BEWShmYWxzZSkKKyAgICAgICAgICAgIDogbV9hcHBDYWNoZUlEKDApCisgICAg ICAgICAgICAsIG1faXNDb250ZW50RmlsdGVyZWQoZmFsc2UpCiAgICAgICAgICAgICAsIG1faXNN dWx0aXBhcnRQYXlsb2FkKGZhbHNlKQorICAgICAgICAgICAgLCBtX3dhc0ZldGNoZWRWaWFTUERZ KGZhbHNlKQorICAgICAgICAgICAgLCBtX3dhc05wbk5lZ290aWF0ZWQoZmFsc2UpCiAgICAgICAg ICAgICAsIG1fcmVzcG9uc2VUaW1lKDApCiAgICAgICAgIHsKICAgICAgICAgfQogCiAgICAgICAg IFJlc291cmNlUmVzcG9uc2UoY29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBl LCBsb25nIGxvbmcgZXhwZWN0ZWRMZW5ndGgsIGNvbnN0IFN0cmluZyYgdGV4dEVuY29kaW5nTmFt ZSwgY29uc3QgU3RyaW5nJiBmaWxlbmFtZSkKICAgICAgICAgICAgIDogUmVzb3VyY2VSZXNwb25z ZUJhc2UodXJsLCBtaW1lVHlwZSwgZXhwZWN0ZWRMZW5ndGgsIHRleHRFbmNvZGluZ05hbWUsIGZp bGVuYW1lKQotICAgICAgICAgICAgLCBtX2lzQ29udGVudEZpbHRlcmVkKGZhbHNlKQogICAgICAg ICAgICAgLCBtX2FwcENhY2hlSUQoMCkKLSAgICAgICAgICAgICwgbV93YXNGZXRjaGVkVmlhU1BE WShmYWxzZSkKKyAgICAgICAgICAgICwgbV9pc0NvbnRlbnRGaWx0ZXJlZChmYWxzZSkKICAgICAg ICAgICAgICwgbV9pc011bHRpcGFydFBheWxvYWQoZmFsc2UpCisgICAgICAgICAgICAsIG1fd2Fz RmV0Y2hlZFZpYVNQRFkoZmFsc2UpCisgICAgICAgICAgICAsIG1fd2FzTnBuTmVnb3RpYXRlZChm YWxzZSkKICAgICAgICAgICAgICwgbV9yZXNwb25zZVRpbWUoMCkKICAgICAgICAgewogICAgICAg ICB9CiAKICAgICAgICAgY29uc3QgQ1N0cmluZyYgZ2V0U2VjdXJpdHlJbmZvKCkgY29uc3QgeyBy ZXR1cm4gbV9zZWN1cml0eUluZm87IH0KLSAgICAgICAgdm9pZCBzZXRTZWN1cml0eUluZm8oY29u c3QgQ1N0cmluZyYgc2VjdXJpdHlJbmZvKQotICAgICAgICB7Ci0gICAgICAgICAgICBtX3NlY3Vy aXR5SW5mbyA9IHNlY3VyaXR5SW5mbzsKLSAgICAgICAgfQotCi0gICAgICAgIGJvb2wgaXNDb250 ZW50RmlsdGVyZWQoKSBjb25zdCB7IHJldHVybiBtX2lzQ29udGVudEZpbHRlcmVkOyB9Ci0gICAg ICAgIHZvaWQgc2V0SXNDb250ZW50RmlsdGVyZWQoYm9vbCBpc0NvbnRlbnRGaWx0ZXJlZCkKLSAg ICAgICAgewotICAgICAgICAgICAgbV9pc0NvbnRlbnRGaWx0ZXJlZCA9IGlzQ29udGVudEZpbHRl cmVkOwotICAgICAgICB9CisgICAgICAgIHZvaWQgc2V0U2VjdXJpdHlJbmZvKGNvbnN0IENTdHJp bmcmIHNlY3VyaXR5SW5mbykgeyBtX3NlY3VyaXR5SW5mbyA9IHNlY3VyaXR5SW5mbzsgfQogCiAg ICAgICAgIGxvbmcgbG9uZyBhcHBDYWNoZUlEKCkgY29uc3QgeyByZXR1cm4gbV9hcHBDYWNoZUlE OyB9Ci0gICAgICAgIHZvaWQgc2V0QXBwQ2FjaGVJRChsb25nIGxvbmcgaWQpCi0gICAgICAgIHsK LSAgICAgICAgICAgIG1fYXBwQ2FjaGVJRCA9IGlkOwotICAgICAgICB9CisgICAgICAgIHZvaWQg c2V0QXBwQ2FjaGVJRChsb25nIGxvbmcgaWQpIHsgbV9hcHBDYWNoZUlEID0gaWQ7IH0KIAogICAg ICAgICBjb25zdCBLVVJMJiBhcHBDYWNoZU1hbmlmZXN0VVJMKCkgY29uc3QgeyByZXR1cm4gbV9h cHBDYWNoZU1hbmlmZXN0VVJMOyB9Ci0gICAgICAgIHZvaWQgc2V0QXBwQ2FjaGVNYW5pZmVzdFVS TChjb25zdCBLVVJMJiB1cmwpCi0gICAgICAgIHsKLSAgICAgICAgICAgIG1fYXBwQ2FjaGVNYW5p ZmVzdFVSTCA9IHVybDsKLSAgICAgICAgfQorICAgICAgICB2b2lkIHNldEFwcENhY2hlTWFuaWZl c3RVUkwoY29uc3QgS1VSTCYgdXJsKSB7IG1fYXBwQ2FjaGVNYW5pZmVzdFVSTCA9IHVybDsgfQor CisgICAgICAgIGJvb2wgaXNDb250ZW50RmlsdGVyZWQoKSBjb25zdCB7IHJldHVybiBtX2lzQ29u dGVudEZpbHRlcmVkOyB9CisgICAgICAgIHZvaWQgc2V0SXNDb250ZW50RmlsdGVyZWQoYm9vbCB2 YWx1ZSkgeyBtX2lzQ29udGVudEZpbHRlcmVkID0gdmFsdWU7IH0KIAogICAgICAgICBib29sIHdh c0ZldGNoZWRWaWFTUERZKCkgY29uc3QgeyByZXR1cm4gbV93YXNGZXRjaGVkVmlhU1BEWTsgfQot ICAgICAgICB2b2lkIHNldFdhc0ZldGNoZWRWaWFTUERZKGJvb2wgdmFsdWUpCi0gICAgICAgIHsK LSAgICAgICAgICAgIG1fd2FzRmV0Y2hlZFZpYVNQRFkgPSB2YWx1ZTsKLSAgICAgICAgfQorICAg ICAgICB2b2lkIHNldFdhc0ZldGNoZWRWaWFTUERZKGJvb2wgdmFsdWUpIHsgbV93YXNGZXRjaGVk VmlhU1BEWSA9IHZhbHVlOyB9CisKKyAgICAgICAgYm9vbCB3YXNOcG5OZWdvdGlhdGVkKCkgY29u c3QgeyByZXR1cm4gbV93YXNOcG5OZWdvdGlhdGVkOyB9CisgICAgICAgIHZvaWQgc2V0V2FzTnBu TmVnb3RpYXRlZChib29sIHZhbHVlKSB7IG1fd2FzTnBuTmVnb3RpYXRlZCA9IHZhbHVlOyB9CiAK ICAgICAgICAgYm9vbCBpc011bHRpcGFydFBheWxvYWQoKSBjb25zdCB7IHJldHVybiBtX2lzTXVs dGlwYXJ0UGF5bG9hZDsgfQotICAgICAgICB2b2lkIHNldElzTXVsdGlwYXJ0UGF5bG9hZChib29s IHZhbHVlKQotICAgICAgICB7Ci0gICAgICAgICAgICBtX2lzTXVsdGlwYXJ0UGF5bG9hZCA9IHZh bHVlOwotICAgICAgICB9CisgICAgICAgIHZvaWQgc2V0SXNNdWx0aXBhcnRQYXlsb2FkKGJvb2wg dmFsdWUpIHsgbV9pc011bHRpcGFydFBheWxvYWQgPSB2YWx1ZTsgfQogCiAgICAgICAgIGRvdWJs ZSByZXNwb25zZVRpbWUoKSBjb25zdCB7IHJldHVybiBtX3Jlc3BvbnNlVGltZTsgfQotICAgICAg ICB2b2lkIHNldFJlc3BvbnNlVGltZShkb3VibGUgcmVzcG9uc2VUaW1lKQotICAgICAgICB7Ci0g ICAgICAgICAgICBtX3Jlc3BvbnNlVGltZSA9IHJlc3BvbnNlVGltZTsKLSAgICAgICAgfQorICAg ICAgICB2b2lkIHNldFJlc3BvbnNlVGltZShkb3VibGUgcmVzcG9uc2VUaW1lKSB7IG1fcmVzcG9u c2VUaW1lID0gcmVzcG9uc2VUaW1lOyB9CiAKICAgICBwcml2YXRlOgogICAgICAgICBmcmllbmQg Y2xhc3MgUmVzb3VyY2VSZXNwb25zZUJhc2U7CkBAIC0xMDksMTAgKzkzLDYgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKICAgICAgICAgfQogCi0g ICAgICAgIC8vIFdoZXRoZXIgdGhlIGNvbnRlbnRzIGZvciB0aGlzIHJlc3BvbnNlIGhhcyBiZWVu IGFsdGVyZWQvYmxvY2tlZCAodXN1YWxseQotICAgICAgICAvLyBmb3Igc2VjdXJpdHkgcmVhc29u cy4KLSAgICAgICAgYm9vbCBtX2lzQ29udGVudEZpbHRlcmVkOwotCiAgICAgICAgIC8vIFRoZSBp ZCBvZiB0aGUgYXBwY2FjaGUgdGhpcyByZXNwb25zZSB3YXMgcmV0cmlldmVkIGZyb20sIG9yIHpl cm8gaWYKICAgICAgICAgLy8gdGhlIHJlc3BvbnNlIHdhcyBub3QgcmV0cmlldmVkIGZyb20gYW4g YXBwY2FjaGUuCiAgICAgICAgIGxvbmcgbG9uZyBtX2FwcENhY2hlSUQ7CkBAIC0xMjEsMTEgKzEw MSwxOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIC8vIE5vdGU6IG9ubHkgdmFsaWQg Zm9yIG1haW4gcmVzb3VyY2UgcmVzcG9uc2VzLgogICAgICAgICBLVVJMIG1fYXBwQ2FjaGVNYW5p ZmVzdFVSTDsKIAotICAgICAgICBib29sIG1fd2FzRmV0Y2hlZFZpYVNQRFk7CisgICAgICAgIC8v IFdoZXRoZXIgdGhlIGNvbnRlbnRzIGZvciB0aGlzIHJlc3BvbnNlIGhhcyBiZWVuIGFsdGVyZWQv YmxvY2tlZCAodXN1YWxseQorICAgICAgICAvLyBmb3Igc2VjdXJpdHkgcmVhc29ucy4KKyAgICAg ICAgYm9vbCBtX2lzQ29udGVudEZpbHRlcmVkOwogCiAgICAgICAgIC8vIFNldCB0byB0cnVlIGlm IHRoaXMgaXMgcGFydCBvZiBhIG11bHRpcGFydCByZXNwb25zZS4KICAgICAgICAgYm9vbCBtX2lz TXVsdGlwYXJ0UGF5bG9hZDsKIAorICAgICAgICAvLyBXYXMgdGhlIHJlc291cmNlIGZldGNoZWQg b3ZlciBTUERZLiAgU2VlIGh0dHA6Ly9kZXYuY2hyb21pdW0ub3JnL3NwZHkKKyAgICAgICAgYm9v bCBtX3dhc0ZldGNoZWRWaWFTUERZOworCisgICAgICAgIC8vIFdhcyB0aGUgcmVzb3VyY2UgZmV0 Y2hlZCBvdmVyIGEgY2hhbm5lbCB3aGljaCB1c2VkIFRMUy9OZXh0LVByb3RvY29sLU5lZ290aWF0 aW9uIChhbHNvIFNQRFkgcmVsYXRlZCkuCisgICAgICAgIGJvb2wgbV93YXNOcG5OZWdvdGlhdGVk OworCiAgICAgICAgIC8vIFRoZSB0aW1lIGF0IHdoaWNoIHRoZSByZXNwb25zZSBoZWFkZXJzIHdl cmUgcmVjZWl2ZWQuICBGb3IgY2FjaGVkCiAgICAgICAgIC8vIHJlc3BvbnNlcywgdGhpcyB0aW1l IGNvdWxkIGJlICJmYXIiIGluIHRoZSBwYXN0LgogICAgICAgICBkb3VibGUgbV9yZXNwb25zZVRp bWU7CmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwppbmRleCAyODEzNDRhM2VkYjNkMDIxNmIyM2NiM2U5MjQzYjQzOGE2ZjYz ZTNiLi42YTVhNmMxYjE0YzQwY2Y5MDJmNjg0ZWJiMWU4OWJlYTFkN2U0YTg5IDEwMDY0NAotLS0g YS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0wNS0xMyAgTWlrZSBCZWxzaGUgIDxtYmVsc2hlQGNo cm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCisKKyAg ICAgICAgQWRkIGEgZmxhZyB0byB0aGUgUmVzb3VyY2VSZXNwb25zZSBmb3IgdHJhY2tpbmcgaWYg YSByZXF1ZXN0IHdhcworICAgICAgICBmZXRjaGVkIHZpYSB0aGUgVExTL05leHQtUHJvdG9jb2wt TmVnb3RpYXRpb24gbWVjaGFuaXNtLgorCisgICAgICAgIEFsc28gY2xlYW5lZCB1cCB0aGUgc3R5 bGUgaW4gUmVzb3VyY2VSZXNwb25zZSB0byBncm91cCB0aGUgZmxhZ3MKKyAgICAgICAgdG9nZXRo ZXIgKGFuZCBhbHBoYWJldGljYWxseSkgYW5kIGhvcGVmdWxseSBpbXByb3ZlIHJlYWRhYmlsaXR5 IG9mCisgICAgICAgIHRoZSBmaWxlLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0zOTA3OAorCisgICAgICAgICogcHVibGljL1dlYlVSTFJlc3BvbnNl Lmg6CisgICAgICAgICogc3JjL1dlYlVSTFJlc3BvbnNlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViVVJMUmVzcG9uc2U6Ondhc05wbk5lZ290aWF0ZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJV UkxSZXNwb25zZTo6c2V0V2FzTnBuTmVnb3RpYXRlZCk6CisKIDIwMTAtMDUtMTUgIEpvY2hlbiBF aXNpbmdlciAgPGpvY2hlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRG1p dHJ5IFRpdG92LgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVUkxSZXNw b25zZS5oIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVUkxSZXNwb25zZS5oCmluZGV4IGYw ODkwMjg1ZmVkMzNmZGYxMDM4NTA1YzQ3ZWEzOWRjYjIzNTIyOGUuLmIzYzA4NGNjZDBkYjgyOWY0 ZWExZTc2YjE0ZmY5OTYzNWViNTY0ZWMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViVVJMUmVzcG9uc2UuaAorKysgYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlVSTFJl c3BvbnNlLmgKQEAgLTEyNiw2ICsxMjYsMTEgQEAgcHVibGljOgogICAgIFdFQktJVF9BUEkgYm9v bCB3YXNGZXRjaGVkVmlhU1BEWSgpIGNvbnN0OwogICAgIFdFQktJVF9BUEkgdm9pZCBzZXRXYXNG ZXRjaGVkVmlhU1BEWShib29sKTsKIAorICAgIC8vIEZsYWcgd2hldGhlciB0aGlzIHJlcXVlc3Qg d2FzIGxvYWRlZCBhZnRlciB0aGUgVExTL05leHQtUHJvdG9jb2wtTmVnb3RpYXRpb24gd2FzIHVz ZWQuCisgICAgLy8gVGhpcyBpcyByZWxhdGVkIHRvIFNQRFkuCisgICAgV0VCS0lUX0FQSSBib29s IHdhc05wbk5lZ290aWF0ZWQoKSBjb25zdDsKKyAgICBXRUJLSVRfQVBJIHZvaWQgc2V0V2FzTnBu TmVnb3RpYXRlZChib29sKTsKKwogICAgIC8vIEZsYWcgd2hldGhlciB0aGlzIHJlcXVlc3QgaXMg cGFydCBvZiBhIG11bHRpcGFydCByZXNwb25zZS4KICAgICBXRUJLSVRfQVBJIGJvb2wgaXNNdWx0 aXBhcnRQYXlsb2FkKCkgY29uc3Q7CiAgICAgV0VCS0lUX0FQSSB2b2lkIHNldElzTXVsdGlwYXJ0 UGF5bG9hZChib29sKTsKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVVJMUmVz cG9uc2UuY3BwIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVUkxSZXNwb25zZS5jcHAKaW5kZXgg NzZlZTRhY2U3NTRkNzkwMTY3ZWRlY2M2ZjM3ZmQ4YTBlM2Y1NWE2My4uMWFiYTU0ZTE3YjA0YmNk OTFhZGViZGYxMDc4NjFhZjA5NTVlOTk1YiAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJVUkxSZXNwb25zZS5jcHAKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVUkxSZXNw b25zZS5jcHAKQEAgLTI3Nyw2ICsyNzcsMTYgQEAgdm9pZCBXZWJVUkxSZXNwb25zZTo6c2V0V2Fz RmV0Y2hlZFZpYVNQRFkoYm9vbCB2YWx1ZSkKICAgICBtX3ByaXZhdGUtPm1fcmVzb3VyY2VSZXNw b25zZS0+c2V0V2FzRmV0Y2hlZFZpYVNQRFkodmFsdWUpOwogfQogCitib29sIFdlYlVSTFJlc3Bv bnNlOjp3YXNOcG5OZWdvdGlhdGVkKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9wcml2YXRlLT5t X3Jlc291cmNlUmVzcG9uc2UtPndhc05wbk5lZ290aWF0ZWQoKTsKK30KKwordm9pZCBXZWJVUkxS ZXNwb25zZTo6c2V0V2FzTnBuTmVnb3RpYXRlZChib29sIHZhbHVlKQoreworICAgIG1fcHJpdmF0 ZS0+bV9yZXNvdXJjZVJlc3BvbnNlLT5zZXRXYXNOcG5OZWdvdGlhdGVkKHZhbHVlKTsKK30KKwog Ym9vbCBXZWJVUkxSZXNwb25zZTo6aXNNdWx0aXBhcnRQYXlsb2FkKCkgY29uc3QKIHsKICAgICBy ZXR1cm4gbV9wcml2YXRlLT5tX3Jlc291cmNlUmVzcG9uc2UtPmlzTXVsdGlwYXJ0UGF5bG9hZCgp Owo=