31627 2009-11-18 05:47:55 -0800 Web Inspector: Store cookie domains in the WebInspector object. 2009-11-19 05:03:29 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 apavlov webkit-unassigned bweinstein commit-queue eric joepeck keishi pfeldman pmuellr rik timothy oldest_to_newest 164550 0 apavlov 2009-11-18 05:47:55 -0800 Currently cookie domains are pushed from InspectorController and stored in the Storage panel. Since other clients may need the cookie domain list, it should be stored in the WebInspector object. 164582 1 43435 apavlov 2009-11-18 08:35:17 -0800 Created attachment 43435 patch 164595 2 43435 timothy 2009-11-18 09:26:40 -0800 Comment on attachment 43435 patch > + var match = payload.documentURL.match(/^(?:http[s]?|file):\/\/([\/]*[^\/]+)/); I am curious if this catches the right "domain" for file URLs. > + if (typeof this.cookieDomains[domain] !== "undefined") A better way to do this is: if (domain in this.cookieDomains) This change would mean Cookies would not be available if the Resources panel ins't enabled. That seems confusing and limiting. But otherwise I like the clean approch this has over the old code… 164597 3 43435 timothy 2009-11-18 09:28:34 -0800 Comment on attachment 43435 patch I'd like to understand how this works when the Resources panel is disabled before it gets r+ed. 164612 4 43438 apavlov 2009-11-18 09:57:34 -0800 Created attachment 43438 patch (fixed) Fixed the "Local Files" issue and the domain existence check. 164733 5 43438 commit-queue 2009-11-18 14:51:35 -0800 Comment on attachment 43438 patch (fixed) Rejecting patch 43438 from commit-queue. Failed to run "WebKitTools/Scripts/build-webkit" exit_code: 1 Last 500 characters of output: cts/CommitQueue/WebCore/inspector/TimelineRecordFactory.cpp -o /Users/eseidel/Projects/build/WebCore.build/Release/WebCore.build/Objects-normal/i386/TimelineRecordFactory.o ** BUILD FAILED ** The following build commands failed: WebCore: Distributed-CompileC /Users/eseidel/Projects/build/WebCore.build/Release/WebCore.build/Objects-normal/i386/InspectorResource.o /Users/eseidel/Projects/CommitQueue/WebCore/inspector/InspectorResource.cpp normal i386 c++ com.apple.compilers.gcc.4_2 (1 failure) 164741 6 eric 2009-11-18 15:01:47 -0800 Sorry to be so slow about getting to the patch. The commit-queue was down for the last 5 days due to bug 31615. It's back now. If you post an updated patch which builds properly on mac this will be landed promptly. 164944 7 43494 apavlov 2009-11-19 03:51:49 -0800 Created attachment 43494 patch (fix mac build) 164954 8 43494 commit-queue 2009-11-19 05:03:19 -0800 Comment on attachment 43494 patch (fix mac build) Clearing flags on attachment: 43494 Committed r51182: <http://trac.webkit.org/changeset/51182> 164955 9 commit-queue 2009-11-19 05:03:29 -0800 All reviewed patches have been landed. Closing bug. 43435 2009-11-18 08:35:17 -0800 2009-11-18 09:57:34 -0800 patch cookiedomains.patch text/plain 7838 apavlov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YzcyNjhjZS4uYTFmOTk0MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAwOS0xMS0xOCAgQWxleGFuZGVyIFBh dmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN0b3JlIGNvb2tpZSBkb21haW5zIGluIHRoZSBXZWJJbnNw ZWN0b3Igb2JqZWN0CisKKyAgICAgICAgVGhlIGNvb2tpZSBkb21haW5zIGhhdmUgYmVlbiBtb3Zl ZCBmcm9tIFN0b3JhZ2VQYW5lbCBpbnRvIFdlYkluc3BlY3Rvci4KKyAgICAgICAgQWxzbywgdGhl IGRvY3VtZW50IFVSTHMgYXJlIG5vdyBwYXNzZWQgaW5zaWRlIHRoZSBXZWJJbnNwZWN0b3IuYWRk UmVzb3VyY2UoKQorICAgICAgICBwYXlsb2FkIHJhdGhlciB0aGFuIHB1c2hlZCBkaXJlY3RseSBm cm9tIEluc3BlY3RvckNvbnRyb2xsZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0zMTYyNworCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNv bnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6cG9w dWxhdGVTY3JpcHRPYmplY3RzKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xs ZXI6OmRpZEZpbmlzaExvYWRpbmcpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9u dGVuZC5jcHA6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmg6CisgICAg ICAgICogaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvclJlc291cmNlOjpjcmVhdGVTY3JpcHRPYmplY3QpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yUmVzb3VyY2U6OnVwZGF0ZVNjcmlwdE9iamVjdCk6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9TdG9yYWdlUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U3RvcmFnZVBhbmVsLnByb3RvdHlwZS5yZXNldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3Rv cmFnZVBhbmVsLnByb3RvdHlwZS5hZGRDb29raWVEb21haW4pOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmFkZFJlc291 cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5hZGRDb29raWVEb21haW4pOgorICAgICAgICAo V2ViSW5zcGVjdG9yLnJlc2V0KToKKwogMjAwOS0xMS0xOCAgR2lyaXNoIFJhbWFrcmlzaG5hbiAg PGdpcmlzaEBmb3J3YXJkYmlhcy5pbj4KIAogICAgICAgICBSZXZpZXdlZCBieSBUb3IgQXJuZSBW ZXN0YsMuLApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxl ci5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAppbmRleCAw YWUwMjI0Li5hNWM3ZjY5IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JD b250cm9sbGVyLmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVy LmNwcApAQCAtNjcwLDEyICs2NzAsOCBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OnBvcHVs YXRlU2NyaXB0T2JqZWN0cygpCiAgICAgbV9kb21BZ2VudC0+c2V0RG9jdW1lbnQobV9pbnNwZWN0 ZWRQYWdlLT5tYWluRnJhbWUoKS0+ZG9jdW1lbnQoKSk7CiAKICAgICBSZXNvdXJjZXNNYXA6Oml0 ZXJhdG9yIHJlc291cmNlc0VuZCA9IG1fcmVzb3VyY2VzLmVuZCgpOwotICAgIGZvciAoUmVzb3Vy Y2VzTWFwOjppdGVyYXRvciBpdCA9IG1fcmVzb3VyY2VzLmJlZ2luKCk7IGl0ICE9IHJlc291cmNl c0VuZDsgKytpdCkgeworICAgIGZvciAoUmVzb3VyY2VzTWFwOjppdGVyYXRvciBpdCA9IG1fcmVz b3VyY2VzLmJlZ2luKCk7IGl0ICE9IHJlc291cmNlc0VuZDsgKytpdCkKICAgICAgICAgaXQtPnNl Y29uZC0+Y3JlYXRlU2NyaXB0T2JqZWN0KG1fZnJvbnRlbmQuZ2V0KCkpOwotICAgICAgICBLVVJM IHJlc291cmNlVVJMID0gaXQtPnNlY29uZC0+ZnJhbWUoKS0+ZG9jdW1lbnQoKS0+dXJsKCk7Ci0g ICAgICAgIGlmIChyZXNvdXJjZVVSTC5wcm90b2NvbEluSFRUUEZhbWlseSgpIHx8IHJlc291cmNl VVJMLnByb3RvY29sSXMoImZpbGUiKSkKLSAgICAgICAgICAgIG1fZnJvbnRlbmQtPmFkZENvb2tp ZURvbWFpbihyZXNvdXJjZVVSTC5ob3N0KCkpOwotICAgIH0KIAogICAgIHVuc2lnbmVkIG1lc3Nh Z2VDb3VudCA9IG1fY29uc29sZU1lc3NhZ2VzLnNpemUoKTsKICAgICBmb3IgKHVuc2lnbmVkIGkg PSAwOyBpIDwgbWVzc2FnZUNvdW50OyArK2kpCkBAIC0xMDExLDEyICsxMDA3LDggQEAgdm9pZCBJ bnNwZWN0b3JDb250cm9sbGVyOjpkaWRGaW5pc2hMb2FkaW5nKERvY3VtZW50TG9hZGVyKiwgdW5z aWduZWQgbG9uZyBpZGVudGkKIAogICAgIGFkZFJlc291cmNlKHJlc291cmNlLmdldCgpKTsKIAot ICAgIGlmICh3aW5kb3dWaXNpYmxlKCkpIHsKKyAgICBpZiAod2luZG93VmlzaWJsZSgpKQogICAg ICAgICByZXNvdXJjZS0+dXBkYXRlU2NyaXB0T2JqZWN0KG1fZnJvbnRlbmQuZ2V0KCkpOwotICAg ICAgICBLVVJMIHJlc291cmNlVVJMID0gcmVzb3VyY2UtPmZyYW1lKCktPmRvY3VtZW50KCktPnVy bCgpOwotICAgICAgICBpZiAocmVzb3VyY2VVUkwucHJvdG9jb2xJbkhUVFBGYW1pbHkoKSB8fCBy ZXNvdXJjZVVSTC5wcm90b2NvbElzKCJmaWxlIikpCi0gICAgICAgICAgICBtX2Zyb250ZW5kLT5h ZGRDb29raWVEb21haW4ocmVzb3VyY2VVUkwuaG9zdCgpKTsKLSAgICB9CiB9CiAKIHZvaWQgSW5z cGVjdG9yQ29udHJvbGxlcjo6ZGlkRmFpbExvYWRpbmcoRG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25l ZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlRXJyb3ImIC8qZXJyb3IqLykKZGlmZiAt LWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmNwcCBiL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmNwcAppbmRleCBmYzVmNTUxLi42OTQyZDAyIDEw MDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZC5jcHAKKysrIGIv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuY3BwCkBAIC0xMzIsMTMgKzEzMiw2 IEBAIHZvaWQgSW5zcGVjdG9yRnJvbnRlbmQ6OnJlbW92ZVJlc291cmNlKGxvbmcgbG9uZyBpZGVu dGlmaWVyKQogICAgIGZ1bmN0aW9uLT5jYWxsKCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yRnJvbnRl bmQ6OmFkZENvb2tpZURvbWFpbihTdHJpbmcgZG9tYWluKQotewotICAgIE93blB0cjxTY3JpcHRG dW5jdGlvbkNhbGw+IGZ1bmN0aW9uKG5ld0Z1bmN0aW9uQ2FsbCgiYWRkQ29va2llRG9tYWluIikp OwotICAgIGZ1bmN0aW9uLT5hcHBlbmRBcmd1bWVudChkb21haW4pOwotICAgIGZ1bmN0aW9uLT5j YWxsKCk7Ci19Ci0KIHZvaWQgSW5zcGVjdG9yRnJvbnRlbmQ6OnVwZGF0ZUZvY3VzZWROb2RlKGxv bmcgbG9uZyBub2RlSWQpCiB7CiAgICAgT3duUHRyPFNjcmlwdEZ1bmN0aW9uQ2FsbD4gZnVuY3Rp b24obmV3RnVuY3Rpb25DYWxsKCJ1cGRhdGVGb2N1c2VkTm9kZSIpKTsKZGlmZiAtLWdpdCBhL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmggYi9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JGcm9udGVuZC5oCmluZGV4IDNjYjliOGMuLjhkODE4ZDEgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmgKKysrIGIvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yRnJvbnRlbmQuaApAQCAtNzEsOCArNzEsNiBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgICAgIGJvb2wgdXBkYXRlUmVzb3VyY2UobG9uZyBsb25nIGlkZW50aWZpZXIsIGNv bnN0IFNjcmlwdE9iamVjdCYgcmVzb3VyY2VPYmopOwogICAgICAgICB2b2lkIHJlbW92ZVJlc291 cmNlKGxvbmcgbG9uZyBpZGVudGlmaWVyKTsKIAotICAgICAgICB2b2lkIGFkZENvb2tpZURvbWFp bihTdHJpbmcpOwotCiAgICAgICAgIHZvaWQgdXBkYXRlRm9jdXNlZE5vZGUobG9uZyBsb25nIG5v ZGVJZCk7CiAgICAgICAgIHZvaWQgc2V0QXR0YWNoZWRXaW5kb3coYm9vbCBhdHRhY2hlZCk7CiAg ICAgICAgIHZvaWQgc2hvd1BhbmVsKGludCBwYW5lbCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZS5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JSZXNvdXJjZS5jcHAKaW5kZXggZmUxNTIyZS4uNTc1OTZhMyAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2UuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvclJlc291cmNlLmNwcApAQCAtMTI4LDYgKzEyOCw3IEBAIHZvaWQgSW5zcGVjdG9y UmVzb3VyY2U6OmNyZWF0ZVNjcmlwdE9iamVjdChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQp CiAgICAgICAgIFNjcmlwdE9iamVjdCByZXF1ZXN0SGVhZGVycyA9IGZyb250ZW5kLT5uZXdTY3Jp cHRPYmplY3QoKTsKICAgICAgICAgcG9wdWxhdGVIZWFkZXJzT2JqZWN0KCZyZXF1ZXN0SGVhZGVy cywgbV9yZXF1ZXN0SGVhZGVyRmllbGRzKTsKICAgICAgICAganNvbk9iamVjdC5zZXQoInJlcXVl c3RIZWFkZXJzIiwgcmVxdWVzdEhlYWRlcnMpOworICAgICAgICBqc29uT2JqZWN0LnNldCgiZG9j dW1lbnRVUkwiLCBtX2ZyYW1lLT5kb2N1bWVudCgpLT51cmwoKSk7CiAgICAgICAgIGpzb25PYmpl Y3Quc2V0KCJyZXF1ZXN0VVJMIiwgcmVxdWVzdFVSTCgpKTsKICAgICAgICAganNvbk9iamVjdC5z ZXQoImhvc3QiLCBtX3JlcXVlc3RVUkwuaG9zdCgpKTsKICAgICAgICAganNvbk9iamVjdC5zZXQo InBhdGgiLCBtX3JlcXVlc3RVUkwucGF0aCgpKTsKQEAgLTE1Niw2ICsxNTcsNyBAQCB2b2lkIElu c3BlY3RvclJlc291cmNlOjp1cGRhdGVTY3JpcHRPYmplY3QoSW5zcGVjdG9yRnJvbnRlbmQqIGZy b250ZW5kKQogICAgIFNjcmlwdE9iamVjdCBqc29uT2JqZWN0ID0gZnJvbnRlbmQtPm5ld1Njcmlw dE9iamVjdCgpOwogICAgIGlmIChtX2NoYW5nZXMuaGFzQ2hhbmdlKFJlcXVlc3RDaGFuZ2UpKSB7 CiAgICAgICAgIGpzb25PYmplY3Quc2V0KCJ1cmwiLCByZXF1ZXN0VVJMKCkpOworICAgICAgICBq c29uT2JqZWN0LnNldCgiZG9jdW1lbnRVUkwiLCBtX2ZyYW1lLT5kb2N1bWVudCgpLT51cmwoKSk7 CiAgICAgICAgIGpzb25PYmplY3Quc2V0KCJkb21haW4iLCBtX3JlcXVlc3RVUkwuaG9zdCgpKTsK ICAgICAgICAganNvbk9iamVjdC5zZXQoInBhdGgiLCBtX3JlcXVlc3RVUkwucGF0aCgpKTsKICAg ICAgICAganNvbk9iamVjdC5zZXQoImxhc3RQYXRoQ29tcG9uZW50IiwgbV9yZXF1ZXN0VVJMLmxh c3RQYXRoQ29tcG9uZW50KCkpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1N0b3JhZ2VQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdG9yYWdl UGFuZWwuanMKaW5kZXggMWFhMTFlZS4uZGQ1NThkZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1N0b3JhZ2VQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU3RvcmFnZVBhbmVsLmpzCkBAIC05Nyw3ICs5Nyw2IEBAIFdlYkluc3BlY3Rvci5T dG9yYWdlUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgICAgIHRoaXMuX2RvbVN0b3JhZ2UgPSBb XTsKIAotICAgICAgICB0aGlzLl9jb29raWVEb21haW5zID0ge307CiAgICAgICAgIHRoaXMuX2Nv b2tpZVZpZXdzID0ge307CiAKICAgICAgICAgdGhpcy5kYXRhYmFzZXNMaXN0VHJlZUVsZW1lbnQu cmVtb3ZlQ2hpbGRyZW4oKTsKQEAgLTEyNCwxMyArMTIzLDggQEAgV2ViSW5zcGVjdG9yLlN0b3Jh Z2VQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgCiAgICAgYWRkQ29va2llRG9tYWluOiBmdW5jdGlv bihkb21haW4pCiAgICAgewotICAgICAgICAvLyBFbGltaW5hdGUgZHVwbGljYXRlIGRvbWFpbnMg ZnJvbSB0aGUgbGlzdC4KLSAgICAgICAgaWYgKHR5cGVvZiB0aGlzLl9jb29raWVEb21haW5zW2Rv bWFpbl0gIT09ICJ1bmRlZmluZWQiKQotICAgICAgICAgICAgcmV0dXJuOwotCiAgICAgICAgIHZh ciBjb29raWVEb21haW5UcmVlRWxlbWVudCA9IG5ldyBXZWJJbnNwZWN0b3IuQ29va2llU2lkZWJh clRyZWVFbGVtZW50KGRvbWFpbik7CiAgICAgICAgIHRoaXMuY29va2llTGlzdFRyZWVFbGVtZW50 LmFwcGVuZENoaWxkKGNvb2tpZURvbWFpblRyZWVFbGVtZW50KTsKLSAgICAgICAgdGhpcy5fY29v a2llRG9tYWluc1tkb21haW5dID0gdHJ1ZTsKICAgICB9LAogCiAgICAgYWRkRE9NU3RvcmFnZTog ZnVuY3Rpb24oZG9tU3RvcmFnZSkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9pbnNwZWN0b3IuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9y LmpzCmluZGV4IDAyZGE4YjUuLjlkYTNkY2IgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5qcwpAQCAtNzAsNiArNzAsNyBAQCBwcmVsb2FkSW1hZ2VzKCk7CiB2YXIgV2Vi SW5zcGVjdG9yID0gewogICAgIHJlc291cmNlczoge30sCiAgICAgcmVzb3VyY2VVUkxNYXA6IHt9 LAorICAgIGNvb2tpZURvbWFpbnM6IHt9LAogICAgIG1pc3NpbmdMb2NhbGl6ZWRTdHJpbmdzOiB7 fSwKIAogICAgIGdldCBwcmV2aW91c0ZvY3VzRWxlbWVudCgpCkBAIC05ODQsNiArOTg1LDEwIEBA IFdlYkluc3BlY3Rvci5hZGRSZXNvdXJjZSA9IGZ1bmN0aW9uKGlkZW50aWZpZXIsIHBheWxvYWQp CiAKICAgICBpZiAodGhpcy5wYW5lbHMucmVzb3VyY2VzKQogICAgICAgICB0aGlzLnBhbmVscy5y ZXNvdXJjZXMuYWRkUmVzb3VyY2UocmVzb3VyY2UpOworCisgICAgdmFyIG1hdGNoID0gcGF5bG9h ZC5kb2N1bWVudFVSTC5tYXRjaCgvXig/Omh0dHBbc10/fGZpbGUpOlwvXC8oW1wvXSpbXlwvXSsp Lyk7CisgICAgaWYgKG1hdGNoKQorICAgICAgICB0aGlzLmFkZENvb2tpZURvbWFpbihtYXRjaFsx XSk7CiB9CiAKIFdlYkluc3BlY3Rvci5jbGVhckNvbnNvbGVNZXNzYWdlcyA9IGZ1bmN0aW9uKCkK QEAgLTEwOTUsNiArMTEwMCwxMSBAQCBXZWJJbnNwZWN0b3IuYWRkRGF0YWJhc2UgPSBmdW5jdGlv bihwYXlsb2FkKQogCiBXZWJJbnNwZWN0b3IuYWRkQ29va2llRG9tYWluID0gZnVuY3Rpb24oZG9t YWluKQogeworICAgIC8vIEVsaW1pbmF0ZSBkdXBsaWNhdGUgZG9tYWlucyBmcm9tIHRoZSBsaXN0 LgorICAgIGlmICh0eXBlb2YgdGhpcy5jb29raWVEb21haW5zW2RvbWFpbl0gIT09ICJ1bmRlZmlu ZWQiKQorICAgICAgICByZXR1cm47CisgICAgdGhpcy5jb29raWVEb21haW5zW2RvbWFpbl0gPSB0 cnVlOworCiAgICAgaWYgKCF0aGlzLnBhbmVscy5zdG9yYWdlKQogICAgICAgICByZXR1cm47CiAg ICAgdGhpcy5wYW5lbHMuc3RvcmFnZS5hZGRDb29raWVEb21haW4oZG9tYWluKTsKQEAgLTExOTUs NiArMTIwNSw3IEBAIFdlYkluc3BlY3Rvci5yZXNldCA9IGZ1bmN0aW9uKCkKIAogICAgIHRoaXMu cmVzb3VyY2VzID0ge307CiAgICAgdGhpcy5yZXNvdXJjZVVSTE1hcCA9IHt9OworICAgIHRoaXMu Y29va2llRG9tYWlucyA9IHt9OwogICAgIHRoaXMuaG92ZXJlZERPTU5vZGUgPSBudWxsOwogCiAg ICAgZGVsZXRlIHRoaXMubWFpblJlc291cmNlOwo= 43438 2009-11-18 09:57:34 -0800 2009-11-19 03:51:49 -0800 patch (fixed) cookiedomains.patch text/plain 7857 apavlov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YzcyNjhjZS4uYTFmOTk0MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAwOS0xMS0xOCAgQWxleGFuZGVyIFBh dmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN0b3JlIGNvb2tpZSBkb21haW5zIGluIHRoZSBXZWJJbnNw ZWN0b3Igb2JqZWN0CisKKyAgICAgICAgVGhlIGNvb2tpZSBkb21haW5zIGhhdmUgYmVlbiBtb3Zl ZCBmcm9tIFN0b3JhZ2VQYW5lbCBpbnRvIFdlYkluc3BlY3Rvci4KKyAgICAgICAgQWxzbywgdGhl IGRvY3VtZW50IFVSTHMgYXJlIG5vdyBwYXNzZWQgaW5zaWRlIHRoZSBXZWJJbnNwZWN0b3IuYWRk UmVzb3VyY2UoKQorICAgICAgICBwYXlsb2FkIHJhdGhlciB0aGFuIHB1c2hlZCBkaXJlY3RseSBm cm9tIEluc3BlY3RvckNvbnRyb2xsZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0zMTYyNworCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNv bnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6cG9w dWxhdGVTY3JpcHRPYmplY3RzKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xs ZXI6OmRpZEZpbmlzaExvYWRpbmcpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9u dGVuZC5jcHA6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmg6CisgICAg ICAgICogaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvclJlc291cmNlOjpjcmVhdGVTY3JpcHRPYmplY3QpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yUmVzb3VyY2U6OnVwZGF0ZVNjcmlwdE9iamVjdCk6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9TdG9yYWdlUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U3RvcmFnZVBhbmVsLnByb3RvdHlwZS5yZXNldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3Rv cmFnZVBhbmVsLnByb3RvdHlwZS5hZGRDb29raWVEb21haW4pOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmFkZFJlc291 cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5hZGRDb29raWVEb21haW4pOgorICAgICAgICAo V2ViSW5zcGVjdG9yLnJlc2V0KToKKwogMjAwOS0xMS0xOCAgR2lyaXNoIFJhbWFrcmlzaG5hbiAg PGdpcmlzaEBmb3J3YXJkYmlhcy5pbj4KIAogICAgICAgICBSZXZpZXdlZCBieSBUb3IgQXJuZSBW ZXN0YsMuLApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxl ci5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAppbmRleCAw YWUwMjI0Li5hNWM3ZjY5IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JD b250cm9sbGVyLmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVy LmNwcApAQCAtNjcwLDEyICs2NzAsOCBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OnBvcHVs YXRlU2NyaXB0T2JqZWN0cygpCiAgICAgbV9kb21BZ2VudC0+c2V0RG9jdW1lbnQobV9pbnNwZWN0 ZWRQYWdlLT5tYWluRnJhbWUoKS0+ZG9jdW1lbnQoKSk7CiAKICAgICBSZXNvdXJjZXNNYXA6Oml0 ZXJhdG9yIHJlc291cmNlc0VuZCA9IG1fcmVzb3VyY2VzLmVuZCgpOwotICAgIGZvciAoUmVzb3Vy Y2VzTWFwOjppdGVyYXRvciBpdCA9IG1fcmVzb3VyY2VzLmJlZ2luKCk7IGl0ICE9IHJlc291cmNl c0VuZDsgKytpdCkgeworICAgIGZvciAoUmVzb3VyY2VzTWFwOjppdGVyYXRvciBpdCA9IG1fcmVz b3VyY2VzLmJlZ2luKCk7IGl0ICE9IHJlc291cmNlc0VuZDsgKytpdCkKICAgICAgICAgaXQtPnNl Y29uZC0+Y3JlYXRlU2NyaXB0T2JqZWN0KG1fZnJvbnRlbmQuZ2V0KCkpOwotICAgICAgICBLVVJM IHJlc291cmNlVVJMID0gaXQtPnNlY29uZC0+ZnJhbWUoKS0+ZG9jdW1lbnQoKS0+dXJsKCk7Ci0g ICAgICAgIGlmIChyZXNvdXJjZVVSTC5wcm90b2NvbEluSFRUUEZhbWlseSgpIHx8IHJlc291cmNl VVJMLnByb3RvY29sSXMoImZpbGUiKSkKLSAgICAgICAgICAgIG1fZnJvbnRlbmQtPmFkZENvb2tp ZURvbWFpbihyZXNvdXJjZVVSTC5ob3N0KCkpOwotICAgIH0KIAogICAgIHVuc2lnbmVkIG1lc3Nh Z2VDb3VudCA9IG1fY29uc29sZU1lc3NhZ2VzLnNpemUoKTsKICAgICBmb3IgKHVuc2lnbmVkIGkg PSAwOyBpIDwgbWVzc2FnZUNvdW50OyArK2kpCkBAIC0xMDExLDEyICsxMDA3LDggQEAgdm9pZCBJ bnNwZWN0b3JDb250cm9sbGVyOjpkaWRGaW5pc2hMb2FkaW5nKERvY3VtZW50TG9hZGVyKiwgdW5z aWduZWQgbG9uZyBpZGVudGkKIAogICAgIGFkZFJlc291cmNlKHJlc291cmNlLmdldCgpKTsKIAot ICAgIGlmICh3aW5kb3dWaXNpYmxlKCkpIHsKKyAgICBpZiAod2luZG93VmlzaWJsZSgpKQogICAg ICAgICByZXNvdXJjZS0+dXBkYXRlU2NyaXB0T2JqZWN0KG1fZnJvbnRlbmQuZ2V0KCkpOwotICAg ICAgICBLVVJMIHJlc291cmNlVVJMID0gcmVzb3VyY2UtPmZyYW1lKCktPmRvY3VtZW50KCktPnVy bCgpOwotICAgICAgICBpZiAocmVzb3VyY2VVUkwucHJvdG9jb2xJbkhUVFBGYW1pbHkoKSB8fCBy ZXNvdXJjZVVSTC5wcm90b2NvbElzKCJmaWxlIikpCi0gICAgICAgICAgICBtX2Zyb250ZW5kLT5h ZGRDb29raWVEb21haW4ocmVzb3VyY2VVUkwuaG9zdCgpKTsKLSAgICB9CiB9CiAKIHZvaWQgSW5z cGVjdG9yQ29udHJvbGxlcjo6ZGlkRmFpbExvYWRpbmcoRG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25l ZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlRXJyb3ImIC8qZXJyb3IqLykKZGlmZiAt LWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmNwcCBiL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmNwcAppbmRleCBmYzVmNTUxLi42OTQyZDAyIDEw MDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZC5jcHAKKysrIGIv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuY3BwCkBAIC0xMzIsMTMgKzEzMiw2 IEBAIHZvaWQgSW5zcGVjdG9yRnJvbnRlbmQ6OnJlbW92ZVJlc291cmNlKGxvbmcgbG9uZyBpZGVu dGlmaWVyKQogICAgIGZ1bmN0aW9uLT5jYWxsKCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yRnJvbnRl bmQ6OmFkZENvb2tpZURvbWFpbihTdHJpbmcgZG9tYWluKQotewotICAgIE93blB0cjxTY3JpcHRG dW5jdGlvbkNhbGw+IGZ1bmN0aW9uKG5ld0Z1bmN0aW9uQ2FsbCgiYWRkQ29va2llRG9tYWluIikp OwotICAgIGZ1bmN0aW9uLT5hcHBlbmRBcmd1bWVudChkb21haW4pOwotICAgIGZ1bmN0aW9uLT5j YWxsKCk7Ci19Ci0KIHZvaWQgSW5zcGVjdG9yRnJvbnRlbmQ6OnVwZGF0ZUZvY3VzZWROb2RlKGxv bmcgbG9uZyBub2RlSWQpCiB7CiAgICAgT3duUHRyPFNjcmlwdEZ1bmN0aW9uQ2FsbD4gZnVuY3Rp b24obmV3RnVuY3Rpb25DYWxsKCJ1cGRhdGVGb2N1c2VkTm9kZSIpKTsKZGlmZiAtLWdpdCBhL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmggYi9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JGcm9udGVuZC5oCmluZGV4IDNjYjliOGMuLjhkODE4ZDEgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmgKKysrIGIvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yRnJvbnRlbmQuaApAQCAtNzEsOCArNzEsNiBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgICAgIGJvb2wgdXBkYXRlUmVzb3VyY2UobG9uZyBsb25nIGlkZW50aWZpZXIsIGNv bnN0IFNjcmlwdE9iamVjdCYgcmVzb3VyY2VPYmopOwogICAgICAgICB2b2lkIHJlbW92ZVJlc291 cmNlKGxvbmcgbG9uZyBpZGVudGlmaWVyKTsKIAotICAgICAgICB2b2lkIGFkZENvb2tpZURvbWFp bihTdHJpbmcpOwotCiAgICAgICAgIHZvaWQgdXBkYXRlRm9jdXNlZE5vZGUobG9uZyBsb25nIG5v ZGVJZCk7CiAgICAgICAgIHZvaWQgc2V0QXR0YWNoZWRXaW5kb3coYm9vbCBhdHRhY2hlZCk7CiAg ICAgICAgIHZvaWQgc2hvd1BhbmVsKGludCBwYW5lbCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZS5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JSZXNvdXJjZS5jcHAKaW5kZXggZmUxNTIyZS4uNTc1OTZhMyAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2UuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvclJlc291cmNlLmNwcApAQCAtMTI4LDYgKzEyOCw3IEBAIHZvaWQgSW5zcGVjdG9y UmVzb3VyY2U6OmNyZWF0ZVNjcmlwdE9iamVjdChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQp CiAgICAgICAgIFNjcmlwdE9iamVjdCByZXF1ZXN0SGVhZGVycyA9IGZyb250ZW5kLT5uZXdTY3Jp cHRPYmplY3QoKTsKICAgICAgICAgcG9wdWxhdGVIZWFkZXJzT2JqZWN0KCZyZXF1ZXN0SGVhZGVy cywgbV9yZXF1ZXN0SGVhZGVyRmllbGRzKTsKICAgICAgICAganNvbk9iamVjdC5zZXQoInJlcXVl c3RIZWFkZXJzIiwgcmVxdWVzdEhlYWRlcnMpOworICAgICAgICBqc29uT2JqZWN0LnNldCgiZG9j dW1lbnRVUkwiLCBtX2ZyYW1lLT5kb2N1bWVudCgpLT51cmwoKSk7CiAgICAgICAgIGpzb25PYmpl Y3Quc2V0KCJyZXF1ZXN0VVJMIiwgcmVxdWVzdFVSTCgpKTsKICAgICAgICAganNvbk9iamVjdC5z ZXQoImhvc3QiLCBtX3JlcXVlc3RVUkwuaG9zdCgpKTsKICAgICAgICAganNvbk9iamVjdC5zZXQo InBhdGgiLCBtX3JlcXVlc3RVUkwucGF0aCgpKTsKQEAgLTE1Niw2ICsxNTcsNyBAQCB2b2lkIElu c3BlY3RvclJlc291cmNlOjp1cGRhdGVTY3JpcHRPYmplY3QoSW5zcGVjdG9yRnJvbnRlbmQqIGZy b250ZW5kKQogICAgIFNjcmlwdE9iamVjdCBqc29uT2JqZWN0ID0gZnJvbnRlbmQtPm5ld1Njcmlw dE9iamVjdCgpOwogICAgIGlmIChtX2NoYW5nZXMuaGFzQ2hhbmdlKFJlcXVlc3RDaGFuZ2UpKSB7 CiAgICAgICAgIGpzb25PYmplY3Quc2V0KCJ1cmwiLCByZXF1ZXN0VVJMKCkpOworICAgICAgICBq c29uT2JqZWN0LnNldCgiZG9jdW1lbnRVUkwiLCBtX2ZyYW1lLT5kb2N1bWVudCgpLT51cmwoKSk7 CiAgICAgICAgIGpzb25PYmplY3Quc2V0KCJkb21haW4iLCBtX3JlcXVlc3RVUkwuaG9zdCgpKTsK ICAgICAgICAganNvbk9iamVjdC5zZXQoInBhdGgiLCBtX3JlcXVlc3RVUkwucGF0aCgpKTsKICAg ICAgICAganNvbk9iamVjdC5zZXQoImxhc3RQYXRoQ29tcG9uZW50IiwgbV9yZXF1ZXN0VVJMLmxh c3RQYXRoQ29tcG9uZW50KCkpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1N0b3JhZ2VQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdG9yYWdl UGFuZWwuanMKaW5kZXggMWFhMTFlZS4uZGQ1NThkZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1N0b3JhZ2VQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU3RvcmFnZVBhbmVsLmpzCkBAIC05Nyw3ICs5Nyw2IEBAIFdlYkluc3BlY3Rvci5T dG9yYWdlUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgICAgIHRoaXMuX2RvbVN0b3JhZ2UgPSBb XTsKIAotICAgICAgICB0aGlzLl9jb29raWVEb21haW5zID0ge307CiAgICAgICAgIHRoaXMuX2Nv b2tpZVZpZXdzID0ge307CiAKICAgICAgICAgdGhpcy5kYXRhYmFzZXNMaXN0VHJlZUVsZW1lbnQu cmVtb3ZlQ2hpbGRyZW4oKTsKQEAgLTEyNCwxMyArMTIzLDggQEAgV2ViSW5zcGVjdG9yLlN0b3Jh Z2VQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgCiAgICAgYWRkQ29va2llRG9tYWluOiBmdW5jdGlv bihkb21haW4pCiAgICAgewotICAgICAgICAvLyBFbGltaW5hdGUgZHVwbGljYXRlIGRvbWFpbnMg ZnJvbSB0aGUgbGlzdC4KLSAgICAgICAgaWYgKHR5cGVvZiB0aGlzLl9jb29raWVEb21haW5zW2Rv bWFpbl0gIT09ICJ1bmRlZmluZWQiKQotICAgICAgICAgICAgcmV0dXJuOwotCiAgICAgICAgIHZh ciBjb29raWVEb21haW5UcmVlRWxlbWVudCA9IG5ldyBXZWJJbnNwZWN0b3IuQ29va2llU2lkZWJh clRyZWVFbGVtZW50KGRvbWFpbik7CiAgICAgICAgIHRoaXMuY29va2llTGlzdFRyZWVFbGVtZW50 LmFwcGVuZENoaWxkKGNvb2tpZURvbWFpblRyZWVFbGVtZW50KTsKLSAgICAgICAgdGhpcy5fY29v a2llRG9tYWluc1tkb21haW5dID0gdHJ1ZTsKICAgICB9LAogCiAgICAgYWRkRE9NU3RvcmFnZTog ZnVuY3Rpb24oZG9tU3RvcmFnZSkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9pbnNwZWN0b3IuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9y LmpzCmluZGV4IDAyZGE4YjUuLjM0YmRjMGUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5qcwpAQCAtNzAsNiArNzAsNyBAQCBwcmVsb2FkSW1hZ2VzKCk7CiB2YXIgV2Vi SW5zcGVjdG9yID0gewogICAgIHJlc291cmNlczoge30sCiAgICAgcmVzb3VyY2VVUkxNYXA6IHt9 LAorICAgIGNvb2tpZURvbWFpbnM6IHt9LAogICAgIG1pc3NpbmdMb2NhbGl6ZWRTdHJpbmdzOiB7 fSwKIAogICAgIGdldCBwcmV2aW91c0ZvY3VzRWxlbWVudCgpCkBAIC05ODQsNiArOTg1LDEwIEBA IFdlYkluc3BlY3Rvci5hZGRSZXNvdXJjZSA9IGZ1bmN0aW9uKGlkZW50aWZpZXIsIHBheWxvYWQp CiAKICAgICBpZiAodGhpcy5wYW5lbHMucmVzb3VyY2VzKQogICAgICAgICB0aGlzLnBhbmVscy5y ZXNvdXJjZXMuYWRkUmVzb3VyY2UocmVzb3VyY2UpOworCisgICAgdmFyIG1hdGNoID0gcGF5bG9h ZC5kb2N1bWVudFVSTC5tYXRjaCgvXihodHRwW3NdP3xmaWxlKTpcL1wvKFtcL10qW15cL10rKS9p KTsKKyAgICBpZiAobWF0Y2gpCisgICAgICAgIHRoaXMuYWRkQ29va2llRG9tYWluKG1hdGNoWzFd LnRvTG93ZXJDYXNlKCkgPT09ICJmaWxlIiA/ICIiIDogbWF0Y2hbMl0pOwogfQogCiBXZWJJbnNw ZWN0b3IuY2xlYXJDb25zb2xlTWVzc2FnZXMgPSBmdW5jdGlvbigpCkBAIC0xMDk1LDYgKzExMDAs MTEgQEAgV2ViSW5zcGVjdG9yLmFkZERhdGFiYXNlID0gZnVuY3Rpb24ocGF5bG9hZCkKIAogV2Vi SW5zcGVjdG9yLmFkZENvb2tpZURvbWFpbiA9IGZ1bmN0aW9uKGRvbWFpbikKIHsKKyAgICAvLyBF bGltaW5hdGUgZHVwbGljYXRlIGRvbWFpbnMgZnJvbSB0aGUgbGlzdC4KKyAgICBpZiAoZG9tYWlu IGluIHRoaXMuY29va2llRG9tYWlucykKKyAgICAgICAgcmV0dXJuOworICAgIHRoaXMuY29va2ll RG9tYWluc1tkb21haW5dID0gdHJ1ZTsKKwogICAgIGlmICghdGhpcy5wYW5lbHMuc3RvcmFnZSkK ICAgICAgICAgcmV0dXJuOwogICAgIHRoaXMucGFuZWxzLnN0b3JhZ2UuYWRkQ29va2llRG9tYWlu KGRvbWFpbik7CkBAIC0xMTk1LDYgKzEyMDUsNyBAQCBXZWJJbnNwZWN0b3IucmVzZXQgPSBmdW5j dGlvbigpCiAKICAgICB0aGlzLnJlc291cmNlcyA9IHt9OwogICAgIHRoaXMucmVzb3VyY2VVUkxN YXAgPSB7fTsKKyAgICB0aGlzLmNvb2tpZURvbWFpbnMgPSB7fTsKICAgICB0aGlzLmhvdmVyZWRE T01Ob2RlID0gbnVsbDsKIAogICAgIGRlbGV0ZSB0aGlzLm1haW5SZXNvdXJjZTsK 43494 2009-11-19 03:51:49 -0800 2009-11-19 05:03:18 -0800 patch (fix mac build) cookiedomains.patch text/plain 7855 apavlov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OTgzYTZmYy4uNTYwNDI2OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAwOS0xMS0xOSAgQWxleGFuZGVyIFBh dmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN0b3JlIGNvb2tpZSBkb21haW5zIGluIHRoZSBXZWJJbnNw ZWN0b3Igb2JqZWN0CisKKyAgICAgICAgVGhlIGNvb2tpZSBkb21haW5zIGhhdmUgYmVlbiBtb3Zl ZCBmcm9tIFN0b3JhZ2VQYW5lbCBpbnRvIFdlYkluc3BlY3Rvci4KKyAgICAgICAgQWxzbywgdGhl IGRvY3VtZW50IFVSTHMgYXJlIG5vdyBwYXNzZWQgaW5zaWRlIHRoZSBXZWJJbnNwZWN0b3IuYWRk UmVzb3VyY2UoKQorICAgICAgICBwYXlsb2FkIHJhdGhlciB0aGFuIHB1c2hlZCBkaXJlY3RseSBm cm9tIEluc3BlY3RvckNvbnRyb2xsZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0zMTYyNworCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNv bnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6cG9w dWxhdGVTY3JpcHRPYmplY3RzKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xs ZXI6OmRpZEZpbmlzaExvYWRpbmcpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9u dGVuZC5jcHA6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmg6CisgICAg ICAgICogaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvclJlc291cmNlOjpjcmVhdGVTY3JpcHRPYmplY3QpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yUmVzb3VyY2U6OnVwZGF0ZVNjcmlwdE9iamVjdCk6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9TdG9yYWdlUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U3RvcmFnZVBhbmVsLnByb3RvdHlwZS5yZXNldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3Rv cmFnZVBhbmVsLnByb3RvdHlwZS5hZGRDb29raWVEb21haW4pOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmFkZFJlc291 cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5hZGRDb29raWVEb21haW4pOgorICAgICAgICAo V2ViSW5zcGVjdG9yLnJlc2V0KToKKwogMjAwOS0xMS0xOCAgTGFzemxvIEdvbWJvcyAgPGxhc3ps by4xLmdvbWJvc0Bub2tpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4KZGlmZiAtLWdpdCBh L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwIGIvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXggNjE3YzRiYi4uOTIwYzNmMCAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKKysrIGIv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKQEAgLTY3MCwxMiArNjcw LDggQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpwb3B1bGF0ZVNjcmlwdE9iamVjdHMoKQog ICAgIG1fZG9tQWdlbnQtPnNldERvY3VtZW50KG1faW5zcGVjdGVkUGFnZS0+bWFpbkZyYW1lKCkt PmRvY3VtZW50KCkpOwogCiAgICAgUmVzb3VyY2VzTWFwOjppdGVyYXRvciByZXNvdXJjZXNFbmQg PSBtX3Jlc291cmNlcy5lbmQoKTsKLSAgICBmb3IgKFJlc291cmNlc01hcDo6aXRlcmF0b3IgaXQg PSBtX3Jlc291cmNlcy5iZWdpbigpOyBpdCAhPSByZXNvdXJjZXNFbmQ7ICsraXQpIHsKKyAgICBm b3IgKFJlc291cmNlc01hcDo6aXRlcmF0b3IgaXQgPSBtX3Jlc291cmNlcy5iZWdpbigpOyBpdCAh PSByZXNvdXJjZXNFbmQ7ICsraXQpCiAgICAgICAgIGl0LT5zZWNvbmQtPmNyZWF0ZVNjcmlwdE9i amVjdChtX2Zyb250ZW5kLmdldCgpKTsKLSAgICAgICAgS1VSTCByZXNvdXJjZVVSTCA9IGl0LT5z ZWNvbmQtPmZyYW1lKCktPmRvY3VtZW50KCktPnVybCgpOwotICAgICAgICBpZiAocmVzb3VyY2VV UkwucHJvdG9jb2xJbkhUVFBGYW1pbHkoKSB8fCByZXNvdXJjZVVSTC5wcm90b2NvbElzKCJmaWxl IikpCi0gICAgICAgICAgICBtX2Zyb250ZW5kLT5hZGRDb29raWVEb21haW4ocmVzb3VyY2VVUkwu aG9zdCgpKTsKLSAgICB9CiAKICAgICB1bnNpZ25lZCBtZXNzYWdlQ291bnQgPSBtX2NvbnNvbGVN ZXNzYWdlcy5zaXplKCk7CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1lc3NhZ2VDb3Vu dDsgKytpKQpAQCAtMTAxMSwxMiArMTAwNyw4IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6 ZGlkRmluaXNoTG9hZGluZyhEb2N1bWVudExvYWRlciosIHVuc2lnbmVkIGxvbmcgaWRlbnRpCiAK ICAgICBhZGRSZXNvdXJjZShyZXNvdXJjZS5nZXQoKSk7CiAKLSAgICBpZiAod2luZG93VmlzaWJs ZSgpKSB7CisgICAgaWYgKHdpbmRvd1Zpc2libGUoKSkKICAgICAgICAgcmVzb3VyY2UtPnVwZGF0 ZVNjcmlwdE9iamVjdChtX2Zyb250ZW5kLmdldCgpKTsKLSAgICAgICAgS1VSTCByZXNvdXJjZVVS TCA9IHJlc291cmNlLT5mcmFtZSgpLT5kb2N1bWVudCgpLT51cmwoKTsKLSAgICAgICAgaWYgKHJl c291cmNlVVJMLnByb3RvY29sSW5IVFRQRmFtaWx5KCkgfHwgcmVzb3VyY2VVUkwucHJvdG9jb2xJ cygiZmlsZSIpKQotICAgICAgICAgICAgbV9mcm9udGVuZC0+YWRkQ29va2llRG9tYWluKHJlc291 cmNlVVJMLmhvc3QoKSk7Ci0gICAgfQogfQogCiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRp ZEZhaWxMb2FkaW5nKERvY3VtZW50TG9hZGVyKiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBj b25zdCBSZXNvdXJjZUVycm9yJiAvKmVycm9yKi8pCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JGcm9udGVuZC5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JG cm9udGVuZC5jcHAKaW5kZXggZmM1ZjU1MS4uNjk0MmQwMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckZyb250ZW5kLmNwcApAQCAtMTMyLDEzICsxMzIsNiBAQCB2b2lkIEluc3BlY3RvckZy b250ZW5kOjpyZW1vdmVSZXNvdXJjZShsb25nIGxvbmcgaWRlbnRpZmllcikKICAgICBmdW5jdGlv bi0+Y2FsbCgpOwogfQogCi12b2lkIEluc3BlY3RvckZyb250ZW5kOjphZGRDb29raWVEb21haW4o U3RyaW5nIGRvbWFpbikKLXsKLSAgICBPd25QdHI8U2NyaXB0RnVuY3Rpb25DYWxsPiBmdW5jdGlv bihuZXdGdW5jdGlvbkNhbGwoImFkZENvb2tpZURvbWFpbiIpKTsKLSAgICBmdW5jdGlvbi0+YXBw ZW5kQXJndW1lbnQoZG9tYWluKTsKLSAgICBmdW5jdGlvbi0+Y2FsbCgpOwotfQotCiB2b2lkIElu c3BlY3RvckZyb250ZW5kOjp1cGRhdGVGb2N1c2VkTm9kZShsb25nIGxvbmcgbm9kZUlkKQogewog ICAgIE93blB0cjxTY3JpcHRGdW5jdGlvbkNhbGw+IGZ1bmN0aW9uKG5ld0Z1bmN0aW9uQ2FsbCgi dXBkYXRlRm9jdXNlZE5vZGUiKSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JGcm9udGVuZC5oIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuaApp bmRleCAzY2I5YjhjLi44ZDgxOGQxIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JGcm9udGVuZC5oCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5k LmgKQEAgLTcxLDggKzcxLDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBib29sIHVw ZGF0ZVJlc291cmNlKGxvbmcgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBTY3JpcHRPYmplY3QmIHJl c291cmNlT2JqKTsKICAgICAgICAgdm9pZCByZW1vdmVSZXNvdXJjZShsb25nIGxvbmcgaWRlbnRp Zmllcik7CiAKLSAgICAgICAgdm9pZCBhZGRDb29raWVEb21haW4oU3RyaW5nKTsKLQogICAgICAg ICB2b2lkIHVwZGF0ZUZvY3VzZWROb2RlKGxvbmcgbG9uZyBub2RlSWQpOwogICAgICAgICB2b2lk IHNldEF0dGFjaGVkV2luZG93KGJvb2wgYXR0YWNoZWQpOwogICAgICAgICB2b2lkIHNob3dQYW5l bChpbnQgcGFuZWwpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVz b3VyY2UuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2UuY3BwCmluZGV4 IGZlMTUyMmUuLjA4NzAyNDAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv clJlc291cmNlLmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZS5j cHAKQEAgLTEyOCw2ICsxMjgsNyBAQCB2b2lkIEluc3BlY3RvclJlc291cmNlOjpjcmVhdGVTY3Jp cHRPYmplY3QoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kKQogICAgICAgICBTY3JpcHRPYmpl Y3QgcmVxdWVzdEhlYWRlcnMgPSBmcm9udGVuZC0+bmV3U2NyaXB0T2JqZWN0KCk7CiAgICAgICAg IHBvcHVsYXRlSGVhZGVyc09iamVjdCgmcmVxdWVzdEhlYWRlcnMsIG1fcmVxdWVzdEhlYWRlckZp ZWxkcyk7CiAgICAgICAgIGpzb25PYmplY3Quc2V0KCJyZXF1ZXN0SGVhZGVycyIsIHJlcXVlc3RI ZWFkZXJzKTsKKyAgICAgICAganNvbk9iamVjdC5zZXQoImRvY3VtZW50VVJMIiwgbV9mcmFtZS0+ ZG9jdW1lbnQoKS0+dXJsKCkuc3RyaW5nKCkpOwogICAgICAgICBqc29uT2JqZWN0LnNldCgicmVx dWVzdFVSTCIsIHJlcXVlc3RVUkwoKSk7CiAgICAgICAgIGpzb25PYmplY3Quc2V0KCJob3N0Iiwg bV9yZXF1ZXN0VVJMLmhvc3QoKSk7CiAgICAgICAgIGpzb25PYmplY3Quc2V0KCJwYXRoIiwgbV9y ZXF1ZXN0VVJMLnBhdGgoKSk7CkBAIC0xNTYsNiArMTU3LDcgQEAgdm9pZCBJbnNwZWN0b3JSZXNv dXJjZTo6dXBkYXRlU2NyaXB0T2JqZWN0KEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCkKICAg ICBTY3JpcHRPYmplY3QganNvbk9iamVjdCA9IGZyb250ZW5kLT5uZXdTY3JpcHRPYmplY3QoKTsK ICAgICBpZiAobV9jaGFuZ2VzLmhhc0NoYW5nZShSZXF1ZXN0Q2hhbmdlKSkgewogICAgICAgICBq c29uT2JqZWN0LnNldCgidXJsIiwgcmVxdWVzdFVSTCgpKTsKKyAgICAgICAganNvbk9iamVjdC5z ZXQoImRvY3VtZW50VVJMIiwgbV9mcmFtZS0+ZG9jdW1lbnQoKS0+dXJsKCkuc3RyaW5nKCkpOwog ICAgICAgICBqc29uT2JqZWN0LnNldCgiZG9tYWluIiwgbV9yZXF1ZXN0VVJMLmhvc3QoKSk7CiAg ICAgICAgIGpzb25PYmplY3Quc2V0KCJwYXRoIiwgbV9yZXF1ZXN0VVJMLnBhdGgoKSk7CiAgICAg ICAgIGpzb25PYmplY3Quc2V0KCJsYXN0UGF0aENvbXBvbmVudCIsIG1fcmVxdWVzdFVSTC5sYXN0 UGF0aENvbXBvbmVudCgpKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TdG9yYWdlUGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3RvcmFnZVBh bmVsLmpzCmluZGV4IDFhYTExZWUuLmRkNTU4ZGYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TdG9yYWdlUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1N0b3JhZ2VQYW5lbC5qcwpAQCAtOTcsNyArOTcsNiBAQCBXZWJJbnNwZWN0b3IuU3Rv cmFnZVBhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB0aGlzLl9kb21TdG9yYWdlID0gW107 CiAKLSAgICAgICAgdGhpcy5fY29va2llRG9tYWlucyA9IHt9OwogICAgICAgICB0aGlzLl9jb29r aWVWaWV3cyA9IHt9OwogCiAgICAgICAgIHRoaXMuZGF0YWJhc2VzTGlzdFRyZWVFbGVtZW50LnJl bW92ZUNoaWxkcmVuKCk7CkBAIC0xMjQsMTMgKzEyMyw4IEBAIFdlYkluc3BlY3Rvci5TdG9yYWdl UGFuZWwucHJvdG90eXBlID0gewogICAgIAogICAgIGFkZENvb2tpZURvbWFpbjogZnVuY3Rpb24o ZG9tYWluKQogICAgIHsKLSAgICAgICAgLy8gRWxpbWluYXRlIGR1cGxpY2F0ZSBkb21haW5zIGZy b20gdGhlIGxpc3QuCi0gICAgICAgIGlmICh0eXBlb2YgdGhpcy5fY29va2llRG9tYWluc1tkb21h aW5dICE9PSAidW5kZWZpbmVkIikKLSAgICAgICAgICAgIHJldHVybjsKLQogICAgICAgICB2YXIg Y29va2llRG9tYWluVHJlZUVsZW1lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLkNvb2tpZVNpZGViYXJU cmVlRWxlbWVudChkb21haW4pOwogICAgICAgICB0aGlzLmNvb2tpZUxpc3RUcmVlRWxlbWVudC5h cHBlbmRDaGlsZChjb29raWVEb21haW5UcmVlRWxlbWVudCk7Ci0gICAgICAgIHRoaXMuX2Nvb2tp ZURvbWFpbnNbZG9tYWluXSA9IHRydWU7CiAgICAgfSwKIAogICAgIGFkZERPTVN0b3JhZ2U6IGZ1 bmN0aW9uKGRvbVN0b3JhZ2UpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvaW5zcGVjdG9yLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5q cwppbmRleCA2NjI3YThiLi5iNjMyYzJjIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvaW5zcGVjdG9yLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuanMKQEAgLTcwLDYgKzcwLDcgQEAgcHJlbG9hZEltYWdlcygpOwogdmFyIFdlYklu c3BlY3RvciA9IHsKICAgICByZXNvdXJjZXM6IHt9LAogICAgIHJlc291cmNlVVJMTWFwOiB7fSwK KyAgICBjb29raWVEb21haW5zOiB7fSwKICAgICBtaXNzaW5nTG9jYWxpemVkU3RyaW5nczoge30s CiAKICAgICBnZXQgcHJldmlvdXNGb2N1c0VsZW1lbnQoKQpAQCAtOTg0LDYgKzk4NSwxMCBAQCBX ZWJJbnNwZWN0b3IuYWRkUmVzb3VyY2UgPSBmdW5jdGlvbihpZGVudGlmaWVyLCBwYXlsb2FkKQog CiAgICAgaWYgKHRoaXMucGFuZWxzLnJlc291cmNlcykKICAgICAgICAgdGhpcy5wYW5lbHMucmVz b3VyY2VzLmFkZFJlc291cmNlKHJlc291cmNlKTsKKworICAgIHZhciBtYXRjaCA9IHBheWxvYWQu ZG9jdW1lbnRVUkwubWF0Y2goL14oaHR0cFtzXT98ZmlsZSk6XC9cLyhbXC9dKlteXC9dKykvaSk7 CisgICAgaWYgKG1hdGNoKQorICAgICAgICB0aGlzLmFkZENvb2tpZURvbWFpbihtYXRjaFsxXS50 b0xvd2VyQ2FzZSgpID09PSAiZmlsZSIgPyAiIiA6IG1hdGNoWzJdKTsKIH0KIAogV2ViSW5zcGVj dG9yLmNsZWFyQ29uc29sZU1lc3NhZ2VzID0gZnVuY3Rpb24oKQpAQCAtMTA5NSw2ICsxMTAwLDEx IEBAIFdlYkluc3BlY3Rvci5hZGREYXRhYmFzZSA9IGZ1bmN0aW9uKHBheWxvYWQpCiAKIFdlYklu c3BlY3Rvci5hZGRDb29raWVEb21haW4gPSBmdW5jdGlvbihkb21haW4pCiB7CisgICAgLy8gRWxp bWluYXRlIGR1cGxpY2F0ZSBkb21haW5zIGZyb20gdGhlIGxpc3QuCisgICAgaWYgKGRvbWFpbiBp biB0aGlzLmNvb2tpZURvbWFpbnMpCisgICAgICAgIHJldHVybjsKKyAgICB0aGlzLmNvb2tpZURv bWFpbnNbZG9tYWluXSA9IHRydWU7CisKICAgICBpZiAoIXRoaXMucGFuZWxzLnN0b3JhZ2UpCiAg ICAgICAgIHJldHVybjsKICAgICB0aGlzLnBhbmVscy5zdG9yYWdlLmFkZENvb2tpZURvbWFpbihk b21haW4pOwpAQCAtMTE5NSw2ICsxMjA1LDcgQEAgV2ViSW5zcGVjdG9yLnJlc2V0ID0gZnVuY3Rp b24oKQogCiAgICAgdGhpcy5yZXNvdXJjZXMgPSB7fTsKICAgICB0aGlzLnJlc291cmNlVVJMTWFw ID0ge307CisgICAgdGhpcy5jb29raWVEb21haW5zID0ge307CiAgICAgdGhpcy5ob3ZlcmVkRE9N Tm9kZSA9IG51bGw7CiAKICAgICBkZWxldGUgdGhpcy5tYWluUmVzb3VyY2U7Cg==