97231 2012-09-20 10:20:06 -0700 Web Inspector: Provide a way to distinguish scripts having sourceURL from standalone scripts. 2012-10-02 12:16:28 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 97680 0 vsevik vsevik apavlov bweinstein dglazkov joepeck keishi loislo ojan peter+ews pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 724607 0 vsevik 2012-09-20 10:20:06 -0700 Currently sourceURL field could be set for - standalone scripts (<script src=foo.js></script>) - evals - scripts in dynamically created script element To distinguish between first two we should provide hasSourceURL flag for each script. 724611 1 vsevik 2012-09-20 10:24:35 -0700 This patch depends on https://codereview.chromium.org/10966011/ landed in v8. 724613 2 164939 vsevik 2012-09-20 10:25:20 -0700 Created attachment 164939 Patch 724615 3 164940 vsevik 2012-09-20 10:28:58 -0700 Created attachment 164940 Patch 724628 4 164940 peter+ews 2012-09-20 10:47:17 -0700 Comment on attachment 164940 Patch Attachment 164940 did not pass cr-android-ews (chromium-android): Output: http://queues.webkit.org/results/13955258 724769 5 164940 webkit.review.bot 2012-09-20 12:55:49 -0700 Comment on attachment 164940 Patch Attachment 164940 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/13935277 732417 6 vsevik 2012-10-02 01:27:54 -0700 Committed r130138: <http://trac.webkit.org/changeset/130138> 732902 7 ojan 2012-10-02 11:50:20 -0700 inspector/debugger/source-url-comment.html times out on all the chromium bots. http://test-results.appspot.com/dashboards/flakiness_dashboard.html#group=%40ToT%20-%20webkit.org&showExpectations=true&tests=inspector%2Fdebugger%2Fsource-url-comment.html http://test-results.appspot.com/dashboards/flakiness_dashboard.html#showExpectations=true&tests=inspector%2Fdebugger%2Fsource-url-comment.html 732932 8 ojan 2012-10-02 12:16:28 -0700 Added to TestExpectations for now: http://trac.webkit.org/changeset/130193 164939 2012-09-20 10:25:20 -0700 2012-09-20 10:28:53 -0700 Patch bug-97231-20120920212445.patch text/plain 13469 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MDAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGI2MjdiMDJmOWY0Mzg1 NGU0OTIwNTk0ZjEwYTIxN2YxYjNkN2Q3NS4uZjE1MmFkNGRiMzkxOTY5ZTAwNGQ0YTRhYzY2YmM1 OGY2Y2Y5YWI1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA5LTIwICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFByb3ZpZGUgYSB3YXkgdG8gZGlzdGluZ3Vpc2ggc2NyaXB0cyBoYXZpbmcgc291cmNlVVJM IGZyb20gc3RhbmRhbG9uZSBzY3JpcHRzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTcyMzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBEZWJ1Z2dlckFnZW50IG5vdyBzY2FucyBzY3JpcHRzIGZvciBzb3Vy Y2VVUkwgY29tbWVudCBhbmQgcHJvdmlkZXMKKyAgICAgICAgaGFzU291cmNlVVJMIGZsYWcgZm9y IGVhY2ggbm9uLWlubGluZSBzY3JpcHQgd2l0aCBzdWNoIGEgY29tbWVudC4KKworICAgICAgICAq IGJpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNj cmlwdERlYnVnU2VydmVyOjpkaXNwYXRjaERpZFBhcnNlU291cmNlKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRlYnVn Z2VyQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6 ZGlkUGFyc2VTb3VyY2UpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJN b2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLnByb3RvdHlwZS5f cGFyc2VkU2NyaXB0U291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlckRpc3Bh dGNoZXIucHJvdG90eXBlLnNjcmlwdFBhcnNlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9TY3JpcHQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0KToKKwogMjAxMi0w OS0xOSAgSm9uYXRoYW4gRG9uZyAgPGpvbmF0aGFuLmRvbmdAdG9yY2htb2JpbGUuY29tLmNuPgog CiAgICAgICAgIFtCbGFja0JlcnJ5XSByZW1vdmUgc3RhdGljX2Nhc3Qgd2hpY2ggd2lsbCBjYXVz ZSB2aWRlbyBjcmFzaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2Ny aXB0RGVidWdTZXJ2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0RGVi dWdTZXJ2ZXIuY3BwCmluZGV4IGFhNjBhMmRkOGEzNThiZmM1ZGUxMWQzYjBjNDcwZTJlYjkxNGRi YTEuLjliMmIwOTM2YjgzZmYyNDBiY2U1NjE2NjViMGRiZDQxZDU5MmRiOWYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHREZWJ1Z1NlcnZlci5jcHAKQEAgLTMyNiw4 ICszMjYsMTEgQEAgdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6ZGlzcGF0Y2hEaWRQYXJzZVNvdXJj ZShjb25zdCBMaXN0ZW5lclNldCYgbGlzdGVuZXJzLCBTb3UKICAgICBzY3JpcHQuaXNDb250ZW50 U2NyaXB0ID0gaXNDb250ZW50U2NyaXB0OwogCiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICBp ZiAoc2NyaXB0LnVybC5pc0VtcHR5KCkpCi0gICAgICAgIHNjcmlwdC51cmwgPSBDb250ZW50U2Vh cmNoVXRpbHM6OmZpbmRTb3VyY2VVUkwoc2NyaXB0LnNvdXJjZSk7CisgICAgaWYgKCFzY3JpcHQu c3RhcnRMaW5lICYmICFzY3JpcHQuc3RhcnRDb2x1bW4pIHsKKyAgICAgICAgU3RyaW5nIHNvdXJj ZVVSTCA9IENvbnRlbnRTZWFyY2hVdGlsczo6ZmluZFNvdXJjZVVSTChzY3JpcHQuc291cmNlKTsK KyAgICAgICAgaWYgKCFzb3VyY2VVUkwuaXNFbXB0eSgpKQorICAgICAgICAgICAgc2NyaXB0LnVy bCA9IHNvdXJjZVVSTDsKKyAgICB9CiAjZW5kaWYKIAogICAgIGludCBzb3VyY2VMZW5ndGggPSBz Y3JpcHQuc291cmNlLmxlbmd0aCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3Rvci5qc29uIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5q c29uCmluZGV4IDRmZTU4YmRmNmI2YWJhMDY3NDY5NTk4MDY0Yjc1MzU5MTAxMWFlZGQuLjBjOTI5 NjIyZjJhMWYxZjkwOWMzNmJhOGNiYTI2YmNjNTg4ZDQxYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yLmpzb24KQEAgLTI3NDAsNyArMjc0MCw4IEBACiAgICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAiZW5kTGluZSIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRp b24iOiAiTGFzdCBsaW5lIG9mIHRoZSBzY3JpcHQuIiB9LAogICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogImVuZENvbHVtbiIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAi TGVuZ3RoIG9mIHRoZSBsYXN0IGxpbmUgb2YgdGhlIHNjcmlwdC4iIH0sCiAgICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAiaXNDb250ZW50U2NyaXB0IiwgInR5cGUiOiAiYm9vbGVhbiIsICJv cHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJEZXRlcm1pbmVzIHdoZXRoZXIgdGhpcyBz Y3JpcHQgaXMgYSB1c2VyIGV4dGVuc2lvbiBzY3JpcHQuIiB9LAotICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogInNvdXJjZU1hcFVSTCIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6 IHRydWUsICJkZXNjcmlwdGlvbiI6ICJVUkwgb2Ygc291cmNlIG1hcCBhc3NvY2lhdGVkIHdpdGgg c2NyaXB0IChpZiBhbnkpLiIgfQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNvdXJj ZU1hcFVSTCIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlv biI6ICJVUkwgb2Ygc291cmNlIG1hcCBhc3NvY2lhdGVkIHdpdGggc2NyaXB0IChpZiBhbnkpLiIg fSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJoYXNTb3VyY2VVUkwiLCAidHlwZSI6 ICJib29sZWFuIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlRydWUsIGlmIHRo aXMgc2NyaXB0IGhhcyBzb3VyY2VVUkwuIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAg ICAgICAgICAiZGVzY3JpcHRpb24iOiAiRmlyZWQgd2hlbiB2aXJ0dWFsIG1hY2hpbmUgcGFyc2Vz IHNjcmlwdC4gVGhpcyBldmVudCBpcyBhbHNvIGZpcmVkIGZvciBhbGwga25vd24gYW5kIHVuY29s bGVjdGVkIHNjcmlwdHMgdXBvbiBlbmFibGluZyBkZWJ1Z2dlci4iCiAgICAgICAgICAgICB9LApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdl bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQu Y3BwCmluZGV4IGFhMDQ3YzkxNDA0N2U0OTI5NWE1MDAyZjA0ZDczZGFkM2FhZjAwNDMuLjEyN2Mx Y2FkNWFjZWEyZDRkNzU0MGIwMTVkZDZlZjcwM2ZlN2QxZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAKQEAgLTYzMCw3ICs2 MzAsMTIgQEAgdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpkaWRQYXJzZVNvdXJjZShjb25z dCBTdHJpbmcmIHNjcmlwdElkLCBjb25zdCBTY3JpcHQKICAgICBjb25zdCBib29sKiBpc0NvbnRl bnRTY3JpcHQgPSBzY3JpcHQuaXNDb250ZW50U2NyaXB0ID8gJnNjcmlwdC5pc0NvbnRlbnRTY3Jp cHQgOiAwOwogICAgIFN0cmluZyBzb3VyY2VNYXBVUkwgPSBzb3VyY2VNYXBVUkxGb3JTY3JpcHQo c2NyaXB0KTsKICAgICBTdHJpbmcqIHNvdXJjZU1hcFVSTFBhcmFtID0gc291cmNlTWFwVVJMLmlz TnVsbCgpID8gMCA6ICZzb3VyY2VNYXBVUkw7Ci0gICAgbV9mcm9udGVuZC0+c2NyaXB0UGFyc2Vk KHNjcmlwdElkLCBzY3JpcHQudXJsLCBzY3JpcHQuc3RhcnRMaW5lLCBzY3JpcHQuc3RhcnRDb2x1 bW4sIHNjcmlwdC5lbmRMaW5lLCBzY3JpcHQuZW5kQ29sdW1uLCBpc0NvbnRlbnRTY3JpcHQsIHNv dXJjZU1hcFVSTFBhcmFtKTsKKyAgICBTdHJpbmcgc291cmNlVVJMOworICAgIGlmICghc2NyaXB0 LnN0YXJ0TGluZSAmJiAhc2NyaXB0LnN0YXJ0Q29sdW1uKQorICAgICAgICBzb3VyY2VVUkwgPSBD b250ZW50U2VhcmNoVXRpbHM6OmZpbmRTb3VyY2VVUkwoc2NyaXB0LnNvdXJjZSk7CisgICAgYm9v bCBoYXNTb3VyY2VVUkwgPSAhc291cmNlVVJMLmlzRW1wdHkoKSAmJiBzb3VyY2VVUkwgPT0gc2Ny aXB0LnVybDsKKyAgICBib29sKiBoYXNTb3VyY2VVUkxQYXJhbSA9IGhhc1NvdXJjZVVSTCA/ICZo YXNTb3VyY2VVUkwgOiAwOworICAgIG1fZnJvbnRlbmQtPnNjcmlwdFBhcnNlZChzY3JpcHRJZCwg c2NyaXB0LnVybCwgc2NyaXB0LnN0YXJ0TGluZSwgc2NyaXB0LnN0YXJ0Q29sdW1uLCBzY3JpcHQu ZW5kTGluZSwgc2NyaXB0LmVuZENvbHVtbiwgaXNDb250ZW50U2NyaXB0LCBzb3VyY2VNYXBVUkxQ YXJhbSwgaGFzU291cmNlVVJMUGFyYW0pOwogCiAgICAgbV9zY3JpcHRzLnNldChzY3JpcHRJZCwg c2NyaXB0KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9EZWJ1Z2dlck1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9E ZWJ1Z2dlck1vZGVsLmpzCmluZGV4IDIxZmI0NWJhMTY2M2U3Y2ExYWFhOWZmMjI0ZTBmYzBkY2E3 NTg1MTQuLmFmZmVmZTBmMGVhMzBlZTU1Mzc3MjVkNjdjOTA1MjU2NzgxZDVlMWQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwuanMK QEAgLTM3MSwxMCArMzcxLDEyIEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLnByb3RvdHlw ZSA9IHsKICAgICAgKiBAcGFyYW0ge251bWJlcn0gZW5kTGluZQogICAgICAqIEBwYXJhbSB7bnVt YmVyfSBlbmRDb2x1bW4KICAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IGlzQ29udGVudFNjcmlwdAor ICAgICAqIEBwYXJhbSB7c3RyaW5nPX0gc291cmNlTWFwVVJMCisgICAgICogQHBhcmFtIHtib29s ZWFuPX0gaGFzU291cmNlVVJMCiAgICAgICovCi0gICAgX3BhcnNlZFNjcmlwdFNvdXJjZTogZnVu Y3Rpb24oc2NyaXB0SWQsIHNvdXJjZVVSTCwgc3RhcnRMaW5lLCBzdGFydENvbHVtbiwgZW5kTGlu ZSwgZW5kQ29sdW1uLCBpc0NvbnRlbnRTY3JpcHQsIHNvdXJjZU1hcFVSTCkKKyAgICBfcGFyc2Vk U2NyaXB0U291cmNlOiBmdW5jdGlvbihzY3JpcHRJZCwgc291cmNlVVJMLCBzdGFydExpbmUsIHN0 YXJ0Q29sdW1uLCBlbmRMaW5lLCBlbmRDb2x1bW4sIGlzQ29udGVudFNjcmlwdCwgc291cmNlTWFw VVJMLCBoYXNTb3VyY2VVUkwpCiAgICAgewotICAgICAgICB2YXIgc2NyaXB0ID0gbmV3IFdlYklu c3BlY3Rvci5TY3JpcHQoc2NyaXB0SWQsIHNvdXJjZVVSTCwgc3RhcnRMaW5lLCBzdGFydENvbHVt biwgZW5kTGluZSwgZW5kQ29sdW1uLCBpc0NvbnRlbnRTY3JpcHQsIHNvdXJjZU1hcFVSTCk7Cisg ICAgICAgIHZhciBzY3JpcHQgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdChzY3JpcHRJZCwgc291 cmNlVVJMLCBzdGFydExpbmUsIHN0YXJ0Q29sdW1uLCBlbmRMaW5lLCBlbmRDb2x1bW4sIGlzQ29u dGVudFNjcmlwdCwgc291cmNlTWFwVVJMLCBoYXNTb3VyY2VVUkwpOwogICAgICAgICB0aGlzLl9y ZWdpc3RlclNjcmlwdChzY3JpcHQpOwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3Rl bmVycyhXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5FdmVudHMuUGFyc2VkU2NyaXB0U291cmNl LCBzY3JpcHQpOwogICAgIH0sCkBAIC02MzcsMTAgKzYzOSwxMSBAQCBXZWJJbnNwZWN0b3IuRGVi dWdnZXJEaXNwYXRjaGVyLnByb3RvdHlwZSA9IHsKICAgICAgKiBAcGFyYW0ge251bWJlcn0gZW5k Q29sdW1uCiAgICAgICogQHBhcmFtIHtib29sZWFuPX0gaXNDb250ZW50U2NyaXB0CiAgICAgICog QHBhcmFtIHtzdHJpbmc9fSBzb3VyY2VNYXBVUkwKKyAgICAgKiBAcGFyYW0ge2Jvb2xlYW49fSBo YXNTb3VyY2VVUkwKICAgICAgKi8KLSAgICBzY3JpcHRQYXJzZWQ6IGZ1bmN0aW9uKHNjcmlwdElk LCBzb3VyY2VVUkwsIHN0YXJ0TGluZSwgc3RhcnRDb2x1bW4sIGVuZExpbmUsIGVuZENvbHVtbiwg aXNDb250ZW50U2NyaXB0LCBzb3VyY2VNYXBVUkwpCisgICAgc2NyaXB0UGFyc2VkOiBmdW5jdGlv bihzY3JpcHRJZCwgc291cmNlVVJMLCBzdGFydExpbmUsIHN0YXJ0Q29sdW1uLCBlbmRMaW5lLCBl bmRDb2x1bW4sIGlzQ29udGVudFNjcmlwdCwgc291cmNlTWFwVVJMLCBoYXNTb3VyY2VVUkwpCiAg ICAgewotICAgICAgICB0aGlzLl9kZWJ1Z2dlck1vZGVsLl9wYXJzZWRTY3JpcHRTb3VyY2Uoc2Ny aXB0SWQsIHNvdXJjZVVSTCwgc3RhcnRMaW5lLCBzdGFydENvbHVtbiwgZW5kTGluZSwgZW5kQ29s dW1uLCAhIWlzQ29udGVudFNjcmlwdCwgc291cmNlTWFwVVJMKTsKKyAgICAgICAgdGhpcy5fZGVi dWdnZXJNb2RlbC5fcGFyc2VkU2NyaXB0U291cmNlKHNjcmlwdElkLCBzb3VyY2VVUkwsIHN0YXJ0 TGluZSwgc3RhcnRDb2x1bW4sIGVuZExpbmUsIGVuZENvbHVtbiwgISFpc0NvbnRlbnRTY3JpcHQs IHNvdXJjZU1hcFVSTCwgaGFzU291cmNlVVJMKTsKICAgICB9LAogCiAgICAgLyoqCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdC5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0LmpzCmluZGV4IDkyMGFjMjY3NTBh NWFmNDBlZTU1NzFmN2QzYTU0MDYxMzk1YjM5YjAuLjk2ZDZhYTlhNTA3Y2Q3MzFkNTBlOGIyMWE3 MjUyZDBlYzc2OTE1NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU2NyaXB0LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2NyaXB0LmpzCkBAIC0zNCw4ICszNCw5IEBACiAgKiBAcGFyYW0ge251bWJlcn0gZW5kQ29sdW1u CiAgKiBAcGFyYW0ge2Jvb2xlYW59IGlzQ29udGVudFNjcmlwdAogICogQHBhcmFtIHtzdHJpbmc9 fSBzb3VyY2VNYXBVUkwKKyAqIEBwYXJhbSB7Ym9vbGVhbj19IGhhc1NvdXJjZVVSTAogICovCi1X ZWJJbnNwZWN0b3IuU2NyaXB0ID0gZnVuY3Rpb24oc2NyaXB0SWQsIHNvdXJjZVVSTCwgc3RhcnRM aW5lLCBzdGFydENvbHVtbiwgZW5kTGluZSwgZW5kQ29sdW1uLCBpc0NvbnRlbnRTY3JpcHQsIHNv dXJjZU1hcFVSTCkKK1dlYkluc3BlY3Rvci5TY3JpcHQgPSBmdW5jdGlvbihzY3JpcHRJZCwgc291 cmNlVVJMLCBzdGFydExpbmUsIHN0YXJ0Q29sdW1uLCBlbmRMaW5lLCBlbmRDb2x1bW4sIGlzQ29u dGVudFNjcmlwdCwgc291cmNlTWFwVVJMLCBoYXNTb3VyY2VVUkwpCiB7CiAgICAgdGhpcy5zY3Jp cHRJZCA9IHNjcmlwdElkOwogICAgIHRoaXMuc291cmNlVVJMID0gc291cmNlVVJMOwpAQCAtNDUs NiArNDYsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0ID0gZnVuY3Rpb24oc2NyaXB0SWQsIHNvdXJj ZVVSTCwgc3RhcnRMaW5lLCBzdGFydENvbHVtbiwgZW5kTAogICAgIHRoaXMuZW5kQ29sdW1uID0g ZW5kQ29sdW1uOwogICAgIHRoaXMuaXNDb250ZW50U2NyaXB0ID0gaXNDb250ZW50U2NyaXB0Owog ICAgIHRoaXMuc291cmNlTWFwVVJMID0gc291cmNlTWFwVVJMOworICAgIHRoaXMuaGFzU291cmNl VVJMID0gaGFzU291cmNlVVJMOwogICAgIHRoaXMuX2xvY2F0aW9ucyA9IFtdOwogfQogCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5k ZXggZGViNjU5MjliNzU3MDE2YTE3NGY4NzI1MWM5ODA3NGM1ZDc2YTEzMi4uOTBhNzkzMTA4Yjk4 ZmE1MDExMTc5YzgxN2ZiNTY2N2I1YzE1ZTZhNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEy LTA5LTIwICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAg IFdlYiBJbnNwZWN0b3I6IFByb3ZpZGUgYSB3YXkgdG8gZGlzdGluZ3Vpc2ggc2NyaXB0cyBoYXZp bmcgc291cmNlVVJMIGZyb20gc3RhbmRhbG9uZSBzY3JpcHRzLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTcyMzEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9zb3VyY2Ut dXJsLWNvbW1lbnQtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9z b3VyY2UtdXJsLWNvbW1lbnQuaHRtbDoKKwogMjAxMi0wOS0xOSAgSm9jaGVuIEVpc2luZ2VyICA8 am9jaGVuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIFVwZGF0ZSB0ZXN0IGV4 cGVjdGF0aW9uIGZvciBpbmRleGVkZGIgdGVzdCB0aGF0IGlzIGN1cnJlbnRseSBvbmx5IHJ1biB1 c2luZyBjb250ZW50X2Jyb3dzZXJ0ZXN0cwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2RlYnVnZ2VyL3NvdXJjZS11cmwtY29tbWVudC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvZGVidWdnZXIvc291cmNlLXVybC1jb21tZW50LWV4cGVjdGVkLnR4dAppbmRl eCAwNGJiYzE5YWMzOGM1NGM0MjNjYmE3MjdjNGZmMDFiNjAxNTdlMDkyLi41ZWU5ZmI4NGU3ZmJk MDc4NjE3MjEyYzhjYWQ3N2MyMDFlMTAzNmZhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZGVidWdnZXIvc291cmNlLXVybC1jb21tZW50LWV4cGVjdGVkLnR4dAorKysgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc291cmNlLXVybC1jb21tZW50LWV4cGVjdGVkLnR4 dApAQCAtMiw4ICsyLDE0IEBAIFRlc3RzIHRoYXQgZXZhbHMgd2l0aCBzb3VyY2VVUkwgY29tbWVu dCBhcmUgc2hvd24gaW4gc2NyaXB0cyBwYW5lbC4KIAogRGVidWdnZXIgd2FzIGVuYWJsZWQuCiAK K1J1bm5pbmc6IHRlc3RTb3VyY2VVUkxDb21tZW50SW5JbmxpbmVTY3JpcHQKKwogUnVubmluZzog dGVzdFNvdXJjZVVSTENvbW1lbnQKIGZ1bmN0aW9uIGtlZXBBbGl2ZSgpIHt9CiAvL0Agc291cmNl VVJMPWV2YWxVUkwuanMKKworUnVubmluZzogdGVzdFNvdXJjZVVSTENvbW1lbnRJbkR5bmFtaWNT Y3JpcHQKK2Z1bmN0aW9uIGtlZXBBbGl2ZUluRHluYW1pY1NjcmlwdCgpIHt9CisvL0Agc291cmNl VVJMPWR5bmFtaWNTY3JpcHRVUkwuanMKIERlYnVnZ2VyIHdhcyBkaXNhYmxlZC4KIApkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NvdXJjZS11cmwtY29tbWVudC5o dG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NvdXJjZS11cmwtY29tbWVudC5o dG1sCmluZGV4IDFlYjI4YTk4ZmEwMjliMjgxNGRiNGYxYTY3MGEzOWM5MmQ2NzI0YzMuLmRlNzRl OGZiNzNlMjJlNjA1YjNiMjdkNGE4NjhhM2UyYTQ2NTlhOTQgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zb3VyY2UtdXJsLWNvbW1lbnQuaHRtbAorKysgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc291cmNlLXVybC1jb21tZW50Lmh0bWwKQEAgLTIs NyArMiwxMSBAQAogPGhlYWQ+CiA8c2NyaXB0IHNyYz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNwZWN0 b3IvaW5zcGVjdG9yLXRlc3QuanMiPjwvc2NyaXB0PgogPHNjcmlwdCBzcmM9Ii4uLy4uL2h0dHAv dGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KK2Z1 bmN0aW9uIGtlZXBBbGl2ZUluSW5saW5lU2NyaXB0KCkgeyB9CiAKKy8vQCBzb3VyY2VVUkw9aW5s aW5lU2NyaXB0VVJMLmpzCis8L3NjcmlwdD4KIDxzY3JpcHQ+CiAKIGZ1bmN0aW9uIGRvRXZhbCgp CkBAIC0xMCw5ICsxNCw0OSBAQCBmdW5jdGlvbiBkb0V2YWwoKQogICAgIGV2YWwoImZ1bmN0aW9u IGtlZXBBbGl2ZSgpIHt9XG4vL0Agc291cmNlVVJMPWV2YWxVUkwuanMiKTsKIH0KIAorZnVuY3Rp b24gZG9EeW5hbWljU2NyaXB0KCkKK3sKKyAgICB2YXIgc2NyaXB0RWxlbWVudCA9IGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoInNjcmlwdCIpOworICAgIHNjcmlwdEVsZW1lbnQudGV4dENvbnRlbnQg PSAiZnVuY3Rpb24ga2VlcEFsaXZlSW5EeW5hbWljU2NyaXB0KCkge31cbi8vQCBzb3VyY2VVUkw9 ZHluYW1pY1NjcmlwdFVSTC5qcyI7CisgICAgZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChzY3Jp cHRFbGVtZW50KTsKK30KKwogZnVuY3Rpb24gdGVzdCgpCisKIHsKKyAgc2V0VGltZW91dChJbnNw ZWN0b3JUZXN0LmNvbXBsZXRlVGVzdC5iaW5kKEluc3BlY3RvclRlc3QpLCAzMDAwKTsKKyAgZnVu Y3Rpb24gZm9yRWFjaFNjcmlwdE1hdGNoaW5nVVJMKHVybCwgaGFuZGxlcikKKyAgICB7CisgICAg ICAgIHZhciBzY3JpcHRzID0gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuc2NyaXB0czsKKyAg ICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzY3JpcHRzLmxlbmd0aDsgKytpKSB7CisgICAgICAg ICAgICBpZiAoc2NyaXB0c1tpXS5zb3VyY2VVUkwuaW5kZXhPZih1cmwpICE9PSAtMSkKKyAgICAg ICAgICAgICAgICBoYW5kbGVyKHNjcmlwdHNbaV0pOworICAgICAgICB9CisgICAgfQorCiAgICAg SW5zcGVjdG9yVGVzdC5ydW5EZWJ1Z2dlclRlc3RTdWl0ZShbCisgICAgICAgIGZ1bmN0aW9uIHRl c3RTb3VyY2VVUkxDb21tZW50SW5JbmxpbmVTY3JpcHQobmV4dCkKKyAgICAgICAgeworICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5zaG93U2NyaXB0U291cmNlKCJzb3VyY2UtdXJsLWNvbW1lbnQu aHRtbCIsIGRpZFNob3dTY3JpcHRTb3VyY2UpOworCisgICAgICAgICAgICBmdW5jdGlvbiBkaWRT aG93U2NyaXB0U291cmNlKHNvdXJjZUZyYW1lKQorICAgICAgICAgICAgeworICAgICAgICAgICAg ICAgIHZhciBwYW5lbCA9IFdlYkluc3BlY3Rvci5wYW5lbCgic2NyaXB0cyIpOworICAgICAgICAg ICAgICAgIHZhciB1aVNvdXJjZUNvZGVzID0gcGFuZWwuX3dvcmtzcGFjZS51aVNvdXJjZUNvZGVz KCk7CisgICAgICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB1aVNvdXJjZUNvZGVzLmxl bmd0aDsgKytpKQorICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydFRydWUo dWlTb3VyY2VDb2Rlc1tpXS51cmwuaW5kZXhPZigiaW5saW5lU2NyaXB0VVJMLmpzIikgPT09IC0x LCAic291cmNlVVJMIGNvbW1lbnQgaW4gaW5saW5lIHNjcmlwdCB3YXMgdXNlZCBhcyBhIHNjcmlw dCBuYW1lIik7CisKKyAgICAgICAgICAgICAgICBmb3JFYWNoU2NyaXB0TWF0Y2hpbmdVUkwoInNv dXJjZS11cmwtY29tbWVudC5odG1sIiwgY2hlY2tTY3JpcHREb2VzTm90SGF2ZVNvdXJjZVVSTCkK KworICAgICAgICAgICAgICAgIGZ1bmN0aW9uIGNoZWNrU2NyaXB0RG9lc05vdEhhdmVTb3VyY2VV Ukwoc2NyaXB0KQorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5hc3NlcnRUcnVlKCFzY3JpcHQuaGFzU291cmNlVVJMLCAiaGFzU291cmNlVVJMIGZs YWcgaXMgc2V0IGZvciBpbmxpbmUgc2NyaXB0Iik7CisgICAgICAgICAgICAgICAgfQorCisgICAg ICAgICAgICAgICAgbmV4dCgpOworICAgICAgICAgICAgfQorICAgICAgICB9LAorCiAgICAgICAg IGZ1bmN0aW9uIHRlc3RTb3VyY2VVUkxDb21tZW50KG5leHQpCiAgICAgICAgIHsKICAgICAgICAg ICAgIEluc3BlY3RvclRlc3Quc2hvd1NjcmlwdFNvdXJjZSgiZXZhbFVSTC5qcyIsIGRpZFNob3dT Y3JpcHRTb3VyY2UpOwpAQCAtMjEsNiArNjUsMzQgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAg ICAgICBmdW5jdGlvbiBkaWRTaG93U2NyaXB0U291cmNlKHNvdXJjZUZyYW1lKQogICAgICAgICAg ICAgewogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KHNvdXJjZUZyYW1l LnRleHRFZGl0b3IudGV4dCgpKTsKKworICAgICAgICAgICAgICAgIGZvckVhY2hTY3JpcHRNYXRj aGluZ1VSTCgiZXZhbFVSTC5qcyIsIGNoZWNrU2NyaXB0SGFzU291cmNlVVJMKQorCisgICAgICAg ICAgICAgICAgZnVuY3Rpb24gY2hlY2tTY3JpcHRIYXNTb3VyY2VVUkwoc2NyaXB0KQorICAgICAg ICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRUcnVl KHNjcmlwdC5oYXNTb3VyY2VVUkwsICJoYXNTb3VyY2VVUkwgZmxhZyBpcyBub3Qgc2V0IGZvciBl dmFsIHdpdGggc291cmNlVVJMIGNvbW1lbnQiKTsKKyAgICAgICAgICAgICAgICB9CisKKyAgICAg ICAgICAgICAgICBuZXh0KCk7CisgICAgICAgICAgICB9CisgICAgICAgIH0sCisKKyAgICAgICAg ZnVuY3Rpb24gdGVzdFNvdXJjZVVSTENvbW1lbnRJbkR5bmFtaWNTY3JpcHQobmV4dCkKKyAgICAg ICAgeworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5zaG93U2NyaXB0U291cmNlKCJkeW5hbWlj U2NyaXB0VVJMLmpzIiwgZGlkU2hvd1NjcmlwdFNvdXJjZSk7CisgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmV2YWx1YXRlSW5QYWdlKCJzZXRUaW1lb3V0KGRvRHluYW1pY1NjcmlwdCwgMCkiKTsK KworICAgICAgICAgICAgZnVuY3Rpb24gZGlkU2hvd1NjcmlwdFNvdXJjZShzb3VyY2VGcmFtZSkK KyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdChz b3VyY2VGcmFtZS50ZXh0RWRpdG9yLnRleHQoKSk7CisKKyAgICAgICAgICAgICAgICBmb3JFYWNo U2NyaXB0TWF0Y2hpbmdVUkwoImR5bmFtaWNTY3JpcHRVUkwuanMiLCBjaGVja1NjcmlwdEhhc1Nv dXJjZVVSTCkKKworICAgICAgICAgICAgICAgIGZ1bmN0aW9uIGNoZWNrU2NyaXB0SGFzU291cmNl VVJMKHNjcmlwdCkKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIEluc3Bl Y3RvclRlc3QuYXNzZXJ0VHJ1ZShzY3JpcHQuaGFzU291cmNlVVJMLCAiaGFzU291cmNlVVJMIGZs YWcgaXMgbm90IHNldCBmb3IgZHluYW1pYyBzY3JpcHQgd2l0aCBzb3VyY2VVUkwgY29tbWVudCIp OworICAgICAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgICAgIG5leHQoKTsKICAgICAgICAg ICAgIH0KICAgICAgICAgfQo= 164940 2012-09-20 10:28:58 -0700 2012-09-24 08:52:39 -0700 Patch bug-97231-20120920212823.patch text/plain 13428 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MDAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGI2MjdiMDJmOWY0Mzg1 NGU0OTIwNTk0ZjEwYTIxN2YxYjNkN2Q3NS4uZjE1MmFkNGRiMzkxOTY5ZTAwNGQ0YTRhYzY2YmM1 OGY2Y2Y5YWI1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA5LTIwICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFByb3ZpZGUgYSB3YXkgdG8gZGlzdGluZ3Vpc2ggc2NyaXB0cyBoYXZpbmcgc291cmNlVVJM IGZyb20gc3RhbmRhbG9uZSBzY3JpcHRzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTcyMzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBEZWJ1Z2dlckFnZW50IG5vdyBzY2FucyBzY3JpcHRzIGZvciBzb3Vy Y2VVUkwgY29tbWVudCBhbmQgcHJvdmlkZXMKKyAgICAgICAgaGFzU291cmNlVVJMIGZsYWcgZm9y IGVhY2ggbm9uLWlubGluZSBzY3JpcHQgd2l0aCBzdWNoIGEgY29tbWVudC4KKworICAgICAgICAq IGJpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNj cmlwdERlYnVnU2VydmVyOjpkaXNwYXRjaERpZFBhcnNlU291cmNlKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRlYnVn Z2VyQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6 ZGlkUGFyc2VTb3VyY2UpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJN b2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLnByb3RvdHlwZS5f cGFyc2VkU2NyaXB0U291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlckRpc3Bh dGNoZXIucHJvdG90eXBlLnNjcmlwdFBhcnNlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9TY3JpcHQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0KToKKwogMjAxMi0w OS0xOSAgSm9uYXRoYW4gRG9uZyAgPGpvbmF0aGFuLmRvbmdAdG9yY2htb2JpbGUuY29tLmNuPgog CiAgICAgICAgIFtCbGFja0JlcnJ5XSByZW1vdmUgc3RhdGljX2Nhc3Qgd2hpY2ggd2lsbCBjYXVz ZSB2aWRlbyBjcmFzaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2Ny aXB0RGVidWdTZXJ2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0RGVi dWdTZXJ2ZXIuY3BwCmluZGV4IGFhNjBhMmRkOGEzNThiZmM1ZGUxMWQzYjBjNDcwZTJlYjkxNGRi YTEuLjliMmIwOTM2YjgzZmYyNDBiY2U1NjE2NjViMGRiZDQxZDU5MmRiOWYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHREZWJ1Z1NlcnZlci5jcHAKQEAgLTMyNiw4 ICszMjYsMTEgQEAgdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6ZGlzcGF0Y2hEaWRQYXJzZVNvdXJj ZShjb25zdCBMaXN0ZW5lclNldCYgbGlzdGVuZXJzLCBTb3UKICAgICBzY3JpcHQuaXNDb250ZW50 U2NyaXB0ID0gaXNDb250ZW50U2NyaXB0OwogCiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICBp ZiAoc2NyaXB0LnVybC5pc0VtcHR5KCkpCi0gICAgICAgIHNjcmlwdC51cmwgPSBDb250ZW50U2Vh cmNoVXRpbHM6OmZpbmRTb3VyY2VVUkwoc2NyaXB0LnNvdXJjZSk7CisgICAgaWYgKCFzY3JpcHQu c3RhcnRMaW5lICYmICFzY3JpcHQuc3RhcnRDb2x1bW4pIHsKKyAgICAgICAgU3RyaW5nIHNvdXJj ZVVSTCA9IENvbnRlbnRTZWFyY2hVdGlsczo6ZmluZFNvdXJjZVVSTChzY3JpcHQuc291cmNlKTsK KyAgICAgICAgaWYgKCFzb3VyY2VVUkwuaXNFbXB0eSgpKQorICAgICAgICAgICAgc2NyaXB0LnVy bCA9IHNvdXJjZVVSTDsKKyAgICB9CiAjZW5kaWYKIAogICAgIGludCBzb3VyY2VMZW5ndGggPSBz Y3JpcHQuc291cmNlLmxlbmd0aCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3Rvci5qc29uIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5q c29uCmluZGV4IDRmZTU4YmRmNmI2YWJhMDY3NDY5NTk4MDY0Yjc1MzU5MTAxMWFlZGQuLjBjOTI5 NjIyZjJhMWYxZjkwOWMzNmJhOGNiYTI2YmNjNTg4ZDQxYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yLmpzb24KQEAgLTI3NDAsNyArMjc0MCw4IEBACiAgICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAiZW5kTGluZSIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRp b24iOiAiTGFzdCBsaW5lIG9mIHRoZSBzY3JpcHQuIiB9LAogICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogImVuZENvbHVtbiIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAi TGVuZ3RoIG9mIHRoZSBsYXN0IGxpbmUgb2YgdGhlIHNjcmlwdC4iIH0sCiAgICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAiaXNDb250ZW50U2NyaXB0IiwgInR5cGUiOiAiYm9vbGVhbiIsICJv cHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJEZXRlcm1pbmVzIHdoZXRoZXIgdGhpcyBz Y3JpcHQgaXMgYSB1c2VyIGV4dGVuc2lvbiBzY3JpcHQuIiB9LAotICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogInNvdXJjZU1hcFVSTCIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6 IHRydWUsICJkZXNjcmlwdGlvbiI6ICJVUkwgb2Ygc291cmNlIG1hcCBhc3NvY2lhdGVkIHdpdGgg c2NyaXB0IChpZiBhbnkpLiIgfQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNvdXJj ZU1hcFVSTCIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlv biI6ICJVUkwgb2Ygc291cmNlIG1hcCBhc3NvY2lhdGVkIHdpdGggc2NyaXB0IChpZiBhbnkpLiIg fSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJoYXNTb3VyY2VVUkwiLCAidHlwZSI6 ICJib29sZWFuIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlRydWUsIGlmIHRo aXMgc2NyaXB0IGhhcyBzb3VyY2VVUkwuIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAg ICAgICAgICAiZGVzY3JpcHRpb24iOiAiRmlyZWQgd2hlbiB2aXJ0dWFsIG1hY2hpbmUgcGFyc2Vz IHNjcmlwdC4gVGhpcyBldmVudCBpcyBhbHNvIGZpcmVkIGZvciBhbGwga25vd24gYW5kIHVuY29s bGVjdGVkIHNjcmlwdHMgdXBvbiBlbmFibGluZyBkZWJ1Z2dlci4iCiAgICAgICAgICAgICB9LApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdl bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQu Y3BwCmluZGV4IGFhMDQ3YzkxNDA0N2U0OTI5NWE1MDAyZjA0ZDczZGFkM2FhZjAwNDMuLjEyN2Mx Y2FkNWFjZWEyZDRkNzU0MGIwMTVkZDZlZjcwM2ZlN2QxZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAKQEAgLTYzMCw3ICs2 MzAsMTIgQEAgdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpkaWRQYXJzZVNvdXJjZShjb25z dCBTdHJpbmcmIHNjcmlwdElkLCBjb25zdCBTY3JpcHQKICAgICBjb25zdCBib29sKiBpc0NvbnRl bnRTY3JpcHQgPSBzY3JpcHQuaXNDb250ZW50U2NyaXB0ID8gJnNjcmlwdC5pc0NvbnRlbnRTY3Jp cHQgOiAwOwogICAgIFN0cmluZyBzb3VyY2VNYXBVUkwgPSBzb3VyY2VNYXBVUkxGb3JTY3JpcHQo c2NyaXB0KTsKICAgICBTdHJpbmcqIHNvdXJjZU1hcFVSTFBhcmFtID0gc291cmNlTWFwVVJMLmlz TnVsbCgpID8gMCA6ICZzb3VyY2VNYXBVUkw7Ci0gICAgbV9mcm9udGVuZC0+c2NyaXB0UGFyc2Vk KHNjcmlwdElkLCBzY3JpcHQudXJsLCBzY3JpcHQuc3RhcnRMaW5lLCBzY3JpcHQuc3RhcnRDb2x1 bW4sIHNjcmlwdC5lbmRMaW5lLCBzY3JpcHQuZW5kQ29sdW1uLCBpc0NvbnRlbnRTY3JpcHQsIHNv dXJjZU1hcFVSTFBhcmFtKTsKKyAgICBTdHJpbmcgc291cmNlVVJMOworICAgIGlmICghc2NyaXB0 LnN0YXJ0TGluZSAmJiAhc2NyaXB0LnN0YXJ0Q29sdW1uKQorICAgICAgICBzb3VyY2VVUkwgPSBD b250ZW50U2VhcmNoVXRpbHM6OmZpbmRTb3VyY2VVUkwoc2NyaXB0LnNvdXJjZSk7CisgICAgYm9v bCBoYXNTb3VyY2VVUkwgPSAhc291cmNlVVJMLmlzRW1wdHkoKSAmJiBzb3VyY2VVUkwgPT0gc2Ny aXB0LnVybDsKKyAgICBib29sKiBoYXNTb3VyY2VVUkxQYXJhbSA9IGhhc1NvdXJjZVVSTCA/ICZo YXNTb3VyY2VVUkwgOiAwOworICAgIG1fZnJvbnRlbmQtPnNjcmlwdFBhcnNlZChzY3JpcHRJZCwg c2NyaXB0LnVybCwgc2NyaXB0LnN0YXJ0TGluZSwgc2NyaXB0LnN0YXJ0Q29sdW1uLCBzY3JpcHQu ZW5kTGluZSwgc2NyaXB0LmVuZENvbHVtbiwgaXNDb250ZW50U2NyaXB0LCBzb3VyY2VNYXBVUkxQ YXJhbSwgaGFzU291cmNlVVJMUGFyYW0pOwogCiAgICAgbV9zY3JpcHRzLnNldChzY3JpcHRJZCwg c2NyaXB0KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9EZWJ1Z2dlck1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9E ZWJ1Z2dlck1vZGVsLmpzCmluZGV4IDIxZmI0NWJhMTY2M2U3Y2ExYWFhOWZmMjI0ZTBmYzBkY2E3 NTg1MTQuLmFmZmVmZTBmMGVhMzBlZTU1Mzc3MjVkNjdjOTA1MjU2NzgxZDVlMWQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwuanMK QEAgLTM3MSwxMCArMzcxLDEyIEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLnByb3RvdHlw ZSA9IHsKICAgICAgKiBAcGFyYW0ge251bWJlcn0gZW5kTGluZQogICAgICAqIEBwYXJhbSB7bnVt YmVyfSBlbmRDb2x1bW4KICAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IGlzQ29udGVudFNjcmlwdAor ICAgICAqIEBwYXJhbSB7c3RyaW5nPX0gc291cmNlTWFwVVJMCisgICAgICogQHBhcmFtIHtib29s ZWFuPX0gaGFzU291cmNlVVJMCiAgICAgICovCi0gICAgX3BhcnNlZFNjcmlwdFNvdXJjZTogZnVu Y3Rpb24oc2NyaXB0SWQsIHNvdXJjZVVSTCwgc3RhcnRMaW5lLCBzdGFydENvbHVtbiwgZW5kTGlu ZSwgZW5kQ29sdW1uLCBpc0NvbnRlbnRTY3JpcHQsIHNvdXJjZU1hcFVSTCkKKyAgICBfcGFyc2Vk U2NyaXB0U291cmNlOiBmdW5jdGlvbihzY3JpcHRJZCwgc291cmNlVVJMLCBzdGFydExpbmUsIHN0 YXJ0Q29sdW1uLCBlbmRMaW5lLCBlbmRDb2x1bW4sIGlzQ29udGVudFNjcmlwdCwgc291cmNlTWFw VVJMLCBoYXNTb3VyY2VVUkwpCiAgICAgewotICAgICAgICB2YXIgc2NyaXB0ID0gbmV3IFdlYklu c3BlY3Rvci5TY3JpcHQoc2NyaXB0SWQsIHNvdXJjZVVSTCwgc3RhcnRMaW5lLCBzdGFydENvbHVt biwgZW5kTGluZSwgZW5kQ29sdW1uLCBpc0NvbnRlbnRTY3JpcHQsIHNvdXJjZU1hcFVSTCk7Cisg ICAgICAgIHZhciBzY3JpcHQgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdChzY3JpcHRJZCwgc291 cmNlVVJMLCBzdGFydExpbmUsIHN0YXJ0Q29sdW1uLCBlbmRMaW5lLCBlbmRDb2x1bW4sIGlzQ29u dGVudFNjcmlwdCwgc291cmNlTWFwVVJMLCBoYXNTb3VyY2VVUkwpOwogICAgICAgICB0aGlzLl9y ZWdpc3RlclNjcmlwdChzY3JpcHQpOwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3Rl bmVycyhXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5FdmVudHMuUGFyc2VkU2NyaXB0U291cmNl LCBzY3JpcHQpOwogICAgIH0sCkBAIC02MzcsMTAgKzYzOSwxMSBAQCBXZWJJbnNwZWN0b3IuRGVi dWdnZXJEaXNwYXRjaGVyLnByb3RvdHlwZSA9IHsKICAgICAgKiBAcGFyYW0ge251bWJlcn0gZW5k Q29sdW1uCiAgICAgICogQHBhcmFtIHtib29sZWFuPX0gaXNDb250ZW50U2NyaXB0CiAgICAgICog QHBhcmFtIHtzdHJpbmc9fSBzb3VyY2VNYXBVUkwKKyAgICAgKiBAcGFyYW0ge2Jvb2xlYW49fSBo YXNTb3VyY2VVUkwKICAgICAgKi8KLSAgICBzY3JpcHRQYXJzZWQ6IGZ1bmN0aW9uKHNjcmlwdElk LCBzb3VyY2VVUkwsIHN0YXJ0TGluZSwgc3RhcnRDb2x1bW4sIGVuZExpbmUsIGVuZENvbHVtbiwg aXNDb250ZW50U2NyaXB0LCBzb3VyY2VNYXBVUkwpCisgICAgc2NyaXB0UGFyc2VkOiBmdW5jdGlv bihzY3JpcHRJZCwgc291cmNlVVJMLCBzdGFydExpbmUsIHN0YXJ0Q29sdW1uLCBlbmRMaW5lLCBl bmRDb2x1bW4sIGlzQ29udGVudFNjcmlwdCwgc291cmNlTWFwVVJMLCBoYXNTb3VyY2VVUkwpCiAg ICAgewotICAgICAgICB0aGlzLl9kZWJ1Z2dlck1vZGVsLl9wYXJzZWRTY3JpcHRTb3VyY2Uoc2Ny aXB0SWQsIHNvdXJjZVVSTCwgc3RhcnRMaW5lLCBzdGFydENvbHVtbiwgZW5kTGluZSwgZW5kQ29s dW1uLCAhIWlzQ29udGVudFNjcmlwdCwgc291cmNlTWFwVVJMKTsKKyAgICAgICAgdGhpcy5fZGVi dWdnZXJNb2RlbC5fcGFyc2VkU2NyaXB0U291cmNlKHNjcmlwdElkLCBzb3VyY2VVUkwsIHN0YXJ0 TGluZSwgc3RhcnRDb2x1bW4sIGVuZExpbmUsIGVuZENvbHVtbiwgISFpc0NvbnRlbnRTY3JpcHQs IHNvdXJjZU1hcFVSTCwgaGFzU291cmNlVVJMKTsKICAgICB9LAogCiAgICAgLyoqCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdC5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0LmpzCmluZGV4IDkyMGFjMjY3NTBh NWFmNDBlZTU1NzFmN2QzYTU0MDYxMzk1YjM5YjAuLjk2ZDZhYTlhNTA3Y2Q3MzFkNTBlOGIyMWE3 MjUyZDBlYzc2OTE1NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU2NyaXB0LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2NyaXB0LmpzCkBAIC0zNCw4ICszNCw5IEBACiAgKiBAcGFyYW0ge251bWJlcn0gZW5kQ29sdW1u CiAgKiBAcGFyYW0ge2Jvb2xlYW59IGlzQ29udGVudFNjcmlwdAogICogQHBhcmFtIHtzdHJpbmc9 fSBzb3VyY2VNYXBVUkwKKyAqIEBwYXJhbSB7Ym9vbGVhbj19IGhhc1NvdXJjZVVSTAogICovCi1X ZWJJbnNwZWN0b3IuU2NyaXB0ID0gZnVuY3Rpb24oc2NyaXB0SWQsIHNvdXJjZVVSTCwgc3RhcnRM aW5lLCBzdGFydENvbHVtbiwgZW5kTGluZSwgZW5kQ29sdW1uLCBpc0NvbnRlbnRTY3JpcHQsIHNv dXJjZU1hcFVSTCkKK1dlYkluc3BlY3Rvci5TY3JpcHQgPSBmdW5jdGlvbihzY3JpcHRJZCwgc291 cmNlVVJMLCBzdGFydExpbmUsIHN0YXJ0Q29sdW1uLCBlbmRMaW5lLCBlbmRDb2x1bW4sIGlzQ29u dGVudFNjcmlwdCwgc291cmNlTWFwVVJMLCBoYXNTb3VyY2VVUkwpCiB7CiAgICAgdGhpcy5zY3Jp cHRJZCA9IHNjcmlwdElkOwogICAgIHRoaXMuc291cmNlVVJMID0gc291cmNlVVJMOwpAQCAtNDUs NiArNDYsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0ID0gZnVuY3Rpb24oc2NyaXB0SWQsIHNvdXJj ZVVSTCwgc3RhcnRMaW5lLCBzdGFydENvbHVtbiwgZW5kTAogICAgIHRoaXMuZW5kQ29sdW1uID0g ZW5kQ29sdW1uOwogICAgIHRoaXMuaXNDb250ZW50U2NyaXB0ID0gaXNDb250ZW50U2NyaXB0Owog ICAgIHRoaXMuc291cmNlTWFwVVJMID0gc291cmNlTWFwVVJMOworICAgIHRoaXMuaGFzU291cmNl VVJMID0gaGFzU291cmNlVVJMOwogICAgIHRoaXMuX2xvY2F0aW9ucyA9IFtdOwogfQogCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5k ZXggZGViNjU5MjliNzU3MDE2YTE3NGY4NzI1MWM5ODA3NGM1ZDc2YTEzMi4uOTBhNzkzMTA4Yjk4 ZmE1MDExMTc5YzgxN2ZiNTY2N2I1YzE1ZTZhNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEy LTA5LTIwICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAg IFdlYiBJbnNwZWN0b3I6IFByb3ZpZGUgYSB3YXkgdG8gZGlzdGluZ3Vpc2ggc2NyaXB0cyBoYXZp bmcgc291cmNlVVJMIGZyb20gc3RhbmRhbG9uZSBzY3JpcHRzLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTcyMzEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9zb3VyY2Ut dXJsLWNvbW1lbnQtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9z b3VyY2UtdXJsLWNvbW1lbnQuaHRtbDoKKwogMjAxMi0wOS0xOSAgSm9jaGVuIEVpc2luZ2VyICA8 am9jaGVuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIFVwZGF0ZSB0ZXN0IGV4 cGVjdGF0aW9uIGZvciBpbmRleGVkZGIgdGVzdCB0aGF0IGlzIGN1cnJlbnRseSBvbmx5IHJ1biB1 c2luZyBjb250ZW50X2Jyb3dzZXJ0ZXN0cwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2RlYnVnZ2VyL3NvdXJjZS11cmwtY29tbWVudC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvZGVidWdnZXIvc291cmNlLXVybC1jb21tZW50LWV4cGVjdGVkLnR4dAppbmRl eCAwNGJiYzE5YWMzOGM1NGM0MjNjYmE3MjdjNGZmMDFiNjAxNTdlMDkyLi41ZWU5ZmI4NGU3ZmJk MDc4NjE3MjEyYzhjYWQ3N2MyMDFlMTAzNmZhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZGVidWdnZXIvc291cmNlLXVybC1jb21tZW50LWV4cGVjdGVkLnR4dAorKysgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc291cmNlLXVybC1jb21tZW50LWV4cGVjdGVkLnR4 dApAQCAtMiw4ICsyLDE0IEBAIFRlc3RzIHRoYXQgZXZhbHMgd2l0aCBzb3VyY2VVUkwgY29tbWVu dCBhcmUgc2hvd24gaW4gc2NyaXB0cyBwYW5lbC4KIAogRGVidWdnZXIgd2FzIGVuYWJsZWQuCiAK K1J1bm5pbmc6IHRlc3RTb3VyY2VVUkxDb21tZW50SW5JbmxpbmVTY3JpcHQKKwogUnVubmluZzog dGVzdFNvdXJjZVVSTENvbW1lbnQKIGZ1bmN0aW9uIGtlZXBBbGl2ZSgpIHt9CiAvL0Agc291cmNl VVJMPWV2YWxVUkwuanMKKworUnVubmluZzogdGVzdFNvdXJjZVVSTENvbW1lbnRJbkR5bmFtaWNT Y3JpcHQKK2Z1bmN0aW9uIGtlZXBBbGl2ZUluRHluYW1pY1NjcmlwdCgpIHt9CisvL0Agc291cmNl VVJMPWR5bmFtaWNTY3JpcHRVUkwuanMKIERlYnVnZ2VyIHdhcyBkaXNhYmxlZC4KIApkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NvdXJjZS11cmwtY29tbWVudC5o dG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NvdXJjZS11cmwtY29tbWVudC5o dG1sCmluZGV4IDFlYjI4YTk4ZmEwMjliMjgxNGRiNGYxYTY3MGEzOWM5MmQ2NzI0YzMuLjdmMTY5 ZDA3NzQ2MGJmYzcxYmQyYjM0Nzk4M2MwNGMxNDRkNDFlMjkgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zb3VyY2UtdXJsLWNvbW1lbnQuaHRtbAorKysgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc291cmNlLXVybC1jb21tZW50Lmh0bWwKQEAgLTIs MTcgKzIsNTggQEAKIDxoZWFkPgogPHNjcmlwdCBzcmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVj dG9yL2luc3BlY3Rvci10ZXN0LmpzIj48L3NjcmlwdD4KIDxzY3JpcHQgc3JjPSIuLi8uLi9odHRw L3Rlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci10ZXN0LmpzIj48L3NjcmlwdD4KLQogPHNjcmlwdD4K K2Z1bmN0aW9uIGtlZXBBbGl2ZUluSW5saW5lU2NyaXB0KCkgeyB9CiAKKy8vQCBzb3VyY2VVUkw9 aW5saW5lU2NyaXB0VVJMLmpzCis8L3NjcmlwdD4KKzxzY3JpcHQ+CiBmdW5jdGlvbiBkb0V2YWwo KQogewogICAgIGV2YWwoImZ1bmN0aW9uIGtlZXBBbGl2ZSgpIHt9XG4vL0Agc291cmNlVVJMPWV2 YWxVUkwuanMiKTsKIH0KIAorZnVuY3Rpb24gZG9EeW5hbWljU2NyaXB0KCkKK3sKKyAgICB2YXIg c2NyaXB0RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNjcmlwdCIpOworICAgIHNj cmlwdEVsZW1lbnQudGV4dENvbnRlbnQgPSAiZnVuY3Rpb24ga2VlcEFsaXZlSW5EeW5hbWljU2Ny aXB0KCkge31cbi8vQCBzb3VyY2VVUkw9ZHluYW1pY1NjcmlwdFVSTC5qcyI7CisgICAgZG9jdW1l bnQuYm9keS5hcHBlbmRDaGlsZChzY3JpcHRFbGVtZW50KTsKK30KKwogZnVuY3Rpb24gdGVzdCgp CisKIHsKKyAgc2V0VGltZW91dChJbnNwZWN0b3JUZXN0LmNvbXBsZXRlVGVzdC5iaW5kKEluc3Bl Y3RvclRlc3QpLCAzMDAwKTsKKyAgZnVuY3Rpb24gZm9yRWFjaFNjcmlwdE1hdGNoaW5nVVJMKHVy bCwgaGFuZGxlcikKKyAgICB7CisgICAgICAgIHZhciBzY3JpcHRzID0gV2ViSW5zcGVjdG9yLmRl YnVnZ2VyTW9kZWwuc2NyaXB0czsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzY3JpcHRz Lmxlbmd0aDsgKytpKSB7CisgICAgICAgICAgICBpZiAoc2NyaXB0c1tpXS5zb3VyY2VVUkwuaW5k ZXhPZih1cmwpICE9PSAtMSkKKyAgICAgICAgICAgICAgICBoYW5kbGVyKHNjcmlwdHNbaV0pOwor ICAgICAgICB9CisgICAgfQorCiAgICAgSW5zcGVjdG9yVGVzdC5ydW5EZWJ1Z2dlclRlc3RTdWl0 ZShbCisgICAgICAgIGZ1bmN0aW9uIHRlc3RTb3VyY2VVUkxDb21tZW50SW5JbmxpbmVTY3JpcHQo bmV4dCkKKyAgICAgICAgeworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5zaG93U2NyaXB0U291 cmNlKCJzb3VyY2UtdXJsLWNvbW1lbnQuaHRtbCIsIGRpZFNob3dTY3JpcHRTb3VyY2UpOworCisg ICAgICAgICAgICBmdW5jdGlvbiBkaWRTaG93U2NyaXB0U291cmNlKHNvdXJjZUZyYW1lKQorICAg ICAgICAgICAgeworICAgICAgICAgICAgICAgIGZ1bmN0aW9uIGNoZWNrU2NyaXB0RG9lc05vdEhh dmVTb3VyY2VVUkwoc2NyaXB0KQorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAg ICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRUcnVlKCFzY3JpcHQuaGFzU291cmNlVVJMLCAiaGFzU291 cmNlVVJMIGZsYWcgaXMgc2V0IGZvciBpbmxpbmUgc2NyaXB0Iik7CisgICAgICAgICAgICAgICAg fQorCisgICAgICAgICAgICAgICAgdmFyIHBhbmVsID0gV2ViSW5zcGVjdG9yLnBhbmVsKCJzY3Jp cHRzIik7CisgICAgICAgICAgICAgICAgdmFyIHVpU291cmNlQ29kZXMgPSBwYW5lbC5fd29ya3Nw YWNlLnVpU291cmNlQ29kZXMoKTsKKyAgICAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8 IHVpU291cmNlQ29kZXMubGVuZ3RoOyArK2kpCisgICAgICAgICAgICAgICAgICAgIEluc3BlY3Rv clRlc3QuYXNzZXJ0VHJ1ZSh1aVNvdXJjZUNvZGVzW2ldLnVybC5pbmRleE9mKCJpbmxpbmVTY3Jp cHRVUkwuanMiKSA9PT0gLTEsICJzb3VyY2VVUkwgY29tbWVudCBpbiBpbmxpbmUgc2NyaXB0IHdh cyB1c2VkIGFzIGEgc2NyaXB0IG5hbWUiKTsKKyAgICAgICAgICAgICAgICBmb3JFYWNoU2NyaXB0 TWF0Y2hpbmdVUkwoInNvdXJjZS11cmwtY29tbWVudC5odG1sIiwgY2hlY2tTY3JpcHREb2VzTm90 SGF2ZVNvdXJjZVVSTCkKKyAgICAgICAgICAgICAgICBuZXh0KCk7CisgICAgICAgICAgICB9Cisg ICAgICAgIH0sCisKICAgICAgICAgZnVuY3Rpb24gdGVzdFNvdXJjZVVSTENvbW1lbnQobmV4dCkK ICAgICAgICAgewogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5zaG93U2NyaXB0U291cmNlKCJl dmFsVVJMLmpzIiwgZGlkU2hvd1NjcmlwdFNvdXJjZSk7CkBAIC0yMCw3ICs2MSwzMSBAQCBmdW5j dGlvbiB0ZXN0KCkKIAogICAgICAgICAgICAgZnVuY3Rpb24gZGlkU2hvd1NjcmlwdFNvdXJjZShz b3VyY2VGcmFtZSkKICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBmdW5jdGlvbiBjaGVj a1NjcmlwdEhhc1NvdXJjZVVSTChzY3JpcHQpCisgICAgICAgICAgICAgICAgeworICAgICAgICAg ICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydFRydWUoc2NyaXB0Lmhhc1NvdXJjZVVSTCwg Imhhc1NvdXJjZVVSTCBmbGFnIGlzIG5vdCBzZXQgZm9yIGV2YWwgd2l0aCBzb3VyY2VVUkwgY29t bWVudCIpOworICAgICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgICAgIEluc3BlY3RvclRl c3QuYWRkUmVzdWx0KHNvdXJjZUZyYW1lLnRleHRFZGl0b3IudGV4dCgpKTsKKyAgICAgICAgICAg ICAgICBmb3JFYWNoU2NyaXB0TWF0Y2hpbmdVUkwoImV2YWxVUkwuanMiLCBjaGVja1NjcmlwdEhh c1NvdXJjZVVSTCk7CisgICAgICAgICAgICAgICAgbmV4dCgpOworICAgICAgICAgICAgfQorICAg ICAgICB9LAorCisgICAgICAgIGZ1bmN0aW9uIHRlc3RTb3VyY2VVUkxDb21tZW50SW5EeW5hbWlj U2NyaXB0KG5leHQpCisgICAgICAgIHsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3Quc2hvd1Nj cmlwdFNvdXJjZSgiZHluYW1pY1NjcmlwdFVSTC5qcyIsIGRpZFNob3dTY3JpcHRTb3VyY2UpOwor ICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZSgic2V0VGltZW91dChkb0R5 bmFtaWNTY3JpcHQsIDApIik7CisKKyAgICAgICAgICAgIGZ1bmN0aW9uIGRpZFNob3dTY3JpcHRT b3VyY2Uoc291cmNlRnJhbWUpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgZnVuY3Rp b24gY2hlY2tTY3JpcHRIYXNTb3VyY2VVUkwoc2NyaXB0KQorICAgICAgICAgICAgICAgIHsKKyAg ICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRUcnVlKHNjcmlwdC5oYXNTb3Vy Y2VVUkwsICJoYXNTb3VyY2VVUkwgZmxhZyBpcyBub3Qgc2V0IGZvciBkeW5hbWljIHNjcmlwdCB3 aXRoIHNvdXJjZVVSTCBjb21tZW50Iik7CisgICAgICAgICAgICAgICAgfQorCiAgICAgICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoc291cmNlRnJhbWUudGV4dEVkaXRvci50ZXh0 KCkpOworICAgICAgICAgICAgICAgIGZvckVhY2hTY3JpcHRNYXRjaGluZ1VSTCgiZHluYW1pY1Nj cmlwdFVSTC5qcyIsIGNoZWNrU2NyaXB0SGFzU291cmNlVVJMKTsKICAgICAgICAgICAgICAgICBu ZXh0KCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0K