6331 2006-01-01 23:58:32 -0800 REGRESSION: form events don't fire after back/forward navigation, due to inconsistent load state 2006-01-09 10:34:22 -0800 1 1 1 Unclassified WebKit JavaScriptCore 420+ Mac OS X 10.4 RESOLVED FIXED P1 Normal --- 1 ggaren ggaren oldest_to_newest 27469 0 ggaren 2006-01-01 23:58:32 -0800 Check out the attached reduction. The patch for 5518 caused this. I'm surprised Mitz didn't catch it; he must be slipping... :) 27470 1 5414 ggaren 2006-01-01 23:59:06 -0800 Created attachment 5414 reduction 27473 2 ggaren 2006-01-02 00:12:28 -0800 Sorry, not 5518; rdar://problem/4268278. 28029 3 5562 ggaren 2006-01-08 22:20:29 -0800 Created attachment 5562 Fix Darin had a look at a previous incarnation of this patch, but I think I've found a better way that is more in tune with the loader's natural behavior. 28030 4 5562 ggaren 2006-01-08 22:22:01 -0800 Comment on attachment 5562 Fix The key to this new patch is: + } else if ([_private->subresourceLoaders count] > 0) { + // The main resource loader already finished loading. Set the cancelled error on the + // document and let the subresourceLoaders send individual cancelled messages below. + [self _setMainDocumentError:[self _cancelledError]]; } else { - // Main handle is already done. Set the cancelled error. - NSError *cancelledError = [NSError _webKitErrorWithDomain:NSURLErrorDomain - code:NSURLErrorCancelled - URL:[self _URL]]; - [self _setMainDocumentError:cancelledError]; + // If there are no resource loaders, we need to manufacture a cancelled message. + // (A back/forward navigation has no resource loaders because its resources are cached.) + [[self _webView] _mainReceivedError:[self _cancelledError] + fromDataSource:self + complete:YES]; } 28060 5 5562 darin 2006-01-09 09:05:30 -0800 Comment on attachment 5562 Fix I would write "Cancels the DataSource's pending loads" as "Cancels the data source's pending loads" (not important, just a comment in passing). This looks better than the earlier fix you had me review last week. r=me 28066 6 ggaren 2006-01-09 10:34:05 -0800 Landed as revision 11963. 5414 2006-01-01 23:59:06 -0800 2006-01-01 23:59:06 -0800 reduction reduction.zip application/octet-stream 966 ggaren UEsDBBQACAAIAKC+ITQAAAAAAAAAAAAAAAAOABAAcmVkdWN0aW9uLmh0bWxVWAwAI9y4Q9vbuEP2 GlAArVTBbtswDL3nKwhd7BSZne24JgG6bkB32DAg6QcoFh0LlSVDopMaQ/99kp14sZNsO0wn0SYf yccnLgoq1WoC/iwK5KK7tqbLrKzo94e81hlJo6GyUlNconN8h1P42XuEs+cWKm75zvKqgCUIk9Ul akoyi5zwi8Jgxaxi0/tBYB+U8KpCLR4LqUQ8Ct/gK303AvvsI5DefYd0TPWp+SpilhntjEI2HaD3 Oc9g3iaXHbsQoWT2Ek/7n5dt45V2922z30ztursbt42J1JKOflnIwWZAtsYZ5Fw5/McGo21NZHQ0 TYR0Faes6CDH8QND5hAfpBbmkCjemJo26OjRaLJGKbTj0YZzzS/RhmTefDYa41G6t8nl7ZJeo1ty n7gWHu4mx53uoh8P6/VHaKkCDE2G8RDwnNDClmcvaW7sgVsBmu/ljocU0V8GTL6hm3n/F02iLqsH FyQ8pulmyIFLetYk1Z/JHdAaTnrnSVWGCy8YdDoiyKXFI0f8Fksz8CoCkiVaB15gYH01xqJIhtXe wdp4kRrAV8xq8rjQLYtjAirwVgoouIPMlJVCQjGDMfAB/TQ9TldFAk8e5l3TFYZ5jn5cexyXkw7s 46g8zMZjeE7j6Oz9RjN4P5/PR1SexmuytsqksJj718x873WrkA9JWJTs/oqeF+n5plyk3RrtjK0R zXESS9aJjJ2tWKmrQHhT4bJ7vyC9X3dlfqeoGpesQKUM8yit5Jds/FrOAYXctxCndbdapP7TqbJQ zWriK2x3/i9QSwcIviN0Zj8CAAD7BQAAUEsDBBQACAAIAPG9ITQAAAAAAAAAAAAAAAAPABAAcmVk dWN0aW9uMi5odG1sVVgMACPcuEOW2rhD9hpQALPJKMnNseOyyUhNTAFSxclFmQUlQIY+ggWVSspP qVTIz8vJT0yxVSrPzEvJL9fLyCwuyS+q1EtKTM7W0FQCqQYpA+sCmQsAUEsHCIP5rhdHAAAAXgAA AFBLAQIVAxQACAAIAKC+ITS+I3RmPwIAAPsFAAAOAAwAAAAAAAAAAEC0gQAAAAByZWR1Y3Rpb24u aHRtbFVYCAAj3LhD29u4Q1BLAQIVAxQACAAIAPG9ITSD+a4XRwAAAF4AAAAPAAwAAAAAAAAAAECk gYsCAAByZWR1Y3Rpb24yLmh0bWxVWAgAI9y4Q5bauENQSwUGAAAAAAIAAgCRAAAAHwMAAAAA 5562 2006-01-08 22:20:29 -0800 2006-01-09 09:05:30 -0800 Fix patch-loader.txt text/plain 15934 ggaren SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDExOTQwKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDUgKzEsMjQgQEAKIDIwMDYtMDEtMDggIEdlb2ZmcmV5IEdhcmVuICA8 Z2dhcmVuQGFwcGxlLmNvbT4KIAorICAgICAgICBMYXlvdXQgdGVzdHMgZm9yCisKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzQyNjgyNzg+IFN1Ym1pdHRpbmcgYSBmb3JtIGluIG9uVW5sb2FkIGV2 ZW50IGhhbmRsZXIgCisgICAgICAgIGNhdXNlcyBjcmFzaCBpbiAtW1dlYkRhdGFTb3VyY2UoV2Vi UHJpdmF0ZSkgX2NvbW1pdElmUmVhZHk6XS4pCisKKyAgICAgICAgYW5kCisKKyAgICAgICAgLSAg aHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9pZD02MzMxCisgICAg ICAgIFJFR1JFU1NJT046IGZvcm0gZXZlbnRzIGRvbid0IGZpcmUgYWZ0ZXIgYmFjay9mb3J3YXJk IG5hdmlnYXRpb24sIAorICAgICAgICBkdWUgdG8gaW5jb25zaXN0ZW50IGxvYWQgc3RhdGUKKwor ICAgICAgICAqIGZhc3QvbG9hZGVyL2Zvcm0tZXZlbnRzLWJhY2stZm9yd2FyZC1leHBlY3RlZC50 eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbG9hZGVyL2Zvcm0tZXZlbnRzLWJhY2stZm9yd2Fy ZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2xvYWRlci9vbnVubG9hZC1mb3JtLXN1Ym1p dC1jcmFzaC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbG9hZGVyL29udW5s b2FkLWZvcm0tc3VibWl0LWNyYXNoLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbG9hZGVy L3Jlc291cmNlcy9vbnVubG9hZC1mb3JtLXN1Ym1pdC1jcmFzaDIuaHRtbDogQWRkZWQuCisKKzIw MDYtMDEtMDggIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KKwogICAgICAgICBS ZXZpZXdlZCBieSBlcmljLgogCiAgICAgICAgIE5ldyByZXN1bHRzIGZvciByZWNlbnRseSBmaXhl ZCB0ZXN0LgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvZm9ybS1ldmVudHMtYmFjay1m b3J3YXJkLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2xvYWRl ci9mb3JtLWV2ZW50cy1iYWNrLWZvcndhcmQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysg TGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvZm9ybS1ldmVudHMtYmFjay1mb3J3YXJkLWV4cGVjdGVk LnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwxMSBAQAorQnVnOiBSRUdSRVNTSU9OOiBmb3Jt IGV2ZW50cyBkb24ndCBmaXJlIGFmdGVyIGJhY2svZm9yd2FyZCBuYXZpZ2F0aW9uLCBkdWUgdG8g aW5jb25zaXN0ZW50IGxvYWQgc3RhdGUKKworVG8gcnVuIHRoaXMgdGVzdCBpbiBTYWZhcmk6CisK K0NsaWNrIGhlcmUgdG8gZG8gYSBiYWNrL2ZvcndhcmQgbmF2aWdhdGlvbi4KK0NsaWNrIGhlcmUg dG8gdGVzdCBmb3JtIGV2ZW50cy4KK0lmIHRoaXMgdGVzdCBwYXNzZXMsIHlvdSdsbCBzZWUgYSBQ QVNTIG1lc3NhZ2UgYmVsb3cuCisKK1BBU1M6IGNsaWNrIGV2ZW50IHNlbnQgdG8gYnV0dG9uCisK KwpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvb251bmxvYWQtZm9ybS1zdWJtaXQtY3Jh c2guaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9vbnVubG9hZC1m b3JtLXN1Ym1pdC1jcmFzaC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9s b2FkZXIvb251bmxvYWQtZm9ybS1zdWJtaXQtY3Jhc2guaHRtbAkocmV2aXNpb24gMCkKQEAgLTAs MCArMSwxNCBAQAorPGh0bWw+CisgICAgPGJvZHkgb25VbmxvYWQ9ImRvY3VtZW50Lm15Rm9ybS5z dWJtaXQoKSI+CisgICAgICAgIDxzY3JpcHQ+CisgICAgICAgICAgICBpZiAod2luZG93LmxheW91 dFRlc3RDb250cm9sbGVyKSB7CisgICAgICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIu ZHVtcEFzVGV4dCgpOworICAgICAgICAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLndhaXRV bnRpbERvbmUoKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgd2luZG93LnNldFRpbWVv dXQoImxvY2F0aW9uLmhyZWY9bG9jYXRpb24uaHJlZiIsIDApOyAvLyBjaGVhcCB3YXkgdG8gZm9y Y2UgYW4gdW5sb2FkCisgICAgICAgIDwvc2NyaXB0PgorICAgICAgICA8cD5UaGlzIGlzIGp1c3Qg YSBkdW1teSBwYWdlIHRoYXQgbG9hZHMgdGhlIG5leHQgcGFnZSB0byBzZWUgaWYgd2UgY3Jhc2gu PC9wPgorICAgICAgICA8Zm9ybSBuYW1lPSJteUZvcm0iIGFjdGlvbj0icmVzb3VyY2VzL29udW5s b2FkLWZvcm0tc3VibWl0LWNyYXNoMi5odG1sIj48L2Zvcm0+CisgICAgPC9ib2R5PgorPGh0bWw+ CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9mb3JtLWV2ZW50cy1iYWNrLWZvcndhcmQu aHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9mb3JtLWV2ZW50cy1i YWNrLWZvcndhcmQuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvbG9hZGVy L2Zvcm0tZXZlbnRzLWJhY2stZm9yd2FyZC5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDUw IEBACis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPHNjcmlwdD4KKyAgICAgICAgICAgIGZ1 bmN0aW9uIHRlc3QoKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGlmICh3aW5kb3cu bGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICAgICAgICAgICAgICAgICAgbGF5b3V0VGVzdENv bnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgICAgICAgICAgICAgICAgICBsYXlvdXRUZXN0Q29u dHJvbGxlci53YWl0VW50aWxEb25lKCk7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAg ICAgICAgICAKKyAgICAgICAgICAgICAgICBpZiAod2luZG93Lm5hdmlnYXRpb25Db250cm9sbGVy KQorICAgICAgICAgICAgICAgICAgICBuYXZpZ2F0aW9uQ29udHJvbGxlci5ldmFsQWZ0ZXJCYWNr Rm9yd2FyZE5hdmlnYXRpb24oImNvbnRpbnVlVGVzdEFmdGVyTmF2aWdhdGlvbigpIik7CisgICAg ICAgICAgICB9CisgICAgICAgICAgICAKKyAgICAgICAgICAgIGZ1bmN0aW9uIGNvbnRpbnVlVGVz dEFmdGVyTmF2aWdhdGlvbigpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgdmFyIGUg PSBkb2N1bWVudC5jcmVhdGVFdmVudCgiTW91c2VFdmVudHMiKTsKKyAgICAgICAgICAgICAgICBl LmluaXRFdmVudCgiY2xpY2siLCB0cnVlLCBmYWxzZSk7CisgICAgICAgICAgICAgICAgZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoJ2J1dHRvbicpLmRpc3BhdGNoRXZlbnQoZSk7CisgICAgICAgICAg ICAgICAgCisgICAgICAgICAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikK KyAgICAgICAgICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIubm90aWZ5RG9uZSgpOwor ICAgICAgICAgICAgfQorCisgICAgICAgICAgICBmdW5jdGlvbiBidXR0b25fb25DbGljaygpCisg ICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgcHJpbnQoJ1BBU1M6IGNsaWNrIGV2ZW50IHNl bnQgdG8gYnV0dG9uJyk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICAKKyAgICAgICAgICAg IGZ1bmN0aW9uIHByaW50KG1lc3NhZ2UpIHsKKyAgICAgICAgICAgICAgICB2YXIgcGFyYWdyYXBo ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgicCIpOworICAgICAgICAgICAgICAgIHBhcmFncmFw aC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZShtZXNzYWdlKSk7CisgICAgICAg ICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbnNvbGUiKS5hcHBlbmRDaGlsZChw YXJhZ3JhcGgpOworICAgICAgICAgICAgfQorICAgICAgICA8L3NjcmlwdD4KKyAgICA8L2hlYWQ+ CisKKyAgICA8Ym9keSBvbmxvYWQ9InRlc3QoKSI+CisgICAgICAgIDxwPkJ1ZzogPGEgaHJlZj0i aHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9pZD02MzMxIj5SRUdS RVNTSU9OOiBmb3JtIGV2ZW50cyBkb24ndCBmaXJlIGFmdGVyIGJhY2svZm9yd2FyZCBuYXZpZ2F0 aW9uLCBkdWUgdG8gaW5jb25zaXN0ZW50IGxvYWQgc3RhdGU8L2E+PC9wPiAKKyAgICAgICAgPHA+ VG8gcnVuIHRoaXMgdGVzdCBpbiBTYWZhcmk6PC9wPgorICAgICAgICA8b2w+CisgICAgICAgICAg ICA8bGk+PGEgaHJlZj0iZ28tYmFjay5odG1sIj5DbGljayBoZXJlIHRvIGRvIGEgYmFjay9mb3J3 YXJkIG5hdmlnYXRpb24uPC9hPjwvbGk+CisgICAgICAgICAgICA8bGk+PGEgaHJlZj0iIiBvbmNs aWNrPSJjb250aW51ZVRlc3RBZnRlck5hdmlnYXRpb24oKTsgcmV0dXJuIGZhbHNlOyI+Q2xpY2sg aGVyZSB0byB0ZXN0IGZvcm0gZXZlbnRzLjwvYT48L2xpPgorICAgICAgICA8L29sPgorICAgICAg ICA8cD5JZiB0aGlzIHRlc3QgcGFzc2VzLCB5b3UnbGwgc2VlIGEgUEFTUyBtZXNzYWdlIGJlbG93 LjwvcD4KKyAgICAgICAgPGhyPgorICAgICAgICA8aW5wdXQgdHlwZT1oaWRkZW4gaWQ9ImJ1dHRv biIgb25jbGljaz0iYnV0dG9uX29uQ2xpY2soKSI+CisgICAgICAgIDxkaXYgaWQ9ImNvbnNvbGUi PjwvZGl2PgorICAgIDwvYm9keT4KKzwvaHRtbD4KSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvbG9h ZGVyL3Jlc291cmNlcy9vbnVubG9hZC1mb3JtLXN1Ym1pdC1jcmFzaDIuaHRtbAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9yZXNvdXJjZXMvb251bmxvYWQtZm9ybS1zdWJt aXQtY3Jhc2gyLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9y ZXNvdXJjZXMvb251bmxvYWQtZm9ybS1zdWJtaXQtY3Jhc2gyLmh0bWwJKHJldmlzaW9uIDApCkBA IC0wLDAgKzEsMjQgQEAKKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8c2NyaXB0PgorICAg ICAgICAgICAgZnVuY3Rpb24gcHJpbnQobWVzc2FnZSkgeworICAgICAgICAgICAgICAgIHZhciBw YXJhZ3JhcGggPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJwIik7CisgICAgICAgICAgICAgICAg cGFyYWdyYXBoLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKG1lc3NhZ2UpKTsK KyAgICAgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29uc29sZSIpLmFwcGVu ZENoaWxkKHBhcmFncmFwaCk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGZ1bmN0aW9u IGNvbnRpbnVlVGVzdEFmdGVyTmF2aWdhdGlvbigpCisgICAgICAgICAgICB7CisgICAgICAgICAg ICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAgICAgICAgICAgICAg ICAgbGF5b3V0VGVzdENvbnRyb2xsZXIubm90aWZ5RG9uZSgpOworICAgICAgICAgICAgfQorICAg ICAgICA8L3NjcmlwdD4KKyAgICA8L2hlYWQ+CisKKyAgICA8Ym9keSBvbmxvYWQ9ImNvbnRpbnVl VGVzdEFmdGVyTmF2aWdhdGlvbigpIj4KKyAgICAgICAgPHA+QnVnOiByZGFyOi8vcHJvYmxlbS80 MjY4Mjc4IFN1Ym1pdHRpbmcgYSBmb3JtIGluIG9uVW5sb2FkIGV2ZW50IGhhbmRsZXIgY2F1c2Vz IGNyYXNoIGluIC1bV2ViRGF0YVNvdXJjZShXZWJQcml2YXRlKSBfY29tbWl0SWZSZWFkeTpdPC9w PiAKKyAgICAgICAgPHA+SWYgdGhpcyB0ZXN0IHBhc3NlcywgeW91J2xsIHNlZSBhIFBBU1MgbWVz c2FnZSBiZWxvdy48L3A+CisgICAgICAgIDxocj4KKyAgICAgICAgPHA+UEFTUzogU2FmYXJpIGRp ZG4ndCBjcmFzaC48L3A+CisgICAgPC9ib2R5PgorPGh0bWw+ClwgTm8gbmV3bGluZSBhdCBlbmQg b2YgZmlsZQpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvb251bmxvYWQtZm9ybS1zdWJt aXQtY3Jhc2gtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvbG9h ZGVyL29udW5sb2FkLWZvcm0tc3VibWl0LWNyYXNoLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkK KysrIExheW91dFRlc3RzL2Zhc3QvbG9hZGVyL29udW5sb2FkLWZvcm0tc3VibWl0LWNyYXNoLWV4 cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw3IEBACitCdWc6IHJkYXI6Ly9wcm9i bGVtLzQyNjgyNzggU3VibWl0dGluZyBhIGZvcm0gaW4gb25VbmxvYWQgZXZlbnQgaGFuZGxlciBj YXVzZXMgY3Jhc2ggaW4gLVtXZWJEYXRhU291cmNlKFdlYlByaXZhdGUpIF9jb21taXRJZlJlYWR5 Ol0KKworSWYgdGhpcyB0ZXN0IHBhc3NlcywgeW91J2xsIHNlZSBhIFBBU1MgbWVzc2FnZSBiZWxv dy4KKworUEFTUzogU2FmYXJpIGRpZG4ndCBjcmFzaC4KKworCkluZGV4OiBXZWJLaXQvQ2hhbmdl TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDExOTI4KQorKysg V2ViS2l0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBACisyMDA2LTAx LSMjICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICAtIFNlY29uZCBjdXQgYXQg Zml4aW5nIDxyZGFyOi8vcHJvYmxlbS80MjY4Mjc4PiBTdWJtaXR0aW5nIGEgZm9ybSAKKyAgICAg ICAgaW4gb25VbmxvYWQgZXZlbnQgaGFuZGxlciBjYXVzZXMgY3Jhc2ggaW4gCisgICAgICAgIC1b V2ViRGF0YVNvdXJjZShXZWJQcml2YXRlKSBfY29tbWl0SWZSZWFkeTpdLikKKworICAgICAgICAt IEZpeGVzIGh0dHA6Ly9idWd6aWxsYS5vcGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjMz MQorICAgICAgICBSRUdSRVNTSU9OOiBmb3JtIGV2ZW50cyBkb24ndCBmaXJlIGFmdGVyIGJhY2sv Zm9yd2FyZCBuYXZpZ2F0aW9uLCAKKyAgICAgICAgZHVlIHRvIGluY29uc2lzdGVudCBsb2FkIHN0 YXRlCisgICAgICAgIAorICAgICAgICAqIFdlYlZpZXcuc3VicHJvai9XZWJEYXRhU291cmNlLm06 CisgICAgICAgICgtW1dlYkRhdGFTb3VyY2UgX3N0b3BMb2FkaW5nXSk6IAorICAgICAgICAoMSkg SWYgdGhlcmUgYXJlIG5vIHJlc291cmNlIGxvYWRlcnMgdG8gc2lnbmFsIHRoZSBXZWJWaWV3IHRo YXQgd2UndmUKKyAgICAgICAgYmVlbiBjYW5jZWxlZCwgbWFudWZhY3R1cmUgdGhlIHNpZ25hbC4g T3RoZXJ3aXNlLCB0aGUgY2FuY2VsIGdldHMgCisgICAgICAgIGlnbm9yZWQgYW5kIG5vYm9keSBj bGVhbnMgdXAgYWZ0ZXIgdGhlIGxvYWQuIChXZSBzaWduYWwgdGhlIFdlYlZpZXcgYnV0CisgICAg ICAgIG5vdCB0aGUgV2ViRnJhbWUgYmVjYXVzZSB3ZSBkb24ndCB3YW50IHRoZSBXZWJGcmFtZSB0 byB0ZWFyIGRvd24gdGhlIAorICAgICAgICBEYXRhU291cmNlLiAgVW5saWtlIG1vc3QgY2FuY2Vs ZWQgRGF0YVNvdXJjZXMsIHRoaXMgb25lIGhhcyB2YWxpZCBkYXRhIAorICAgICAgICBiZWNhdXNl IGl0J3MgaW4gdGhlIGJhY2svZm9yd2FyZCBjYWNoZS4pCisgICAgICAgICgyKSBVcGRhdGUgX3By aXZhdGUtPnN0b3BwaW5nIGJlZm9yZSByZXR1cm5pbmcgYmVjYXVzZSBpZiB0aGUgCisgICAgICAg IERhdGFTb3VyY2UgaXMgaW4gdGhlIGJhY2svZm9yd2FyZCBjYWNoZSBpdCBjYW4gYmUgcmV1c2Vk LCBzbyBpdCAKKyAgICAgICAgbmVlZHMgdG8gYmUgaW4gYSBjb25zaXN0ZW50IHN0YXRlLiAoV2Ug bmV2ZXIgZW5jb3VudGVyZWQgdGhpcyAKKyAgICAgICAgc2l0dWF0aW9uIGJlZm9yZSBiZWNhdXNl IHdlIHdvdWxkIGFsd2F5cyBjcmFzaCBmaXJzdC4pCisgICAgICAgICgtW1dlYkRhdGFTb3VyY2Ug X2NvbW1pdExvYWRXaXRoRGF0YTpdKTogTW92ZSBfY29tbWl0SWZSZWFkeSBjYWxsIAorICAgICAg ICBpbnNpZGUgcmV0YWluIGJsb2NrIGJlY2F1c2UgdGhlIGNvbW1pdCBtYXkgY2F1c2UgYW4gdW5s b2FkIGV2ZW50IAorICAgICAgICB0byBmaXJlLCB3aGljaCBtYXkgc3RhcnQgYSBuZXcgbG9hZCwg ZGVhbGxvY2F0aW5nIHRoZSBjdXJyZW50IAorICAgICAgICBEYXRhU291cmNlLiAoVGhpcyBpcyB0 aGUgc2FtZSByZWFzb24gdGhlIHJlc3Qgb2YgdGhlIGZ1bmN0aW9uIGlzIAorICAgICAgICBpbiB0 aGUgcmV0YWluIGJsb2NrLikKKyAgICAgICAgKiBXZWJWaWV3LnN1YnByb2ovV2ViRnJhbWUubToK KyAgICAgICAgKC1bV2ViRnJhbWUgX3RyYW5zaXRpb25Ub0NvbW1pdHRlZDpdKTogSWYgdGhlIHVu bG9hZCBoYW5kbGVyIAorICAgICAgICBzdGFydGVkIGEgbmV3IGxvYWQsIHJldHVybiBlYXJseSB0 byBhdm9pZCBzdG9tcGluZyBpdC4KKyAgICAgICAgKC1bV2ViRnJhbWUgX2NvbnRpbnVlTG9hZFJl cXVlc3RBZnRlck5hdmlnYXRpb25Qb2xpY3k6Zm9ybVN0YXRlOl0pOiAKKyAgICAgICAgVW5kbyBw cmV2aW91cyBpbmNvcnJlY3QgZml4LgorICAgICAgICAoLVtXZWJGcmFtZSBzdG9wTG9hZGluZ10p OiBSZW1vdmUgbWlzbGVhZGluZyBjb21tZW50LiBTZXR0aW5nIAorICAgICAgICBwcm92aXNpb25h bERhdGFTb3VyY2UgdG8gbmlsIGlzIG5vdCBvcHRpb25hbCBidXQgcmVxdWlyZWQgZm9yIAorICAg ICAgICBpbnRlcm5hbCBjb25zaXN0ZW5jeS4KKwogMjAwNi0wMS0wNyAgTWl0eiBQZXR0ZWwgIDxv cGVuZGFyd2luLm9yZ0BtaXR6cGV0dGVsLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJp biwgbGFuZGVkIGJ5IGFwLgpJbmRleDogV2ViS2l0L1dlYlZpZXcuc3VicHJvai9XZWJGcmFtZS5t Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdC9XZWJWaWV3LnN1YnByb2ovV2ViRnJhbWUubQkocmV2aXNp b24gMTE5MjgpCisrKyBXZWJLaXQvV2ViVmlldy5zdWJwcm9qL1dlYkZyYW1lLm0JKHdvcmtpbmcg Y29weSkKQEAgLTcyNSw2ICs3MjUsMTQgQEAKICAgICAgICAgICAgICAgICBbX3ByaXZhdGUgc2V0 UHJvdmlzaW9uYWxJdGVtOm5pbF07CiAgICAgICAgICAgICB9CiAKKyAgICAgICAgICAgIC8vIFRo ZSBjYWxsIHRvIGNsb3NlVVJMIGludm9rZXMgdGhlIHVubG9hZCBldmVudCBoYW5kbGVyLCB3aGlj aCBjYW4gZXhlY3V0ZSBhcmJpdHJhcnkKKyAgICAgICAgICAgIC8vIEphdmFTY3JpcHQuIElmIHRo ZSBzY3JpcHQgaW5pdGlhdGVzIGEgbmV3IGxvYWQsIHdlIG5lZWQgdG8gYWJhbmRvbiB0aGUgY3Vy cmVudCBsb2FkLAorICAgICAgICAgICAgLy8gb3IgdGhlIHR3byB3aWxsIHN0b21wIGVhY2ggb3Ro ZXIuCisgICAgICAgICAgICBXZWJEYXRhU291cmNlICpwZCA9IF9wcml2YXRlLT5wcm92aXNpb25h bERhdGFTb3VyY2U7CisgICAgICAgICAgICBbW3NlbGYgX2JyaWRnZV0gY2xvc2VVUkxdOworICAg ICAgICAgICAgaWYgKHBkICE9IF9wcml2YXRlLT5wcm92aXNpb25hbERhdGFTb3VyY2UpCisgICAg ICAgICAgICAgICAgcmV0dXJuOworCiAgICAgICAgICAgICAvLyBTZXQgdGhlIGNvbW1pdHRlZCBk YXRhIHNvdXJjZSBvbiB0aGUgZnJhbWUuCiAgICAgICAgICAgICBbc2VsZiBfc2V0RGF0YVNvdXJj ZTpfcHJpdmF0ZS0+cHJvdmlzaW9uYWxEYXRhU291cmNlXTsKICAgICAgICAgICAgICAgICAKQEAg LTIyNDgsMjEgKzIyNTYsNiBAQAogICAgIC8vIFRoZSAiYmVmb3JlIHVubG9hZCIgZXZlbnQgaGFu ZGxlciBydW5zIG9ubHkgZm9yIHRoZSBtYWluIGZyYW1lLgogICAgIEJPT0wgY2FuQ29udGludWUg PSByZXF1ZXN0ICYmIChbW3NlbGYgd2ViVmlld10gbWFpbkZyYW1lXSAhPSBzZWxmIHx8IFtfcHJp dmF0ZS0+YnJpZGdlIHNob3VsZENsb3NlXSk7CiAKLSAgICAvLyBUaGUgY2FsbCB0byBjbG9zZVVS TCBiZWxvdyBpbnZva2VzIHRoZSB1bmxvYWQgZXZlbnQgaGFuZGxlciwgd2hpY2ggY2FuIGV4ZWN1 dGUgYXJiaXRyYXJ5Ci0gICAgLy8gSmF2YVNjcmlwdC4gSWYgdGhlIHNjcmlwdCBpbml0aWF0ZXMg YSBuZXcgbG9hZCwgd2UgbmVlZCB0byBjYW5jZWwgdGhlIHJlcXVlc3RlZCBsb2FkLAotICAgIC8v IG9yIHRoZSB0d28gd2lsbCBzdG9tcCBlYWNoIG90aGVyLgotCi0gICAgLy8gQ2FjaGUgdGhlIGxv YWQgdHlwZSBvZiB0aGUgY3VycmVudCByZXF1ZXN0LCBzaW5jZSBfcHJpdmF0ZS0+cG9saWN5TG9h ZFR5cGUgd2lsbCBjaGFuZ2UgCi0gICAgLy8gaWYgdGhlIHVubG9hZCBoYW5kbGVyIGluaXRpYXRl cyBhIGxvYWQuIChXZSB1c2UgdGhpcyB2YWx1ZSB0byBkZXRlcm1pbmUgaWYgd2UgbmVlZCB0bwot ICAgIC8vIHJlc2V0IHRoZSBiYWNrL2ZvcndhcmQgY3Vyc29yLikKLSAgICBXZWJGcmFtZUxvYWRU eXBlIHJlcXVlc3RMb2FkVHlwZSA9IF9wcml2YXRlLT5wb2xpY3lMb2FkVHlwZTsKLSAgICBpZiAo Y2FuQ29udGludWUpIHsKLSAgICAgICAgW3NlbGYgc3RvcExvYWRpbmddOwotICAgICAgICBbW3Nl bGYgX2JyaWRnZV0gY2xvc2VVUkxdOwotICAgICAgICAKLSAgICAgICAgY2FuQ29udGludWUgPSBb c2VsZiBwcm92aXNpb25hbERhdGFTb3VyY2VdID09IG5pbDsKLSAgICB9Ci0gICAgCiAgICAgaWYg KCFjYW5Db250aW51ZSkgewogICAgICAgICAvLyBJZiB3ZSB3ZXJlIHdhaXRpbmcgZm9yIGEgcXVp Y2sgcmVkaXJlY3QsIGJ1dCB0aGUgcG9saWN5IGRlbGVnYXRlIGRlY2lkZWQgdG8gaWdub3JlIGl0 LCB0aGVuIHdlIAogICAgICAgICAvLyBuZWVkIHRvIHJlcG9ydCB0aGF0IHRoZSBjbGllbnQgcmVk aXJlY3Qgd2FzIGNhbmNlbGxlZC4KQEAgLTIyNzQsOSArMjI2Nyw5IEBACiAgICAgICAgIC8vIHBy b2JsZW0gdGhhdCB3ZSBoYXZlIG9wdGltaXN0aWNhbGx5IG1vdmVkIHRoZSBiL2YgY3Vyc29yIGFs cmVhZHksIHNvIG1vdmUgaXQgYmFjay4gIEZvciBzYW5pdHksIAogICAgICAgICAvLyB3ZSBvbmx5 IGRvIHRoaXMgd2hlbiBwdW50aW5nIGEgbmF2aWdhdGlvbiBmb3IgdGhlIHRhcmdldCBmcmFtZSBv ciB0b3AtbGV2ZWwgZnJhbWUuICAKICAgICAgICAgaWYgKChbaXRlbSBpc1RhcmdldEl0ZW1dIHx8 IFtbc2VsZiB3ZWJWaWV3XSBtYWluRnJhbWVdID09IHNlbGYpCi0gICAgICAgICAgICAmJiAocmVx dWVzdExvYWRUeXBlID09IFdlYkZyYW1lTG9hZFR5cGVGb3J3YXJkCi0gICAgICAgICAgICAgICAg fHwgcmVxdWVzdExvYWRUeXBlID09IFdlYkZyYW1lTG9hZFR5cGVCYWNrCi0gICAgICAgICAgICAg ICAgfHwgcmVxdWVzdExvYWRUeXBlID09IFdlYkZyYW1lTG9hZFR5cGVJbmRleGVkQmFja0Zvcndh cmQpKQorICAgICAgICAgICAgJiYgKF9wcml2YXRlLT5wb2xpY3lMb2FkVHlwZSA9PSBXZWJGcmFt ZUxvYWRUeXBlRm9yd2FyZAorICAgICAgICAgICAgICAgIHx8IF9wcml2YXRlLT5wb2xpY3lMb2Fk VHlwZSA9PSBXZWJGcmFtZUxvYWRUeXBlQmFjaworICAgICAgICAgICAgICAgIHx8IF9wcml2YXRl LT5wb2xpY3lMb2FkVHlwZSA9PSBXZWJGcmFtZUxvYWRUeXBlSW5kZXhlZEJhY2tGb3J3YXJkKSkK ICAgICAgICAgICAgIFtbW3NlbGYgd2ViVmlld10gbWFpbkZyYW1lXSBfcmVzZXRCYWNrRm9yd2Fy ZExpc3RdOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMjI4NCw2ICsyMjc3LDcgQEAKICAg ICBXZWJGcmFtZUxvYWRUeXBlIGxvYWRUeXBlID0gX3ByaXZhdGUtPnBvbGljeUxvYWRUeXBlOwog ICAgIFdlYkRhdGFTb3VyY2UgKmRhdGFTb3VyY2UgPSBbX3ByaXZhdGUtPnBvbGljeURhdGFTb3Vy Y2UgcmV0YWluXTsKICAgICAKKyAgICBbc2VsZiBzdG9wTG9hZGluZ107CiAgICAgW3NlbGYgX3Nl dExvYWRUeXBlOmxvYWRUeXBlXTsKICAgICBbc2VsZiBfc2V0UHJvdmlzaW9uYWxEYXRhU291cmNl OmRhdGFTb3VyY2VdOwogICAgIFtkYXRhU291cmNlIHJlbGVhc2VdOwpAQCAtMjk1NSw5ICsyOTQ5 LDggQEAKICAgICBbX3ByaXZhdGUtPnByb3Zpc2lvbmFsRGF0YVNvdXJjZSBfc3RvcExvYWRpbmdd OwogICAgIFtfcHJpdmF0ZS0+ZGF0YVNvdXJjZSBfc3RvcExvYWRpbmddOwogCi0gICAgLy8gUmVs ZWFzZSB0aGUgcHJvdmlzaW9uYWwgZGF0YSBzb3VyY2UgYmVjYXVzZSB0aGVyZSdzIG5vIHBvaW50 IGluIGtlZXBpbmcgaXQgYXJvdW5kIHNpbmNlIGl0IGlzIHVudXNlZCBpbiB0aGlzIGNhc2UuCiAg ICAgW3NlbGYgX3NldFByb3Zpc2lvbmFsRGF0YVNvdXJjZTpuaWxdOwotICAgIAorCiAgICAgX3By aXZhdGUtPmlzU3RvcHBpbmdMb2FkID0gTk87CiB9CiAKSW5kZXg6IFdlYktpdC9XZWJWaWV3LnN1 YnByb2ovV2ViRGF0YVNvdXJjZS5tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9XZWJWaWV3LnN1YnBy b2ovV2ViRGF0YVNvdXJjZS5tCShyZXZpc2lvbiAxMTkyOCkKKysrIFdlYktpdC9XZWJWaWV3LnN1 YnByb2ovV2ViRGF0YVNvdXJjZS5tCSh3b3JraW5nIGNvcHkpCkBAIC0zNTksMTIgKzM1OSwxNyBA QAogICAgIFtzZWxmIF9zdGFydExvYWRpbmc6bmlsXTsKIH0KIAorLSAoTlNFcnJvciAqKV9jYW5j ZWxsZWRFcnJvcgoreworICAgIHJldHVybiBbTlNFcnJvciBfd2ViS2l0RXJyb3JXaXRoRG9tYWlu Ok5TVVJMRXJyb3JEb21haW4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29kZTpOU1VSTEVycm9yQ2FuY2VsbGVkCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBVUkw6W3NlbGYgX1VSTF1dOworfQogCi0vLyBDYW5jZWxzIGFueSBwZW5kaW5nIGxv YWRzLiAgQSBkYXRhIHNvdXJjZSBpcyBjb25jZXB0dWFsbHkgb25seSBldmVyIGxvYWRpbmcKLS8v IG9uZSBkb2N1bWVudCBhdCBhIHRpbWUsIGFsdGhvdWdoIG9uZSBkb2N1bWVudCBtYXkgaGF2ZSBt YW55IHJlbGF0ZWQKLS8vIHJlc291cmNlcy4gIHN0b3BMb2FkaW5nIHdpbGwgc3RvcCBhbGwgbG9h ZHMgcmVsYXRlZCB0byB0aGUgZGF0YSBzb3VyY2UuICBUaGlzCi0vLyBtZXRob2Qgd2lsbCBub3Qg c3RvcCBsb2FkcyB0aGF0IG1heSBiZSBoYXBwZW5pbmcgaW4gY2hpbGQgZnJhbWVzLCB0aGF0IGlz IHRoZSAKLS8vIFdlYkZyYW1lJ3Mgam9iCisvLyBDYW5jZWxzIHRoZSBEYXRhU291cmNlJ3MgcGVu ZGluZyBsb2Fkcy4gIENvbmNlcHR1YWxseSwgYSBkYXRhIHNvdXJjZSBvbmx5IGxvYWRzCisvLyBv bmUgZG9jdW1lbnQgYXQgYSB0aW1lLCBidXQgb25lIGRvY3VtZW50IG1heSBoYXZlIG1hbnkgcmVs YXRlZCByZXNvdXJjZXMuIAorLy8gX3N0b3BMb2FkaW5nIHdpbGwgc3RvcCBhbGwgbG9hZHMgaW5p dGlhdGVkIGJ5IHRoZSBEYXRhU291cmNlLCAKKy8vIGJ1dCBub3QgbG9hZHMgaW5pdGlhdGVkIGJ5 IGNoaWxkIGZyYW1lcycgRGF0YVNvdXJjZXMgLS0gdGhhdCdzIHRoZSBXZWJGcmFtZSdzIGpvYi4K IC0gKHZvaWQpX3N0b3BMb2FkaW5nCiB7CiAgICAgLy8gQWx3YXlzIGF0dGVtcHQgdG8gc3RvcCB0 aGUgaWNvbiBsb2FkZXIgYmVjYXVzZSBpdCBtYXkgc3RpbGwgYmUgbG9hZGluZyBhZnRlciB0aGUg ZGF0YSBzb3VyY2UKQEAgLTM4MSwyMiArMzg2LDI4IEBACiAgICAgW3NlbGYgcmV0YWluXTsKIAog ICAgIF9wcml2YXRlLT5zdG9wcGluZyA9IFlFUzsKLQorICAgIAogICAgIGlmIChfcHJpdmF0ZS0+ bWFpblJlc291cmNlTG9hZGVyKSB7Ci0gICAgICAgIC8vIFN0b3AgdGhlIG1haW4gaGFuZGxlIGFu ZCBsZXQgaXQgc2V0IHRoZSBjYW5jZWxsZWQgZXJyb3IuCisgICAgICAgIC8vIFN0b3AgdGhlIG1h aW4gcmVzb3VyY2UgbG9hZGVyIGFuZCBsZXQgaXQgc2VuZCB0aGUgY2FuY2VsbGVkIG1lc3NhZ2Uu CiAgICAgICAgIFtfcHJpdmF0ZS0+bWFpblJlc291cmNlTG9hZGVyIGNhbmNlbF07CisgICAgfSBl bHNlIGlmIChbX3ByaXZhdGUtPnN1YnJlc291cmNlTG9hZGVycyBjb3VudF0gPiAwKSB7CisgICAg ICAgIC8vIFRoZSBtYWluIHJlc291cmNlIGxvYWRlciBhbHJlYWR5IGZpbmlzaGVkIGxvYWRpbmcu IFNldCB0aGUgY2FuY2VsbGVkIGVycm9yIG9uIHRoZSAKKyAgICAgICAgLy8gZG9jdW1lbnQgYW5k IGxldCB0aGUgc3VicmVzb3VyY2VMb2FkZXJzIHNlbmQgaW5kaXZpZHVhbCBjYW5jZWxsZWQgbWVz c2FnZXMgYmVsb3cuCisgICAgICAgIFtzZWxmIF9zZXRNYWluRG9jdW1lbnRFcnJvcjpbc2VsZiBf Y2FuY2VsbGVkRXJyb3JdXTsKICAgICB9IGVsc2UgewotICAgICAgICAvLyBNYWluIGhhbmRsZSBp cyBhbHJlYWR5IGRvbmUuIFNldCB0aGUgY2FuY2VsbGVkIGVycm9yLgotICAgICAgICBOU0Vycm9y ICpjYW5jZWxsZWRFcnJvciA9IFtOU0Vycm9yIF93ZWJLaXRFcnJvcldpdGhEb21haW46TlNVUkxF cnJvckRvbWFpbgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGNvZGU6TlNVUkxFcnJvckNhbmNlbGxlZAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBVUkw6W3NlbGYg X1VSTF1dOwotICAgICAgICBbc2VsZiBfc2V0TWFpbkRvY3VtZW50RXJyb3I6Y2FuY2VsbGVkRXJy b3JdOworICAgICAgICAvLyBJZiB0aGVyZSBhcmUgbm8gcmVzb3VyY2UgbG9hZGVycywgd2UgbmVl ZCB0byBtYW51ZmFjdHVyZSBhIGNhbmNlbGxlZCBtZXNzYWdlLgorICAgICAgICAvLyAoQSBiYWNr L2ZvcndhcmQgbmF2aWdhdGlvbiBoYXMgbm8gcmVzb3VyY2UgbG9hZGVycyBiZWNhdXNlIGl0cyBy ZXNvdXJjZXMgYXJlIGNhY2hlZC4pCisgICAgICAgIFtbc2VsZiBfd2ViVmlld10gX21haW5SZWNl aXZlZEVycm9yOltzZWxmIF9jYW5jZWxsZWRFcnJvcl0KKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZnJvbURhdGFTb3VyY2U6c2VsZgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBjb21wbGV0ZTpZRVNdOwogICAgIH0KICAgICAKICAgICBOU0FycmF5ICpsb2FkZXJzID0g W19wcml2YXRlLT5zdWJyZXNvdXJjZUxvYWRlcnMgY29weV07CiAgICAgW2xvYWRlcnMgbWFrZU9i amVjdHNQZXJmb3JtU2VsZWN0b3I6QHNlbGVjdG9yKGNhbmNlbCldOwogICAgIFtsb2FkZXJzIHJl bGVhc2VdOwogCisgICAgX3ByaXZhdGUtPnN0b3BwaW5nID0gTk87CisgICAgCiAgICAgW3NlbGYg cmVsZWFzZV07CiB9CiAKQEAgLTEwMTQsOSArMTAyNSwxMCBAQAogCiAtICh2b2lkKV9jb21taXRM b2FkV2l0aERhdGE6KE5TRGF0YSAqKWRhdGEKIHsKKyAgICAvLyBCb3RoIHVubG9hZGluZyB0aGUg b2xkIHBhZ2UgYW5kIHBhcnNpbmcgdGhlIG5ldyBwYWdlIG1heSBleGVjdXRlIEphdmFTY3JpcHQg d2hpY2ggZGVzdHJveXMgdGhlIGRhdGFzb3VyY2UKKyAgICAvLyBieSBzdGFydGluZyBhIG5ldyBs b2FkLCBzbyByZXRhaW4gdGVtcG9yYXJpbHkuCisgICAgW3NlbGYgcmV0YWluXTsKICAgICBbc2Vs ZiBfY29tbWl0SWZSZWFkeV07Ci0gICAgLy8gUGFyc2luZyB0aGUgcGFnZSBtYXkgcmVzdWx0IGlu IHJ1bm5pbmcgYSBzY3JpcHQgd2hpY2ggY291bGQgZGVzdHJveSB0aGUgZGF0YXNvdXJjZSwgc28g cmV0YWluIHRlbXBvcmFyaWx5Ci0gICAgW3NlbGYgcmV0YWluXTsKICAgICBbW3NlbGYgcmVwcmVz ZW50YXRpb25dIHJlY2VpdmVkRGF0YTpkYXRhIHdpdGhEYXRhU291cmNlOnNlbGZdOwogICAgIFtb W1tzZWxmIHdlYkZyYW1lXSBmcmFtZVZpZXddIGRvY3VtZW50Vmlld10gZGF0YVNvdXJjZVVwZGF0 ZWQ6c2VsZl07CiAgICAgW3NlbGYgcmVsZWFzZV07Cg==