53749 2011-02-03 19:32:47 -0800 Templatize KURLGooglePrivate::init 2011-02-11 00:14:29 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC All RESOLVED FIXED P3 Enhancement --- 54228 1 ctruta ctruta abarth brettw commit-queue levin webkit.review.bot oldest_to_newest 345264 0 ctruta 2011-02-03 19:32:47 -0800 Currently, there are two backend initializers with identical source implementations. They can easily be replaced by a single template function. 345267 1 81175 ctruta 2011-02-03 19:46:04 -0800 Created attachment 81175 Patch There is a bogus failure in the style checker. It complains "Use 0 instead of NULL" [readability/null], although the word "NULL" appears in a comment only. 345290 2 webkit.review.bot 2011-02-03 20:33:00 -0800 Attachment 81175 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/platform/KURLGooglePrivate.h:59: Use 0 instead of NULL. [readability/null] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 345319 3 ctruta 2011-02-03 21:11:33 -0800 Filed bug 53755 against check-webkit-style. 345546 4 levin 2011-02-04 09:45:11 -0800 (In reply to comment #1) > Created an attachment (id=81175) [details] > Patch > > There is a bogus failure in the style checker. It complains "Use 0 instead of NULL" [readability/null], although the word "NULL" appears in a comment only. This is by design and not a bogus failure. 345653 5 81258 ctruta 2011-02-04 11:47:11 -0800 Created attachment 81258 Patch (In reply to comment #4) > This is by design and not a bogus failure. Ok. I am resubmitting the patch, with the comments updated. check-webkit-style is now passing. I replaced "NULL" with "0", "'\0'" or "null" as appropriate. I kept using the (dictionary word) "null" because it makes sense to refer to the "null string", and also because it has semantic meaning in the underlying classes (e.g. CString::isNull). In fact, before this change, the spellings "null" and "NULL" were used interchangeably. 348825 6 brettw 2011-02-09 22:57:17 -0800 I'm not a super template instantiation expert. Normally you'd need to define the function in the header so all the callers for the different types see the same thing. That seems to not be necessary in this case because there are only two possible instantiations, and they're both instantiated from the .cpp file where the actual implementation is. Maybe a real WebKit reviewer has an idea for if there is a better method more commonly used in WebKit for this kind of thing. But this looks good to me. 348880 7 81258 abarth 2011-02-10 01:30:10 -0800 Comment on attachment 81258 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=81258&action=review Can you post the style cleanups in a separate patch? It's difficult to see what the actual code change is in this patch. > Source/WebCore/platform/KURLGoogle.cpp:66 > - // The encoding parameter may be NULL, but in this case the object must not > + // The encoding parameter may be null, but in this case the object must not NULL => 0 349354 8 ctruta 2011-02-10 13:58:38 -0800 (In reply to comment #7) > Can you post the style cleanups in a separate patch? It's difficult to see what the actual code change is in this patch. Done. It's bug 54228. I saw that you noticed it already. > > Source/WebCore/platform/KURLGoogle.cpp:66 > > - // The encoding parameter may be NULL, but in this case the object must not > > + // The encoding parameter may be null, but in this case the object must not > > NULL => 0 Also done. I removed null from everywhere except for comments that concern URLs and strings. 349388 9 81258 levin 2011-02-10 14:38:40 -0800 Comment on attachment 81258 Patch r- as Adam mentioned re separating out the massive style change. 349395 10 ctruta 2011-02-10 14:45:23 -0800 (In reply to comment #9) > r- as Adam mentioned re separating out the massive style change. I will prepare another patch as soon as Adam (or someone else) reviews the style fix in bug 54228. 349555 11 82085 ctruta 2011-02-10 18:43:42 -0800 Created attachment 82085 Patch 349603 12 82085 abarth 2011-02-10 20:48:01 -0800 Comment on attachment 82085 Patch Ah. Looks great. 349606 13 abarth 2011-02-10 20:49:18 -0800 > Maybe a real WebKit reviewer has an idea for if there is a better method more commonly used in WebKit for this kind of thing. But this looks good to me. We usually put the body of the templated function in the header, but if this works, its fine. We can always move the function later if we need to. 349632 14 82099 ctruta 2011-02-10 21:35:08 -0800 Created attachment 82099 Reworked patch (In reply to comment #13) > We usually put the body of the templated function in the header, but if this works, its fine. We can always move the function later if we need to. Thank you for the r+, Adam, but now I'm thinking: Would it not be better to clearly indicate that the template is only a helper, not to be called from the outside (hence no template body in the header), and name it the same way in which googleurl internal helpers are named? I renamed the template helper to doInit, and I added a comment in KURLGooglePrivate.h about its internal-only use. Should it ever need to be used from outside, then it can be renamed back to init, and moved to the header. I also fixed another bunch of comment typos along the way. 349634 15 webkit.review.bot 2011-02-10 21:37:00 -0800 Attachment 82099 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files']" exit_code: 1 Total errors found: 0 in 0 files If any of these errors are false positives, please file a bug against check-webkit-style. 349635 16 82100 ctruta 2011-02-10 21:46:32 -0800 Created attachment 82100 Reworked patch Oops, clicked on the wrong file name to attach, by mistake. 349641 17 82100 abarth 2011-02-10 22:06:25 -0800 Comment on attachment 82100 Reworked patch doInit isn't the correct name for this function. WebKit functions never start with the word "do". It's almost always redundant. I liked the previous patch better. 349645 18 82103 ctruta 2011-02-10 22:21:23 -0800 Created attachment 82103 Patch (In reply to comment #17) > doInit isn't the correct name for this function. WebKit functions never start with the word "do". It's almost always redundant. I liked the previous patch better. I understand. I'm attaching the old patch, but with the comment fixes in. 349646 19 82104 ctruta 2011-02-10 22:25:47 -0800 Created attachment 82104 Patch Oops, another typo (this one was introduced by me). It's getting late... 349671 20 82104 commit-queue 2011-02-11 00:14:24 -0800 Comment on attachment 82104 Patch Clearing flags on attachment: 82104 Committed r78319: <http://trac.webkit.org/changeset/78319> 349672 21 commit-queue 2011-02-11 00:14:29 -0800 All reviewed patches have been landed. Closing bug. 81175 2011-02-03 19:46:04 -0800 2011-02-04 11:47:11 -0800 Patch wk53749.diff.submit text/plain 3904 ctruta ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4ODhlMWFlLi42YWI4MWFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMDItMDMgIENvc21pbiBUcnV0YSAgPGN0cnV0YUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVtcGxhdGl6ZSBL VVJMR29vZ2xlUHJpdmF0ZTo6aW5pdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTM3NDkKKworICAgICAgICBObyBuZXcgdGVzdHMuIE5vIGJlaGF2aW9y YWwgY2hhbmdlLgorCisgICAgICAgICogcGxhdGZvcm0vS1VSTEdvb2dsZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpLVVJMR29vZ2xlUHJpdmF0ZTo6aW5pdCk6CisgICAgICAgICogcGxhdGZvcm0v S1VSTEdvb2dsZVByaXZhdGUuaDoKKwogMjAxMS0wMi0wMyAgUGF2ZWwgUG9kaXZpbG92ICA8cG9k aXZpbG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFu LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTEdvb2dsZS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlLmNwcAppbmRleCA2ZDYzNzM0Li43ZTRk MTc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlLmNwcApAQCAtMTk0LDggKzE5 NCw4IEBAIHZvaWQgS1VSTEdvb2dsZVByaXZhdGU6OmluaXQoY29uc3QgS1VSTCYgYmFzZSwKICAg ICBpbml0KGJhc2UsIHJlbGF0aXZlLmNoYXJhY3RlcnMoKSwgcmVsYXRpdmUubGVuZ3RoKCksIHF1 ZXJ5RW5jb2RpbmcpOwogfQogCi0vLyBOb3RlOiBjb2RlIG1vc3RseSBkdXBsaWNhdGVkIGJlbG93 Lgotdm9pZCBLVVJMR29vZ2xlUHJpdmF0ZTo6aW5pdChjb25zdCBLVVJMJiBiYXNlLCBjb25zdCBj aGFyKiByZWwsIGludCByZWxMZW5ndGgsCit0ZW1wbGF0ZSA8dHlwZW5hbWUgQ0hBUj4KK3ZvaWQg S1VSTEdvb2dsZVByaXZhdGU6OmluaXQoY29uc3QgS1VSTCYgYmFzZSwgY29uc3QgQ0hBUiogcmVs LCBpbnQgcmVsTGVuZ3RoLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBUZXh0 RW5jb2RpbmcqIHF1ZXJ5RW5jb2RpbmcpCiB7CiAgICAgLy8gQXMgYSBwZXJmb3JtYW5jZSBvcHRp bWl6YXRpb24sIHdlIGRvIG5vdCB1c2UgdGhlIGNoYXJzZXQgY29udmVydGVyIGlmCkBAIC0yMzgs MzIgKzIzOCw2IEBAIHZvaWQgS1VSTEdvb2dsZVByaXZhdGU6OmluaXQoY29uc3QgS1VSTCYgYmFz ZSwgY29uc3QgY2hhciogcmVsLCBpbnQgcmVsTGVuZ3RoLAogICAgIH0KIH0KIAotLy8gTm90ZTog Y29kZSBtb3N0bHkgZHVwbGljYXRlZCBhYm92ZS4gU2VlIEZJWE1FcyBhbmQgY29tbWVudHMgdGhl cmUuCi12b2lkIEtVUkxHb29nbGVQcml2YXRlOjppbml0KGNvbnN0IEtVUkwmIGJhc2UsIGNvbnN0 IFVDaGFyKiByZWwsIGludCByZWxMZW5ndGgsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IFRleHRFbmNvZGluZyogcXVlcnlFbmNvZGluZykKLXsKLSAgICBLVVJMQ2hhcnNldENv bnZlcnRlciBjaGFyc2V0Q29udmVydGVyT2JqZWN0KHF1ZXJ5RW5jb2RpbmcpOwotICAgIEtVUkxD aGFyc2V0Q29udmVydGVyKiBjaGFyc2V0Q29udmVydGVyID0KLSAgICAgICAgKCFxdWVyeUVuY29k aW5nIHx8IGlzVW5pY29kZUVuY29kaW5nKHF1ZXJ5RW5jb2RpbmcpKSA/IDAgOgotICAgICAgICAm Y2hhcnNldENvbnZlcnRlck9iamVjdDsKLQotICAgIHVybF9jYW5vbjo6UmF3Q2Fub25PdXRwdXRU PGNoYXI+IG91dHB1dDsKLSAgICBjb25zdCBDU3RyaW5nJiBiYXNlU3RyID0gYmFzZS5tX3VybC51 dGY4U3RyaW5nKCk7Ci0gICAgbV9pc1ZhbGlkID0gdXJsX3V0aWw6OlJlc29sdmVSZWxhdGl2ZShi YXNlU3RyLmRhdGEoKSwgYmFzZVN0ci5sZW5ndGgoKSwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGJhc2UubV91cmwubV9wYXJzZWQsIHJlbCwgcmVsTGVuZ3RoLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2hhcnNldENvbnZlcnRl ciwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZvdXRwdXQsICZt X3BhcnNlZCk7Ci0KLQotICAgIGlmIChtX2lzVmFsaWQgfHwgb3V0cHV0Lmxlbmd0aCgpKSB7Ci0g ICAgICAgIGlmIChtX3BhcnNlZC5yZWYuaXNfbm9uZW1wdHkoKSkKLSAgICAgICAgICAgIHNldFV0 ZjgoQ1N0cmluZyhvdXRwdXQuZGF0YSgpLCBvdXRwdXQubGVuZ3RoKCkpKTsKLSAgICAgICAgZWxz ZQotICAgICAgICAgICAgc2V0QXNjaWkoQ1N0cmluZyhvdXRwdXQuZGF0YSgpLCBvdXRwdXQubGVu Z3RoKCkpKTsKLSAgICB9IGVsc2UKLSAgICAgICAgc2V0VXRmOChDU3RyaW5nKCIiLCAwKSk7Ci19 Ci0KIHZvaWQgS1VSTEdvb2dsZVByaXZhdGU6OmluaXRQcm90b2NvbEluSFRUUEZhbWlseSgpCiB7 CiAgICAgaWYgKCFtX2lzVmFsaWQpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL0tVUkxHb29nbGVQcml2YXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29v Z2xlUHJpdmF0ZS5oCmluZGV4IGM3MWU1NmIuLjVhNmQzNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGVQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vS1VSTEdvb2dsZVByaXZhdGUuaApAQCAtNTUsMTMgKzU1LDEyIEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBpbml0KGNvbnN0IEtVUkwmIGJhc2UsIGNvbnN0IFN0 cmluZyYgcmVsYXRpdmUsCiAgICAgICAgICAgICAgICAgICBjb25zdCBUZXh0RW5jb2RpbmcqIHF1 ZXJ5RW5jb2RpbmcpOwogCi0gICAgICAgIC8vIEJhY2tlbmQgaW5pdGlhbGl6ZXJzLiBUaGUgcXVl cnkgZW5jb2RpbmcgcGFyYW1ldGVycyBhcmUgb3B0aW9uYWwgYW5kIGNhbgotICAgICAgICAvLyBi ZSBOVUxMICh0aGlzIGltcGxpZXMgVVRGLTgpLiBUaGVzZSBpbml0aWFsaXplcnMgcmVxdWlyZSB0 aGF0IHRoZSBvYmplY3QKKyAgICAgICAgLy8gQmFja2VuZCBpbml0aWFsaXplci4gVGhlIHF1ZXJ5 IGVuY29kaW5nIHBhcmFtZXRlcnMgYXJlIG9wdGlvbmFsIGFuZCBjYW4KKyAgICAgICAgLy8gYmUg TlVMTCAodGhpcyBpbXBsaWVzIFVURi04KS4gVGhpcyBpbml0aWFsaXplciByZXF1aXJlcyB0aGF0 IHRoZSBvYmplY3QKICAgICAgICAgLy8gaGFzIGp1c3QgYmVlbiBjcmVhdGVkIGFuZCB0aGUgc3Ry aW5ncyBhcmUgTlVMTC4gRG8gbm90IGNhbGwgb24gYW4KICAgICAgICAgLy8gYWxyZWFkeS1jb25z dHJ1Y3RlZCBvYmplY3QuCi0gICAgICAgIHZvaWQgaW5pdChjb25zdCBLVVJMJiBiYXNlLCBjb25z dCBjaGFyKiByZWwsIGludCByZWxMZW5ndGgsCi0gICAgICAgICAgICAgICAgICBjb25zdCBUZXh0 RW5jb2RpbmcqIHF1ZXJ5RW5jb2RpbmcpOwotICAgICAgICB2b2lkIGluaXQoY29uc3QgS1VSTCYg YmFzZSwgY29uc3QgVUNoYXIqIHJlbCwgaW50IHJlbExlbmd0aCwKKyAgICAgICAgdGVtcGxhdGUg PHR5cGVuYW1lIENIQVI+CisgICAgICAgIHZvaWQgaW5pdChjb25zdCBLVVJMJiBiYXNlLCBjb25z dCBDSEFSKiByZWwsIGludCByZWxMZW5ndGgsCiAgICAgICAgICAgICAgICAgICBjb25zdCBUZXh0 RW5jb2RpbmcqIHF1ZXJ5RW5jb2RpbmcpOwogCiAgICAgICAgIC8vIERvZXMgYSBkZWVwIGNvcHkg dG8gdGhlIGdpdmVuIG91dHB1dCBvYmplY3QuCg== 81258 2011-02-04 11:47:11 -0800 2011-02-10 18:43:42 -0800 Patch wk53749.diff.submit text/plain 10656 ctruta ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4ODhlMWFlLi4xYWFmNjBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTEtMDItMDQgIENvc21pbiBUcnV0YSAgPGN0cnV0YUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVtcGxhdGl6ZSBL VVJMR29vZ2xlUHJpdmF0ZTo6aW5pdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTM3NDkKKworICAgICAgICBBbHNvIHJlcGxhY2Ugb2NjdXJyZW5jZXMg b2YgTlVMTCB3aXRoIDAsICdcMCcgb3IgbnVsbCAoYXMgYXBwbGljYWJsZSksCisgICAgICAgIHRv IGFwcGVhc2UgY2hlY2std2Via2l0LXN0eWxlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gTm8g YmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogcGxhdGZvcm0vS1VSTEdvb2dsZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpLVVJMR29vZ2xlUHJpdmF0ZTo6aW5pdCk6CisgICAgICAgICogcGxh dGZvcm0vS1VSTEdvb2dsZVByaXZhdGUuaDoKKwogMjAxMS0wMi0wMyAgUGF2ZWwgUG9kaXZpbG92 ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBG ZWxkbWFuLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTEdvb2dsZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlLmNwcAppbmRleCA2ZDYzNzM0 Li5hZmNiN2UyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlLmNwcApAQCAtNjMs NyArNjMsNyBAQCBzdGF0aWMgY29uc3QgaW50IGludmFsaWRQb3J0TnVtYmVyID0gMHhGRkZGOwog Ly8gY2Fub25pY2FsaXplci4KIGNsYXNzIEtVUkxDaGFyc2V0Q29udmVydGVyIDogcHVibGljIHVy bF9jYW5vbjo6Q2hhcnNldENvbnZlcnRlciB7CiBwdWJsaWM6Ci0gICAgLy8gVGhlIGVuY29kaW5n IHBhcmFtZXRlciBtYXkgYmUgTlVMTCwgYnV0IGluIHRoaXMgY2FzZSB0aGUgb2JqZWN0IG11c3Qg bm90CisgICAgLy8gVGhlIGVuY29kaW5nIHBhcmFtZXRlciBtYXkgYmUgbnVsbCwgYnV0IGluIHRo aXMgY2FzZSB0aGUgb2JqZWN0IG11c3Qgbm90CiAgICAgLy8gYmUgY2FsbGVkLgogICAgIEtVUkxD aGFyc2V0Q29udmVydGVyKGNvbnN0IFRleHRFbmNvZGluZyogZW5jb2RpbmcpCiAgICAgICAgIDog bV9lbmNvZGluZyhlbmNvZGluZykKQEAgLTk2LDggKzk2LDggQEAgc3RhdGljIGlubGluZSB2b2lk IGFzc2VydFByb3RvY29sSXNHb29kKGNvbnN0IGNoYXIqIHByb3RvY29sKQogfQogCiAvLyBSZXR1 cm5zIHRoZSBjaGFyYWN0ZXJzIGZvciB0aGUgZ2l2ZW4gc3RyaW5nLCBvciBhIHBvaW50ZXIgdG8g YSBzdGF0aWMgZW1wdHkKLS8vIHN0cmluZyBpZiB0aGUgaW5wdXQgc3RyaW5nIGlzIE5VTEwuIFRo aXMgd2lsbCBhbHdheXMgZW5zdXJlIHdlIGhhdmUgYSBub24tCi0vLyBOVUxMIGNoYXJhY3RlciBw b2ludGVyIHNpbmNlIFJlcGxhY2VDb21wb25lbnRzIGhhcyBzcGVjaWFsIG1lYW5pbmcgZm9yIE5V TEwuCisvLyBzdHJpbmcgaWYgdGhlIGlucHV0IHN0cmluZyBpcyBudWxsLiBUaGlzIHdpbGwgYWx3 YXlzIGVuc3VyZSB3ZSBoYXZlIGEgbm9uLQorLy8gbnVsbCBjaGFyYWN0ZXIgcG9pbnRlciBzaW5j ZSBSZXBsYWNlQ29tcG9uZW50cyBoYXMgc3BlY2lhbCBtZWFuaW5nIGZvciBudWxsLgogc3RhdGlj IGlubGluZSBjb25zdCB1cmxfcGFyc2U6OlVURjE2Q2hhciogQ2hhcmFjdGVyc09yRW1wdHkoY29u c3QgU3RyaW5nJiBzdHIpCiB7CiAgICAgc3RhdGljIGNvbnN0IHVybF9wYXJzZTo6VVRGMTZDaGFy IHplcm8gPSAwOwpAQCAtMTk0LDggKzE5NCw4IEBAIHZvaWQgS1VSTEdvb2dsZVByaXZhdGU6Omlu aXQoY29uc3QgS1VSTCYgYmFzZSwKICAgICBpbml0KGJhc2UsIHJlbGF0aXZlLmNoYXJhY3RlcnMo KSwgcmVsYXRpdmUubGVuZ3RoKCksIHF1ZXJ5RW5jb2RpbmcpOwogfQogCi0vLyBOb3RlOiBjb2Rl IG1vc3RseSBkdXBsaWNhdGVkIGJlbG93Lgotdm9pZCBLVVJMR29vZ2xlUHJpdmF0ZTo6aW5pdChj b25zdCBLVVJMJiBiYXNlLCBjb25zdCBjaGFyKiByZWwsIGludCByZWxMZW5ndGgsCit0ZW1wbGF0 ZSA8dHlwZW5hbWUgQ0hBUj4KK3ZvaWQgS1VSTEdvb2dsZVByaXZhdGU6OmluaXQoY29uc3QgS1VS TCYgYmFzZSwgY29uc3QgQ0hBUiogcmVsLCBpbnQgcmVsTGVuZ3RoLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBjb25zdCBUZXh0RW5jb2RpbmcqIHF1ZXJ5RW5jb2RpbmcpCiB7CiAgICAg Ly8gQXMgYSBwZXJmb3JtYW5jZSBvcHRpbWl6YXRpb24sIHdlIGRvIG5vdCB1c2UgdGhlIGNoYXJz ZXQgY29udmVydGVyIGlmCkBAIC0yMzMsMzcgKzIzMywxMSBAQCB2b2lkIEtVUkxHb29nbGVQcml2 YXRlOjppbml0KGNvbnN0IEtVUkwmIGJhc2UsIGNvbnN0IGNoYXIqIHJlbCwgaW50IHJlbExlbmd0 aCwKICAgICAgICAgZWxzZQogICAgICAgICAgICAgc2V0QXNjaWkoQ1N0cmluZyhvdXRwdXQuZGF0 YSgpLCBvdXRwdXQubGVuZ3RoKCkpKTsKICAgICB9IGVsc2UgewotICAgICAgICAvLyBXZWJDb3Jl IGV4cGVjdHMgcmVzb2x2ZWQgVVJMcyB0byBiZSBlbXB0eSByYXRoZXIgdGhhbiBOVUxMLgorICAg ICAgICAvLyBXZWJDb3JlIGV4cGVjdHMgcmVzb2x2ZWQgVVJMcyB0byBiZSBlbXB0eSByYXRoZXIg dGhhbiBudWxsLgogICAgICAgICBzZXRVdGY4KENTdHJpbmcoIiIsIDApKTsKICAgICB9CiB9CiAK LS8vIE5vdGU6IGNvZGUgbW9zdGx5IGR1cGxpY2F0ZWQgYWJvdmUuIFNlZSBGSVhNRXMgYW5kIGNv bW1lbnRzIHRoZXJlLgotdm9pZCBLVVJMR29vZ2xlUHJpdmF0ZTo6aW5pdChjb25zdCBLVVJMJiBi YXNlLCBjb25zdCBVQ2hhciogcmVsLCBpbnQgcmVsTGVuZ3RoLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjb25zdCBUZXh0RW5jb2RpbmcqIHF1ZXJ5RW5jb2RpbmcpCi17Ci0gICAgS1VS TENoYXJzZXRDb252ZXJ0ZXIgY2hhcnNldENvbnZlcnRlck9iamVjdChxdWVyeUVuY29kaW5nKTsK LSAgICBLVVJMQ2hhcnNldENvbnZlcnRlciogY2hhcnNldENvbnZlcnRlciA9Ci0gICAgICAgICgh cXVlcnlFbmNvZGluZyB8fCBpc1VuaWNvZGVFbmNvZGluZyhxdWVyeUVuY29kaW5nKSkgPyAwIDoK LSAgICAgICAgJmNoYXJzZXRDb252ZXJ0ZXJPYmplY3Q7Ci0KLSAgICB1cmxfY2Fub246OlJhd0Nh bm9uT3V0cHV0VDxjaGFyPiBvdXRwdXQ7Ci0gICAgY29uc3QgQ1N0cmluZyYgYmFzZVN0ciA9IGJh c2UubV91cmwudXRmOFN0cmluZygpOwotICAgIG1faXNWYWxpZCA9IHVybF91dGlsOjpSZXNvbHZl UmVsYXRpdmUoYmFzZVN0ci5kYXRhKCksIGJhc2VTdHIubGVuZ3RoKCksCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBiYXNlLm1fdXJsLm1fcGFyc2VkLCByZWwsIHJl bExlbmd0aCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNoYXJz ZXRDb252ZXJ0ZXIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAm b3V0cHV0LCAmbV9wYXJzZWQpOwotCi0KLSAgICBpZiAobV9pc1ZhbGlkIHx8IG91dHB1dC5sZW5n dGgoKSkgewotICAgICAgICBpZiAobV9wYXJzZWQucmVmLmlzX25vbmVtcHR5KCkpCi0gICAgICAg ICAgICBzZXRVdGY4KENTdHJpbmcob3V0cHV0LmRhdGEoKSwgb3V0cHV0Lmxlbmd0aCgpKSk7Ci0g ICAgICAgIGVsc2UKLSAgICAgICAgICAgIHNldEFzY2lpKENTdHJpbmcob3V0cHV0LmRhdGEoKSwg b3V0cHV0Lmxlbmd0aCgpKSk7Ci0gICAgfSBlbHNlCi0gICAgICAgIHNldFV0ZjgoQ1N0cmluZygi IiwgMCkpOwotfQotCiB2b2lkIEtVUkxHb29nbGVQcml2YXRlOjppbml0UHJvdG9jb2xJbkhUVFBG YW1pbHkoKQogewogICAgIGlmICghbV9pc1ZhbGlkKSB7CkBAIC0yOTUsOCArMjY5LDggQEAgdm9p ZCBLVVJMR29vZ2xlUHJpdmF0ZTo6Y29weVRvKEtVUkxHb29nbGVQcml2YXRlKiBkZXN0KSBjb25z dAogU3RyaW5nIEtVUkxHb29nbGVQcml2YXRlOjpjb21wb25lbnRTdHJpbmcoY29uc3QgdXJsX3Bh cnNlOjpDb21wb25lbnQmIGNvbXApIGNvbnN0CiB7CiAgICAgaWYgKCFtX2lzVmFsaWQgfHwgY29t cC5sZW4gPD0gMCkgewotICAgICAgICAvLyBLVVJMIHJldHVybnMgYSBOVUxMIHN0cmluZyBpZiB0 aGUgVVJMIGlzIGl0c2VsZiBhIE5VTEwgc3RyaW5nLCBhbmQgYW4KLSAgICAgICAgLy8gZW1wdHkg c3RyaW5nIGZvciBvdGhlciBub25leGlzdGFudCBlbnRpdGllcy4KKyAgICAgICAgLy8gS1VSTCBy ZXR1cm5zIGEgbnVsbCBzdHJpbmcgaWYgdGhlIFVSTCBpcyBpdHNlbGYgYSBudWxsIHN0cmluZywg YW5kIGFuCisgICAgICAgIC8vIGVtcHR5IHN0cmluZyBmb3Igb3RoZXIgbm9uZXhpc3RlbnQgZW50 aXRpZXMuCiAgICAgICAgIGlmICh1dGY4U3RyaW5nKCkuaXNOdWxsKCkpCiAgICAgICAgICAgICBy ZXR1cm4gU3RyaW5nKCk7CiAgICAgICAgIHJldHVybiBTdHJpbmcoIiIsIDApOwpAQCAtMzMwLDkg KzMwNCw5IEBAIHZvaWQgS1VSTEdvb2dsZVByaXZhdGU6OnJlcGxhY2VDb21wb25lbnRzKGNvbnN0 IFJlcGxhY2VtZW50cyYgcmVwbGFjZW1lbnRzKQogY29uc3QgU3RyaW5nJiBLVVJMR29vZ2xlUHJp dmF0ZTo6c3RyaW5nKCkgY29uc3QKIHsKICAgICBpZiAoIW1fc3RyaW5nSXNWYWxpZCkgewotICAg ICAgICAvLyBNdXN0IHNwZWNpYWwgY2FzZSB0aGUgTlVMTCBjYXNlLCBzaW5jZSBjb25zdHJ1Y3Rp bmcgdGhlCi0gICAgICAgIC8vIHN0cmluZyBsaWtlIHdlIGRvIGJlbG93IHdpbGwgZ2VuZXJhdGUg YW4gZW1wdHkgcmF0aGVyIHRoYW4KLSAgICAgICAgLy8gYSBOVUxMIHN0cmluZy4KKyAgICAgICAg Ly8gSGFuZGxlIHRoZSBudWxsIGNhc2Ugc2VwYXJhdGVseS4gT3RoZXJ3aXNlLCBjb25zdHJ1Y3Rp bmcKKyAgICAgICAgLy8gdGhlIHN0cmluZyBsaWtlIHdlIGRvIGJlbG93IHdvdWxkIGdlbmVyYXRl IHRoZSBlbXB0eSBzdHJpbmcsCisgICAgICAgIC8vIG5vdCB0aGUgbnVsbCBzdHJpbmcuCiAgICAg ICAgIGlmIChtX3V0ZjguaXNOdWxsKCkpCiAgICAgICAgICAgICBtX3N0cmluZyA9IFN0cmluZygp OwogICAgICAgICBlbHNlIGlmIChtX3V0ZjhJc0FTQ0lJKQpAQCAtMzQ2LDkgKzMyMCw5IEBAIGNv bnN0IFN0cmluZyYgS1VSTEdvb2dsZVByaXZhdGU6OnN0cmluZygpIGNvbnN0CiAKIC8vIEtVUkwg LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tCiAKLS8vIENyZWF0ZXMgd2l0aCBOVUxMLXRlcm1pbmF0ZWQgc3RyaW5n IGlucHV0IHJlcHJlc2VudGluZyBhbiBhYnNvbHV0ZSBVUkwuCisvLyBDcmVhdGVzIHdpdGggbnVs bC10ZXJtaW5hdGVkIHN0cmluZyBpbnB1dCByZXByZXNlbnRpbmcgYW4gYWJzb2x1dGUgVVJMLgog Ly8gV2ViQ29yZSBnZW5lcmFsbHkgY2FsbHMgdGhpcyBvbmx5IHdpdGggaGFyZGNvZGVkIHN0cmlu Z3MsIHNvIHRoZSBpbnB1dCBpcwotLy8gQVNDSUkuIFdlIHRyZWF0IGlzIGFzIFVURi04IGp1c3Qg aW4gY2FzZS4KKy8vIEFTQ0lJLiBXZSB0cmVhdCBpdCBhcyBVVEYtOCBqdXN0IGluIGNhc2UuCiBL VVJMOjpLVVJMKFBhcnNlZFVSTFN0cmluZ1RhZywgY29uc3QgY2hhciAqdXJsKQogewogICAgIC8v IEZJWE1FIFRoZSBNYWMgY29kZSBjaGVja3MgZm9yIGJlZ2lubmluZyB3aXRoIGEgc2xhc2ggYW5k IGNvbnZlcnRpbmcgdG8gYQpAQCAtMzU2LDcgKzMzMCw3IEBAIEtVUkw6OktVUkwoUGFyc2VkVVJM U3RyaW5nVGFnLCBjb25zdCBjaGFyICp1cmwpCiAgICAgLy8gc3lzdGVtIGxpa2UgdGhhdC4KICAg ICBtX3VybC5pbml0KEtVUkwoKSwgdXJsLCBzdHJsZW4odXJsKSwgMCk7CiAKLSAgICAvLyBUaGUg b25lLWFyZ3VtZW50IGNvbnN0cnVjdG9ycyBzaG91bGQgbmV2ZXIgZ2VuZXJhdGUgYSBOVUxMIHN0 cmluZy4KKyAgICAvLyBUaGUgb25lLWFyZ3VtZW50IGNvbnN0cnVjdG9ycyBzaG91bGQgbmV2ZXIg Z2VuZXJhdGUgYSBudWxsIHN0cmluZy4KICAgICAvLyBUaGlzIGlzIGEgZnVubnkgcXVpcmsgb2Yg S1VSTC5jcHAgKHByb2JhYmx5IGEgYnVnKSB3aGljaCB3ZSBwcmVzZXJ2ZS4KICAgICBpZiAobV91 cmwudXRmOFN0cmluZygpLmlzTnVsbCgpKQogICAgICAgICBtX3VybC5zZXRBc2NpaShDU3RyaW5n KCIiLCAwKSk7CkBAIC0zNjUsNyArMzM5LDcgQEAgS1VSTDo6S1VSTChQYXJzZWRVUkxTdHJpbmdU YWcsIGNvbnN0IGNoYXIgKnVybCkKIC8vIEluaXRpYWxpemVzIHdpdGggYSBzdHJpbmcgcmVwcmVz ZW50aW5nIGFuIGFic29sdXRlIFVSTC4gTm8gZW5jb2RpbmcKIC8vIGluZm9ybWF0aW9uIGlzIHNw ZWNpZmllZC4gVGhpcyBnZW5lcmFsbHkgaGFwcGVucyB3aGVuIGEgS1VSTCBpcyBjb252ZXJ0ZWQK IC8vIHRvIGEgc3RyaW5nIGFuZCB0aGVuIGNvbnZlcnRlZCBiYWNrLiBJbiB0aGlzIGNhc2UsIHRo ZSBVUkwgaXMgYWxyZWFkeQotLy8gY2Fub25pY2FsIGFuZCBpbiBwcm9wZXIgZXNjYXBlZCBmb3Jt IHNvIG5lZWRzIG5vIGVuY29kaW5nLiBXZSB0cmVhdCBpdCB3YXMKKy8vIGNhbm9uaWNhbCBhbmQg aW4gcHJvcGVyIGVzY2FwZWQgZm9ybSBzbyBuZWVkcyBubyBlbmNvZGluZy4gV2UgdHJlYXQgaXQg YXMKIC8vIFVURi04IGp1c3QgaW4gY2FzZS4KIEtVUkw6OktVUkwoUGFyc2VkVVJMU3RyaW5nVGFn LCBjb25zdCBTdHJpbmcmIHVybCkKIHsKQEAgLTUzMyw4ICs1MDcsOCBAQCBTdHJpbmcgS1VSTDo6 dXNlcigpIGNvbnN0CiBTdHJpbmcgS1VSTDo6ZnJhZ21lbnRJZGVudGlmaWVyKCkgY29uc3QKIHsK ICAgICAvLyBFbXB0eSBidXQgcHJlc2VudCByZWZzICgiZm9vLmNvbS9iYXIjIikgc2hvdWxkIHJl c3VsdCBpbiB0aGUgZW1wdHkKLSAgICAvLyBzdHJpbmcsIHdoaWNoIG1fdXJsLmNvbXBvbmVudFN0 cmluZyB3aWxsIHByb2R1Y2UuIE5vbmV4aXN0YW50IHJlZnMgc2hvdWxkIGJlCi0gICAgLy8gdGhl IE5VTEwgc3RyaW5nLgorICAgIC8vIHN0cmluZywgd2hpY2ggbV91cmwuY29tcG9uZW50U3RyaW5n IHdpbGwgcHJvZHVjZS4gTm9uZXhpc3RlbnQgcmVmcworICAgIC8vIHNob3VsZCBiZSB0aGUgbnVs bCBzdHJpbmcuCiAgICAgaWYgKCFtX3VybC5tX3BhcnNlZC5yZWYuaXNfdmFsaWQoKSkKICAgICAg ICAgcmV0dXJuIFN0cmluZygpOwogCkBAIC03NDUsNyArNzE5LDcgQEAgdm9pZCBLVVJMOjpzZXRR dWVyeShjb25zdCBTdHJpbmcmIHF1ZXJ5KQogewogICAgIEtVUkxHb29nbGVQcml2YXRlOjpSZXBs YWNlbWVudHMgcmVwbGFjZW1lbnRzOwogICAgIGlmIChxdWVyeS5pc051bGwoKSkgewotICAgICAg ICAvLyBLVVJMLmNwcCBzZXRzIHRvIE5VTEwgdG8gY2xlYXIgYW55IHF1ZXJ5LgorICAgICAgICAv LyBLVVJMLmNwcCBzZXRzIHRvIG51bGwgdG8gY2xlYXIgYW55IHF1ZXJ5LgogICAgICAgICByZXBs YWNlbWVudHMuQ2xlYXJRdWVyeSgpOwogICAgIH0gZWxzZSBpZiAocXVlcnkubGVuZ3RoKCkgPiAw ICYmIHF1ZXJ5WzBdID09ICc/JykgewogICAgICAgICAvLyBXZWJDb3JlIGV4cGVjdHMgdGhlIHF1 ZXJ5IHN0cmluZyB0byBiZWdpbiB3aXRoIGEgcXVlc3Rpb24gbWFyaywgYnV0CkBAIC05NDYsNyAr OTIwLDcgQEAgU3RyaW5nIGRlY29kZVVSTEVzY2FwZVNlcXVlbmNlcyhjb25zdCBTdHJpbmcmIHN0 cikKIH0KIAogLy8gSW4gS1VSTC5jcHAncyBpbXBsZW1lbnRhdGlvbiwgdGhpcyBpcyBjYWxsZWQg YnkgZXZlcnkgY29tcG9uZW50IGdldHRlci4KLS8vIEl0IHdpbGwgdW5lc2NhcGUgZXZlcnkgY2hh cmFjdGVyLCBpbmNsdWRpbmcgTlVMTC4gVGhpcyBpcyBzY2FyeSwgYW5kIG1heQorLy8gSXQgd2ls bCB1bmVzY2FwZSBldmVyeSBjaGFyYWN0ZXIsIGluY2x1ZGluZyAnXDAnLiBUaGlzIGlzIHNjYXJ5 LCBhbmQgbWF5CiAvLyBjYXVzZSBzZWN1cml0eSBob2xlcy4gV2UgbmV2ZXIgY2FsbCB0aGlzIGZ1 bmN0aW9uIGZvciBjb21wb25lbnRzLCBhbmQKIC8vIGp1c3QgcmV0dXJuIHRoZSBBU0NJSSB2ZXJz aW9ucyBpbnN0ZWFkLgogLy8KQEAgLTEwMDUsMTAgKzk3OSwxMCBAQCBib29sIEtVUkw6OmlzTG9j YWxGaWxlKCkgY29uc3QKIC8vIHdpbGwgYXV0b21hdGljYWxseSBkbyB0aGUgY29ycmVjdCBlc2Nh cGluZywgdGhpcyBmdW5jdGlvbiBkb2VzIG5vdCBoYXZlIHRvCiAvLyBkbyBhbnkgd29yay4KIC8v Ci0vLyBUaGVyZSBpcyBhIHBvc3NpYmlsaXR5IHRoYXQgYSBmdXR1cmUgY2FsbGVkIG1heSB1c2Ug dGhpcyBmdW5jdGlvbiBpbiBvdGhlcgorLy8gVGhlcmUgaXMgYSBwb3NzaWJpbGl0eSB0aGF0IGEg ZnV0dXJlIGNhbGxlciBtYXkgdXNlIHRoaXMgZnVuY3Rpb24gaW4gb3RoZXIKIC8vIHdheXMsIGFu ZCBtYXkgZXhwZWN0IHRvIGdldCBhIHZhbGlkIFVSTCBzdHJpbmcuIFRoZSBkYW5nZXJvdXMgdGhp bmcgd2Ugd2FudAotLy8gdG8gcHJvdGVjdCBhZ2FpbnN0IGhlcmUgaXMgYWNjaWRlbnRhbGx5IGdl dHRpbmcgTlVMTHMgaW4gYSBzdHJpbmcgdGhhdCBpcwotLy8gbm90IHN1cHBvc2VkIHRvIGhhdmUg TlVMTHMuIFRoZXJlZm9yZSwgd2UgZXNjYXBlIE5VTExzIGhlcmUgdG8gcHJldmVudCB0aGlzLgor Ly8gdG8gcHJvdGVjdCBhZ2FpbnN0IGhlcmUgaXMgYWNjaWRlbnRhbGx5IGdldHRpbmcgJ1wwJyBj aGFyYWN0ZXJzIGluIGEgc3RyaW5nCisvLyB0aGF0IGlzIG5vdCBzdXBwb3NlZCB0byBoYXZlIHRo ZW0uIFRoZXJlZm9yZSwgd2UgZXNjYXBlIHRoZXNlIGNoYXJhY3RlcnMuCiBTdHJpbmcgZW5jb2Rl V2l0aFVSTEVzY2FwZVNlcXVlbmNlcyhjb25zdCBTdHJpbmcmIG5vdEVuY29kZWRTdHJpbmcpCiB7 CiAgICAgQ1N0cmluZyB1dGY4ID0gVVRGOEVuY29kaW5nKCkuZW5jb2RlKApAQCAtMTExNSw3ICsx MDg5LDcgQEAgYm9vbCBwcm90b2NvbElzKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBjaGFyKiBw cm90b2NvbCkKIAogICAgIC8vIENoZWNrIHRoZSBzY2hlbWUgbGlrZSBHVVJMIGRvZXMuCiAgICAg cmV0dXJuIHVybF91dGlsOjpGaW5kQW5kQ29tcGFyZVNjaGVtZSh1cmwuY2hhcmFjdGVycygpLCB1 cmwubGVuZ3RoKCksIAotICAgICAgICBwcm90b2NvbCwgTlVMTCk7IAorICAgICAgICBwcm90b2Nv bCwgMCk7CiB9CiAKIGlubGluZSBib29sIEtVUkw6OnByb3RvY29sSXMoY29uc3QgU3RyaW5nJiBz dHJpbmcsIGNvbnN0IGNoYXIqIHByb3RvY29sKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vS1VSTEdvb2dsZVByaXZhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tV UkxHb29nbGVQcml2YXRlLmgKaW5kZXggYzcxZTU2Yi4uMTQ4NDBhYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTEdvb2dsZVByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlUHJpdmF0ZS5oCkBAIC01NSwxMyArNTUsMTIgQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIGluaXQoY29uc3QgS1VSTCYgYmFzZSwgY29u c3QgU3RyaW5nJiByZWxhdGl2ZSwKICAgICAgICAgICAgICAgICAgIGNvbnN0IFRleHRFbmNvZGlu ZyogcXVlcnlFbmNvZGluZyk7CiAKLSAgICAgICAgLy8gQmFja2VuZCBpbml0aWFsaXplcnMuIFRo ZSBxdWVyeSBlbmNvZGluZyBwYXJhbWV0ZXJzIGFyZSBvcHRpb25hbCBhbmQgY2FuCi0gICAgICAg IC8vIGJlIE5VTEwgKHRoaXMgaW1wbGllcyBVVEYtOCkuIFRoZXNlIGluaXRpYWxpemVycyByZXF1 aXJlIHRoYXQgdGhlIG9iamVjdAotICAgICAgICAvLyBoYXMganVzdCBiZWVuIGNyZWF0ZWQgYW5k IHRoZSBzdHJpbmdzIGFyZSBOVUxMLiBEbyBub3QgY2FsbCBvbiBhbgorICAgICAgICAvLyBCYWNr ZW5kIGluaXRpYWxpemVyLiBUaGUgcXVlcnkgZW5jb2RpbmcgcGFyYW1ldGVycyBhcmUgb3B0aW9u YWwgYW5kIGNhbgorICAgICAgICAvLyBiZSBudWxsICh0aGlzIGltcGxpZXMgVVRGLTgpLiBUaGlz IGluaXRpYWxpemVyIHJlcXVpcmVzIHRoYXQgdGhlIG9iamVjdAorICAgICAgICAvLyBoYXMganVz dCBiZWVuIGNyZWF0ZWQgYW5kIHRoZSBzdHJpbmdzIGFyZSBudWxsLiBEbyBub3QgY2FsbCBvbiBh bgogICAgICAgICAvLyBhbHJlYWR5LWNvbnN0cnVjdGVkIG9iamVjdC4KLSAgICAgICAgdm9pZCBp bml0KGNvbnN0IEtVUkwmIGJhc2UsIGNvbnN0IGNoYXIqIHJlbCwgaW50IHJlbExlbmd0aCwKLSAg ICAgICAgICAgICAgICAgIGNvbnN0IFRleHRFbmNvZGluZyogcXVlcnlFbmNvZGluZyk7Ci0gICAg ICAgIHZvaWQgaW5pdChjb25zdCBLVVJMJiBiYXNlLCBjb25zdCBVQ2hhciogcmVsLCBpbnQgcmVs TGVuZ3RoLAorICAgICAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgQ0hBUj4KKyAgICAgICAgdm9pZCBp bml0KGNvbnN0IEtVUkwmIGJhc2UsIGNvbnN0IENIQVIqIHJlbCwgaW50IHJlbExlbmd0aCwKICAg ICAgICAgICAgICAgICAgIGNvbnN0IFRleHRFbmNvZGluZyogcXVlcnlFbmNvZGluZyk7CiAKICAg ICAgICAgLy8gRG9lcyBhIGRlZXAgY29weSB0byB0aGUgZ2l2ZW4gb3V0cHV0IG9iamVjdC4K 82085 2011-02-10 18:43:42 -0800 2011-02-10 21:35:08 -0800 Patch wk53749.diff.submit text/plain 3892 ctruta ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4MTVjODQ5Li5kOTZkMTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMDItMTAgIENvc21pbiBUcnV0YSAgPGN0cnV0YUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVtcGxhdGl6ZSBL VVJMR29vZ2xlUHJpdmF0ZTo6aW5pdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTM3NDkKKworICAgICAgICBObyBuZXcgdGVzdHMuIFRoaXMgaXMgcmVm YWN0b3JpbmcuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9LVVJMR29vZ2xlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OktVUkxHb29nbGVQcml2YXRlOjppbml0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9L VVJMR29vZ2xlUHJpdmF0ZS5oOgorCiAyMDExLTAyLTEwICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJv ZmZAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmcmV5IEdhcmVuLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTEdvb2dsZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlLmNwcAppbmRleCBjMWIzZTAxLi5kYjcxYzhiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlLmNwcApAQCAtMTkzLDggKzE5Myw4IEBA IHZvaWQgS1VSTEdvb2dsZVByaXZhdGU6OmluaXQoY29uc3QgS1VSTCYgYmFzZSwKICAgICBpbml0 KGJhc2UsIHJlbGF0aXZlLmNoYXJhY3RlcnMoKSwgcmVsYXRpdmUubGVuZ3RoKCksIHF1ZXJ5RW5j b2RpbmcpOwogfQogCi0vLyBOb3RlOiBjb2RlIG1vc3RseSBkdXBsaWNhdGVkIGJlbG93Lgotdm9p ZCBLVVJMR29vZ2xlUHJpdmF0ZTo6aW5pdChjb25zdCBLVVJMJiBiYXNlLCBjb25zdCBjaGFyKiBy ZWwsIGludCByZWxMZW5ndGgsCit0ZW1wbGF0ZSA8dHlwZW5hbWUgQ0hBUj4KK3ZvaWQgS1VSTEdv b2dsZVByaXZhdGU6OmluaXQoY29uc3QgS1VSTCYgYmFzZSwgY29uc3QgQ0hBUiogcmVsLCBpbnQg cmVsTGVuZ3RoLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBUZXh0RW5jb2Rp bmcqIHF1ZXJ5RW5jb2RpbmcpCiB7CiAgICAgLy8gQXMgYSBwZXJmb3JtYW5jZSBvcHRpbWl6YXRp b24sIHdlIGRvIG5vdCB1c2UgdGhlIGNoYXJzZXQgY29udmVydGVyIGlmCkBAIC0yMzcsMzIgKzIz Nyw2IEBAIHZvaWQgS1VSTEdvb2dsZVByaXZhdGU6OmluaXQoY29uc3QgS1VSTCYgYmFzZSwgY29u c3QgY2hhciogcmVsLCBpbnQgcmVsTGVuZ3RoLAogICAgIH0KIH0KIAotLy8gTm90ZTogY29kZSBt b3N0bHkgZHVwbGljYXRlZCBhYm92ZS4gU2VlIEZJWE1FcyBhbmQgY29tbWVudHMgdGhlcmUuCi12 b2lkIEtVUkxHb29nbGVQcml2YXRlOjppbml0KGNvbnN0IEtVUkwmIGJhc2UsIGNvbnN0IFVDaGFy KiByZWwsIGludCByZWxMZW5ndGgsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0 IFRleHRFbmNvZGluZyogcXVlcnlFbmNvZGluZykKLXsKLSAgICBLVVJMQ2hhcnNldENvbnZlcnRl ciBjaGFyc2V0Q29udmVydGVyT2JqZWN0KHF1ZXJ5RW5jb2RpbmcpOwotICAgIEtVUkxDaGFyc2V0 Q29udmVydGVyKiBjaGFyc2V0Q29udmVydGVyID0KLSAgICAgICAgKCFxdWVyeUVuY29kaW5nIHx8 IGlzVW5pY29kZUVuY29kaW5nKHF1ZXJ5RW5jb2RpbmcpKSA/IDAgOgotICAgICAgICAmY2hhcnNl dENvbnZlcnRlck9iamVjdDsKLQotICAgIHVybF9jYW5vbjo6UmF3Q2Fub25PdXRwdXRUPGNoYXI+ IG91dHB1dDsKLSAgICBjb25zdCBDU3RyaW5nJiBiYXNlU3RyID0gYmFzZS5tX3VybC51dGY4U3Ry aW5nKCk7Ci0gICAgbV9pc1ZhbGlkID0gdXJsX3V0aWw6OlJlc29sdmVSZWxhdGl2ZShiYXNlU3Ry LmRhdGEoKSwgYmFzZVN0ci5sZW5ndGgoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGJhc2UubV91cmwubV9wYXJzZWQsIHJlbCwgcmVsTGVuZ3RoLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2hhcnNldENvbnZlcnRlciwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZvdXRwdXQsICZtX3BhcnNl ZCk7Ci0KLQotICAgIGlmIChtX2lzVmFsaWQgfHwgb3V0cHV0Lmxlbmd0aCgpKSB7Ci0gICAgICAg IGlmIChtX3BhcnNlZC5yZWYuaXNfbm9uZW1wdHkoKSkKLSAgICAgICAgICAgIHNldFV0ZjgoQ1N0 cmluZyhvdXRwdXQuZGF0YSgpLCBvdXRwdXQubGVuZ3RoKCkpKTsKLSAgICAgICAgZWxzZQotICAg ICAgICAgICAgc2V0QXNjaWkoQ1N0cmluZyhvdXRwdXQuZGF0YSgpLCBvdXRwdXQubGVuZ3RoKCkp KTsKLSAgICB9IGVsc2UKLSAgICAgICAgc2V0VXRmOChDU3RyaW5nKCIiLCAwKSk7Ci19Ci0KIHZv aWQgS1VSTEdvb2dsZVByaXZhdGU6OmluaXRQcm90b2NvbEluSFRUUEZhbWlseSgpCiB7CiAgICAg aWYgKCFtX2lzVmFsaWQpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tV UkxHb29nbGVQcml2YXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlUHJp dmF0ZS5oCmluZGV4IGExNDM2YWUuLmRiNjkyNmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL0tVUkxHb29nbGVQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vS1VSTEdvb2dsZVByaXZhdGUuaApAQCAtNTUsMTMgKzU1LDEyIEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKICAgICAgICAgdm9pZCBpbml0KGNvbnN0IEtVUkwmIGJhc2UsIGNvbnN0IFN0cmluZyYg cmVsYXRpdmUsCiAgICAgICAgICAgICAgICAgICBjb25zdCBUZXh0RW5jb2RpbmcqIHF1ZXJ5RW5j b2RpbmcpOwogCi0gICAgICAgIC8vIEJhY2tlbmQgaW5pdGlhbGl6ZXJzLiBUaGUgcXVlcnkgZW5j b2RpbmcgcGFyYW1ldGVycyBhcmUgb3B0aW9uYWwgYW5kIGNhbgotICAgICAgICAvLyBiZSAwICh0 aGlzIGltcGxpZXMgVVRGLTgpLiBUaGVzZSBpbml0aWFsaXplcnMgcmVxdWlyZSB0aGF0IHRoZSBv YmplY3QKKyAgICAgICAgLy8gQmFja2VuZCBpbml0aWFsaXplci4gVGhlIHF1ZXJ5IGVuY29kaW5n IHBhcmFtZXRlcnMgYXJlIG9wdGlvbmFsIGFuZCBjYW4KKyAgICAgICAgLy8gYmUgMCAodGhpcyBp bXBsaWVzIFVURi04KS4gVGhpcyBpbml0aWFsaXplciByZXF1aXJlcyB0aGF0IHRoZSBvYmplY3QK ICAgICAgICAgLy8gaGFzIGp1c3QgYmVlbiBjcmVhdGVkIGFuZCB0aGUgc3RyaW5ncyBhcmUgbnVs bC4gRG8gbm90IGNhbGwgb24gYW4KICAgICAgICAgLy8gYWxyZWFkeS1jb25zdHJ1Y3RlZCBvYmpl Y3QuCi0gICAgICAgIHZvaWQgaW5pdChjb25zdCBLVVJMJiBiYXNlLCBjb25zdCBjaGFyKiByZWws IGludCByZWxMZW5ndGgsCi0gICAgICAgICAgICAgICAgICBjb25zdCBUZXh0RW5jb2RpbmcqIHF1 ZXJ5RW5jb2RpbmcpOwotICAgICAgICB2b2lkIGluaXQoY29uc3QgS1VSTCYgYmFzZSwgY29uc3Qg VUNoYXIqIHJlbCwgaW50IHJlbExlbmd0aCwKKyAgICAgICAgdGVtcGxhdGUgPHR5cGVuYW1lIENI QVI+CisgICAgICAgIHZvaWQgaW5pdChjb25zdCBLVVJMJiBiYXNlLCBjb25zdCBDSEFSKiByZWws IGludCByZWxMZW5ndGgsCiAgICAgICAgICAgICAgICAgICBjb25zdCBUZXh0RW5jb2RpbmcqIHF1 ZXJ5RW5jb2RpbmcpOwogCiAgICAgICAgIC8vIERvZXMgYSBkZWVwIGNvcHkgdG8gdGhlIGdpdmVu IG91dHB1dCBvYmplY3QuCg== 82099 2011-02-10 21:35:08 -0800 2011-02-10 21:46:32 -0800 Reworked patch test_png.svg text/plain 468 ctruta PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/Pgo8IURPQ1RZUEUgc3ZnIFBVQkxJ QyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9T VkcvMS4xL0RURC9zdmcxMS5kdGQiPgo8c3ZnCglzdHlsZT0iYmFja2dyb3VuZDpyZWQiCgl2ZXJz aW9uPSIxLjEiCgl4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCgl4bWxuczp4bGlu az0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIKPgoJPGcgaWQ9ImZvb2JhciI+CgkJPHJl Y3QgZmlsbD0iIzAwZiIgeD0iMTAiIHk9IjEwIiB3aWR0aD0iNTU0IiBoZWlnaHQ9IjMwMyIvPgoJ CTxpbWFnZSB4PSIyMCIgeT0iMjAiIHdpZHRoPSI1MzQiIGhlaWdodD0iMjgzIiB4bGluazpocmVm PSJzdmcuc3ZnIi8+Cgk8L2c+Cgk8dXNlIHg9IjAiIHk9IjMxMyIgeGxpbms6aHJlZj0iI2Zvb2Jh ciIvPgo8L3N2Zz4K 82100 2011-02-10 21:46:32 -0800 2011-02-10 22:21:23 -0800 Reworked patch wk53749.diff.submit text/plain 7162 ctruta ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4MTVjODQ5Li45MWYxNzZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTEtMDItMTAgIENvc21pbiBUcnV0YSAgPGN0cnV0YUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVtcGxhdGl6ZSBL VVJMR29vZ2xlUHJpdmF0ZTo6aW5pdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTM3NDkKKworICAgICAgICBJbiBhZGRpdGlvbiB0byB0ZW1wbGF0aXph dGlvbiwgdGhpcyBtZXRob2Qgd2FzIHJlbmFtZWQgdG8gZG9Jbml0LAorICAgICAgICB0byBpbmRp Y2F0ZSB0aGF0IGl0IGlzIGFuIGludGVybmFsIG1ldGhvZC4gVGhpcyBmb2xsb3dzIHRoZSBuYW1p bmcKKyAgICAgICAgY29udmVudGlvbiB1c2VkIGJ5IGdvb2dsZXVybC4KKworICAgICAgICBObyBu ZXcgdGVzdHMuIFJlZmFjdG9yaW5nLgorCisgICAgICAgICogcGxhdGZvcm0vS1VSTEdvb2dsZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpLVVJMR29vZ2xlUHJpdmF0ZTo6ZG9Jbml0KToKKyAgICAg ICAgVGhpcyBpcyB0aGUgbmV3IG5hbWUgb2YgdGhlIGJhY2tlbmQgaW5pdGlhbGl6ZXIsIGZvcm1l cmx5IGFuIG92ZXJsb2FkIG9mIEtVUkxHb29nbGVQcml2YXRlOjppbml0LgorICAgICAgICAoV2Vi Q29yZTo6S1VSTEdvb2dsZVByaXZhdGU6OmluaXQpOiBDYWxsIHNpdGUgZm9yIEtVUkxHb29nbGVQ cml2YXRlOjpkb0luaXQ8VUNoYXI+LgorICAgICAgICAoV2ViQ29yZTo6S1VSTDo6S1VSTCk6IENh bGwgc2l0ZSBmb3IgS1VSTEdvb2dsZVByaXZhdGU6OmRvSW5pdDxjaGFyPi4KKyAgICAgICAgKiBw bGF0Zm9ybS9LVVJMR29vZ2xlUHJpdmF0ZS5oOgorCiAyMDExLTAyLTEwICBNaWNoYWVsIFNhYm9m ZiAgPG1zYWJvZmZAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmcmV5IEdh cmVuLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTEdvb2dsZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlLmNwcAppbmRleCBjMWIzZTAxLi45 ZWY5OGMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlLmNwcApAQCAtMTkwLDE4 ICsxOTAsMTggQEAgdm9pZCBLVVJMR29vZ2xlUHJpdmF0ZTo6aW5pdChjb25zdCBLVVJMJiBiYXNl LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBTdHJpbmcmIHJlbGF0aXZlLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBUZXh0RW5jb2RpbmcqIHF1ZXJ5RW5j b2RpbmcpCiB7Ci0gICAgaW5pdChiYXNlLCByZWxhdGl2ZS5jaGFyYWN0ZXJzKCksIHJlbGF0aXZl Lmxlbmd0aCgpLCBxdWVyeUVuY29kaW5nKTsKKyAgICBkb0luaXQoYmFzZSwgcmVsYXRpdmUuY2hh cmFjdGVycygpLCByZWxhdGl2ZS5sZW5ndGgoKSwgcXVlcnlFbmNvZGluZyk7CiB9CiAKLS8vIE5v dGU6IGNvZGUgbW9zdGx5IGR1cGxpY2F0ZWQgYmVsb3cuCi12b2lkIEtVUkxHb29nbGVQcml2YXRl Ojppbml0KGNvbnN0IEtVUkwmIGJhc2UsIGNvbnN0IGNoYXIqIHJlbCwgaW50IHJlbExlbmd0aCwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgVGV4dEVuY29kaW5nKiBxdWVyeUVu Y29kaW5nKQordGVtcGxhdGUgPHR5cGVuYW1lIENIQVI+Cit2b2lkIEtVUkxHb29nbGVQcml2YXRl Ojpkb0luaXQoY29uc3QgS1VSTCYgYmFzZSwgY29uc3QgQ0hBUiogcmVsLCBpbnQgcmVsTGVuZ3Ro LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFRleHRFbmNvZGluZyogcXVl cnlFbmNvZGluZykKIHsKLSAgICAvLyBBcyBhIHBlcmZvcm1hbmNlIG9wdGltaXphdGlvbiwgd2Ug ZG8gbm90IHVzZSB0aGUgY2hhcnNldCBjb252ZXJ0ZXIgaWYKLSAgICAvLyBlbmNvZGluZyBpcyBV VEYtOCBvciBvdGhlciBVbmljb2RlIGVuY29kaW5ncy4gTm90ZSB0aGF0IHRoaXMgaXMKLSAgICAv LyBwZXIgSFRNTDUgMi41LjMgKHJlc29sdmluZyBVUkwpLiBUaGUgVVJMIGNhbm9uaWNhbGl6ZXIg d2lsbCBiZQotICAgIC8vIG1vcmUgZWZmaWNpZW50IHdpdGggbm8gY2hhcnNldCBjb252ZXJ0ZXIg b2JqZWN0IGJlY2F1c2UgaXQKLSAgICAvLyBjYW4gZG8gVVRGLTggaW50ZXJuYWxseSB3aXRoIG5v IGV4dHJhIGNvcGllcy4KKyAgICAvLyBBcyBhIHBlcmZvcm1hbmNlIG9wdGltaXphdGlvbiwgd2Ug ZG8gbm90IHVzZSB0aGUgY2hhcnNldCBjb252ZXJ0ZXIKKyAgICAvLyBpZiBlbmNvZGluZyBpcyBV VEYtOCBvciBvdGhlciBVbmljb2RlIGVuY29kaW5ncy4gTm90ZSB0aGF0IHRoaXMgaXMKKyAgICAv LyBwZXIgSFRNTDUgMi41LjMgKHJlc29sdmluZyBVUkwpLiBUaGUgVVJMIGNhbm9uaWNhbGl6ZXIg d2lsbCBiZSBtb3JlCisgICAgLy8gZWZmaWNpZW50IHdpdGggbm8gY2hhcnNldCBjb252ZXJ0ZXIg b2JqZWN0IGJlY2F1c2UgY2FuIGRvIFVURi04CisgICAgLy8gaW50ZXJuYWxseSB3aXRoIG5vIGV4 dHJhIGNvcGllcy4KIAogICAgIC8vIFdlIGZlZWwgZnJlZSB0byBtYWtlIHRoZSBjaGFyc2V0IGNv bnZlcnRlciBvYmplY3QgZXZlcnkgdGltZSBzaW5jZSBpdCdzCiAgICAgLy8ganVzdCBhIHdyYXBw ZXIgYXJvdW5kIGEgcmVmZXJlbmNlLgpAQCAtMjM3LDMyICsyMzcsNiBAQCB2b2lkIEtVUkxHb29n bGVQcml2YXRlOjppbml0KGNvbnN0IEtVUkwmIGJhc2UsIGNvbnN0IGNoYXIqIHJlbCwgaW50IHJl bExlbmd0aCwKICAgICB9CiB9CiAKLS8vIE5vdGU6IGNvZGUgbW9zdGx5IGR1cGxpY2F0ZWQgYWJv dmUuIFNlZSBGSVhNRXMgYW5kIGNvbW1lbnRzIHRoZXJlLgotdm9pZCBLVVJMR29vZ2xlUHJpdmF0 ZTo6aW5pdChjb25zdCBLVVJMJiBiYXNlLCBjb25zdCBVQ2hhciogcmVsLCBpbnQgcmVsTGVuZ3Ro LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBUZXh0RW5jb2RpbmcqIHF1ZXJ5 RW5jb2RpbmcpCi17Ci0gICAgS1VSTENoYXJzZXRDb252ZXJ0ZXIgY2hhcnNldENvbnZlcnRlck9i amVjdChxdWVyeUVuY29kaW5nKTsKLSAgICBLVVJMQ2hhcnNldENvbnZlcnRlciogY2hhcnNldENv bnZlcnRlciA9Ci0gICAgICAgICghcXVlcnlFbmNvZGluZyB8fCBpc1VuaWNvZGVFbmNvZGluZyhx dWVyeUVuY29kaW5nKSkgPyAwIDoKLSAgICAgICAgJmNoYXJzZXRDb252ZXJ0ZXJPYmplY3Q7Ci0K LSAgICB1cmxfY2Fub246OlJhd0Nhbm9uT3V0cHV0VDxjaGFyPiBvdXRwdXQ7Ci0gICAgY29uc3Qg Q1N0cmluZyYgYmFzZVN0ciA9IGJhc2UubV91cmwudXRmOFN0cmluZygpOwotICAgIG1faXNWYWxp ZCA9IHVybF91dGlsOjpSZXNvbHZlUmVsYXRpdmUoYmFzZVN0ci5kYXRhKCksIGJhc2VTdHIubGVu Z3RoKCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBiYXNlLm1f dXJsLm1fcGFyc2VkLCByZWwsIHJlbExlbmd0aCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGNoYXJzZXRDb252ZXJ0ZXIsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAmb3V0cHV0LCAmbV9wYXJzZWQpOwotCi0KLSAgICBpZiAobV9p c1ZhbGlkIHx8IG91dHB1dC5sZW5ndGgoKSkgewotICAgICAgICBpZiAobV9wYXJzZWQucmVmLmlz X25vbmVtcHR5KCkpCi0gICAgICAgICAgICBzZXRVdGY4KENTdHJpbmcob3V0cHV0LmRhdGEoKSwg b3V0cHV0Lmxlbmd0aCgpKSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHNldEFzY2lpKENT dHJpbmcob3V0cHV0LmRhdGEoKSwgb3V0cHV0Lmxlbmd0aCgpKSk7Ci0gICAgfSBlbHNlCi0gICAg ICAgIHNldFV0ZjgoQ1N0cmluZygiIiwgMCkpOwotfQotCiB2b2lkIEtVUkxHb29nbGVQcml2YXRl Ojppbml0UHJvdG9jb2xJbkhUVFBGYW1pbHkoKQogewogICAgIGlmICghbV9pc1ZhbGlkKSB7CkBA IC0zNTAsMTAgKzMyNCwxMCBAQCBjb25zdCBTdHJpbmcmIEtVUkxHb29nbGVQcml2YXRlOjpzdHJp bmcoKSBjb25zdAogLy8gQVNDSUkuIFdlIHRyZWF0IGl0IGFzIFVURi04IGp1c3QgaW4gY2FzZS4K IEtVUkw6OktVUkwoUGFyc2VkVVJMU3RyaW5nVGFnLCBjb25zdCBjaGFyICp1cmwpCiB7Ci0gICAg Ly8gRklYTUUgVGhlIE1hYyBjb2RlIGNoZWNrcyBmb3IgYmVnaW5uaW5nIHdpdGggYSBzbGFzaCBh bmQgY29udmVydGluZyB0byBhCisgICAgLy8gRklYTUUgVGhlIE1hYyBjb2RlIGNoZWNrcyBmb3Ig YmVnaW5uaW5nIHdpdGggYSBzbGFzaCBhbmQgY29udmVydHMgaXQgdG8KICAgICAvLyBmaWxlOiBV UkwuIFdlIHdpbGwgd2FudCB0byBhZGQgdGhpcyBhcyB3ZWxsIG9uY2Ugd2UgY2FuIGNvbXBpbGUg b24gYQogICAgIC8vIHN5c3RlbSBsaWtlIHRoYXQuCi0gICAgbV91cmwuaW5pdChLVVJMKCksIHVy bCwgc3RybGVuKHVybCksIDApOworICAgIG1fdXJsLmRvSW5pdChLVVJMKCksIHVybCwgc3RybGVu KHVybCksIDApOwogCiAgICAgLy8gVGhlIG9uZS1hcmd1bWVudCBjb25zdHJ1Y3RvcnMgc2hvdWxk IG5ldmVyIGdlbmVyYXRlIGEgbnVsbCBzdHJpbmcuCiAgICAgLy8gVGhpcyBpcyBhIGZ1bm55IHF1 aXJrIG9mIEtVUkwuY3BwIChwcm9iYWJseSBhIGJ1Zykgd2hpY2ggd2UgcHJlc2VydmUuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlUHJpdmF0ZS5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTEdvb2dsZVByaXZhdGUuaAppbmRleCBhMTQzNmFlLi40 ZGZjODIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlUHJp dmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGVQcml2YXRlLmgK QEAgLTQxLDcgKzQxLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIGNsYXNzIEtVUkw7CiAg ICAgY2xhc3MgVGV4dEVuY29kaW5nOwogCi0gICAgLy8gV3JhcHMgdGhlIGludGVybmFscyByZWxh dGVkIHRvIHVzaW5nIEdvb2dsZS1VUkwgYXMgdGhlIGJuYWNrZW5kIGZvciBLVVJMLgorICAgIC8v IFdyYXBzIHRoZSBpbnRlcm5hbHMgcmVsYXRlZCB0byB1c2luZyBHb29nbGUtVVJMIGFzIHRoZSBi YWNrZW5kIGZvciBLVVJMLgogICAgIC8vIFRoaXMgbWFpbnRhaW5zIHRoZSBzdGF0ZSBhbmQgaGFz IGF1eGlsaWFyeSBmdW5jdGlvbnMgc28gdGhhdCB3ZSBkb24ndCBuZWVkCiAgICAgLy8gdG8gdWds aWZ5IEtVUkwuaCB3aGlsZSBhbGxvd2luZyBHb29nbGUtVVJMIHRvIGJlIGV2YWx1YXRlZC4KICAg ICBjbGFzcyBLVVJMR29vZ2xlUHJpdmF0ZSB7CkBAIC00OSwyMCArNDksMjEgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogICAgICAgICBLVVJMR29vZ2xlUHJpdmF0ZSgpOwogICAgICAgICBLVVJMR29v Z2xlUHJpdmF0ZShjb25zdCB1cmxfcGFyc2U6OlBhcnNlZCYsIGJvb2wgaXNWYWxpZCk7CiAKLSAg ICAgICAgLy8gSW5pdGlhbGl6ZXMgdGhlIG9iamVjdC4gVGhpcyB3aWxsIGNhbGwgdGhyb3VnaCB0 byBvbmUgb2YgdGhlIGJhY2tlbmQKLSAgICAgICAgLy8gaW5pdGlhbGl6ZXJzIGJlbG93IGRlcGVu ZGluZyBvbiB3aGV0aGVyIHRoZSBzdHJpbmcncyBpbnRlcm5hbAotICAgICAgICAvLyByZXByZXNl bnRhdGlvbiBpcyA4IG9yIDE2IGJpdC4KKyAgICAgICAgLy8gSW5pdGlhbGl6ZXMgdGhlIG9iamVj dC4gVGhpcyB3aWxsIGNhbGwgdGhyb3VnaCB0aGUgYmFja2VuZCBpbml0aWFsaXplcgorICAgICAg ICAvLyBiZWxvdy4KICAgICAgICAgdm9pZCBpbml0KGNvbnN0IEtVUkwmIGJhc2UsIGNvbnN0IFN0 cmluZyYgcmVsYXRpdmUsCiAgICAgICAgICAgICAgICAgICBjb25zdCBUZXh0RW5jb2RpbmcqIHF1 ZXJ5RW5jb2RpbmcpOwogCi0gICAgICAgIC8vIEJhY2tlbmQgaW5pdGlhbGl6ZXJzLiBUaGUgcXVl cnkgZW5jb2RpbmcgcGFyYW1ldGVycyBhcmUgb3B0aW9uYWwgYW5kIGNhbgotICAgICAgICAvLyBi ZSAwICh0aGlzIGltcGxpZXMgVVRGLTgpLiBUaGVzZSBpbml0aWFsaXplcnMgcmVxdWlyZSB0aGF0 IHRoZSBvYmplY3QKKyAgICAgICAgLy8gQmFja2VuZCBpbml0aWFsaXplci4gVGhlIHF1ZXJ5IGVu Y29kaW5nIHBhcmFtZXRlcnMgYXJlIG9wdGlvbmFsIGFuZCBjYW4KKyAgICAgICAgLy8gYmUgMCAo dGhpcyBpbXBsaWVzIFVURi04KS4gVGhpcyBpbml0aWFsaXplciByZXF1aXJlcyB0aGF0IHRoZSBv YmplY3QKICAgICAgICAgLy8gaGFzIGp1c3QgYmVlbiBjcmVhdGVkIGFuZCB0aGUgc3RyaW5ncyBh cmUgbnVsbC4gRG8gbm90IGNhbGwgb24gYW4KICAgICAgICAgLy8gYWxyZWFkeS1jb25zdHJ1Y3Rl ZCBvYmplY3QuCi0gICAgICAgIHZvaWQgaW5pdChjb25zdCBLVVJMJiBiYXNlLCBjb25zdCBjaGFy KiByZWwsIGludCByZWxMZW5ndGgsCi0gICAgICAgICAgICAgICAgICBjb25zdCBUZXh0RW5jb2Rp bmcqIHF1ZXJ5RW5jb2RpbmcpOwotICAgICAgICB2b2lkIGluaXQoY29uc3QgS1VSTCYgYmFzZSwg Y29uc3QgVUNoYXIqIHJlbCwgaW50IHJlbExlbmd0aCwKLSAgICAgICAgICAgICAgICAgIGNvbnN0 IFRleHRFbmNvZGluZyogcXVlcnlFbmNvZGluZyk7CisgICAgICAgIC8vIEFsdGhvdWdoIHRoaXMg aXMgYSBwdWJsaWMgbWV0aG9kLCBpdCBpcyBvbmx5IG1lYW50IHRvIGJlIHVzZWQgYnkgdGhlCisg ICAgICAgIC8vIEtVUkwgYW5kIEtVUkxHb29nbGVQcml2YXRlIGluaXRpYWxpemVycywgc28gdGhl IHRlbXBsYXRlIGJvZHkgaXMgbm90CisgICAgICAgIC8vIHZpc2libGUgaGVyZS4KKyAgICAgICAg dGVtcGxhdGUgPHR5cGVuYW1lIENIQVI+CisgICAgICAgIHZvaWQgZG9Jbml0KGNvbnN0IEtVUkwm IGJhc2UsIGNvbnN0IENIQVIqIHJlbCwgaW50IHJlbExlbmd0aCwKKyAgICAgICAgICAgICAgICAg ICAgY29uc3QgVGV4dEVuY29kaW5nKiBxdWVyeUVuY29kaW5nKTsKIAogICAgICAgICAvLyBEb2Vz IGEgZGVlcCBjb3B5IHRvIHRoZSBnaXZlbiBvdXRwdXQgb2JqZWN0LgogICAgICAgICB2b2lkIGNv cHlUbyhLVVJMR29vZ2xlUHJpdmF0ZSogZGVzdCkgY29uc3Q7Cg== 82103 2011-02-10 22:21:23 -0800 2011-02-10 22:25:47 -0800 Patch wk53749.diff.submit text/plain 5917 ctruta ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4MTVjODQ5Li4yYTY2OTUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMDItMTAgIENvc21pbiBUcnV0YSAgPGN0cnV0YUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVtcGxhdGl6ZSBL VVJMR29vZ2xlUHJpdmF0ZTo6aW5pdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTM3NDkKKworICAgICAgICBObyBuZXcgdGVzdHMuIFJlZmFjdG9yaW5n LgorCisgICAgICAgICogcGxhdGZvcm0vS1VSTEdvb2dsZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpLVVJMR29vZ2xlUHJpdmF0ZTo6aW5pdCk6CisgICAgICAgICogcGxhdGZvcm0vS1VSTEdvb2ds ZVByaXZhdGUuaDoKKwogMjAxMS0wMi0xMCAgTWljaGFlbCBTYWJvZmYgIDxtc2Fib2ZmQGFwcGxl LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBHZW9mZnJleSBHYXJlbi4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGUuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vS1VSTEdvb2dsZS5jcHAKaW5kZXggYzFiM2UwMS4uMDBkYjViZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTEdvb2dsZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vS1VSTEdvb2dsZS5jcHAKQEAgLTE5MywxNSArMTkzLDE1IEBAIHZvaWQg S1VSTEdvb2dsZVByaXZhdGU6OmluaXQoY29uc3QgS1VSTCYgYmFzZSwKICAgICBpbml0KGJhc2Us IHJlbGF0aXZlLmNoYXJhY3RlcnMoKSwgcmVsYXRpdmUubGVuZ3RoKCksIHF1ZXJ5RW5jb2Rpbmcp OwogfQogCi0vLyBOb3RlOiBjb2RlIG1vc3RseSBkdXBsaWNhdGVkIGJlbG93Lgotdm9pZCBLVVJM R29vZ2xlUHJpdmF0ZTo6aW5pdChjb25zdCBLVVJMJiBiYXNlLCBjb25zdCBjaGFyKiByZWwsIGlu dCByZWxMZW5ndGgsCit0ZW1wbGF0ZSA8dHlwZW5hbWUgQ0hBUj4KK3ZvaWQgS1VSTEdvb2dsZVBy aXZhdGU6OmluaXQoY29uc3QgS1VSTCYgYmFzZSwgY29uc3QgQ0hBUiogcmVsLCBpbnQgcmVsTGVu Z3RoLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBUZXh0RW5jb2RpbmcqIHF1 ZXJ5RW5jb2RpbmcpCiB7Ci0gICAgLy8gQXMgYSBwZXJmb3JtYW5jZSBvcHRpbWl6YXRpb24sIHdl IGRvIG5vdCB1c2UgdGhlIGNoYXJzZXQgY29udmVydGVyIGlmCi0gICAgLy8gZW5jb2RpbmcgaXMg VVRGLTggb3Igb3RoZXIgVW5pY29kZSBlbmNvZGluZ3MuIE5vdGUgdGhhdCB0aGlzIGlzCi0gICAg Ly8gcGVyIEhUTUw1IDIuNS4zIChyZXNvbHZpbmcgVVJMKS4gVGhlIFVSTCBjYW5vbmljYWxpemVy IHdpbGwgYmUKLSAgICAvLyBtb3JlIGVmZmljaWVudCB3aXRoIG5vIGNoYXJzZXQgY29udmVydGVy IG9iamVjdCBiZWNhdXNlIGl0Ci0gICAgLy8gY2FuIGRvIFVURi04IGludGVybmFsbHkgd2l0aCBu byBleHRyYSBjb3BpZXMuCisgICAgLy8gQXMgYSBwZXJmb3JtYW5jZSBvcHRpbWl6YXRpb24sIHdl IGRvIG5vdCB1c2UgdGhlIGNoYXJzZXQgY29udmVydGVyCisgICAgLy8gaWYgZW5jb2RpbmcgaXMg VVRGLTggb3Igb3RoZXIgVW5pY29kZSBlbmNvZGluZ3MuIE5vdGUgdGhhdCB0aGlzIGlzCisgICAg Ly8gcGVyIEhUTUw1IDIuNS4zIChyZXNvbHZpbmcgVVJMKS4gVGhlIFVSTCBjYW5vbmljYWxpemVy IHdpbGwgYmUgbW9yZQorICAgIC8vIGVmZmljaWVudCB3aXRoIG5vIGNoYXJzZXQgY29udmVydGVy IG9iamVjdCBiZWNhdXNlIGNhbiBkbyBVVEYtOAorICAgIC8vIGludGVybmFsbHkgd2l0aCBubyBl eHRyYSBjb3BpZXMuCiAKICAgICAvLyBXZSBmZWVsIGZyZWUgdG8gbWFrZSB0aGUgY2hhcnNldCBj b252ZXJ0ZXIgb2JqZWN0IGV2ZXJ5IHRpbWUgc2luY2UgaXQncwogICAgIC8vIGp1c3QgYSB3cmFw cGVyIGFyb3VuZCBhIHJlZmVyZW5jZS4KQEAgLTIzNywzMiArMjM3LDYgQEAgdm9pZCBLVVJMR29v Z2xlUHJpdmF0ZTo6aW5pdChjb25zdCBLVVJMJiBiYXNlLCBjb25zdCBjaGFyKiByZWwsIGludCBy ZWxMZW5ndGgsCiAgICAgfQogfQogCi0vLyBOb3RlOiBjb2RlIG1vc3RseSBkdXBsaWNhdGVkIGFi b3ZlLiBTZWUgRklYTUVzIGFuZCBjb21tZW50cyB0aGVyZS4KLXZvaWQgS1VSTEdvb2dsZVByaXZh dGU6OmluaXQoY29uc3QgS1VSTCYgYmFzZSwgY29uc3QgVUNoYXIqIHJlbCwgaW50IHJlbExlbmd0 aCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgVGV4dEVuY29kaW5nKiBxdWVy eUVuY29kaW5nKQotewotICAgIEtVUkxDaGFyc2V0Q29udmVydGVyIGNoYXJzZXRDb252ZXJ0ZXJP YmplY3QocXVlcnlFbmNvZGluZyk7Ci0gICAgS1VSTENoYXJzZXRDb252ZXJ0ZXIqIGNoYXJzZXRD b252ZXJ0ZXIgPQotICAgICAgICAoIXF1ZXJ5RW5jb2RpbmcgfHwgaXNVbmljb2RlRW5jb2Rpbmco cXVlcnlFbmNvZGluZykpID8gMCA6Ci0gICAgICAgICZjaGFyc2V0Q29udmVydGVyT2JqZWN0Owot Ci0gICAgdXJsX2Nhbm9uOjpSYXdDYW5vbk91dHB1dFQ8Y2hhcj4gb3V0cHV0OwotICAgIGNvbnN0 IENTdHJpbmcmIGJhc2VTdHIgPSBiYXNlLm1fdXJsLnV0ZjhTdHJpbmcoKTsKLSAgICBtX2lzVmFs aWQgPSB1cmxfdXRpbDo6UmVzb2x2ZVJlbGF0aXZlKGJhc2VTdHIuZGF0YSgpLCBiYXNlU3RyLmxl bmd0aCgpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYmFzZS5t X3VybC5tX3BhcnNlZCwgcmVsLCByZWxMZW5ndGgsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjaGFyc2V0Q29udmVydGVyLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgJm91dHB1dCwgJm1fcGFyc2VkKTsKLQotCi0gICAgaWYgKG1f aXNWYWxpZCB8fCBvdXRwdXQubGVuZ3RoKCkpIHsKLSAgICAgICAgaWYgKG1fcGFyc2VkLnJlZi5p c19ub25lbXB0eSgpKQotICAgICAgICAgICAgc2V0VXRmOChDU3RyaW5nKG91dHB1dC5kYXRhKCks IG91dHB1dC5sZW5ndGgoKSkpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBzZXRBc2NpaShD U3RyaW5nKG91dHB1dC5kYXRhKCksIG91dHB1dC5sZW5ndGgoKSkpOwotICAgIH0gZWxzZQotICAg ICAgICBzZXRVdGY4KENTdHJpbmcoIiIsIDApKTsKLX0KLQogdm9pZCBLVVJMR29vZ2xlUHJpdmF0 ZTo6aW5pdFByb3RvY29sSW5IVFRQRmFtaWx5KCkKIHsKICAgICBpZiAoIW1faXNWYWxpZCkgewpA QCAtMzUwLDcgKzMyNCw3IEBAIGNvbnN0IFN0cmluZyYgS1VSTEdvb2dsZVByaXZhdGU6OnN0cmlu ZygpIGNvbnN0CiAvLyBBU0NJSS4gV2UgdHJlYXQgaXQgYXMgVVRGLTgganVzdCBpbiBjYXNlLgog S1VSTDo6S1VSTChQYXJzZWRVUkxTdHJpbmdUYWcsIGNvbnN0IGNoYXIgKnVybCkKIHsKLSAgICAv LyBGSVhNRSBUaGUgTWFjIGNvZGUgY2hlY2tzIGZvciBiZWdpbm5pbmcgd2l0aCBhIHNsYXNoIGFu ZCBjb252ZXJ0aW5nIHRvIGEKKyAgICAvLyBGSVhNRSBUaGUgTWFjIGNvZGUgY2hlY2tzIGZvciBi ZWdpbm5pbmcgd2l0aCBhIHNsYXNoIGFuZCBjb252ZXJ0cyBpdCB0bwogICAgIC8vIGZpbGU6IFVS TC4gV2Ugd2lsbCB3YW50IHRvIGFkZCB0aGlzIGFzIHdlbGwgb25jZSB3ZSBjYW4gY29tcGlsZSBv biBhCiAgICAgLy8gc3lzdGVtIGxpa2UgdGhhdC4KICAgICBtX3VybC5pbml0KEtVUkwoKSwgdXJs LCBzdHJsZW4odXJsKSwgMCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9L VVJMR29vZ2xlUHJpdmF0ZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTEdvb2dsZVBy aXZhdGUuaAppbmRleCBhMTQzNmFlLi5jNzRhNmI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9LVVJMR29vZ2xlUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL0tVUkxHb29nbGVQcml2YXRlLmgKQEAgLTQxLDcgKzQxLDcgQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogICAgIGNsYXNzIEtVUkw7CiAgICAgY2xhc3MgVGV4dEVuY29kaW5nOwogCi0gICAgLy8g V3JhcHMgdGhlIGludGVybmFscyByZWxhdGVkIHRvIHVzaW5nIEdvb2dsZS1VUkwgYXMgdGhlIGJu YWNrZW5kIGZvciBLVVJMLgorICAgIC8vIFdyYXBzIHRoZSBpbnRlcm5hbHMgcmVsYXRlZCB0byB1 c2luZyBHb29nbGUtVVJMIGFzIHRoZSBiYWNrZW5kIGZvciBLVVJMLgogICAgIC8vIFRoaXMgbWFp bnRhaW5zIHRoZSBzdGF0ZSBhbmQgaGFzIGF1eGlsaWFyeSBmdW5jdGlvbnMgc28gdGhhdCB3ZSBk b24ndCBuZWVkCiAgICAgLy8gdG8gdWdsaWZ5IEtVUkwuaCB3aGlsZSBhbGxvd2luZyBHb29nbGUt VVJMIHRvIGJlIGV2YWx1YXRlZC4KICAgICBjbGFzcyBLVVJMR29vZ2xlUHJpdmF0ZSB7CkBAIC00 OSwxOSArNDksMTcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBLVVJMR29vZ2xlUHJp dmF0ZSgpOwogICAgICAgICBLVVJMR29vZ2xlUHJpdmF0ZShjb25zdCB1cmxfcGFyc2U6OlBhcnNl ZCYsIGJvb2wgaXNWYWxpZCk7CiAKLSAgICAgICAgLy8gSW5pdGlhbGl6ZXMgdGhlIG9iamVjdC4g VGhpcyB3aWxsIGNhbGwgdGhyb3VnaCB0byBvbmUgb2YgdGhlIGJhY2tlbmQKLSAgICAgICAgLy8g aW5pdGlhbGl6ZXJzIGJlbG93IGRlcGVuZGluZyBvbiB3aGV0aGVyIHRoZSBzdHJpbmcncyBpbnRl cm5hbAotICAgICAgICAvLyByZXByZXNlbnRhdGlvbiBpcyA4IG9yIDE2IGJpdC4KKyAgICAgICAg Ly8gSW5pdGlhbGl6ZXMgdGhlIG9iamVjdC4gVGhpcyB3aWxsIGNhbGwgdGhyb3VnaCB0aGUgYmFj a2VuZCBpbml0aWFsaXplcgorICAgICAgICAvLyBiZWxvdy4KICAgICAgICAgdm9pZCBpbml0KGNv bnN0IEtVUkwmIGJhc2UsIGNvbnN0IFN0cmluZyYgcmVsYXRpdmUsCiAgICAgICAgICAgICAgICAg ICBjb25zdCBUZXh0RW5jb2RpbmcqIHF1ZXJ5RW5jb2RpbmcpOwogCi0gICAgICAgIC8vIEJhY2tl bmQgaW5pdGlhbGl6ZXJzLiBUaGUgcXVlcnkgZW5jb2RpbmcgcGFyYW1ldGVycyBhcmUgb3B0aW9u YWwgYW5kIGNhbgotICAgICAgICAvLyBiZSAwICh0aGlzIGltcGxpZXMgVVRGLTgpLiBUaGVzZSBp bml0aWFsaXplcnMgcmVxdWlyZSB0aGF0IHRoZSBvYmplY3QKKyAgICAgICAgLy8gQmFja2VuZCBp bml0aWFsaXplci4gVGhlIHF1ZXJ5IGVuY29kaW5nIHBhcmFtZXRlcnMgYXJlIG9wdGlvbmFsIGFu ZCBjYW4KKyAgICAgICAgLy8gYmUgMCAodGhpcyBpbXBsaWVzIFVURi04KS4gVGhpcyBpbml0aWFs aXplciByZXF1aXJlcyB0aGF0IHRoZSBvYmplY3QKICAgICAgICAgLy8gaGFzIGp1c3QgYmVlbiBj cmVhdGVkIGFuZCB0aGUgc3RyaW5ncyBhcmUgbnVsbC4gRG8gbm90IGNhbGwgb24gYW4KICAgICAg ICAgLy8gYWxyZWFkeS1jb25zdHJ1Y3RlZCBvYmplY3QuCi0gICAgICAgIHZvaWQgaW5pdChjb25z dCBLVVJMJiBiYXNlLCBjb25zdCBjaGFyKiByZWwsIGludCByZWxMZW5ndGgsCi0gICAgICAgICAg ICAgICAgICBjb25zdCBUZXh0RW5jb2RpbmcqIHF1ZXJ5RW5jb2RpbmcpOwotICAgICAgICB2b2lk IGluaXQoY29uc3QgS1VSTCYgYmFzZSwgY29uc3QgVUNoYXIqIHJlbCwgaW50IHJlbExlbmd0aCwK KyAgICAgICAgdGVtcGxhdGUgPHR5cGVuYW1lIENIQVI+CisgICAgICAgIHZvaWQgaW5pdChjb25z dCBLVVJMJiBiYXNlLCBjb25zdCBDSEFSKiByZWwsIGludCByZWxMZW5ndGgsCiAgICAgICAgICAg ICAgICAgICBjb25zdCBUZXh0RW5jb2RpbmcqIHF1ZXJ5RW5jb2RpbmcpOwogCiAgICAgICAgIC8v IERvZXMgYSBkZWVwIGNvcHkgdG8gdGhlIGdpdmVuIG91dHB1dCBvYmplY3QuCg== 82104 2011-02-10 22:25:47 -0800 2011-02-11 00:14:24 -0800 Patch wk53749.diff.submit text/plain 5920 ctruta ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4MTVjODQ5Li4yYTY2OTUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMDItMTAgIENvc21pbiBUcnV0YSAgPGN0cnV0YUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVtcGxhdGl6ZSBL VVJMR29vZ2xlUHJpdmF0ZTo6aW5pdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTM3NDkKKworICAgICAgICBObyBuZXcgdGVzdHMuIFJlZmFjdG9yaW5n LgorCisgICAgICAgICogcGxhdGZvcm0vS1VSTEdvb2dsZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpLVVJMR29vZ2xlUHJpdmF0ZTo6aW5pdCk6CisgICAgICAgICogcGxhdGZvcm0vS1VSTEdvb2ds ZVByaXZhdGUuaDoKKwogMjAxMS0wMi0xMCAgTWljaGFlbCBTYWJvZmYgIDxtc2Fib2ZmQGFwcGxl LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBHZW9mZnJleSBHYXJlbi4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGUuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vS1VSTEdvb2dsZS5jcHAKaW5kZXggYzFiM2UwMS4uMDY5N2IzMyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTEdvb2dsZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vS1VSTEdvb2dsZS5jcHAKQEAgLTE5MywxNSArMTkzLDE1IEBAIHZvaWQg S1VSTEdvb2dsZVByaXZhdGU6OmluaXQoY29uc3QgS1VSTCYgYmFzZSwKICAgICBpbml0KGJhc2Us IHJlbGF0aXZlLmNoYXJhY3RlcnMoKSwgcmVsYXRpdmUubGVuZ3RoKCksIHF1ZXJ5RW5jb2Rpbmcp OwogfQogCi0vLyBOb3RlOiBjb2RlIG1vc3RseSBkdXBsaWNhdGVkIGJlbG93Lgotdm9pZCBLVVJM R29vZ2xlUHJpdmF0ZTo6aW5pdChjb25zdCBLVVJMJiBiYXNlLCBjb25zdCBjaGFyKiByZWwsIGlu dCByZWxMZW5ndGgsCit0ZW1wbGF0ZSA8dHlwZW5hbWUgQ0hBUj4KK3ZvaWQgS1VSTEdvb2dsZVBy aXZhdGU6OmluaXQoY29uc3QgS1VSTCYgYmFzZSwgY29uc3QgQ0hBUiogcmVsLCBpbnQgcmVsTGVu Z3RoLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBUZXh0RW5jb2RpbmcqIHF1 ZXJ5RW5jb2RpbmcpCiB7Ci0gICAgLy8gQXMgYSBwZXJmb3JtYW5jZSBvcHRpbWl6YXRpb24sIHdl IGRvIG5vdCB1c2UgdGhlIGNoYXJzZXQgY29udmVydGVyIGlmCi0gICAgLy8gZW5jb2RpbmcgaXMg VVRGLTggb3Igb3RoZXIgVW5pY29kZSBlbmNvZGluZ3MuIE5vdGUgdGhhdCB0aGlzIGlzCi0gICAg Ly8gcGVyIEhUTUw1IDIuNS4zIChyZXNvbHZpbmcgVVJMKS4gVGhlIFVSTCBjYW5vbmljYWxpemVy IHdpbGwgYmUKLSAgICAvLyBtb3JlIGVmZmljaWVudCB3aXRoIG5vIGNoYXJzZXQgY29udmVydGVy IG9iamVjdCBiZWNhdXNlIGl0Ci0gICAgLy8gY2FuIGRvIFVURi04IGludGVybmFsbHkgd2l0aCBu byBleHRyYSBjb3BpZXMuCisgICAgLy8gQXMgYSBwZXJmb3JtYW5jZSBvcHRpbWl6YXRpb24sIHdl IGRvIG5vdCB1c2UgdGhlIGNoYXJzZXQgY29udmVydGVyCisgICAgLy8gaWYgZW5jb2RpbmcgaXMg VVRGLTggb3Igb3RoZXIgVW5pY29kZSBlbmNvZGluZ3MuIE5vdGUgdGhhdCB0aGlzIGlzCisgICAg Ly8gcGVyIEhUTUw1IDIuNS4zIChyZXNvbHZpbmcgVVJMKS4gVGhlIFVSTCBjYW5vbmljYWxpemVy IHdpbGwgYmUgbW9yZQorICAgIC8vIGVmZmljaWVudCB3aXRoIG5vIGNoYXJzZXQgY29udmVydGVy IG9iamVjdCBiZWNhdXNlIGl0IGNhbiBkbyBVVEYtOAorICAgIC8vIGludGVybmFsbHkgd2l0aCBu byBleHRyYSBjb3BpZXMuCiAKICAgICAvLyBXZSBmZWVsIGZyZWUgdG8gbWFrZSB0aGUgY2hhcnNl dCBjb252ZXJ0ZXIgb2JqZWN0IGV2ZXJ5IHRpbWUgc2luY2UgaXQncwogICAgIC8vIGp1c3QgYSB3 cmFwcGVyIGFyb3VuZCBhIHJlZmVyZW5jZS4KQEAgLTIzNywzMiArMjM3LDYgQEAgdm9pZCBLVVJM R29vZ2xlUHJpdmF0ZTo6aW5pdChjb25zdCBLVVJMJiBiYXNlLCBjb25zdCBjaGFyKiByZWwsIGlu dCByZWxMZW5ndGgsCiAgICAgfQogfQogCi0vLyBOb3RlOiBjb2RlIG1vc3RseSBkdXBsaWNhdGVk IGFib3ZlLiBTZWUgRklYTUVzIGFuZCBjb21tZW50cyB0aGVyZS4KLXZvaWQgS1VSTEdvb2dsZVBy aXZhdGU6OmluaXQoY29uc3QgS1VSTCYgYmFzZSwgY29uc3QgVUNoYXIqIHJlbCwgaW50IHJlbExl bmd0aCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgVGV4dEVuY29kaW5nKiBx dWVyeUVuY29kaW5nKQotewotICAgIEtVUkxDaGFyc2V0Q29udmVydGVyIGNoYXJzZXRDb252ZXJ0 ZXJPYmplY3QocXVlcnlFbmNvZGluZyk7Ci0gICAgS1VSTENoYXJzZXRDb252ZXJ0ZXIqIGNoYXJz ZXRDb252ZXJ0ZXIgPQotICAgICAgICAoIXF1ZXJ5RW5jb2RpbmcgfHwgaXNVbmljb2RlRW5jb2Rp bmcocXVlcnlFbmNvZGluZykpID8gMCA6Ci0gICAgICAgICZjaGFyc2V0Q29udmVydGVyT2JqZWN0 OwotCi0gICAgdXJsX2Nhbm9uOjpSYXdDYW5vbk91dHB1dFQ8Y2hhcj4gb3V0cHV0OwotICAgIGNv bnN0IENTdHJpbmcmIGJhc2VTdHIgPSBiYXNlLm1fdXJsLnV0ZjhTdHJpbmcoKTsKLSAgICBtX2lz VmFsaWQgPSB1cmxfdXRpbDo6UmVzb2x2ZVJlbGF0aXZlKGJhc2VTdHIuZGF0YSgpLCBiYXNlU3Ry Lmxlbmd0aCgpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYmFz ZS5tX3VybC5tX3BhcnNlZCwgcmVsLCByZWxMZW5ndGgsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBjaGFyc2V0Q29udmVydGVyLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgJm91dHB1dCwgJm1fcGFyc2VkKTsKLQotCi0gICAgaWYg KG1faXNWYWxpZCB8fCBvdXRwdXQubGVuZ3RoKCkpIHsKLSAgICAgICAgaWYgKG1fcGFyc2VkLnJl Zi5pc19ub25lbXB0eSgpKQotICAgICAgICAgICAgc2V0VXRmOChDU3RyaW5nKG91dHB1dC5kYXRh KCksIG91dHB1dC5sZW5ndGgoKSkpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBzZXRBc2Np aShDU3RyaW5nKG91dHB1dC5kYXRhKCksIG91dHB1dC5sZW5ndGgoKSkpOwotICAgIH0gZWxzZQot ICAgICAgICBzZXRVdGY4KENTdHJpbmcoIiIsIDApKTsKLX0KLQogdm9pZCBLVVJMR29vZ2xlUHJp dmF0ZTo6aW5pdFByb3RvY29sSW5IVFRQRmFtaWx5KCkKIHsKICAgICBpZiAoIW1faXNWYWxpZCkg ewpAQCAtMzUwLDcgKzMyNCw3IEBAIGNvbnN0IFN0cmluZyYgS1VSTEdvb2dsZVByaXZhdGU6OnN0 cmluZygpIGNvbnN0CiAvLyBBU0NJSS4gV2UgdHJlYXQgaXQgYXMgVVRGLTgganVzdCBpbiBjYXNl LgogS1VSTDo6S1VSTChQYXJzZWRVUkxTdHJpbmdUYWcsIGNvbnN0IGNoYXIgKnVybCkKIHsKLSAg ICAvLyBGSVhNRSBUaGUgTWFjIGNvZGUgY2hlY2tzIGZvciBiZWdpbm5pbmcgd2l0aCBhIHNsYXNo IGFuZCBjb252ZXJ0aW5nIHRvIGEKKyAgICAvLyBGSVhNRSBUaGUgTWFjIGNvZGUgY2hlY2tzIGZv ciBiZWdpbm5pbmcgd2l0aCBhIHNsYXNoIGFuZCBjb252ZXJ0cyBpdCB0bwogICAgIC8vIGZpbGU6 IFVSTC4gV2Ugd2lsbCB3YW50IHRvIGFkZCB0aGlzIGFzIHdlbGwgb25jZSB3ZSBjYW4gY29tcGls ZSBvbiBhCiAgICAgLy8gc3lzdGVtIGxpa2UgdGhhdC4KICAgICBtX3VybC5pbml0KEtVUkwoKSwg dXJsLCBzdHJsZW4odXJsKSwgMCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9LVVJMR29vZ2xlUHJpdmF0ZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTEdvb2ds ZVByaXZhdGUuaAppbmRleCBhMTQzNmFlLi5jNzRhNmI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL0tVUkxHb29nbGVQcml2YXRlLmgKQEAgLTQxLDcgKzQxLDcgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogICAgIGNsYXNzIEtVUkw7CiAgICAgY2xhc3MgVGV4dEVuY29kaW5nOwogCi0gICAg Ly8gV3JhcHMgdGhlIGludGVybmFscyByZWxhdGVkIHRvIHVzaW5nIEdvb2dsZS1VUkwgYXMgdGhl IGJuYWNrZW5kIGZvciBLVVJMLgorICAgIC8vIFdyYXBzIHRoZSBpbnRlcm5hbHMgcmVsYXRlZCB0 byB1c2luZyBHb29nbGUtVVJMIGFzIHRoZSBiYWNrZW5kIGZvciBLVVJMLgogICAgIC8vIFRoaXMg bWFpbnRhaW5zIHRoZSBzdGF0ZSBhbmQgaGFzIGF1eGlsaWFyeSBmdW5jdGlvbnMgc28gdGhhdCB3 ZSBkb24ndCBuZWVkCiAgICAgLy8gdG8gdWdsaWZ5IEtVUkwuaCB3aGlsZSBhbGxvd2luZyBHb29n bGUtVVJMIHRvIGJlIGV2YWx1YXRlZC4KICAgICBjbGFzcyBLVVJMR29vZ2xlUHJpdmF0ZSB7CkBA IC00OSwxOSArNDksMTcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBLVVJMR29vZ2xl UHJpdmF0ZSgpOwogICAgICAgICBLVVJMR29vZ2xlUHJpdmF0ZShjb25zdCB1cmxfcGFyc2U6OlBh cnNlZCYsIGJvb2wgaXNWYWxpZCk7CiAKLSAgICAgICAgLy8gSW5pdGlhbGl6ZXMgdGhlIG9iamVj dC4gVGhpcyB3aWxsIGNhbGwgdGhyb3VnaCB0byBvbmUgb2YgdGhlIGJhY2tlbmQKLSAgICAgICAg Ly8gaW5pdGlhbGl6ZXJzIGJlbG93IGRlcGVuZGluZyBvbiB3aGV0aGVyIHRoZSBzdHJpbmcncyBp bnRlcm5hbAotICAgICAgICAvLyByZXByZXNlbnRhdGlvbiBpcyA4IG9yIDE2IGJpdC4KKyAgICAg ICAgLy8gSW5pdGlhbGl6ZXMgdGhlIG9iamVjdC4gVGhpcyB3aWxsIGNhbGwgdGhyb3VnaCB0aGUg YmFja2VuZCBpbml0aWFsaXplcgorICAgICAgICAvLyBiZWxvdy4KICAgICAgICAgdm9pZCBpbml0 KGNvbnN0IEtVUkwmIGJhc2UsIGNvbnN0IFN0cmluZyYgcmVsYXRpdmUsCiAgICAgICAgICAgICAg ICAgICBjb25zdCBUZXh0RW5jb2RpbmcqIHF1ZXJ5RW5jb2RpbmcpOwogCi0gICAgICAgIC8vIEJh Y2tlbmQgaW5pdGlhbGl6ZXJzLiBUaGUgcXVlcnkgZW5jb2RpbmcgcGFyYW1ldGVycyBhcmUgb3B0 aW9uYWwgYW5kIGNhbgotICAgICAgICAvLyBiZSAwICh0aGlzIGltcGxpZXMgVVRGLTgpLiBUaGVz ZSBpbml0aWFsaXplcnMgcmVxdWlyZSB0aGF0IHRoZSBvYmplY3QKKyAgICAgICAgLy8gQmFja2Vu ZCBpbml0aWFsaXplci4gVGhlIHF1ZXJ5IGVuY29kaW5nIHBhcmFtZXRlcnMgYXJlIG9wdGlvbmFs IGFuZCBjYW4KKyAgICAgICAgLy8gYmUgMCAodGhpcyBpbXBsaWVzIFVURi04KS4gVGhpcyBpbml0 aWFsaXplciByZXF1aXJlcyB0aGF0IHRoZSBvYmplY3QKICAgICAgICAgLy8gaGFzIGp1c3QgYmVl biBjcmVhdGVkIGFuZCB0aGUgc3RyaW5ncyBhcmUgbnVsbC4gRG8gbm90IGNhbGwgb24gYW4KICAg ICAgICAgLy8gYWxyZWFkeS1jb25zdHJ1Y3RlZCBvYmplY3QuCi0gICAgICAgIHZvaWQgaW5pdChj b25zdCBLVVJMJiBiYXNlLCBjb25zdCBjaGFyKiByZWwsIGludCByZWxMZW5ndGgsCi0gICAgICAg ICAgICAgICAgICBjb25zdCBUZXh0RW5jb2RpbmcqIHF1ZXJ5RW5jb2RpbmcpOwotICAgICAgICB2 b2lkIGluaXQoY29uc3QgS1VSTCYgYmFzZSwgY29uc3QgVUNoYXIqIHJlbCwgaW50IHJlbExlbmd0 aCwKKyAgICAgICAgdGVtcGxhdGUgPHR5cGVuYW1lIENIQVI+CisgICAgICAgIHZvaWQgaW5pdChj b25zdCBLVVJMJiBiYXNlLCBjb25zdCBDSEFSKiByZWwsIGludCByZWxMZW5ndGgsCiAgICAgICAg ICAgICAgICAgICBjb25zdCBUZXh0RW5jb2RpbmcqIHF1ZXJ5RW5jb2RpbmcpOwogCiAgICAgICAg IC8vIERvZXMgYSBkZWVwIGNvcHkgdG8gdGhlIGdpdmVuIG91dHB1dCBvYmplY3QuCg==