93773 2012-08-11 21:23:47 -0700 Enable XPC Service based WebProcess with runtime flag 2012-08-11 22:29:47 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam mitz oldest_to_newest 693166 0 sam 2012-08-11 21:23:47 -0700 Enable XPC Service base WebProcess with runtime flag 693167 1 157885 sam 2012-08-11 21:35:36 -0700 Created attachment 157885 Patch 693168 2 157885 mitz 2012-08-11 21:56:02 -0700 Comment on attachment 157885 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=157885&action=review > Source/WTF/ChangeLog:3 > + Enable XPC Service base WebProcess with runtime flag based? > Source/WebKit2/ChangeLog:3 > + Enable XPC Service base WebProcess with runtime flag based? > Tools/ChangeLog:3 > + Enable XPC Service base WebProcess with runtime flag based? > Tools/Scripts/webkitdirs.pm:2697 > + --guard-malloc Enable Guard Malloc (Mac OS X only) > + --use-web-process-xpc-service Launch the WebProcess as an XPC Service (Mac OS X only) Could drop “Mac” > Tools/Scripts/webkitdirs.pm:2729 > + $ENV{__XPC_DYLD_INSERT_LIBRARIES} = $productDir . "/WebProcessShim.dylib"; Shouldn’t this copy and append to DYLD_INSERT_LIBRARIES so that guard malloc works? Shouldn’t the UI process unset these so that they don’t propagate to other processes it launches? > Tools/Scripts/webkitdirs.pm:2772 > + $ENV{__XPC_DYLD_FRAMEWORK_PATH} = $productDir; > + $ENV{__XPC_DYLD_INSERT_LIBRARIES} = $productDir . "/WebProcessShim.dylib"; Shouldn’t the UI process unset these so that they don’t propagate to other processes it launches? > Tools/Scripts/webkitdirs.pm:2779 > + die "Targetting the WebProcess is not compatible with using an XPC Service for the WebProcess at this time."; I think it’s either “the Web process” or “WebProcess”, but not “the WebProcess”. 693169 3 sam 2012-08-11 22:15:49 -0700 (In reply to comment #2) > (From update of attachment 157885 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=157885&action=review > > > Source/WTF/ChangeLog:3 > > + Enable XPC Service base WebProcess with runtime flag > > based? > > > Source/WebKit2/ChangeLog:3 > > + Enable XPC Service base WebProcess with runtime flag > > based? > > > Tools/ChangeLog:3 > > + Enable XPC Service base WebProcess with runtime flag > > based? > > > Tools/Scripts/webkitdirs.pm:2697 > > + --guard-malloc Enable Guard Malloc (Mac OS X only) > > + --use-web-process-xpc-service Launch the WebProcess as an XPC Service (Mac OS X only) > > Could drop “Mac” > > > Tools/Scripts/webkitdirs.pm:2729 > > + $ENV{__XPC_DYLD_INSERT_LIBRARIES} = $productDir . "/WebProcessShim.dylib"; > > Shouldn’t this copy and append to DYLD_INSERT_LIBRARIES so that guard malloc works? Yes. > Shouldn’t the UI process unset these so that they don’t propagate to other processes it launches? Unfortunately, that does work with the __XPC variants of these. Before this is the default, we will have to find a way of doing it, but I don't have it yet. > > > Tools/Scripts/webkitdirs.pm:2772 > > + $ENV{__XPC_DYLD_FRAMEWORK_PATH} = $productDir; > > + $ENV{__XPC_DYLD_INSERT_LIBRARIES} = $productDir . "/WebProcessShim.dylib"; > > Shouldn’t the UI process unset these so that they don’t propagate to other processes it launches? > > > Tools/Scripts/webkitdirs.pm:2779 > > + die "Targetting the WebProcess is not compatible with using an XPC Service for the WebProcess at this time."; > > I think it’s either “the Web process” or “WebProcess”, but not “the WebProcess”. Ok. 693170 4 157885 buildbot 2012-08-11 22:18:07 -0700 Comment on attachment 157885 Patch Attachment 157885 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/13474814 693171 5 157886 sam 2012-08-11 22:21:51 -0700 Created attachment 157886 Patch 693172 6 157887 sam 2012-08-11 22:23:28 -0700 Created attachment 157887 Updated patch 693173 7 sam 2012-08-11 22:29:47 -0700 Committed r125361: <http://trac.webkit.org/changeset/125361> 157885 2012-08-11 21:35:36 -0700 2012-08-11 22:21:49 -0700 Patch bug-93773-20120811213508.patch text/plain 9277 sam SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxMjUzNTgpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA4LTExICBTYW0gV2VpbmlnICA8c2FtQHdl YmtpdC5vcmc+CisKKyAgICAgICAgRW5hYmxlIFhQQyBTZXJ2aWNlIGJhc2UgV2ViUHJvY2VzcyB3 aXRoIHJ1bnRpbWUgZmxhZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTM3NzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHd0Zi9QbGF0Zm9ybS5oOgorICAgICAgICBEZWZpbmUgSEFWRV9YUEMgb24gMTAu NyBhbmQgbGF0ZXIuCisKIDIwMTItMDgtMTEgIEJlbmphbWluIFBvdWxhaW4gIDxicG91bGFpbkBh cHBsZS5jb20+CiAKICAgICAgICAgRG8gdGhlIERlY2ltYWxOdW1iZXIgdG8gU3RyaW5nIGNvbnZl cnNpb24gb24gOCBiaXRzCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XVEYvd3RmL1BsYXRmb3JtLmgJKHJldmlzaW9uIDEyNTM1OCkKKysrIFNv dXJjZS9XVEYvd3RmL1BsYXRmb3JtLmgJKHdvcmtpbmcgY29weSkKQEAgLTUzMiw2ICs1MzIsNyBA QAogI2RlZmluZSBFTkFCTEVfR0VTVFVSRV9FVkVOVFMgMQogI2RlZmluZSBFTkFCTEVfUlVCQkVS X0JBTkRJTkcgMQogI2RlZmluZSBXVEZfVVNFX1NDUk9MTEJBUl9QQUlOVEVSIDEKKyNkZWZpbmUg SEFWRV9YUEMgMQogI2VuZGlmCiAjaWYgIWRlZmluZWQoRU5BQkxFX0pBVkFfQlJJREdFKQogI2Rl ZmluZSBFTkFCTEVfSkFWQV9CUklER0UgMQpJbmRleDogU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNpb24gMTI1MzU4 KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MjMgQEAKKzIwMTItMDgtMTEgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAg ICBFbmFibGUgWFBDIFNlcnZpY2UgYmFzZSBXZWJQcm9jZXNzIHdpdGggcnVudGltZSBmbGFnCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05Mzc3MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSB0aGUgWFBD IFNlcnZpY2UgZm9yIFdlYlByb2Nlc3MgY29kZSBwYXRoIGlmIFdFQktJVF9VU0VfWFBDX1NFUlZJ Q0VfRk9SX1dFQl9QUk9DRVNTCisgICAgICAgIGlzIHNldCBpbiB0aGUgZW52aXJvbm1lbnQuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvTGF1bmNoZXIvbWFjL1Byb2Nlc3NMYXVuY2hlck1hYy5tbToK KyAgICAgICAgKFdlYktpdDo6bGF1bmNoWFBDU2VydmljZSk6CisgICAgICAgIEZpeCBpc3N1ZSB0 aGF0IHdhcyBjYXVzaW5nIHRoaXMgY29kZSBub3QgdG8gY29tcGlsZS4gVGhpcyB3YXMgbm90IGNh dWdodCBiZWZvcmUgc2luY2UKKyAgICAgICAgdGhlIGNvZGUgd2FzIG5vdCBiZWluZyBidWlsdC4K KyAgICAgICAgCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6Y29ubmVjdCk6CisgICAgICAgIFN3aXRjaCBm cm9tIGhhcmQgY29kaW5nIGFsd2F5cyB1c2luZyB0aGUgWFBDIFNlcnZpY2UgY29kZSBwYXRoIGlm CisgICAgICAgIEhBVkUoWFBDKSB3YXMgdHJ1ZSwgdG8gZG9pbmcgaXQgY29uZGl0aW9uYWxseSBv biBhbiBlbnZpcm9ubWVudCB2YXJpYWJsZS4KKwogMjAxMi0wOC0xMSAgU2FtIFdlaW5pZyAgPHNh bUB3ZWJraXQub3JnPgogCiAgICAgICAgIE1ha2UgaXQgcG9zc2libGUgdG8gcnVuIHRoZSBXZWJQ cm9jZXNzIGFzIGFuIFhQQyBzZXJ2aWNlCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUHJvY2Vzc1Byb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAkocmV2aXNpb24gMTI1MzU4KQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMSw3 ICsxMTEsNyBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6Y29ubmVjdCgpCiAgICAgICAgIGxhdW5j aE9wdGlvbnMuYXJjaGl0ZWN0dXJlID0gUHJvY2Vzc0xhdW5jaGVyOjpMYXVuY2hPcHRpb25zOjpN YXRjaEN1cnJlbnRBcmNoaXRlY3R1cmU7CiAgICAgICAgIGxhdW5jaE9wdGlvbnMuZXhlY3V0YWJs ZUhlYXAgPSBmYWxzZTsKICNpZiBIQVZFKFhQQykKLSAgICAgICAgbGF1bmNoT3B0aW9ucy51c2VY UEMgPSB0cnVlOyAvLyBGSVhNRTogVGhpcyBuZWVkcyB0byBiZSBjb25maWd1cmFibGUuCisgICAg ICAgIGxhdW5jaE9wdGlvbnMudXNlWFBDID0gZ2V0ZW52KCJXRUJLSVRfVVNFX1hQQ19TRVJWSUNF X0ZPUl9XRUJfUFJPQ0VTUyIpOwogI2VuZGlmCiAjZW5kaWYKICNpZm5kZWYgTkRFQlVHCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvbWFjL1Byb2Nlc3NMYXVuY2hlck1h Yy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvbWFj L1Byb2Nlc3NMYXVuY2hlck1hYy5tbQkocmV2aXNpb24gMTI1MzU4KQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0xhdW5jaGVyL21hYy9Qcm9jZXNzTGF1bmNoZXJNYWMubW0JKHdvcmtpbmcg Y29weSkKQEAgLTEyMCwxMiArMTIwLDEyIEBAIHN0YXRpYyB2b2lkIGxhdW5jaFhQQ1NlcnZpY2Uo Y29uc3QgUHJvY2UKIAogICAgICAgICAgICAgLy8gQW5kIHRoZSByZWNlaXZlIHJpZ2h0LgogICAg ICAgICAgICAgbWFjaF9wb3J0X21vZF9yZWZzKG1hY2hfdGFza19zZWxmKCksIGxpc3RlbmluZ1Bv cnQsIE1BQ0hfUE9SVF9SSUdIVF9SRUNFSVZFLCAtMSk7Ci0gICAgICAgICAgICAKLSAgICAgICAg ICAgIFJ1bkxvb3A6Om1haW4oKS0+ZGlzcGF0Y2goYmluZChkaWRGaW5pc2hMYXVuY2hpbmdQcm9j ZXNzRnVuY3Rpb24sIHRoaXMsIDAsIENvcmVJUEM6OkNvbm5lY3Rpb246OklkZW50aWZpZXIoKSkp OworCisgICAgICAgICAgICBSdW5Mb29wOjptYWluKCktPmRpc3BhdGNoKGJpbmQoZGlkRmluaXNo TGF1bmNoaW5nUHJvY2Vzc0Z1bmN0aW9uLCB0aGF0LCAwLCBDb3JlSVBDOjpDb25uZWN0aW9uOjpJ ZGVudGlmaWVyKCkpKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIEFTU0VSVCh0eXBl ID09IFhQQ19UWVBFX0RJQ1RJT05BUlkpOwogICAgICAgICAgICAgQVNTRVJUKCFzdHJjbXAoeHBj X2RpY3Rpb25hcnlfZ2V0X3N0cmluZyhyZXBseSwgIm1lc3NhZ2UtbmFtZSIpLCAicHJvY2Vzcy1m aW5pc2hlZC1sYXVuY2hpbmciKSk7Ci0gICAgCisKICAgICAgICAgICAgIC8vIFRoZSBwcm9jZXNz IGhhcyBmaW5pc2hlZCBsYXVuY2hpbmcsIGdyYWIgdGhlIHBpZCBmcm9tIHRoZSBjb25uZWN0aW9u LgogICAgICAgICAgICAgcGlkX3QgcHJvY2Vzc0lkZW50aWZpZXIgPSB4cGNfY29ubmVjdGlvbl9n ZXRfcGlkKGNvbm5lY3Rpb24pOwogCkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxMjUzNTgpCisrKyBUb29scy9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwzNCBAQAorMjAxMi0wOC0xMSAgU2FtIFdlaW5pZyAg PHNhbUB3ZWJraXQub3JnPgorCisgICAgICAgIEVuYWJsZSBYUEMgU2VydmljZSBiYXNlIFdlYlBy b2Nlc3Mgd2l0aCBydW50aW1lIGZsYWcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTkzNzczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQ29udmVydCAtLXVzZS13ZWItcHJvY2Vzcy14cGMtc2VydmljZSBwYXNz ZWQgdG8gcnVuLXNhZmFyaSAoYW5kIHNpbWlsYXIgc2NyaXB0cykKKyAgICAgICAgdG8gc2V0dGlu ZyBXRUJLSVRfVVNFX1hQQ19TRVJWSUNFX0ZPUl9XRUJfUFJPQ0VTUz1ZRVMgaW4gdGhlIGVudmly b25tZW50IGFuZCBzZXR0aW5nCisgICAgICAgIHVwIF9fWFBDX0RZTERfRlJBTUVXT1JLX1BBVEgg YW5kIF9fWFBDX0RZTERfSU5TRVJUX0xJQlJBUklFUyB2YXJpYWJsZXMuIE5PVEU6IHVzaW5nCisg ICAgICAgIHRoZSBYUEMgc2VydmljZSBpcyBub3QgdGhlIGRlZmF1bHQgY29kZSBwYXRoLgorCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAoc2hvdWxkVXNlWFBDU2Vy dmljZUZvcldlYlByb2Nlc3MpOgorICAgICAgICAoZGV0ZXJtaW5lU2hvdWxkVXNlWFBDU2Vydmlj ZUZvcldlYlByb2Nlc3MpOgorICAgICAgICBBZGQgZnVuY3Rpb25zIHRvIGV4dHJhY3QgLS11c2Ut d2ViLXByb2Nlc3MteHBjLXNlcnZpY2UgZnJvbSBBUkdWIGFuZCBzZXQgYQorICAgICAgICBnbG9i YWwgdmFyaWFibGUuCisKKyAgICAgICAgKHByaW50SGVscEFuZEV4aXRGb3JSdW5BbmREZWJ1Z1dl YktpdEFwcElmTmVlZGVkKToKKyAgICAgICAgQWRkIGhlbHAgdGV4dCBmb3IgLS11c2Utd2ViLXBy b2Nlc3MteHBjLXNlcnZpY2UuCisKKyAgICAgICAgKHJ1bk1hY1dlYktpdEFwcCk6CisgICAgICAg IFNldCB0aGUgV0VCS0lUX1VTRV9YUENfU0VSVklDRV9GT1JfV0VCX1BST0NFU1MgZW52aXJvbm1l bnQgdmFyaWFibGUgYW5kIERZTEQKKyAgICAgICAgaWYgLS11c2Utd2ViLXByb2Nlc3MteHBjLXNl cnZpY2Ugd2FzIHBhc3NlZCBvbiB0aGUgY29tbWFuZCBsaW5lLgorCisgICAgICAgIChleGVjTWFj V2ViS2l0QXBwRm9yRGVidWdnaW5nKToKKyAgICAgICAgU2V0IHRoZSBXRUJLSVRfVVNFX1hQQ19T RVJWSUNFX0ZPUl9XRUJfUFJPQ0VTUyBlbnZpcm9ubWVudCB2YXJpYWJsZSBhbmQgRFlMRAorICAg ICAgICBpZiAtLXVzZS13ZWItcHJvY2Vzcy14cGMtc2VydmljZSB3YXMgcGFzc2VkIG9uIHRoZSBj b21tYW5kIGxpbmUuIEFsc28sIGJhaWwKKyAgICAgICAgaWYgYm90aCAtLXVzZS13ZWItcHJvY2Vz cy14cGMtc2VydmljZSBhbmQgLS10YXJnZXQtd2ViLXByb2Nlc3MgYXJlIHBhc3NlZCBvbgorICAg ICAgICB0aGUgY29tbWFuZCBsaW5lLCBhcyB3ZSBkb24ndCBjdXJyZW50bHkgc3VwcG9ydCB1c2lu ZyBib3RoLgorCiAyMDEyLTA4LTExICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3Vu Zy5jb20+CiAKICAgICAgICAgW0VGTF0gQnVtcCBoYXJmYnV6eiBkZXBlbmRlbmN5IHRvIHYwLjku MgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1NjcmlwdHMvd2Via2l0ZGlycy5wbQkocmV2aXNpb24gMTI1MzU4KQorKysgVG9vbHMvU2NyaXB0 cy93ZWJraXRkaXJzLnBtCSh3b3JraW5nIGNvcHkpCkBAIC0xMDUsNiArMTA1LDcgQEAgbXkgJGZv cmNlQ2hyb21pdW1VcGRhdGU7CiBteSAkaXNJbnNwZWN0b3JGcm9udGVuZDsKIG15ICRpc1dLMjsK IG15ICRzaG91bGRUYXJnZXRXZWJQcm9jZXNzOworbXkgJHNob3VsZFVzZVhQQ1NlcnZpY2VGb3JX ZWJQcm9jZXNzOwogbXkgJHNob3VsZFVzZUd1YXJkTWFsbG9jOwogbXkgJHhjb2RlVmVyc2lvbjsK IApAQCAtMTQ0MSw2ICsxNDQyLDE4IEBAIHN1YiBkZXRlcm1pbmVTaG91bGRUYXJnZXRXZWJQcm9j ZXNzCiAgICAgJHNob3VsZFRhcmdldFdlYlByb2Nlc3MgPSBjaGVja0ZvckFyZ3VtZW50QW5kUmVt b3ZlRnJvbUFSR1YoIi0tdGFyZ2V0LXdlYi1wcm9jZXNzIik7CiB9CiAKK3N1YiBzaG91bGRVc2VY UENTZXJ2aWNlRm9yV2ViUHJvY2VzcworeworICAgIGRldGVybWluZVNob3VsZFVzZVhQQ1NlcnZp Y2VGb3JXZWJQcm9jZXNzKCk7CisgICAgcmV0dXJuICRzaG91bGRVc2VYUENTZXJ2aWNlRm9yV2Vi UHJvY2VzczsKK30KKworc3ViIGRldGVybWluZVNob3VsZFVzZVhQQ1NlcnZpY2VGb3JXZWJQcm9j ZXNzCit7CisgICAgcmV0dXJuIGlmIGRlZmluZWQoJHNob3VsZFVzZVhQQ1NlcnZpY2VGb3JXZWJQ cm9jZXNzKTsKKyAgICAkc2hvdWxkVXNlWFBDU2VydmljZUZvcldlYlByb2Nlc3MgPSBjaGVja0Zv ckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tdXNlLXdlYi1wcm9jZXNzLXhwYy1zZXJ2aWNl Iik7Cit9CisKIHN1YiBkZWJ1Z2dlcgogewogICAgIGRldGVybWluZURlYnVnZ2VyKCk7CkBAIC0y Njc4LDE1ICsyNjkxLDE2IEBAIHN1YiBwcmludEhlbHBBbmRFeGl0Rm9yUnVuQW5kRGVidWdXZWJL aXQKIAogICAgIHByaW50IFNUREVSUiA8PEVPRjsKIFVzYWdlOiBAe1tiYXNlbmFtZSgkMCldfSBb b3B0aW9uc10gW2FyZ3MgLi4uXQotICAtLWhlbHAgICAgICAgICAgICAgICAgU2hvdyB0aGlzIGhl bHAgbWVzc2FnZQotICAtLW5vLXNhdmVkLXN0YXRlICAgICAgRGlzYWJsZSBhcHBsaWNhdGlvbiBy ZXN1bWUgZm9yIHRoZSBzZXNzaW9uIG9uIE1hYyBPUyAxMC43Ci0gIC0tZ3VhcmQtbWFsbG9jICAg ICAgICBFbmFibGUgR3VhcmQgTWFsbG9jIChNYWMgT1MgWCBvbmx5KQorICAtLWhlbHAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgU2hvdyB0aGlzIGhlbHAgbWVzc2FnZQorICAtLW5vLXNhdmVk LXN0YXRlICAgICAgICAgICAgICAgICAgRGlzYWJsZSBhcHBsaWNhdGlvbiByZXN1bWUgZm9yIHRo ZSBzZXNzaW9uIG9uIE1hYyBPUyAxMC43CisgIC0tZ3VhcmQtbWFsbG9jICAgICAgICAgICAgICAg ICAgICBFbmFibGUgR3VhcmQgTWFsbG9jIChNYWMgT1MgWCBvbmx5KQorICAtLXVzZS13ZWItcHJv Y2Vzcy14cGMtc2VydmljZSAgICAgTGF1bmNoIHRoZSBXZWJQcm9jZXNzIGFzIGFuIFhQQyBTZXJ2 aWNlIChNYWMgT1MgWCBvbmx5KQogRU9GCiAKICAgICBpZiAoJGluY2x1ZGVPcHRpb25zRm9yRGVi dWdnaW5nKSB7CiAgICAgICAgIHByaW50IFNUREVSUiA8PEVPRjsKLSAgLS10YXJnZXQtd2ViLXBy b2Nlc3MgIERlYnVnIHRoZSB3ZWIgcHJvY2VzcwotICAtLXVzZS1sbGRiICAgICAgICAgICAgVXNl IExMREIKKyAgLS10YXJnZXQtd2ViLXByb2Nlc3MgICAgICAgICAgICAgIERlYnVnIHRoZSB3ZWIg cHJvY2VzcworICAtLXVzZS1sbGRiICAgICAgICAgICAgICAgICAgICAgICAgVXNlIExMREIKIEVP RgogICAgIH0KIApAQCAtMjcxMCw2ICsyNzI0LDEyIEBAIHN1YiBydW5NYWNXZWJLaXRBcHAoJDsk KQogCiAgICAgc2V0VXBHdWFyZE1hbGxvY0lmTmVlZGVkKCk7CiAKKyAgICBpZiAoc2hvdWxkVXNl WFBDU2VydmljZUZvcldlYlByb2Nlc3MoKSkgeworICAgICAgICAkRU5We19fWFBDX0RZTERfRlJB TUVXT1JLX1BBVEh9ID0gJHByb2R1Y3REaXI7CisgICAgICAgICRFTlZ7X19YUENfRFlMRF9JTlNF UlRfTElCUkFSSUVTfSA9ICRwcm9kdWN0RGlyIC4gIi9XZWJQcm9jZXNzU2hpbS5keWxpYiI7Cisg ICAgICAgICRFTlZ7V0VCS0lUX1VTRV9YUENfU0VSVklDRV9GT1JfV0VCX1BST0NFU1N9ID0gIllF UyI7CisgICAgfQorCiAgICAgaWYgKGRlZmluZWQoJHVzZU9wZW5Db21tYW5kKSAmJiAkdXNlT3Bl bkNvbW1hbmQgPT0gVVNFX09QRU5fQ09NTUFORCkgewogICAgICAgICByZXR1cm4gc3lzdGVtKCJv cGVuIiwgIi1XIiwgIi1hIiwgJGFwcFBhdGgsICItLWFyZ3MiLCBhcmd1bWVudHNGb3JSdW5BbmRE ZWJ1Z01hY1dlYktpdEFwcCgpKTsKICAgICB9CkBAIC0yNzQ3LDkgKzI3NjcsMTggQEAgc3ViIGV4 ZWNNYWNXZWJLaXRBcHBGb3JEZWJ1Z2dpbmcoJCkKIAogICAgIG15IEBhcmNoaXRlY3R1cmVGbGFn cyA9ICgkYXJjaGl0ZWN0dXJlU3dpdGNoLCBhcmNoaXRlY3R1cmUoKSk7CiAgICAgaWYgKCFzaG91 bGRUYXJnZXRXZWJQcm9jZXNzKCkpIHsKKyAgICAgICAgaWYgKHNob3VsZFVzZVhQQ1NlcnZpY2VG b3JXZWJQcm9jZXNzKCkpIHsKKyAgICAgICAgICAgICRFTlZ7X19YUENfRFlMRF9GUkFNRVdPUktf UEFUSH0gPSAkcHJvZHVjdERpcjsKKyAgICAgICAgICAgICRFTlZ7X19YUENfRFlMRF9JTlNFUlRf TElCUkFSSUVTfSA9ICRwcm9kdWN0RGlyIC4gIi9XZWJQcm9jZXNzU2hpbS5keWxpYiI7CisgICAg ICAgICAgICAkRU5We1dFQktJVF9VU0VfWFBDX1NFUlZJQ0VfRk9SX1dFQl9QUk9DRVNTfSA9ICJZ RVMiOworICAgICAgICB9CiAgICAgICAgIHByaW50ICJTdGFydGluZyBAe1tiYXNlbmFtZSgkYXBw UGF0aCldfSB1bmRlciAkZGVidWdnZXIgd2l0aCBEWUxEX0ZSQU1FV09SS19QQVRIIHNldCB0byBw b2ludCB0byBidWlsdCBXZWJLaXQgaW4gJHByb2R1Y3REaXIuXG4iOwogICAgICAgICBleGVjIHsg JGRlYnVnZ2VyUGF0aCB9ICRkZWJ1Z2dlclBhdGgsIEBhcmNoaXRlY3R1cmVGbGFncywgJGFyZ3Vt ZW50c1NlcGFyYXRvciwgJGFwcFBhdGgsIGFyZ3VtZW50c0ZvclJ1bkFuZERlYnVnTWFjV2ViS2l0 QXBwKCkgb3IgZGllOwogICAgIH0gZWxzZSB7CisgICAgICAgIGlmIChzaG91bGRVc2VYUENTZXJ2 aWNlRm9yV2ViUHJvY2VzcygpKSB7CisgICAgICAgICAgICBkaWUgIlRhcmdldHRpbmcgdGhlIFdl YlByb2Nlc3MgaXMgbm90IGNvbXBhdGlibGUgd2l0aCB1c2luZyBhbiBYUEMgU2VydmljZSBmb3Ig dGhlIFdlYlByb2Nlc3MgYXQgdGhpcyB0aW1lLiI7CisgICAgICAgIH0KKyAgICAgICAgCiAgICAg ICAgIG15ICR3ZWJQcm9jZXNzU2hpbVBhdGggPSBGaWxlOjpTcGVjLT5jYXRmaWxlKCRwcm9kdWN0 RGlyLCAiV2ViUHJvY2Vzc1NoaW0uZHlsaWIiKTsKICAgICAgICAgbXkgJHdlYlByb2Nlc3NQYXRo ID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKCRwcm9kdWN0RGlyLCAiV2ViUHJvY2Vzcy5hcHAiKTsKICAg ICAgICAgbXkgJHdlYktpdDJFeGVjdXRhYmxlUGF0aCA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoJHBy b2R1Y3REaXIsICJXZWJLaXQyLmZyYW1ld29yayIsICJXZWJLaXQyIik7Cg== 157886 2012-08-11 22:21:51 -0700 2012-08-11 22:23:25 -0700 Patch bug-93773-20120811222125.patch text/plain 9666 sam SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxMjUzNTgpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA4LTExICBTYW0gV2VpbmlnICA8c2FtQHdl YmtpdC5vcmc+CisKKyAgICAgICAgRW5hYmxlIFhQQyBTZXJ2aWNlIGJhc2VkIFdlYlByb2Nlc3Mg d2l0aCBydW50aW1lIGZsYWcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTkzNzczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiB3dGYvUGxhdGZvcm0uaDoKKyAgICAgICAgRGVmaW5lIEhBVkVfWFBDIG9uIDEw LjcgYW5kIGxhdGVyLgorCiAyMDEyLTA4LTExICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5A YXBwbGUuY29tPgogCiAgICAgICAgIERvIHRoZSBEZWNpbWFsTnVtYmVyIHRvIFN0cmluZyBjb252 ZXJzaW9uIG9uIDggYml0cwpJbmRleDogU291cmNlL1dURi93dGYvUGxhdGZvcm0uaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oCShyZXZpc2lvbiAxMjUzNTgpCisrKyBT b3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oCSh3b3JraW5nIGNvcHkpCkBAIC01MzIsNiArNTMyLDcg QEAKICNkZWZpbmUgRU5BQkxFX0dFU1RVUkVfRVZFTlRTIDEKICNkZWZpbmUgRU5BQkxFX1JVQkJF Ul9CQU5ESU5HIDEKICNkZWZpbmUgV1RGX1VTRV9TQ1JPTExCQVJfUEFJTlRFUiAxCisjZGVmaW5l IEhBVkVfWFBDIDEKICNlbmRpZgogI2lmICFkZWZpbmVkKEVOQUJMRV9KQVZBX0JSSURHRSkKICNk ZWZpbmUgRU5BQkxFX0pBVkFfQlJJREdFIDEKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxv Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNTM1 OCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDIzIEBACisyMDEyLTA4LTExICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAg ICAgRW5hYmxlIFhQQyBTZXJ2aWNlIGJhc2VkIFdlYlByb2Nlc3Mgd2l0aCBydW50aW1lIGZsYWcK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkzNzczCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIHRoZSBY UEMgU2VydmljZSBmb3IgV2ViUHJvY2VzcyBjb2RlIHBhdGggaWYgV0VCS0lUX1VTRV9YUENfU0VS VklDRV9GT1JfV0VCX1BST0NFU1MKKyAgICAgICAgaXMgc2V0IGluIHRoZSBlbnZpcm9ubWVudC4K KworICAgICAgICAqIFVJUHJvY2Vzcy9MYXVuY2hlci9tYWMvUHJvY2Vzc0xhdW5jaGVyTWFjLm1t OgorICAgICAgICAoV2ViS2l0OjpsYXVuY2hYUENTZXJ2aWNlKToKKyAgICAgICAgRml4IGlzc3Vl IHRoYXQgd2FzIGNhdXNpbmcgdGhpcyBjb2RlIG5vdCB0byBjb21waWxlLiBUaGlzIHdhcyBub3Qg Y2F1Z2h0IGJlZm9yZSBzaW5jZQorICAgICAgICB0aGUgY29kZSB3YXMgbm90IGJlaW5nIGJ1aWx0 LgorICAgICAgICAKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5Ojpjb25uZWN0KToKKyAgICAgICAgU3dpdGNo IGZyb20gaGFyZCBjb2RpbmcgYWx3YXlzIHVzaW5nIHRoZSBYUEMgU2VydmljZSBjb2RlIHBhdGgg aWYKKyAgICAgICAgSEFWRShYUEMpIHdhcyB0cnVlLCB0byBkb2luZyBpdCBjb25kaXRpb25hbGx5 IG9uIGFuIGVudmlyb25tZW50IHZhcmlhYmxlLgorCiAyMDEyLTA4LTExICBTYW0gV2VpbmlnICA8 c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgTWFrZSBpdCBwb3NzaWJsZSB0byBydW4gdGhlIFdl YlByb2Nlc3MgYXMgYW4gWFBDIHNlcnZpY2UKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQcm9jZXNzUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCShyZXZpc2lvbiAxMjUzNTgpCisrKyBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTEx LDcgKzExMSw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojpjb25uZWN0KCkKICAgICAgICAgbGF1 bmNoT3B0aW9ucy5hcmNoaXRlY3R1cmUgPSBQcm9jZXNzTGF1bmNoZXI6OkxhdW5jaE9wdGlvbnM6 Ok1hdGNoQ3VycmVudEFyY2hpdGVjdHVyZTsKICAgICAgICAgbGF1bmNoT3B0aW9ucy5leGVjdXRh YmxlSGVhcCA9IGZhbHNlOwogI2lmIEhBVkUoWFBDKQotICAgICAgICBsYXVuY2hPcHRpb25zLnVz ZVhQQyA9IHRydWU7IC8vIEZJWE1FOiBUaGlzIG5lZWRzIHRvIGJlIGNvbmZpZ3VyYWJsZS4KKyAg ICAgICAgbGF1bmNoT3B0aW9ucy51c2VYUEMgPSBnZXRlbnYoIldFQktJVF9VU0VfWFBDX1NFUlZJ Q0VfRk9SX1dFQl9QUk9DRVNTIik7CiAjZW5kaWYKICNlbmRpZgogI2lmbmRlZiBOREVCVUcKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9tYWMvUHJvY2Vzc0xhdW5jaGVy TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9t YWMvUHJvY2Vzc0xhdW5jaGVyTWFjLm1tCShyZXZpc2lvbiAxMjUzNTgpCisrKyBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvbWFjL1Byb2Nlc3NMYXVuY2hlck1hYy5tbQkod29ya2lu ZyBjb3B5KQpAQCAtMTIwLDEyICsxMjAsMTIgQEAgc3RhdGljIHZvaWQgbGF1bmNoWFBDU2Vydmlj ZShjb25zdCBQcm9jZQogCiAgICAgICAgICAgICAvLyBBbmQgdGhlIHJlY2VpdmUgcmlnaHQuCiAg ICAgICAgICAgICBtYWNoX3BvcnRfbW9kX3JlZnMobWFjaF90YXNrX3NlbGYoKSwgbGlzdGVuaW5n UG9ydCwgTUFDSF9QT1JUX1JJR0hUX1JFQ0VJVkUsIC0xKTsKLSAgICAgICAgICAgIAotICAgICAg ICAgICAgUnVuTG9vcDo6bWFpbigpLT5kaXNwYXRjaChiaW5kKGRpZEZpbmlzaExhdW5jaGluZ1By b2Nlc3NGdW5jdGlvbiwgdGhpcywgMCwgQ29yZUlQQzo6Q29ubmVjdGlvbjo6SWRlbnRpZmllcigp KSk7CisKKyAgICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS0+ZGlzcGF0Y2goYmluZChkaWRGaW5p c2hMYXVuY2hpbmdQcm9jZXNzRnVuY3Rpb24sIHRoYXQsIDAsIENvcmVJUEM6OkNvbm5lY3Rpb246 OklkZW50aWZpZXIoKSkpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgQVNTRVJUKHR5 cGUgPT0gWFBDX1RZUEVfRElDVElPTkFSWSk7CiAgICAgICAgICAgICBBU1NFUlQoIXN0cmNtcCh4 cGNfZGljdGlvbmFyeV9nZXRfc3RyaW5nKHJlcGx5LCAibWVzc2FnZS1uYW1lIiksICJwcm9jZXNz LWZpbmlzaGVkLWxhdW5jaGluZyIpKTsKLSAgICAKKwogICAgICAgICAgICAgLy8gVGhlIHByb2Nl c3MgaGFzIGZpbmlzaGVkIGxhdW5jaGluZywgZ3JhYiB0aGUgcGlkIGZyb20gdGhlIGNvbm5lY3Rp b24uCiAgICAgICAgICAgICBwaWRfdCBwcm9jZXNzSWRlbnRpZmllciA9IHhwY19jb25uZWN0aW9u X2dldF9waWQoY29ubmVjdGlvbik7CiAKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNTM1OCkKKysrIFRvb2xzL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDEyLTA4LTExICBTYW0gV2Vpbmln ICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRW5hYmxlIFhQQyBTZXJ2aWNlIGJhc2VkIFdl YlByb2Nlc3Mgd2l0aCBydW50aW1lIGZsYWcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTkzNzczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQ29udmVydCAtLXVzZS13ZWItcHJvY2Vzcy14cGMtc2VydmljZSBw YXNzZWQgdG8gcnVuLXNhZmFyaSAoYW5kIHNpbWlsYXIgc2NyaXB0cykKKyAgICAgICAgdG8gc2V0 dGluZyBXRUJLSVRfVVNFX1hQQ19TRVJWSUNFX0ZPUl9XRUJfUFJPQ0VTUz1ZRVMgaW4gdGhlIGVu dmlyb25tZW50IGFuZCBzZXR0aW5nCisgICAgICAgIHVwIF9fWFBDX0RZTERfRlJBTUVXT1JLX1BB VEggYW5kIF9fWFBDX0RZTERfSU5TRVJUX0xJQlJBUklFUyB2YXJpYWJsZXMuIE5PVEU6IHVzaW5n CisgICAgICAgIHRoZSBYUEMgc2VydmljZSBpcyBub3QgdGhlIGRlZmF1bHQgY29kZSBwYXRoLgor CisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAoc2hvdWxkVXNlWFBD U2VydmljZUZvcldlYlByb2Nlc3MpOgorICAgICAgICAoZGV0ZXJtaW5lU2hvdWxkVXNlWFBDU2Vy dmljZUZvcldlYlByb2Nlc3MpOgorICAgICAgICBBZGQgZnVuY3Rpb25zIHRvIGV4dHJhY3QgLS11 c2Utd2ViLXByb2Nlc3MteHBjLXNlcnZpY2UgZnJvbSBBUkdWIGFuZCBzZXQgYQorICAgICAgICBn bG9iYWwgdmFyaWFibGUuCisKKyAgICAgICAgKHByaW50SGVscEFuZEV4aXRGb3JSdW5BbmREZWJ1 Z1dlYktpdEFwcElmTmVlZGVkKToKKyAgICAgICAgQWRkIGhlbHAgdGV4dCBmb3IgLS11c2Utd2Vi LXByb2Nlc3MteHBjLXNlcnZpY2UuCisKKyAgICAgICAgKHJ1bk1hY1dlYktpdEFwcCk6CisgICAg ICAgIFNldCB0aGUgV0VCS0lUX1VTRV9YUENfU0VSVklDRV9GT1JfV0VCX1BST0NFU1MgZW52aXJv bm1lbnQgdmFyaWFibGUgYW5kIERZTEQKKyAgICAgICAgaWYgLS11c2Utd2ViLXByb2Nlc3MteHBj LXNlcnZpY2Ugd2FzIHBhc3NlZCBvbiB0aGUgY29tbWFuZCBsaW5lLgorCisgICAgICAgIChleGVj TWFjV2ViS2l0QXBwRm9yRGVidWdnaW5nKToKKyAgICAgICAgU2V0IHRoZSBXRUJLSVRfVVNFX1hQ Q19TRVJWSUNFX0ZPUl9XRUJfUFJPQ0VTUyBlbnZpcm9ubWVudCB2YXJpYWJsZSBhbmQgRFlMRAor ICAgICAgICBpZiAtLXVzZS13ZWItcHJvY2Vzcy14cGMtc2VydmljZSB3YXMgcGFzc2VkIG9uIHRo ZSBjb21tYW5kIGxpbmUuIEFsc28sIGJhaWwKKyAgICAgICAgaWYgYm90aCAtLXVzZS13ZWItcHJv Y2Vzcy14cGMtc2VydmljZSBhbmQgLS10YXJnZXQtd2ViLXByb2Nlc3MgYXJlIHBhc3NlZCBvbgor ICAgICAgICB0aGUgY29tbWFuZCBsaW5lLCBhcyB3ZSBkb24ndCBjdXJyZW50bHkgc3VwcG9ydCB1 c2luZyBib3RoLgorCiAyMDEyLTA4LTExICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ft c3VuZy5jb20+CiAKICAgICAgICAgW0VGTF0gQnVtcCBoYXJmYnV6eiBkZXBlbmRlbmN5IHRvIHYw LjkuMgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkocmV2aXNpb24gMTI1MzU4KQorKysgVG9vbHMvU2Ny aXB0cy93ZWJraXRkaXJzLnBtCSh3b3JraW5nIGNvcHkpCkBAIC0xMDUsNiArMTA1LDcgQEAgbXkg JGZvcmNlQ2hyb21pdW1VcGRhdGU7CiBteSAkaXNJbnNwZWN0b3JGcm9udGVuZDsKIG15ICRpc1dL MjsKIG15ICRzaG91bGRUYXJnZXRXZWJQcm9jZXNzOworbXkgJHNob3VsZFVzZVhQQ1NlcnZpY2VG b3JXZWJQcm9jZXNzOwogbXkgJHNob3VsZFVzZUd1YXJkTWFsbG9jOwogbXkgJHhjb2RlVmVyc2lv bjsKIApAQCAtMTQ0MSw2ICsxNDQyLDE4IEBAIHN1YiBkZXRlcm1pbmVTaG91bGRUYXJnZXRXZWJQ cm9jZXNzCiAgICAgJHNob3VsZFRhcmdldFdlYlByb2Nlc3MgPSBjaGVja0ZvckFyZ3VtZW50QW5k UmVtb3ZlRnJvbUFSR1YoIi0tdGFyZ2V0LXdlYi1wcm9jZXNzIik7CiB9CiAKK3N1YiBzaG91bGRV c2VYUENTZXJ2aWNlRm9yV2ViUHJvY2VzcworeworICAgIGRldGVybWluZVNob3VsZFVzZVhQQ1Nl cnZpY2VGb3JXZWJQcm9jZXNzKCk7CisgICAgcmV0dXJuICRzaG91bGRVc2VYUENTZXJ2aWNlRm9y V2ViUHJvY2VzczsKK30KKworc3ViIGRldGVybWluZVNob3VsZFVzZVhQQ1NlcnZpY2VGb3JXZWJQ cm9jZXNzCit7CisgICAgcmV0dXJuIGlmIGRlZmluZWQoJHNob3VsZFVzZVhQQ1NlcnZpY2VGb3JX ZWJQcm9jZXNzKTsKKyAgICAkc2hvdWxkVXNlWFBDU2VydmljZUZvcldlYlByb2Nlc3MgPSBjaGVj a0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tdXNlLXdlYi1wcm9jZXNzLXhwYy1zZXJ2 aWNlIik7Cit9CisKIHN1YiBkZWJ1Z2dlcgogewogICAgIGRldGVybWluZURlYnVnZ2VyKCk7CkBA IC0xNDgwLDYgKzE0OTMsOSBAQCBzdWIgc2V0VXBHdWFyZE1hbGxvY0lmTmVlZGVkCiAKICAgICBp ZiAoJHNob3VsZFVzZUd1YXJkTWFsbG9jKSB7CiAgICAgICAgIGFwcGVuZFRvRW52aXJvbm1lbnRW YXJpYWJsZUxpc3QoIkRZTERfSU5TRVJUX0xJQlJBUklFUyIsICIvdXNyL2xpYi9saWJnbWFsbG9j LmR5bGliIik7CisgICAgICAgIGlmIChzaG91bGRVc2VYUENTZXJ2aWNlRm9yV2ViUHJvY2Vzcygp KSB7CisgICAgICAgICAgICBhcHBlbmRUb0Vudmlyb25tZW50VmFyaWFibGVMaXN0KCJfX1hQQ19E WUxEX0lOU0VSVF9MSUJSQVJJRVMiLCAiL3Vzci9saWIvbGliZ21hbGxvYy5keWxpYiIpOworICAg ICAgICB9CiAgICAgfQogfQogCkBAIC0yNjc4LDE1ICsyNjk0LDE2IEBAIHN1YiBwcmludEhlbHBB bmRFeGl0Rm9yUnVuQW5kRGVidWdXZWJLaXQKIAogICAgIHByaW50IFNUREVSUiA8PEVPRjsKIFVz YWdlOiBAe1tiYXNlbmFtZSgkMCldfSBbb3B0aW9uc10gW2FyZ3MgLi4uXQotICAtLWhlbHAgICAg ICAgICAgICAgICAgU2hvdyB0aGlzIGhlbHAgbWVzc2FnZQotICAtLW5vLXNhdmVkLXN0YXRlICAg ICAgRGlzYWJsZSBhcHBsaWNhdGlvbiByZXN1bWUgZm9yIHRoZSBzZXNzaW9uIG9uIE1hYyBPUyAx MC43Ci0gIC0tZ3VhcmQtbWFsbG9jICAgICAgICBFbmFibGUgR3VhcmQgTWFsbG9jIChNYWMgT1Mg WCBvbmx5KQorICAtLWhlbHAgICAgICAgICAgICAgICAgICAgICAgICAgICAgU2hvdyB0aGlzIGhl bHAgbWVzc2FnZQorICAtLW5vLXNhdmVkLXN0YXRlICAgICAgICAgICAgICAgICAgRGlzYWJsZSBh cHBsaWNhdGlvbiByZXN1bWUgZm9yIHRoZSBzZXNzaW9uIG9uIE1hYyBPUyAxMC43CisgIC0tZ3Vh cmQtbWFsbG9jICAgICAgICAgICAgICAgICAgICBFbmFibGUgR3VhcmQgTWFsbG9jIChPUyBYIG9u bHkpCisgIC0tdXNlLXdlYi1wcm9jZXNzLXhwYy1zZXJ2aWNlICAgICBMYXVuY2ggdGhlIFdlYiBQ cm9jZXNzIGFzIGFuIFhQQyBTZXJ2aWNlIChPUyBYIG9ubHkpCiBFT0YKIAogICAgIGlmICgkaW5j bHVkZU9wdGlvbnNGb3JEZWJ1Z2dpbmcpIHsKICAgICAgICAgcHJpbnQgU1RERVJSIDw8RU9GOwot ICAtLXRhcmdldC13ZWItcHJvY2VzcyAgRGVidWcgdGhlIHdlYiBwcm9jZXNzCi0gIC0tdXNlLWxs ZGIgICAgICAgICAgICBVc2UgTExEQgorICAtLXRhcmdldC13ZWItcHJvY2VzcyAgICAgICAgICAg ICAgRGVidWcgdGhlIHdlYiBwcm9jZXNzCisgIC0tdXNlLWxsZGIgICAgICAgICAgICAgICAgICAg ICAgICBVc2UgTExEQgogRU9GCiAgICAgfQogCkBAIC0yNzEwLDYgKzI3MjcsMTIgQEAgc3ViIHJ1 bk1hY1dlYktpdEFwcCgkOyQpCiAKICAgICBzZXRVcEd1YXJkTWFsbG9jSWZOZWVkZWQoKTsKIAor ICAgIGlmIChzaG91bGRVc2VYUENTZXJ2aWNlRm9yV2ViUHJvY2VzcygpKSB7CisgICAgICAgICRF TlZ7X19YUENfRFlMRF9GUkFNRVdPUktfUEFUSH0gPSAkcHJvZHVjdERpcjsKKyAgICAgICAgYXBw ZW5kVG9FbnZpcm9ubWVudFZhcmlhYmxlTGlzdCgiX19YUENfRFlMRF9JTlNFUlRfTElCUkFSSUVT IiwgJHByb2R1Y3REaXIgLiAiL1dlYlByb2Nlc3NTaGltLmR5bGliIik7CisgICAgICAgICRFTlZ7 V0VCS0lUX1VTRV9YUENfU0VSVklDRV9GT1JfV0VCX1BST0NFU1N9ID0gIllFUyI7CisgICAgfQor CiAgICAgaWYgKGRlZmluZWQoJHVzZU9wZW5Db21tYW5kKSAmJiAkdXNlT3BlbkNvbW1hbmQgPT0g VVNFX09QRU5fQ09NTUFORCkgewogICAgICAgICByZXR1cm4gc3lzdGVtKCJvcGVuIiwgIi1XIiwg Ii1hIiwgJGFwcFBhdGgsICItLWFyZ3MiLCBhcmd1bWVudHNGb3JSdW5BbmREZWJ1Z01hY1dlYktp dEFwcCgpKTsKICAgICB9CkBAIC0yNzQ3LDkgKzI3NzAsMTggQEAgc3ViIGV4ZWNNYWNXZWJLaXRB cHBGb3JEZWJ1Z2dpbmcoJCkKIAogICAgIG15IEBhcmNoaXRlY3R1cmVGbGFncyA9ICgkYXJjaGl0 ZWN0dXJlU3dpdGNoLCBhcmNoaXRlY3R1cmUoKSk7CiAgICAgaWYgKCFzaG91bGRUYXJnZXRXZWJQ cm9jZXNzKCkpIHsKKyAgICAgICAgaWYgKHNob3VsZFVzZVhQQ1NlcnZpY2VGb3JXZWJQcm9jZXNz KCkpIHsKKyAgICAgICAgICAgICRFTlZ7X19YUENfRFlMRF9GUkFNRVdPUktfUEFUSH0gPSAkcHJv ZHVjdERpcjsKKyAgICAgICAgICAgICRFTlZ7X19YUENfRFlMRF9JTlNFUlRfTElCUkFSSUVTfSA9 ICRwcm9kdWN0RGlyIC4gIi9XZWJQcm9jZXNzU2hpbS5keWxpYiI7CisgICAgICAgICAgICAkRU5W e1dFQktJVF9VU0VfWFBDX1NFUlZJQ0VfRk9SX1dFQl9QUk9DRVNTfSA9ICJZRVMiOworICAgICAg ICB9CiAgICAgICAgIHByaW50ICJTdGFydGluZyBAe1tiYXNlbmFtZSgkYXBwUGF0aCldfSB1bmRl ciAkZGVidWdnZXIgd2l0aCBEWUxEX0ZSQU1FV09SS19QQVRIIHNldCB0byBwb2ludCB0byBidWls dCBXZWJLaXQgaW4gJHByb2R1Y3REaXIuXG4iOwogICAgICAgICBleGVjIHsgJGRlYnVnZ2VyUGF0 aCB9ICRkZWJ1Z2dlclBhdGgsIEBhcmNoaXRlY3R1cmVGbGFncywgJGFyZ3VtZW50c1NlcGFyYXRv ciwgJGFwcFBhdGgsIGFyZ3VtZW50c0ZvclJ1bkFuZERlYnVnTWFjV2ViS2l0QXBwKCkgb3IgZGll OwogICAgIH0gZWxzZSB7CisgICAgICAgIGlmIChzaG91bGRVc2VYUENTZXJ2aWNlRm9yV2ViUHJv Y2VzcygpKSB7CisgICAgICAgICAgICBkaWUgIlRhcmdldHRpbmcgdGhlIFdlYiBQcm9jZXNzIGlz IG5vdCBjb21wYXRpYmxlIHdpdGggdXNpbmcgYW4gWFBDIFNlcnZpY2UgZm9yIHRoZSBXZWIgUHJv Y2VzcyBhdCB0aGlzIHRpbWUuIjsKKyAgICAgICAgfQorICAgICAgICAKICAgICAgICAgbXkgJHdl YlByb2Nlc3NTaGltUGF0aCA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoJHByb2R1Y3REaXIsICJXZWJQ cm9jZXNzU2hpbS5keWxpYiIpOwogICAgICAgICBteSAkd2ViUHJvY2Vzc1BhdGggPSBGaWxlOjpT cGVjLT5jYXRkaXIoJHByb2R1Y3REaXIsICJXZWJQcm9jZXNzLmFwcCIpOwogICAgICAgICBteSAk d2ViS2l0MkV4ZWN1dGFibGVQYXRoID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkcHJvZHVjdERpciwg IldlYktpdDIuZnJhbWV3b3JrIiwgIldlYktpdDIiKTsK 157887 2012-08-11 22:23:28 -0700 2012-08-11 22:24:35 -0700 Updated patch bug-93773-20120811222301.patch text/plain 9732 sam SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxMjUzNTgpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA4LTExICBTYW0gV2VpbmlnICA8c2FtQHdl YmtpdC5vcmc+CisKKyAgICAgICAgRW5hYmxlIFhQQyBTZXJ2aWNlIGJhc2VkIFdlYlByb2Nlc3Mg d2l0aCBydW50aW1lIGZsYWcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTkzNzczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiB3dGYvUGxhdGZvcm0uaDoKKyAgICAgICAgRGVmaW5lIEhBVkVfWFBDIG9uIDEw LjcgYW5kIGxhdGVyLgorCiAyMDEyLTA4LTExICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5A YXBwbGUuY29tPgogCiAgICAgICAgIERvIHRoZSBEZWNpbWFsTnVtYmVyIHRvIFN0cmluZyBjb252 ZXJzaW9uIG9uIDggYml0cwpJbmRleDogU291cmNlL1dURi93dGYvUGxhdGZvcm0uaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oCShyZXZpc2lvbiAxMjUzNTgpCisrKyBT b3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oCSh3b3JraW5nIGNvcHkpCkBAIC01MzIsNiArNTMyLDcg QEAKICNkZWZpbmUgRU5BQkxFX0dFU1RVUkVfRVZFTlRTIDEKICNkZWZpbmUgRU5BQkxFX1JVQkJF Ul9CQU5ESU5HIDEKICNkZWZpbmUgV1RGX1VTRV9TQ1JPTExCQVJfUEFJTlRFUiAxCisjZGVmaW5l IEhBVkVfWFBDIDEKICNlbmRpZgogI2lmICFkZWZpbmVkKEVOQUJMRV9KQVZBX0JSSURHRSkKICNk ZWZpbmUgRU5BQkxFX0pBVkFfQlJJREdFIDEKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxv Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNTM1 OCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDIzIEBACisyMDEyLTA4LTExICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAg ICAgRW5hYmxlIFhQQyBTZXJ2aWNlIGJhc2VkIFdlYlByb2Nlc3Mgd2l0aCBydW50aW1lIGZsYWcK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkzNzczCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIHRoZSBY UEMgU2VydmljZSBmb3IgV2ViUHJvY2VzcyBjb2RlIHBhdGggaWYgV0VCS0lUX1VTRV9YUENfU0VS VklDRV9GT1JfV0VCX1BST0NFU1MKKyAgICAgICAgaXMgc2V0IGluIHRoZSBlbnZpcm9ubWVudC4K KworICAgICAgICAqIFVJUHJvY2Vzcy9MYXVuY2hlci9tYWMvUHJvY2Vzc0xhdW5jaGVyTWFjLm1t OgorICAgICAgICAoV2ViS2l0OjpsYXVuY2hYUENTZXJ2aWNlKToKKyAgICAgICAgRml4IGlzc3Vl IHRoYXQgd2FzIGNhdXNpbmcgdGhpcyBjb2RlIG5vdCB0byBjb21waWxlLiBUaGlzIHdhcyBub3Qg Y2F1Z2h0IGJlZm9yZSBzaW5jZQorICAgICAgICB0aGUgY29kZSB3YXMgbm90IGJlaW5nIGJ1aWx0 LgorICAgICAgICAKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5Ojpjb25uZWN0KToKKyAgICAgICAgU3dpdGNo IGZyb20gaGFyZCBjb2RpbmcgYWx3YXlzIHVzaW5nIHRoZSBYUEMgU2VydmljZSBjb2RlIHBhdGgg aWYKKyAgICAgICAgSEFWRShYUEMpIHdhcyB0cnVlLCB0byBkb2luZyBpdCBjb25kaXRpb25hbGx5 IG9uIGFuIGVudmlyb25tZW50IHZhcmlhYmxlLgorCiAyMDEyLTA4LTExICBTYW0gV2VpbmlnICA8 c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgTWFrZSBpdCBwb3NzaWJsZSB0byBydW4gdGhlIFdl YlByb2Nlc3MgYXMgYW4gWFBDIHNlcnZpY2UKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQcm9jZXNzUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCShyZXZpc2lvbiAxMjUzNTgpCisrKyBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTEx LDcgKzExMSw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojpjb25uZWN0KCkKICAgICAgICAgbGF1 bmNoT3B0aW9ucy5hcmNoaXRlY3R1cmUgPSBQcm9jZXNzTGF1bmNoZXI6OkxhdW5jaE9wdGlvbnM6 Ok1hdGNoQ3VycmVudEFyY2hpdGVjdHVyZTsKICAgICAgICAgbGF1bmNoT3B0aW9ucy5leGVjdXRh YmxlSGVhcCA9IGZhbHNlOwogI2lmIEhBVkUoWFBDKQotICAgICAgICBsYXVuY2hPcHRpb25zLnVz ZVhQQyA9IHRydWU7IC8vIEZJWE1FOiBUaGlzIG5lZWRzIHRvIGJlIGNvbmZpZ3VyYWJsZS4KKyAg ICAgICAgbGF1bmNoT3B0aW9ucy51c2VYUEMgPSBnZXRlbnYoIldFQktJVF9VU0VfWFBDX1NFUlZJ Q0VfRk9SX1dFQl9QUk9DRVNTIik7CiAjZW5kaWYKICNlbmRpZgogI2lmbmRlZiBOREVCVUcKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9tYWMvUHJvY2Vzc0xhdW5jaGVy TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9t YWMvUHJvY2Vzc0xhdW5jaGVyTWFjLm1tCShyZXZpc2lvbiAxMjUzNTgpCisrKyBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvbWFjL1Byb2Nlc3NMYXVuY2hlck1hYy5tbQkod29ya2lu ZyBjb3B5KQpAQCAtMTIwLDEyICsxMjAsMTIgQEAgc3RhdGljIHZvaWQgbGF1bmNoWFBDU2Vydmlj ZShjb25zdCBQcm9jZQogCiAgICAgICAgICAgICAvLyBBbmQgdGhlIHJlY2VpdmUgcmlnaHQuCiAg ICAgICAgICAgICBtYWNoX3BvcnRfbW9kX3JlZnMobWFjaF90YXNrX3NlbGYoKSwgbGlzdGVuaW5n UG9ydCwgTUFDSF9QT1JUX1JJR0hUX1JFQ0VJVkUsIC0xKTsKLSAgICAgICAgICAgIAotICAgICAg ICAgICAgUnVuTG9vcDo6bWFpbigpLT5kaXNwYXRjaChiaW5kKGRpZEZpbmlzaExhdW5jaGluZ1By b2Nlc3NGdW5jdGlvbiwgdGhpcywgMCwgQ29yZUlQQzo6Q29ubmVjdGlvbjo6SWRlbnRpZmllcigp KSk7CisKKyAgICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS0+ZGlzcGF0Y2goYmluZChkaWRGaW5p c2hMYXVuY2hpbmdQcm9jZXNzRnVuY3Rpb24sIHRoYXQsIDAsIENvcmVJUEM6OkNvbm5lY3Rpb246 OklkZW50aWZpZXIoKSkpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgQVNTRVJUKHR5 cGUgPT0gWFBDX1RZUEVfRElDVElPTkFSWSk7CiAgICAgICAgICAgICBBU1NFUlQoIXN0cmNtcCh4 cGNfZGljdGlvbmFyeV9nZXRfc3RyaW5nKHJlcGx5LCAibWVzc2FnZS1uYW1lIiksICJwcm9jZXNz LWZpbmlzaGVkLWxhdW5jaGluZyIpKTsKLSAgICAKKwogICAgICAgICAgICAgLy8gVGhlIHByb2Nl c3MgaGFzIGZpbmlzaGVkIGxhdW5jaGluZywgZ3JhYiB0aGUgcGlkIGZyb20gdGhlIGNvbm5lY3Rp b24uCiAgICAgICAgICAgICBwaWRfdCBwcm9jZXNzSWRlbnRpZmllciA9IHhwY19jb25uZWN0aW9u X2dldF9waWQoY29ubmVjdGlvbik7CiAKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNTM1OCkKKysrIFRvb2xzL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDEyLTA4LTExICBTYW0gV2Vpbmln ICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRW5hYmxlIFhQQyBTZXJ2aWNlIGJhc2VkIFdl YlByb2Nlc3Mgd2l0aCBydW50aW1lIGZsYWcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTkzNzczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQ29udmVydCAtLXVzZS13ZWItcHJvY2Vzcy14cGMtc2VydmljZSBw YXNzZWQgdG8gcnVuLXNhZmFyaSAoYW5kIHNpbWlsYXIgc2NyaXB0cykKKyAgICAgICAgdG8gc2V0 dGluZyBXRUJLSVRfVVNFX1hQQ19TRVJWSUNFX0ZPUl9XRUJfUFJPQ0VTUz1ZRVMgaW4gdGhlIGVu dmlyb25tZW50IGFuZCBzZXR0aW5nCisgICAgICAgIHVwIF9fWFBDX0RZTERfRlJBTUVXT1JLX1BB VEggYW5kIF9fWFBDX0RZTERfSU5TRVJUX0xJQlJBUklFUyB2YXJpYWJsZXMuIE5PVEU6IHVzaW5n CisgICAgICAgIHRoZSBYUEMgc2VydmljZSBpcyBub3QgdGhlIGRlZmF1bHQgY29kZSBwYXRoLgor CisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAoc2hvdWxkVXNlWFBD U2VydmljZUZvcldlYlByb2Nlc3MpOgorICAgICAgICAoZGV0ZXJtaW5lU2hvdWxkVXNlWFBDU2Vy dmljZUZvcldlYlByb2Nlc3MpOgorICAgICAgICBBZGQgZnVuY3Rpb25zIHRvIGV4dHJhY3QgLS11 c2Utd2ViLXByb2Nlc3MteHBjLXNlcnZpY2UgZnJvbSBBUkdWIGFuZCBzZXQgYQorICAgICAgICBn bG9iYWwgdmFyaWFibGUuCisKKyAgICAgICAgKHByaW50SGVscEFuZEV4aXRGb3JSdW5BbmREZWJ1 Z1dlYktpdEFwcElmTmVlZGVkKToKKyAgICAgICAgQWRkIGhlbHAgdGV4dCBmb3IgLS11c2Utd2Vi LXByb2Nlc3MteHBjLXNlcnZpY2UuCisKKyAgICAgICAgKHJ1bk1hY1dlYktpdEFwcCk6CisgICAg ICAgIFNldCB0aGUgV0VCS0lUX1VTRV9YUENfU0VSVklDRV9GT1JfV0VCX1BST0NFU1MgZW52aXJv bm1lbnQgdmFyaWFibGUgYW5kIERZTEQKKyAgICAgICAgaWYgLS11c2Utd2ViLXByb2Nlc3MteHBj LXNlcnZpY2Ugd2FzIHBhc3NlZCBvbiB0aGUgY29tbWFuZCBsaW5lLgorCisgICAgICAgIChleGVj TWFjV2ViS2l0QXBwRm9yRGVidWdnaW5nKToKKyAgICAgICAgU2V0IHRoZSBXRUJLSVRfVVNFX1hQ Q19TRVJWSUNFX0ZPUl9XRUJfUFJPQ0VTUyBlbnZpcm9ubWVudCB2YXJpYWJsZSBhbmQgRFlMRAor ICAgICAgICBpZiAtLXVzZS13ZWItcHJvY2Vzcy14cGMtc2VydmljZSB3YXMgcGFzc2VkIG9uIHRo ZSBjb21tYW5kIGxpbmUuIEFsc28sIGJhaWwKKyAgICAgICAgaWYgYm90aCAtLXVzZS13ZWItcHJv Y2Vzcy14cGMtc2VydmljZSBhbmQgLS10YXJnZXQtd2ViLXByb2Nlc3MgYXJlIHBhc3NlZCBvbgor ICAgICAgICB0aGUgY29tbWFuZCBsaW5lLCBhcyB3ZSBkb24ndCBjdXJyZW50bHkgc3VwcG9ydCB1 c2luZyBib3RoLgorCiAyMDEyLTA4LTExICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ft c3VuZy5jb20+CiAKICAgICAgICAgW0VGTF0gQnVtcCBoYXJmYnV6eiBkZXBlbmRlbmN5IHRvIHYw LjkuMgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkocmV2aXNpb24gMTI1MzU4KQorKysgVG9vbHMvU2Ny aXB0cy93ZWJraXRkaXJzLnBtCSh3b3JraW5nIGNvcHkpCkBAIC0xMDUsNiArMTA1LDcgQEAgbXkg JGZvcmNlQ2hyb21pdW1VcGRhdGU7CiBteSAkaXNJbnNwZWN0b3JGcm9udGVuZDsKIG15ICRpc1dL MjsKIG15ICRzaG91bGRUYXJnZXRXZWJQcm9jZXNzOworbXkgJHNob3VsZFVzZVhQQ1NlcnZpY2VG b3JXZWJQcm9jZXNzOwogbXkgJHNob3VsZFVzZUd1YXJkTWFsbG9jOwogbXkgJHhjb2RlVmVyc2lv bjsKIApAQCAtMTQ0MSw2ICsxNDQyLDE4IEBAIHN1YiBkZXRlcm1pbmVTaG91bGRUYXJnZXRXZWJQ cm9jZXNzCiAgICAgJHNob3VsZFRhcmdldFdlYlByb2Nlc3MgPSBjaGVja0ZvckFyZ3VtZW50QW5k UmVtb3ZlRnJvbUFSR1YoIi0tdGFyZ2V0LXdlYi1wcm9jZXNzIik7CiB9CiAKK3N1YiBzaG91bGRV c2VYUENTZXJ2aWNlRm9yV2ViUHJvY2VzcworeworICAgIGRldGVybWluZVNob3VsZFVzZVhQQ1Nl cnZpY2VGb3JXZWJQcm9jZXNzKCk7CisgICAgcmV0dXJuICRzaG91bGRVc2VYUENTZXJ2aWNlRm9y V2ViUHJvY2VzczsKK30KKworc3ViIGRldGVybWluZVNob3VsZFVzZVhQQ1NlcnZpY2VGb3JXZWJQ cm9jZXNzCit7CisgICAgcmV0dXJuIGlmIGRlZmluZWQoJHNob3VsZFVzZVhQQ1NlcnZpY2VGb3JX ZWJQcm9jZXNzKTsKKyAgICAkc2hvdWxkVXNlWFBDU2VydmljZUZvcldlYlByb2Nlc3MgPSBjaGVj a0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tdXNlLXdlYi1wcm9jZXNzLXhwYy1zZXJ2 aWNlIik7Cit9CisKIHN1YiBkZWJ1Z2dlcgogewogICAgIGRldGVybWluZURlYnVnZ2VyKCk7CkBA IC0xNDgwLDYgKzE0OTMsOSBAQCBzdWIgc2V0VXBHdWFyZE1hbGxvY0lmTmVlZGVkCiAKICAgICBp ZiAoJHNob3VsZFVzZUd1YXJkTWFsbG9jKSB7CiAgICAgICAgIGFwcGVuZFRvRW52aXJvbm1lbnRW YXJpYWJsZUxpc3QoIkRZTERfSU5TRVJUX0xJQlJBUklFUyIsICIvdXNyL2xpYi9saWJnbWFsbG9j LmR5bGliIik7CisgICAgICAgIGlmIChzaG91bGRVc2VYUENTZXJ2aWNlRm9yV2ViUHJvY2Vzcygp KSB7CisgICAgICAgICAgICBhcHBlbmRUb0Vudmlyb25tZW50VmFyaWFibGVMaXN0KCJfX1hQQ19E WUxEX0lOU0VSVF9MSUJSQVJJRVMiLCAiL3Vzci9saWIvbGliZ21hbGxvYy5keWxpYiIpOworICAg ICAgICB9CiAgICAgfQogfQogCkBAIC0yNjc4LDE1ICsyNjk0LDE2IEBAIHN1YiBwcmludEhlbHBB bmRFeGl0Rm9yUnVuQW5kRGVidWdXZWJLaXQKIAogICAgIHByaW50IFNUREVSUiA8PEVPRjsKIFVz YWdlOiBAe1tiYXNlbmFtZSgkMCldfSBbb3B0aW9uc10gW2FyZ3MgLi4uXQotICAtLWhlbHAgICAg ICAgICAgICAgICAgU2hvdyB0aGlzIGhlbHAgbWVzc2FnZQotICAtLW5vLXNhdmVkLXN0YXRlICAg ICAgRGlzYWJsZSBhcHBsaWNhdGlvbiByZXN1bWUgZm9yIHRoZSBzZXNzaW9uIG9uIE1hYyBPUyAx MC43Ci0gIC0tZ3VhcmQtbWFsbG9jICAgICAgICBFbmFibGUgR3VhcmQgTWFsbG9jIChNYWMgT1Mg WCBvbmx5KQorICAtLWhlbHAgICAgICAgICAgICAgICAgICAgICAgICAgICAgU2hvdyB0aGlzIGhl bHAgbWVzc2FnZQorICAtLW5vLXNhdmVkLXN0YXRlICAgICAgICAgICAgICAgICAgRGlzYWJsZSBh cHBsaWNhdGlvbiByZXN1bWUgZm9yIHRoZSBzZXNzaW9uIG9uIE1hYyBPUyAxMC43CisgIC0tZ3Vh cmQtbWFsbG9jICAgICAgICAgICAgICAgICAgICBFbmFibGUgR3VhcmQgTWFsbG9jIChPUyBYIG9u bHkpCisgIC0tdXNlLXdlYi1wcm9jZXNzLXhwYy1zZXJ2aWNlICAgICBMYXVuY2ggdGhlIFdlYiBQ cm9jZXNzIGFzIGFuIFhQQyBTZXJ2aWNlIChPUyBYIG9ubHkpCiBFT0YKIAogICAgIGlmICgkaW5j bHVkZU9wdGlvbnNGb3JEZWJ1Z2dpbmcpIHsKICAgICAgICAgcHJpbnQgU1RERVJSIDw8RU9GOwot ICAtLXRhcmdldC13ZWItcHJvY2VzcyAgRGVidWcgdGhlIHdlYiBwcm9jZXNzCi0gIC0tdXNlLWxs ZGIgICAgICAgICAgICBVc2UgTExEQgorICAtLXRhcmdldC13ZWItcHJvY2VzcyAgICAgICAgICAg ICAgRGVidWcgdGhlIHdlYiBwcm9jZXNzCisgIC0tdXNlLWxsZGIgICAgICAgICAgICAgICAgICAg ICAgICBVc2UgTExEQgogRU9GCiAgICAgfQogCkBAIC0yNzEwLDYgKzI3MjcsMTIgQEAgc3ViIHJ1 bk1hY1dlYktpdEFwcCgkOyQpCiAKICAgICBzZXRVcEd1YXJkTWFsbG9jSWZOZWVkZWQoKTsKIAor ICAgIGlmIChzaG91bGRVc2VYUENTZXJ2aWNlRm9yV2ViUHJvY2VzcygpKSB7CisgICAgICAgICRF TlZ7X19YUENfRFlMRF9GUkFNRVdPUktfUEFUSH0gPSAkcHJvZHVjdERpcjsKKyAgICAgICAgYXBw ZW5kVG9FbnZpcm9ubWVudFZhcmlhYmxlTGlzdCgiX19YUENfRFlMRF9JTlNFUlRfTElCUkFSSUVT IiwgRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkcHJvZHVjdERpciwgIldlYlByb2Nlc3NTaGltLmR5bGli IikpOworICAgICAgICAkRU5We1dFQktJVF9VU0VfWFBDX1NFUlZJQ0VfRk9SX1dFQl9QUk9DRVNT fSA9ICJZRVMiOworICAgIH0KKwogICAgIGlmIChkZWZpbmVkKCR1c2VPcGVuQ29tbWFuZCkgJiYg JHVzZU9wZW5Db21tYW5kID09IFVTRV9PUEVOX0NPTU1BTkQpIHsKICAgICAgICAgcmV0dXJuIHN5 c3RlbSgib3BlbiIsICItVyIsICItYSIsICRhcHBQYXRoLCAiLS1hcmdzIiwgYXJndW1lbnRzRm9y UnVuQW5kRGVidWdNYWNXZWJLaXRBcHAoKSk7CiAgICAgfQpAQCAtMjc0Nyw5ICsyNzcwLDE4IEBA IHN1YiBleGVjTWFjV2ViS2l0QXBwRm9yRGVidWdnaW5nKCQpCiAKICAgICBteSBAYXJjaGl0ZWN0 dXJlRmxhZ3MgPSAoJGFyY2hpdGVjdHVyZVN3aXRjaCwgYXJjaGl0ZWN0dXJlKCkpOwogICAgIGlm ICghc2hvdWxkVGFyZ2V0V2ViUHJvY2VzcygpKSB7CisgICAgICAgIGlmIChzaG91bGRVc2VYUENT ZXJ2aWNlRm9yV2ViUHJvY2VzcygpKSB7CisgICAgICAgICAgICAkRU5We19fWFBDX0RZTERfRlJB TUVXT1JLX1BBVEh9ID0gJHByb2R1Y3REaXI7CisgICAgICAgICAgICBhcHBlbmRUb0Vudmlyb25t ZW50VmFyaWFibGVMaXN0KCJfX1hQQ19EWUxEX0lOU0VSVF9MSUJSQVJJRVMiLCBGaWxlOjpTcGVj LT5jYXRmaWxlKCRwcm9kdWN0RGlyLCAiV2ViUHJvY2Vzc1NoaW0uZHlsaWIiKSk7CisgICAgICAg ICAgICAkRU5We1dFQktJVF9VU0VfWFBDX1NFUlZJQ0VfRk9SX1dFQl9QUk9DRVNTfSA9ICJZRVMi OworICAgICAgICB9CiAgICAgICAgIHByaW50ICJTdGFydGluZyBAe1tiYXNlbmFtZSgkYXBwUGF0 aCldfSB1bmRlciAkZGVidWdnZXIgd2l0aCBEWUxEX0ZSQU1FV09SS19QQVRIIHNldCB0byBwb2lu dCB0byBidWlsdCBXZWJLaXQgaW4gJHByb2R1Y3REaXIuXG4iOwogICAgICAgICBleGVjIHsgJGRl YnVnZ2VyUGF0aCB9ICRkZWJ1Z2dlclBhdGgsIEBhcmNoaXRlY3R1cmVGbGFncywgJGFyZ3VtZW50 c1NlcGFyYXRvciwgJGFwcFBhdGgsIGFyZ3VtZW50c0ZvclJ1bkFuZERlYnVnTWFjV2ViS2l0QXBw KCkgb3IgZGllOwogICAgIH0gZWxzZSB7CisgICAgICAgIGlmIChzaG91bGRVc2VYUENTZXJ2aWNl Rm9yV2ViUHJvY2VzcygpKSB7CisgICAgICAgICAgICBkaWUgIlRhcmdldHRpbmcgdGhlIFdlYiBQ cm9jZXNzIGlzIG5vdCBjb21wYXRpYmxlIHdpdGggdXNpbmcgYW4gWFBDIFNlcnZpY2UgZm9yIHRo ZSBXZWIgUHJvY2VzcyBhdCB0aGlzIHRpbWUuIjsKKyAgICAgICAgfQorICAgICAgICAKICAgICAg ICAgbXkgJHdlYlByb2Nlc3NTaGltUGF0aCA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoJHByb2R1Y3RE aXIsICJXZWJQcm9jZXNzU2hpbS5keWxpYiIpOwogICAgICAgICBteSAkd2ViUHJvY2Vzc1BhdGgg PSBGaWxlOjpTcGVjLT5jYXRkaXIoJHByb2R1Y3REaXIsICJXZWJQcm9jZXNzLmFwcCIpOwogICAg ICAgICBteSAkd2ViS2l0MkV4ZWN1dGFibGVQYXRoID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkcHJv ZHVjdERpciwgIldlYktpdDIuZnJhbWV3b3JrIiwgIldlYktpdDIiKTsK