82437 2012-03-28 01:33:30 -0700 [EFL] DRT should support LayoutTestController's dumpResourceLoadCallbacks() for resource request/response 2012-04-19 15:48:35 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED DUPLICATE 81891 P2 Normal --- 81891 0 cdumez webkit-unassigned gyuyoung.kim lucas.de.marchi oldest_to_newest 589741 0 cdumez 2012-03-28 01:33:30 -0700 EFL DRT does not obey dumpResourceLoadCallbacks() issued by tests - HTTP callbacks should be caught and resource load log dumps should be performed. This bug report is targeting dumpResourceLoadCallbacks support for resource requests and resource responses, in particular. cmp. GTK's willSendRequestCallback, didReceiveResponse in GTK DumpRenderTree.cpp. 589794 1 134248 cdumez 2012-03-28 02:57:30 -0700 Created attachment 134248 Proposed patch 591891 2 cdumez 2012-03-29 23:17:20 -0700 Addressed in the parent. *** This bug has been marked as a duplicate of bug 81891 *** 606032 3 134248 eric 2012-04-19 15:48:35 -0700 Comment on attachment 134248 Proposed patch Cleared review? from attachment 134248 so that this bug does not appear in http://webkit.org/pending-review. If you would like this patch reviewed, please attach it to a new bug (or re-open this bug before marking it for review again). 134248 2012-03-28 02:57:30 -0700 2012-04-19 15:48:35 -0700 Proposed patch 82437_dumpResourceLoadCallbacks_req_rep.patch text/plain 18998 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCA4MzZjN2RkLi4xZTQ5MmI1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjcgQEAKKzIwMTItMDMtMjggIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhl LmR1bWV6QGludGVsLmNvbT4KKworICAgICAgICBbRUZMXSBEUlQgc2hvdWxkIHN1cHBvcnQgTGF5 b3V0VGVzdENvbnRyb2xsZXIncyBkdW1wUmVzb3VyY2VMb2FkQ2FsbGJhY2tzKCkgZm9yIHJlc291 cmNlIHJlcXVlc3QvcmVzcG9uc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTgyNDM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQnJpbmdzIHBhcnRpYWwgc3VwcG9ydCBpbiBFRkwncyBEUlQgZm9yIExheW91 dFRlc3RDb250cm9sbGVyJ3MKKyAgICAgICAgZHVtcFJlc291cmNlTG9hZENhbGxiYWNrcygpLiBk dW1wUmVzb3VyY2VMb2FkQ2FsbGJhY2tzKCkgbm93IHByaW50cworICAgICAgICBvdXRwdXQgZm9y IHJlc291cmNlIHJlcXVlc3RzIGFib3V0IHRvIGJlIHNlbnQgYW5kIHJlc3BvbnNlcyB0byBzdWNo CisgICAgICAgIHJlcXVlc3QuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRl ckNsaWVudEVmbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEVmbDo6 ZGlzcGF0Y2hXaWxsU2VuZFJlcXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJD bGllbnRFZmw6OmFzc2lnbklkZW50aWZpZXJUb0luaXRpYWxSZXF1ZXN0KToKKyAgICAgICAgKFdl YkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZFJlY2VpdmVSZXNwb25zZSk6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEVmbDo6ZGlzcGF0Y2hEZWNpZGVQ b2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKToKKyAgICAgICAgKiBld2svZXdrX2ZyYW1lLmNwcDoK KyAgICAgICAgKGV3a19mcmFtZV9yZXF1ZXN0X3dpbGxfc2VuZCk6CisgICAgICAgIChld2tfZnJh bWVfcmVzcG9uc2VfcmVjZWl2ZWQpOgorICAgICAgICAqIGV3ay9ld2tfZnJhbWUuaDoKKyAgICAg ICAgKiBld2svZXdrX3ByaXZhdGUuaDoKKyAgICAgICAgKiBld2svZXdrX3ZpZXcuaDoKKwogMjAx Mi0wMy0yNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW1NPVVBdIEltcGxlbWVudCBtaXNzaW5nIG1ldGhvZHMgaW4gQ29va2llSmFyU291cApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJD bGllbnRFZmwuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2Fk ZXJDbGllbnRFZmwuY3BwCmluZGV4IDcwNmVmZjIuLjYyZGU0MzcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50RWZsLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5j cHAKQEAgLTE2MywxNCArMTYzLDI0IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRFZmw6OmRpc3Bh dGNoRGlkQ2FuY2VsQXV0aGVudGljYXRpb25DaGFsbGVuZ2UoRG9jdW1lbnRMb2FkCiB2b2lkIEZy YW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaFdpbGxTZW5kUmVxdWVzdChEb2N1bWVudExvYWRl ciogbG9hZGVyLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIFJlc291cmNlUmVxdWVzdCYgY29y ZVJlcXVlc3QsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIGNvcmVSZXNwb25zZSkKIHsKICAgICBD U3RyaW5nIHVybCA9IGNvcmVSZXF1ZXN0LnVybCgpLnN0cmluZygpLnV0ZjgoKTsKKyAgICBDU3Ry aW5nIGZpcnN0UGFydHkgPSBjb3JlUmVxdWVzdC5maXJzdFBhcnR5Rm9yQ29va2llcygpLnN0cmlu ZygpLnV0ZjgoKTsKKyAgICBDU3RyaW5nIGh0dHBNZXRob2QgPSBjb3JlUmVxdWVzdC5odHRwTWV0 aG9kKCkudXRmOCgpOwogICAgIERCRygiUmVzb3VyY2UgdXJsPSVzIiwgdXJsLmRhdGEoKSk7CiAK LSAgICBFd2tfRnJhbWVfUmVzb3VyY2VfUmVxdWVzdCByZXF1ZXN0ID0geyAwLCBpZGVudGlmaWVy IH07CisgICAgRXdrX0ZyYW1lX1Jlc291cmNlX1JlcXVlc3QgcmVxdWVzdCA9IHsgMCwgMCwgMCwg aWRlbnRpZmllciB9OwogICAgIEV3a19GcmFtZV9SZXNvdXJjZV9SZXF1ZXN0IG9yaWcgPSByZXF1 ZXN0OyAvKiBJbml0aWFsaXplIGNvbnN0IGZpZWxkcy4gKi8KIAogICAgIG9yaWcudXJsID0gcmVx dWVzdC51cmwgPSB1cmwuZGF0YSgpOworICAgIHJlcXVlc3QuZmlyc3RfcGFydHkgPSBmaXJzdFBh cnR5LmRhdGEoKTsKKyAgICByZXF1ZXN0Lmh0dHBfbWV0aG9kID0gaHR0cE1ldGhvZC5kYXRhKCk7 CiAKLSAgICBld2tfZnJhbWVfcmVxdWVzdF93aWxsX3NlbmQobV9mcmFtZSwgJnJlcXVlc3QpOwor ICAgIENTdHJpbmcgcmVkaXJlY3RVcmwgPSBjb3JlUmVzcG9uc2UuaXNOdWxsKCkgPyBDU3RyaW5n KCkgOiBjb3JlUmVzcG9uc2UudXJsKCkuc3RyaW5nKCkudXRmOCgpOworICAgIGNvbnN0IGludCBy ZXBvbnNlU3RhdHVzQ29kZSA9IGNvcmVSZXNwb25zZS5pc051bGwoKSA/IDAgOiBjb3JlUmVzcG9u c2UuaHR0cFN0YXR1c0NvZGUoKTsKKyAgICBFd2tfRnJhbWVfUmVzb3VyY2VfUmVzcG9uc2UgcmVk aXJlY3RSZXNwb25zZSA9IHsgcmVkaXJlY3RVcmwuZGF0YSgpLCByZXBvbnNlU3RhdHVzQ29kZSB9 OworCisgICAgRXdrX0ZyYW1lX1Jlc291cmNlX01lc3NhZ2VzIG1lc3NhZ2VzID0geyAmcmVxdWVz dCwgY29yZVJlc3BvbnNlLmlzTnVsbCgpID8gMDogJnJlZGlyZWN0UmVzcG9uc2UgfTsKKworICAg IGV3a19mcmFtZV9yZXF1ZXN0X3dpbGxfc2VuZChtX2ZyYW1lLCAmbWVzc2FnZXMpOwogCiAgICAg Ly8gV2Ugd2FudCB0byBkaXN0aW5ndWlzaCBiZXR3ZWVuIGEgcmVxdWVzdCBmb3IgYSBkb2N1bWVu dCB0byBiZSBsb2FkZWQgaW50bwogICAgIC8vIHRoZSBtYWluIGZyYW1lLCBhIHN1Yi1mcmFtZSwg b3IgdGhlIHN1Yi1vYmplY3RzIGluIHRoYXQgZG9jdW1lbnQgKHZpYSBDaHJvbWl1bSkuCkBAIC0x NzgsNyArMTg4LDcgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6ZGlzcGF0Y2hXaWxsU2Vu ZFJlcXVlc3QoRG9jdW1lbnRMb2FkZXIqIGxvYWRlciwgdW5zaWcKICAgICAgICAgY29uc3QgRnJh bWVMb2FkZXIqIGZyYW1lTG9hZGVyID0gbG9hZGVyLT5mcmFtZUxvYWRlcigpOwogICAgICAgICBj b25zdCBib29sIGlzTWFpbkZyYW1lUmVxdWVzdCA9IChsb2FkZXIgPT0gZnJhbWVMb2FkZXItPnBy b3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIoKSAmJiBmcmFtZUxvYWRlci0+aXNMb2FkaW5nTWFpbkZy YW1lKCkpOwogICAgICAgICBpZiAoaXNNYWluRnJhbWVSZXF1ZXN0KQotICAgICAgICAgICAgZXZh c19vYmplY3Rfc21hcnRfY2FsbGJhY2tfY2FsbChtX3ZpZXcsICJyZXNvdXJjZSxyZXF1ZXN0LHdp bGxzZW5kIiwgJnJlcXVlc3QpOworICAgICAgICAgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJh Y2tfY2FsbChtX3ZpZXcsICJyZXNvdXJjZSxyZXF1ZXN0LHdpbGxzZW5kIiwgJm1lc3NhZ2VzKTsK ICAgICB9CiAKICAgICBpZiAocmVxdWVzdC51cmwgIT0gb3JpZy51cmwpIHsKQEAgLTIwMSw3ICsy MTEsNyBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjphc3NpZ25JZGVudGlmaWVyVG9Jbml0 aWFsUmVxdWVzdCh1bnNpZ25lZCBsb25nIGlkZW50aQogICAgIENTdHJpbmcgdXJsID0gY29yZVJl cXVlc3QudXJsKCkuc3RyaW5nKCkudXRmOCgpOwogICAgIERCRygiUmVzb3VyY2UgdXJsPSVzIiwg dXJsLmRhdGEoKSk7CiAKLSAgICBFd2tfRnJhbWVfUmVzb3VyY2VfUmVxdWVzdCByZXF1ZXN0ID0g eyAwLCBpZGVudGlmaWVyIH07CisgICAgRXdrX0ZyYW1lX1Jlc291cmNlX1JlcXVlc3QgcmVxdWVz dCA9IHsgMCwgMCwgMCwgaWRlbnRpZmllciB9OwogICAgIGV3a19mcmFtZV9yZXF1ZXN0X2Fzc2ln bl9pZGVudGlmaWVyKG1fZnJhbWUsICZyZXF1ZXN0KTsKIH0KIApAQCAtMjM5LDEzICsyNDksMTkg QEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6ZnJhbWVMb2FkZXJEZXN0cm95ZWQoKQogICAg IGRlbGV0ZSB0aGlzOwogfQogCi12b2lkIEZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERp ZFJlY2VpdmVSZXNwb25zZShEb2N1bWVudExvYWRlciogbG9hZGVyLCB1bnNpZ25lZCBsb25nLCBj b25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKK3ZvaWQgRnJhbWVMb2FkZXJDbGllbnRF Zmw6OmRpc3BhdGNoRGlkUmVjZWl2ZVJlc3BvbnNlKERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIHVu c2lnbmVkIGxvbmcsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIGNvcmVSZXNwb25zZSkKIHsKICAg ICAvLyBVcGRhdGUgb3VyIGtub3dsZWRnZSBvZiByZXF1ZXN0IHNvdXAgZmxhZ3MgLSBzb21lIGFy ZSBvbmx5IHNldAogICAgIC8vIGFmdGVyIHRoZSByZXF1ZXN0IGlzIGRvbmUuCi0gICAgbG9hZGVy LT5yZXF1ZXN0KCkuc2V0U291cE1lc3NhZ2VGbGFncyhyZXNwb25zZS5zb3VwTWVzc2FnZUZsYWdz KCkpOworICAgIGxvYWRlci0+cmVxdWVzdCgpLnNldFNvdXBNZXNzYWdlRmxhZ3MoY29yZVJlc3Bv bnNlLnNvdXBNZXNzYWdlRmxhZ3MoKSk7CisKKyAgICBtX3Jlc3BvbnNlID0gY29yZVJlc3BvbnNl OworCisgICAgRXdrX0ZyYW1lX1Jlc291cmNlX1Jlc3BvbnNlIHJlc3BvbnNlID0geyAwLCBjb3Jl UmVzcG9uc2UuaHR0cFN0YXR1c0NvZGUoKSB9OworICAgIENTdHJpbmcgdXJsID0gY29yZVJlc3Bv bnNlLnVybCgpLnN0cmluZygpLnV0ZjgoKTsKKyAgICByZXNwb25zZS51cmwgPSB1cmwuZGF0YSgp OwogCi0gICAgbV9yZXNwb25zZSA9IHJlc3BvbnNlOworICAgIGV3a19mcmFtZV9yZXNwb25zZV9y ZWNlaXZlZChtX2ZyYW1lLCAmcmVzcG9uc2UpOwogfQogCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50 RWZsOjpkaXNwYXRjaERlY2lkZVBvbGljeUZvclJlc3BvbnNlKEZyYW1lUG9saWN5RnVuY3Rpb24g ZnVuY3Rpb24sIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBjb25zdCBSZXNvdXJj ZVJlcXVlc3QmIHJlc291cmNlUmVxdWVzdCkKQEAgLTI5NCw3ICszMTAsNyBAQCB2b2lkIEZyYW1l TG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24o RnJhbWVQb2xpY3lGdQogICAgIC8vIGlmIG5vdCBhY2NlcHROYXZpZ2F0aW9uUmVxdWVzdCAtIGxv b2sgYXQgUXQgLT4gUG9saWN5SWdub3JlOwogICAgIC8vIEZJWE1FOiBkbyBwcm9wZXIgY2hlY2sg YW5kIG9ubHkgcmVzZXQgZm9ybXMgd2hlbiBvbiBQb2xpY3lJZ25vcmUKICAgICBjaGFyKiB1cmwg PSBzdHJkdXAocmVzb3VyY2VSZXF1ZXN0LnVybCgpLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwot ICAgIEV3a19GcmFtZV9SZXNvdXJjZV9SZXF1ZXN0IHJlcXVlc3QgPSB7IHVybCwgMCB9OworICAg IEV3a19GcmFtZV9SZXNvdXJjZV9SZXF1ZXN0IHJlcXVlc3QgPSB7IHVybCwgMCwgMCwgMCB9Owog ICAgIGJvb2wgcmV0ID0gZXdrX3ZpZXdfbmF2aWdhdGlvbl9wb2xpY3lfZGVjaXNpb24obV92aWV3 LCAmcmVxdWVzdCk7CiAgICAgZnJlZSh1cmwpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2VmbC9ld2svZXdrX2ZyYW1lLmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUu Y3BwCmluZGV4IGMyMjlmODAuLmI0YTU3NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZs L2V3ay9ld2tfZnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUu Y3BwCkBAIC0xMjA3LDE1ICsxMjA3LDE1IEBAIHZvaWQgZXdrX2ZyYW1lX2NvcmVfZ29uZShFdmFz X09iamVjdCogZXdrRnJhbWUpCiAgKiBjaGFuZ2luZyB2YWx1ZXMgaW4gQHBhcmFtIHJlcXVlc3Qu CiAgKgogICogQHBhcmFtIGV3a0ZyYW1lIEZyYW1lLgotICogQHBhcmFtIHJlcXVlc3QgUmVxdWVz dCBkZXRhaWxzIHRoYXQgdXNlciBtYXkgb3ZlcnJpZGUuIFdoZW5ldmVyIHZhbHVlcyBvbgotICog dGhpcyBzdHJ1Y3QgY2hhbmdlcywgaXQgbXVzdCBiZSBwcm9wZXJseSBtYWxsb2MnZCBhcyBpdCB3 aWxsIGJlIGZyZWVkCi0gKiBhZnRlcndhcmRzLgorICogQHBhcmFtIG1lc3NhZ2VzIE1lc3NhZ2Vz IGNvbnRhaW5pbmcgdGhlIHJlcXVlc3QgZGV0YWlscyB0aGF0IHVzZXIgbWF5IG92ZXJyaWRlIGFu ZCBhCisgKiBwb3NzaWJsZSByZWRpcmVjdCByZXBvbnNlLiBXaGVuZXZlciB2YWx1ZXMgb24gdGhp cyBzdHJ1Y3QgY2hhbmdlcywgaXQgbXVzdCBiZSBwcm9wZXJseQorICogbWFsbG9jJ2QgYXMgaXQg d2lsbCBiZSBmcmVlZCBhZnRlcndhcmRzLgogICoKICAqIEVtaXRzIHNpZ25hbDogInJlc291cmNl LHJlcXVlc3Qsd2lsbHNlbmQiCiAgKi8KLXZvaWQgZXdrX2ZyYW1lX3JlcXVlc3Rfd2lsbF9zZW5k KEV2YXNfT2JqZWN0KiBld2tGcmFtZSwgRXdrX0ZyYW1lX1Jlc291cmNlX1JlcXVlc3QqIHJlcXVl c3QpCit2b2lkIGV3a19mcmFtZV9yZXF1ZXN0X3dpbGxfc2VuZChFdmFzX09iamVjdCogZXdrRnJh bWUsIEV3a19GcmFtZV9SZXNvdXJjZV9NZXNzYWdlcyogbWVzc2FnZXMpCiB7Ci0gICAgZXZhc19v YmplY3Rfc21hcnRfY2FsbGJhY2tfY2FsbChld2tGcmFtZSwgInJlc291cmNlLHJlcXVlc3Qsd2ls bHNlbmQiLCByZXF1ZXN0KTsKKyAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19jYWxsKGV3 a0ZyYW1lLCAicmVzb3VyY2UscmVxdWVzdCx3aWxsc2VuZCIsIG1lc3NhZ2VzKTsKIH0KIAogLyoq CkBAIC0xMjM0LDYgKzEyMzQsMjAgQEAgdm9pZCBld2tfZnJhbWVfcmVxdWVzdF9hc3NpZ25faWRl bnRpZmllcihFdmFzX09iamVjdCogZXdrRnJhbWUsIGNvbnN0IEV3a19GcmFtZV8KIAogLyoqCiAg KiBAaW50ZXJuYWwKKyAqIFJlcG9ydHMgdGhhdCBhIHJlc3BvbnNlIHRvIGEgcmVzb3VyY2UgcmVx dWVzdCB3YXMgcmVjZWl2ZWQuCisgKgorICogQHBhcmFtIGV3a0ZyYW1lIEZyYW1lLgorICogQHBh cmFtIHJlcXVlc3QgUmVzcG9uc2UgZGV0YWlscy4gTm8gY2hhbmdlcyBhcmUgYWxsb3dlZCB0byBm aWVsZHMuCisgKgorICogRW1pdHMgc2lnbmFsOiAicmVzb3VyY2UscmVzcG9uc2UscmVjZWl2ZWQi CisgKi8KK3ZvaWQgZXdrX2ZyYW1lX3Jlc3BvbnNlX3JlY2VpdmVkKEV2YXNfT2JqZWN0KiBld2tG cmFtZSwgRXdrX0ZyYW1lX1Jlc291cmNlX1Jlc3BvbnNlKiByZXNwb25zZSkKK3sKKyAgICBldmFz X29iamVjdF9zbWFydF9jYWxsYmFja19jYWxsKGV3a0ZyYW1lLCAicmVzb3VyY2UscmVzcG9uc2Us cmVjZWl2ZWQiLCByZXNwb25zZSk7Cit9CisKKy8qKgorICogQGludGVybmFsCiAgKiBSZXBvcnRz IHRoYXQgZmlyc3QgbmF2aWdhdGlvbiBvY2N1cnJlZAogICoKICAqIEBwYXJhbSBld2tGcmFtZSBG cmFtZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuaCBiL1Nv dXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuaAppbmRleCBmNzQ1NTVlLi4zYjg2MzhmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmgKKysrIGIvU291cmNl L1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5oCkBAIC01Nyw4ICs1NywxMCBAQAogICogIC0gIm5h dmlnYXRpb24sZmlyc3QiLCB2b2lkOiBmaXJzdCBuYXZpZ2F0aW9uIHdhcyBvY2N1cnJlZC4KICAq ICAtICJyZXNvdXJjZSxyZXF1ZXN0LG5ldyIsIEV3a19GcmFtZV9SZXNvdXJjZV9SZXF1ZXN0Kjog cmVwb3J0cyB0aGF0CiAgKiAgICB0aGVyZSdzIGEgbmV3IHJlc291cmNlIHJlcXVlc3QuCi0gKiAg LSAicmVzb3VyY2UscmVxdWVzdCx3aWxsc2VuZCIsIEV3a19GcmFtZV9SZXNvdXJjZV9SZXF1ZXN0 KjogYSByZXNvdXJjZSB3aWxsCisgKiAgLSAicmVzb3VyY2UscmVxdWVzdCx3aWxsc2VuZCIsIEV3 a19GcmFtZV9SZXNvdXJjZV9NZXNzYWdlcyo6IGEgcmVzb3VyY2Ugd2lsbAogICogICAgYmUgcmVx dWVzdGVkLgorICogIC0gInJlc291cmNlLHJlc3BvbnNlLHJlY2VpdmVkIiwgRXdrX0ZyYW1lX1Jl c291cmNlX1Jlc3BvbnNlKjogcmVwb3J0cyB0aGF0IGEgcmVzcG9uc2UKKyAqICAgIHRvIGEgcmVz b3VyY2UgcmVxdWVzdCB3YXMgcmVjZWl2ZWQuCiAgKiAgLSAic3RhdGUsc2F2ZSIsIHZvaWQ6IGZy YW1lJ3Mgc3RhdGUgd2lsbCBiZSBzYXZlZCBhcyBhIGhpc3RvcnkgaXRlbS4KICAqICAtICJ0aXRs ZSxjaGFuZ2VkIiwgY29uc3QgY2hhcio6IHRpdGxlIG9mIHRoZSBtYWluIGZyYW1lIHdhcyBjaGFu Z2VkLgogICogIC0gInVyaSxjaGFuZ2VkIiwgY29uc3QgY2hhcio6IHVyaSBvZiB0aGUgbWFpbiBm cmFtZSB3YXMgY2hhbmdlZC4KQEAgLTk2LDYgKzk4LDM3IEBAIHN0cnVjdCBfRXdrX0ZyYW1lX0xv YWRfRXJyb3IgewogCiAvLy8gQ3JlYXRlcyBhIHR5cGUgbmFtZSBmb3IgX0V3a19GcmFtZV9SZXNv dXJjZV9SZXF1ZXN0LgogdHlwZWRlZiBzdHJ1Y3QgX0V3a19GcmFtZV9SZXNvdXJjZV9SZXF1ZXN0 IEV3a19GcmFtZV9SZXNvdXJjZV9SZXF1ZXN0OworCisvKioKKyAqIEBicmllZiAgIFN0cnVjdHVy ZSBjb250YWluaW5nIGRldGFpbHMgYWJvdXQgYSByZXNvdXJjZSByZXF1ZXN0LgorICoKKyAqIERl dGFpbHMgZ2l2ZW4gYmVmb3JlIGEgcmVzb3VyY2UgaXMgbG9hZGVkIG9uIGEgZ2l2ZW4gZnJhbWUu IEl0J3MgdXNlZCBpbgorICogRXdrX0ZyYW1lX1Jlc291cmNlX01lc3NhZ2VzIHRvIGluZm9ybSBh Ym91dCB0aGUgZGV0YWlscyBvZiBhIHJlc291cmNlIHJlcXVlc3QuCisgKi8KK3N0cnVjdCBfRXdr X0ZyYW1lX1Jlc291cmNlX1JlcXVlc3QgeworICAgIGNvbnN0IGNoYXIgKnVybDsgLyoqPCB1cmwg b2YgdGhlIHJlc291cmNlICovCisgICAgY29uc3QgY2hhciAqZmlyc3RfcGFydHk7IC8qKjwgZmly c3QgcGFydHkgZm9yIGNvb2tpZXMsIGNhbiBub3QgYmUgY2hhbmdlZCAgKi8KKyAgICBjb25zdCBj aGFyICpodHRwX21ldGhvZDsgLyoqPCBodHRwIG1ldGhvZCwgY2FuIG5vdCBiZSBjaGFuZ2VkICAq LworICAgIGNvbnN0IHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcjsgLyoqPCBpZGVudGlmaWVyIG9m IHJlc291cmNlLCBjYW4gbm90IGJlIGNoYW5nZWQgKi8KK307CisKKy8vLyBDcmVhdGVzIGEgdHlw ZSBuYW1lIGZvciBfRXdrX0ZyYW1lX1Jlc291cmNlX1Jlc3BvbnNlLgordHlwZWRlZiBzdHJ1Y3Qg X0V3a19GcmFtZV9SZXNvdXJjZV9SZXNwb25zZSBFd2tfRnJhbWVfUmVzb3VyY2VfUmVzcG9uc2U7 CisKKy8qKgorICogQGJyaWVmICAgU3RydWN0dXJlIGNvbnRhaW5pbmcgZGV0YWlscyBhYm91dCBh IHJlc3BvbnNlIHRvIGEgcmVzb3VyY2UgcmVxdWVzdC4KKyAqCisgKiBEZXRhaWxzIGdpdmVuIGlu IHRoZSByZXNwb25zZSB0byBhIHJlc291cmNlIHJlcXVlc3QuIEl0J3MgdXNlZCBieQorICogZXdr X2ZyYW1lX3Jlc3BvbnNlX3JlY2VpdmVkKCkgdG8gaW5mb3JtIGFib3V0IHRoZSBkZXRhaWxzIG9m IGEgcmVzcG9uc2UuCisgKi8KK3N0cnVjdCBfRXdrX0ZyYW1lX1Jlc291cmNlX1Jlc3BvbnNlIHsK KyAgICBjb25zdCBjaGFyICp1cmw7IC8qKjwgdXJsIG9mIHRoZSByZXNvdXJjZSAqLworICAgIGNv bnN0IGludCBzdGF0dXNfY29kZTsgLyoqPCBodHRwIHN0YXR1cyBjb2RlICovCit9OworCisvLy8g Q3JlYXRlcyBhIHR5cGUgbmFtZSBmb3IgX0V3a19GcmFtZV9SZXNvdXJjZV9NZXNzYWdlcy4KK3R5 cGVkZWYgc3RydWN0IF9Fd2tfRnJhbWVfUmVzb3VyY2VfTWVzc2FnZXMgRXdrX0ZyYW1lX1Jlc291 cmNlX01lc3NhZ2VzOworCiAvKioKICAqIEBicmllZiAgIFN0cnVjdHVyZSB1c2VkIHRvIHJlcG9y dCByZXNvdXJjZSByZXF1ZXN0LgogICoKQEAgLTEwMyw5ICsxMzYsOSBAQCB0eXBlZGVmIHN0cnVj dCBfRXdrX0ZyYW1lX1Jlc291cmNlX1JlcXVlc3QgRXdrX0ZyYW1lX1Jlc291cmNlX1JlcXVlc3Q7 CiAgKiBld2tfZnJhbWVfcmVxdWVzdF93aWxsX3NlbmQoKSB0byBpbmZvcm0gdGhlIGRldGFpbHMg b2YgYSB0by1iZS1sb2FkZWQKICAqIHJlc291cmNlLCBhbGxvd2luZyB0aGVtIHRvIGJlIG92ZXJy aWRkZW4uCiAgKi8KLXN0cnVjdCBfRXdrX0ZyYW1lX1Jlc291cmNlX1JlcXVlc3QgewotICAgIGNv bnN0IGNoYXIgKnVybDsgLyoqPCB1cmwgb2YgdGhlIHJlc291cmNlICovCi0gICAgY29uc3QgdW5z aWduZWQgbG9uZyBpZGVudGlmaWVyOyAvKio8IGlkZW50aWZpZXIgb2YgcmVzb3VyY2UsIGNhbiBu b3QgYmUgY2hhbmdlZCAqLworc3RydWN0IF9Fd2tfRnJhbWVfUmVzb3VyY2VfTWVzc2FnZXMgewor ICAgIEV3a19GcmFtZV9SZXNvdXJjZV9SZXF1ZXN0ICpyZXF1ZXN0OyAvKio8IHJlc291cmNlIHJl cXVlc3QgKi8KKyAgICBFd2tfRnJhbWVfUmVzb3VyY2VfUmVzcG9uc2UgKnJlZGlyZWN0X3Jlc3Bv bnNlOyAvKio8IHJlZGlyZWN0IHJlc3BvbnNlLCBjYW4gbm90IGJlIGNoYW5nZWQgKi8KIH07CiAK IC8vLyBFbnVtIGNvbnRhaW5pbmcgaGl0IHRlc3QgZGF0YSB0eXBlcwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a19wcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2sv ZXdrX3ByaXZhdGUuaAppbmRleCA5NmU0Nzk1Li5jMTU2YzlhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2sv ZXdrX3ByaXZhdGUuaApAQCAtMjExLDggKzIxMSw5IEBAIHZvaWQgZXdrX2ZyYW1lX2xvYWRfZmlu aXNoZWQoRXZhc19PYmplY3QqIGV3a0ZyYW1lLCBjb25zdCBjaGFyKiBlcnJvckRvbWFpbiwgaW50 CiB2b2lkIGV3a19mcmFtZV9sb2FkX2Vycm9yKEV2YXNfT2JqZWN0KiBld2tGcmFtZSwgY29uc3Qg Y2hhciogZXJyb3JEb21haW4sIGludCBlcnJvckNvZGUsIGJvb2wgaXNDYW5jZWxsYXRpb24sIGNv bnN0IGNoYXIqIGVycm9yRGVzY3JpcHRpb24sIGNvbnN0IGNoYXIqIGZhaWxpbmdVcmwpOwogdm9p ZCBld2tfZnJhbWVfbG9hZF9wcm9ncmVzc19jaGFuZ2VkKEV2YXNfT2JqZWN0KiBld2tGcmFtZSk7 CiAKLXZvaWQgZXdrX2ZyYW1lX3JlcXVlc3Rfd2lsbF9zZW5kKEV2YXNfT2JqZWN0KiBld2tGcmFt ZSwgRXdrX0ZyYW1lX1Jlc291cmNlX1JlcXVlc3QqIHJlcXVlc3QpOwordm9pZCBld2tfZnJhbWVf cmVxdWVzdF93aWxsX3NlbmQoRXZhc19PYmplY3QqIGV3a0ZyYW1lLCBFd2tfRnJhbWVfUmVzb3Vy Y2VfTWVzc2FnZXMqIG1lc3NhZ2VzKTsKIHZvaWQgZXdrX2ZyYW1lX3JlcXVlc3RfYXNzaWduX2lk ZW50aWZpZXIoRXZhc19PYmplY3QqIGV3a0ZyYW1lLCBjb25zdCBFd2tfRnJhbWVfUmVzb3VyY2Vf UmVxdWVzdCogcmVxdWVzdCk7Cit2b2lkIGV3a19mcmFtZV9yZXNwb25zZV9yZWNlaXZlZChFdmFz X09iamVjdCogZXdrRnJhbWUsIEV3a19GcmFtZV9SZXNvdXJjZV9SZXNwb25zZSogcmVzcG9uc2Up Owogdm9pZCBld2tfZnJhbWVfdmlld19zdGF0ZV9zYXZlKEV2YXNfT2JqZWN0KiBld2tGcmFtZSwg V2ViQ29yZTo6SGlzdG9yeUl0ZW0qIGl0ZW0pOwogCiB2b2lkIGV3a19mcmFtZV9kaWRfcGVyZm9y bV9maXJzdF9uYXZpZ2F0aW9uKEV2YXNfT2JqZWN0KiBld2tGcmFtZSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9l d2tfdmlldy5oCmluZGV4IDFjNTMzMzUuLmY0YTI4YTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvZWZsL2V3ay9ld2tfdmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmll dy5oCkBAIC02MSw3ICs2MSw4IEBACiAgKiAgLSAibWl4ZWRjb250ZW50LGRpc3BsYXllZCIsIHZv aWQ6IGFueSBvZiB0aGUgY29udGFpbmluZyBmcmFtZXMgaGFzIGxvYWRlZCBhbmQgZGlzcGxheWVk IG1peGVkIGNvbnRlbnQuCiAgKiAgLSAibWl4ZWRjb250ZW50LHJ1biIsIHZvaWQ6IGFueSBvZiB0 aGUgY29udGFpbmluZyBmcmFtZXMgaGFzIGxvYWRlZCBhbmQgcnVuIG1peGVkIGNvbnRlbnQuCiAg KiAgLSAicmVhZHkiLCB2b2lkOiBwYWdlIGlzIGZ1bGx5IGxvYWRlZC4KLSAqICAtICJyZXNvdXJj ZSxyZXF1ZXN0LHdpbGxzZW5kIiwgRXdrX0ZyYW1lX1Jlc291cmNlX1JlcXVlc3QqOiB0aGUgbmV0 d29yayByZXF1ZXN0IGZvciB0aGUgbWFpbiBmcmFtZSB3aWxsIGJlIHNlbnQuCisgKiAgLSAicmVz b3VyY2UscmVxdWVzdCx3aWxsc2VuZCIsIEV3a19GcmFtZV9SZXNvdXJjZV9NZXNzYWdlcyo6IHRo ZSBuZXR3b3JrIHJlcXVlc3QgZm9yIHRoZSBtYWluIGZyYW1lIHdpbGwgYmUgc2VudAorICogICAg IGFuZCB0aGUgcG9zc2libGUgcmVkaXJlY3QgcmVzcG9uc2UuCiAgKiAgLSAic2Nyb2xsYmFycyx2 aXNpYmxlLGdldCIsIEVpbmFfQm9vbCAqOiBleHBlY3RzIGEgQGMgRUlOQV9UUlVFIGlmIHNjcm9s bGJhcnMKICAqICAgIGFyZSB2aXNpYmxlOyBAYyBFSU5BX0ZBTFNFLCBvdGhlcndpc2UuCiAgKiAg LSAic2Nyb2xsYmFycyx2aXNpYmxlLHNldCIsIEVpbmFfQm9vbDogc2V0cyBzY3JvbGxiYXJzIHZp c2liaWxpdHkuCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cK aW5kZXggYTU5MmE5Zi4uMDc1ZjJmOCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTAzLTI4ICBDaHJpc3RvcGhl IER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CisKKyAgICAgICAgW0VGTF0gRFJU IHNob3VsZCBzdXBwb3J0IExheW91dFRlc3RDb250cm9sbGVyJ3MgZHVtcFJlc291cmNlTG9hZENh bGxiYWNrcygpIGZvciByZXNvdXJjZSByZXF1ZXN0L3Jlc3BvbnNlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjQzNworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJyaW5ncyBwYXJ0aWFsIHN1cHBvcnQgaW4g RUZMJ3MgRFJUIGZvciBMYXlvdXRUZXN0Q29udHJvbGxlcidzCisgICAgICAgIGR1bXBSZXNvdXJj ZUxvYWRDYWxsYmFja3MoKS4gZHVtcFJlc291cmNlTG9hZENhbGxiYWNrcygpIG5vdyBwcmludHMK KyAgICAgICAgb3V0cHV0IGZvciByZXNvdXJjZSByZXF1ZXN0cyBhYm91dCB0byBiZSBzZW50IGFu ZCByZXNwb25zZXMgdG8gc3VjaAorICAgICAgICByZXF1ZXN0LgorCisgICAgICAgICogRHVtcFJl bmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmNwcDoKKyAgICAgICAgKER1bXBSZW5k ZXJUcmVlQ2hyb21lOjpjcmVhdGVWaWV3KToKKyAgICAgICAgKHBhdGhTdWl0YWJsZUZvclRlc3RS ZXN1bHQpOgorICAgICAgICAodXJsU3VpdGFibGVGb3JUZXN0UmVzdWx0KToKKyAgICAgICAgKGRl c2NyaXB0aW9uU3VpdGFibGVGb3JUZXN0UmVzdWx0KToKKyAgICAgICAgKER1bXBSZW5kZXJUcmVl Q2hyb21lOjpvbldpbGxTZW5kUmVxdWVzdCk6CisgICAgICAgIChEdW1wUmVuZGVyVHJlZUNocm9t ZTo6b25SZXNwb25zZVJlY2VpdmVkKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9lZmwvRHVt cFJlbmRlclRyZWVDaHJvbWUuaDoKKyAgICAgICAgKER1bXBSZW5kZXJUcmVlQ2hyb21lKToKKwog MjAxMi0wMy0yOCAgSGFvIFpoZW5nICA8emhlbmdoYW9AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IE1ha2UgQ2hyb21pdW0gcG9ydCBmb3IgQW5kcm9pZCB1c2UgaGFyZHdhcmUgZ3B1IHBhdGggZGVm YXVsdC4KZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJl ZUNocm9tZS5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvRHVtcFJlbmRlclRyZWVDaHJv bWUuY3BwCmluZGV4IDk2MjEyYzEuLjYzMTc2ZDAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRl clRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmNwcApAQCAtOTksOCArOTksMTAgQEAgRXZh c19PYmplY3QqIER1bXBSZW5kZXJUcmVlQ2hyb21lOjpjcmVhdGVWaWV3KCkgY29uc3QKICAgICAv LyBMaXN0ZW4gZm9yIHRoZSAicmVzb3VyY2UscmVxdWVzdCx3aWxsc2VuZCIgc2lnbmFsIGZyb20g dGhlIG1haW4gZnJhbWUgaW4gb3JkZXIgdG8KICAgICAvLyBnZXQgbm90aWZpZWQgd2hlbiBzdWIt Y29tcG9uZW50cyBhcmUgYWJvdXQgdG8gdGhlIHJlcXVlc3RlZC4KICAgICBFdmFzX09iamVjdCog bWFpbkZyYW1lID0gZXdrX3ZpZXdfZnJhbWVfbWFpbl9nZXQodmlldyk7Ci0gICAgaWYgKG1haW5G cmFtZSkKKyAgICBpZiAobWFpbkZyYW1lKSB7CiAgICAgICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2Nh bGxiYWNrX2FkZChtYWluRnJhbWUsICJyZXNvdXJjZSxyZXF1ZXN0LHdpbGxzZW5kIiwgb25XaWxs U2VuZFJlcXVlc3QsIDApOworICAgICAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQo bWFpbkZyYW1lLCAicmVzb3VyY2UscmVzcG9uc2UscmVjZWl2ZWQiLCBvblJlc3BvbnNlUmVjZWl2 ZWQsIDApOworICAgIH0KIAogICAgIHJldHVybiB2aWV3OwogfQpAQCAtMjkyLDE5ICsyOTQsMTAz IEBAIHZvaWQgRHVtcFJlbmRlclRyZWVDaHJvbWU6Om9uRG9jdW1lbnRMb2FkRmluaXNoZWQodm9p ZCosIEV2YXNfT2JqZWN0Kiwgdm9pZCogZXZlCiAgICAgfQogfQogCitzdGF0aWMgQ1N0cmluZyBw YXRoU3VpdGFibGVGb3JUZXN0UmVzdWx0KGNvbnN0IGNoYXIqIHVyaVN0cmluZykKK3sKKyAgICBp ZiAoIXVyaVN0cmluZykKKyAgICAgICAgcmV0dXJuIENTdHJpbmcoKTsKKworICAgIEtVUkwgdXJp ID0gS1VSTChQYXJzZWRVUkxTdHJpbmcsIHVyaVN0cmluZyk7CisKKyAgICBpZiAodXJpLnByb3Rv Y29sSXMoImh0dHAiKSB8fCB1cmkucHJvdG9jb2xJcygiZnRwIikpCisgICAgICAgIHJldHVybiB1 cmkuc3RyaW5nKCkudXRmOCgpOworCisgICAgU3RyaW5nIHBhdGhTdHJpbmcgPSB1cmkucGF0aCgp OworICAgIHNpemVfdCBpbmRleEJhc2VOYW1lID0gcGF0aFN0cmluZy5yZXZlcnNlRmluZCgnLycp OworICAgIFN0cmluZyBiYXNlTmFtZTsKKyAgICBpZiAoaW5kZXhCYXNlTmFtZSA9PSBub3RGb3Vu ZCkKKyAgICAgICAgYmFzZU5hbWUgPSBwYXRoU3RyaW5nOworICAgIGVsc2UKKyAgICAgICAgYmFz ZU5hbWUgPSBwYXRoU3RyaW5nLnN1YnN0cmluZyhpbmRleEJhc2VOYW1lICsgMSk7CisKKyAgICBT dHJpbmcgZGlyTmFtZTsKKyAgICBpZiAoaW5kZXhCYXNlTmFtZSAhPSBub3RGb3VuZCkgeworICAg ICAgICBzaXplX3QgaW5kZXhEaXJOYW1lID0gcGF0aFN0cmluZy5yZXZlcnNlRmluZCgnLycsIGlu ZGV4QmFzZU5hbWUgLSAxKTsKKyAgICAgICAgaWYgKGluZGV4RGlyTmFtZSAhPSBub3RGb3VuZCkK KyAgICAgICAgICAgIGRpck5hbWUgPSBwYXRoU3RyaW5nLnN1YnN0cmluZyhpbmRleERpck5hbWUg KyAxLCBpbmRleEJhc2VOYW1lIC0gaW5kZXhEaXJOYW1lIC0gMSk7CisgICAgfQorCisgICAgU3Ry aW5nIHJldCA9IGRpck5hbWUgKyAiLyIgKyBiYXNlTmFtZTsKKyAgICByZXR1cm4gcmV0LnV0Zjgo KTsKK30KKworc3RhdGljIENTdHJpbmcgdXJsU3VpdGFibGVGb3JUZXN0UmVzdWx0KGNvbnN0IGNo YXIqIHVyaVN0cmluZykKK3sKKyAgICBLVVJMIHVyaSA9IEtVUkwoUGFyc2VkVVJMU3RyaW5nLCB1 cmlTdHJpbmcpOworICAgIGlmICghdXJpLmlzTG9jYWxGaWxlKCkpCisgICAgICAgIHJldHVybiBD U3RyaW5nKHVyaVN0cmluZyk7CisKKyAgICB1bnNpZ25lZCBzdGFydEluZGV4ID0gdXJpLnBhdGhB ZnRlckxhc3RTbGFzaCgpOworICAgIHJldHVybiB1cmkuc3RyaW5nKCkuc3Vic3RyaW5nKHN0YXJ0 SW5kZXgpLnV0ZjgoKTsKK30KKworc3RhdGljIENTdHJpbmcgZGVzY3JpcHRpb25TdWl0YWJsZUZv clRlc3RSZXN1bHQoRXdrX0ZyYW1lX1Jlc291cmNlX1JlcXVlc3QqIHJlcXVlc3QpCit7CisgICAg U3RyaW5nIHJldCA9ICI8TlNVUkxSZXF1ZXN0IFVSTCAiOworICAgIHJldCArPSBwYXRoU3VpdGFi bGVGb3JUZXN0UmVzdWx0KHJlcXVlc3QtPnVybCkuZGF0YSgpOworICAgIHJldCArPSAiLCBtYWlu IGRvY3VtZW50IFVSTCAiOworICAgIHJldCArPSB1cmxTdWl0YWJsZUZvclRlc3RSZXN1bHQocmVx dWVzdC0+Zmlyc3RfcGFydHkpLmRhdGEoKTsKKyAgICByZXQgKz0gIiwgaHR0cCBtZXRob2QgIjsK KyAgICByZXQgKz0gcmVxdWVzdC0+aHR0cF9tZXRob2QgPyBTdHJpbmcocmVxdWVzdC0+aHR0cF9t ZXRob2QpIDogIihub25lKSI7CisgICAgcmV0ICs9ICI+IjsKKworICAgIHJldHVybiByZXQudXRm OCgpOworfQorCitzdGF0aWMgQ1N0cmluZyBkZXNjcmlwdGlvblN1aXRhYmxlRm9yVGVzdFJlc3Vs dChjb25zdCBFd2tfRnJhbWVfUmVzb3VyY2VfUmVzcG9uc2UqIHJlc3BvbnNlKQoreworICAgIGlm ICghcmVzcG9uc2UpCisgICAgICAgIHJldHVybiBDU3RyaW5nKCIobnVsbCkiKTsKKworICAgIFN0 cmluZyByZXQgPSAiPE5TVVJMUmVzcG9uc2UgIjsKKyAgICByZXQgKz0gcGF0aFN1aXRhYmxlRm9y VGVzdFJlc3VsdChyZXNwb25zZS0+dXJsKS5kYXRhKCk7CisgICAgcmV0ICs9ICIsIGh0dHAgc3Rh dHVzIGNvZGUgIjsKKyAgICByZXQgKz0gU3RyaW5nOjpudW1iZXIocmVzcG9uc2UtPnN0YXR1c19j b2RlKTsKKyAgICByZXQgKz0gIj4iOworCisgICAgcmV0dXJuIHJldC51dGY4KCk7Cit9CisKIHZv aWQgRHVtcFJlbmRlclRyZWVDaHJvbWU6Om9uV2lsbFNlbmRSZXF1ZXN0KHZvaWQqLCBFdmFzX09i amVjdCosIHZvaWQqIGV2ZW50SW5mbykKIHsKLSAgICBFd2tfRnJhbWVfUmVzb3VyY2VfUmVxdWVz dCogcmVxdWVzdCA9IHN0YXRpY19jYXN0PEV3a19GcmFtZV9SZXNvdXJjZV9SZXF1ZXN0Kj4oZXZl bnRJbmZvKTsKKyAgICBFd2tfRnJhbWVfUmVzb3VyY2VfTWVzc2FnZXMqIG1lc3NhZ2VzID0gc3Rh dGljX2Nhc3Q8RXdrX0ZyYW1lX1Jlc291cmNlX01lc3NhZ2VzKj4oZXZlbnRJbmZvKTsKKworICAg IGlmICghZG9uZSAmJiBnTGF5b3V0VGVzdENvbnRyb2xsZXItPmR1bXBSZXNvdXJjZUxvYWRDYWxs YmFja3MoKSkKKyAgICAgICAgcHJpbnRmKCIlcyAtIHdpbGxTZW5kUmVxdWVzdCAlcyByZWRpcmVj dFJlc3BvbnNlICVzXG4iLAorICAgICAgICAgICAgICAgcGF0aFN1aXRhYmxlRm9yVGVzdFJlc3Vs dChtZXNzYWdlcy0+cmVxdWVzdC0+dXJsKS5kYXRhKCksCisgICAgICAgICAgICAgICBkZXNjcmlw dGlvblN1aXRhYmxlRm9yVGVzdFJlc3VsdChtZXNzYWdlcy0+cmVxdWVzdCkuZGF0YSgpLAorICAg ICAgICAgICAgICAgZGVzY3JpcHRpb25TdWl0YWJsZUZvclRlc3RSZXN1bHQobWVzc2FnZXMtPnJl ZGlyZWN0X3Jlc3BvbnNlKS5kYXRhKCkpOwogCi0gICAgS1VSTCB1cmwgPSBLVVJMKFBhcnNlZFVS TFN0cmluZywgcmVxdWVzdC0+dXJsKTsKKyAgICBLVVJMIHVybCA9IEtVUkwoUGFyc2VkVVJMU3Ry aW5nLCBtZXNzYWdlcy0+cmVxdWVzdC0+dXJsKTsKIAogICAgIGlmICh1cmwuaXNWYWxpZCgpCiAg ICAgICAgICYmIHVybC5wcm90b2NvbElzSW5IVFRQRmFtaWx5KCkKICAgICAgICAgJiYgdXJsLmhv c3QoKSAhPSAiMTI3LjAuMC4xIgogICAgICAgICAmJiB1cmwuaG9zdCgpICE9ICIyNTUuMjU1LjI1 NS4yNTUiCiAgICAgICAgICYmIHVybC5ob3N0KCkubG93ZXIoKSAhPSAibG9jYWxob3N0Iikgewot ICAgICAgICBwcmludGYoIkJsb2NrZWQgYWNjZXNzIHRvIGV4dGVybmFsIFVSTCAlc1xuIiwgcmVx dWVzdC0+dXJsKTsKLSAgICAgICAgcmVxdWVzdC0+dXJsID0gMDsKKyAgICAgICAgcHJpbnRmKCJC bG9ja2VkIGFjY2VzcyB0byBleHRlcm5hbCBVUkwgJXNcbiIsIG1lc3NhZ2VzLT5yZXF1ZXN0LT51 cmwpOworICAgICAgICBtZXNzYWdlcy0+cmVxdWVzdC0+dXJsID0gMDsKICAgICAgICAgcmV0dXJu OwogICAgIH0KIH0KKwordm9pZCBEdW1wUmVuZGVyVHJlZUNocm9tZTo6b25SZXNwb25zZVJlY2Vp dmVkKHZvaWQqLCBFdmFzX09iamVjdCosIHZvaWQqIGV2ZW50SW5mbykKK3sKKyAgICBFd2tfRnJh bWVfUmVzb3VyY2VfUmVzcG9uc2UqIHJlc3BvbnNlID0gc3RhdGljX2Nhc3Q8RXdrX0ZyYW1lX1Jl c291cmNlX1Jlc3BvbnNlKj4oZXZlbnRJbmZvKTsKKworICAgIGlmICghZG9uZSAmJiBnTGF5b3V0 VGVzdENvbnRyb2xsZXItPmR1bXBSZXNvdXJjZUxvYWRDYWxsYmFja3MoKSkgeworICAgICAgICBD U3RyaW5nIHJlc3BvbnNlRGVzY3JpcHRpb24oZGVzY3JpcHRpb25TdWl0YWJsZUZvclRlc3RSZXN1 bHQocmVzcG9uc2UpKTsKKyAgICAgICAgcHJpbnRmKCIlcyAtIGRpZFJlY2VpdmVSZXNwb25zZSAl c1xuIiwKKyAgICAgICAgICAgICAgIHBhdGhTdWl0YWJsZUZvclRlc3RSZXN1bHQocmVzcG9uc2Ut PnVybCkuZGF0YSgpLAorICAgICAgICAgICAgICAgcmVzcG9uc2VEZXNjcmlwdGlvbi5kYXRhKCkp OworICAgIH0KK30KZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVu ZGVyVHJlZUNocm9tZS5oIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVl Q2hyb21lLmgKaW5kZXggZTE1NmI0ZC4uY2NlZDBhYSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJl bmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmgKKysrIGIvVG9vbHMvRHVtcFJlbmRl clRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmgKQEAgLTc3LDYgKzc3LDggQEAgcHJpdmF0 ZToKICAgICBzdGF0aWMgdm9pZCBvbkRvY3VtZW50TG9hZEZpbmlzaGVkKHZvaWQqLCBFdmFzX09i amVjdCosIHZvaWQqKTsKIAogICAgIHN0YXRpYyB2b2lkIG9uV2lsbFNlbmRSZXF1ZXN0KHZvaWQq LCBFdmFzX09iamVjdCosIHZvaWQqKTsKKworICAgIHN0YXRpYyB2b2lkIG9uUmVzcG9uc2VSZWNl aXZlZCh2b2lkKiwgRXZhc19PYmplY3QqLCB2b2lkKik7CiB9OwogCiAjZW5kaWYgLy8gRHVtcFJl bmRlclRyZWVDaHJvbWVfaAo=