29644 2009-09-22 09:09:20 -0700 [GTK] Add WEBKIT_LOAD_ERROR status 2009-09-24 05:55:11 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 xan.lopez webkit-unassigned jmalonzo oldest_to_newest 149063 0 xan.lopez 2009-09-22 09:09:20 -0700 Page loads can fail to be completed and reach WEBKIT_LOAD_FINISHED status (user cancels the load, non-existent URI, etc). At the moment the only way to figure out this is to connect to both notify::load-status and WebKitWebView::load-error, which is far from ideal IMHO. This patch adds a new load-status enum, WEBKIT_LOAD_ERROR, which indicates that some error happened and that the load was stopped. In this way it's still possible to handle the whole flow of the load by only connecting to a single signal. Tests included. 149064 1 39926 xan.lopez 2009-09-22 09:15:04 -0700 Created attachment 39926 loaderror.diff 149082 2 39926 gustavo 2009-09-22 10:05:47 -0700 Comment on attachment 39926 loaderror.diff I like the idea. You have my half r+. I'll take this into consideration when re-submitting sub-resource load tracking. 149141 3 jmalonzo 2009-09-22 12:09:27 -0700 (In reply to comment #1) > Created an attachment (id=39926) [details] > loaderror.diff Does this only appply to committed load errors? 149149 4 xan.lopez 2009-09-22 12:27:23 -0700 (In reply to comment #3) > (In reply to comment #1) > > Created an attachment (id=39926) [details] [details] > > loaderror.diff > > Does this only appply to committed load errors? Not really, when a URL does not exist we'll go from provisional to error directly. Why? BTW, I'm thinking that WEBKIT_LOAD_FAIL might be a better name than WEBKIT_LOAD_ERROR, since the dispatch is called didFailLoad. Opinions? :) 149151 5 xan.lopez 2009-09-22 12:30:28 -0700 (In reply to comment #4) > (In reply to comment #3) > > (In reply to comment #1) > > > Created an attachment (id=39926) [details] [details] [details] > > > loaderror.diff > > > > Does this only appply to committed load errors? > > Not really, when a URL does not exist we'll go from provisional to error > directly. Why? > > BTW, I'm thinking that WEBKIT_LOAD_FAIL might be a better name than > WEBKIT_LOAD_ERROR, since the dispatch is called didFailLoad. Opinions? :) On the other hand the existing signal is called 'load-error', hmmm... Naming things sucks. 149154 6 39926 jmalonzo 2009-09-22 12:44:35 -0700 Comment on attachment 39926 loaderror.diff (In reply to comment #5) > (In reply to comment #4) > > (In reply to comment #3) > > > (In reply to comment #1) > > > > Created an attachment (id=39926) [details] [details] [details] [details] > > > > loaderror.diff > > > > > > Does this only appply to committed load errors? > > > > Not really, when a URL does not exist we'll go from provisional to error > > directly. Why? > > > > BTW, I'm thinking that WEBKIT_LOAD_FAIL might be a better name than > > WEBKIT_LOAD_ERROR, since the dispatch is called didFailLoad. Opinions? :) I prefer LOAD_FAIL. > On the other hand the existing signal is called 'load-error', hmmm... Naming > things sucks. Can we break API? Either way, r=me. 149738 7 xan.lopez 2009-09-24 05:55:11 -0700 Landed in r48719 renaming the status to LOAD_FAILED as discussed on IRC. 39926 2009-09-22 09:15:04 -0700 2009-09-22 12:44:35 -0700 loaderror.diff loaderror.diff text/plain 9545 xan.lopez RnJvbSA5NWQ2Njk2ZGNkYzk5YWJhNGU0ZDczOGFkZTEwNTE1NmUxY2M3YjVkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhsb3BlekBpZ2FsaWEuY29tPgpEYXRlOiBU dWUsIDIyIFNlcCAyMDA5IDE5OjEzOjQ1ICswMzAwClN1YmplY3Q6IFtQQVRDSF0gMjAwOS0wOS0y MiAgWGFuIExvcGV6ICA8eGxvcGV6QGlnYWxpYS5jb20+CgogICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKICAgICAgICBbR1RLXSBBZGQgV0VCS0lUX0xPQURfRVJST1Igc3RhdHVz CiAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI5NjQ0Cgog ICAgICAgIEFkZCBhIG5ldyBsb2FkLXN0YXR1cyBlbnVtIHZhbHVlLCBXRUJLSVRfTE9BRF9FUlJP UiwgZW1pdHRlZCB3aGVuCiAgICAgICAgdGhlcmUncyBhbiBlcnJvciBkdXJpbmcgdGhlIGxvYWQg cHJvY2Vzcy4gVGhpcyBpcyBuZWVkZWQgaWYgd2UKICAgICAgICB3YW50IG5vdGlmeTo6bG9hZC1z dGF0dXMgdG8gYmUgYWJsZSB0byBoYW5kbGUgYWxsIHNpdHVhdGlvbnMsCiAgICAgICAgc2luY2Ug V0VCS0lUX0xPQURfRklOSVNIRUQgaXMgbm90IGVtaXR0ZWQgd2hlbiB0aGVyZSdzIGFuIGVycm9y CiAgICAgICAgYW5kIHdlIGFyZSBsYWNraW5nIGEgbm90aWZpY2F0aW9uIG9mIHRoZSBsb2FkIGJl aW5nIHN0b3BwZWQuCgogICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRH dGsuY3BwOgogICAgICAgIChXZWJLaXQ6OkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZEZh aWxMb2FkKToKICAgICAgICAqIHRlc3RzL3Rlc3Rsb2FkaW5nLmM6CiAgICAgICAgKHdlYl9sb2Fk aW5nX2ZpeHR1cmVfc2V0dXApOgogICAgICAgIChsb2FkX2Vycm9yX3N0YXR1c19jaGFuZ2VkX2Ni KToKICAgICAgICAobG9hZF9lcnJvcl9jYik6CiAgICAgICAgKHRlc3RfbG9hZGluZ19lcnJvcik6 CiAgICAgICAgKGxvYWRfY2FuY2VsbGVkX2NiKToKICAgICAgICAoc3RvcF9sb2FkKToKICAgICAg ICAobG9hZF9jYW5jZWxsZWRfc3RhdHVzX2NoYW5nZWRfY2IpOgogICAgICAgICh0ZXN0X2xvYWRp bmdfY2FuY2VsbGVkKToKICAgICAgICAobWFpbik6CiAgICAgICAgKiB3ZWJraXQvd2Via2l0d2Vi ZnJhbWUuaDoKLS0tCiBXZWJLaXQvZ3RrL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB8ICAgMjcgKysrKysrKwogV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxv YWRlckNsaWVudEd0ay5jcHAgfCAgICAyICsKIFdlYktpdC9ndGsvdGVzdHMvdGVzdGxvYWRpbmcu YyAgICAgICAgICAgICAgICAgICAgIHwgICA4MCArKysrKysrKysrKysrKysrKysrLQogV2ViS2l0 L2d0ay93ZWJraXQvd2Via2l0d2ViZnJhbWUuaCAgICAgICAgICAgICAgICAgfCAgICA3ICsrLQog NCBmaWxlcyBjaGFuZ2VkLCAxMTEgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmluZGV4 IDljYmY0MzAuLjc0OTZmZGEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisrKyBi L1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzIgQEAKIDIwMDktMDktMjIgIFhhbiBM b3BleiAgPHhsb3BlekBpZ2FsaWEuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtHVEtdIEFkZCBXRUJLSVRfTE9BRF9FUlJPUiBzdGF0dXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI5NjQ0CisKKyAg ICAgICAgQWRkIGEgbmV3IGxvYWQtc3RhdHVzIGVudW0gdmFsdWUsIFdFQktJVF9MT0FEX0VSUk9S LCBlbWl0dGVkIHdoZW4KKyAgICAgICAgdGhlcmUncyBhbiBlcnJvciBkdXJpbmcgdGhlIGxvYWQg cHJvY2Vzcy4gVGhpcyBpcyBuZWVkZWQgaWYgd2UKKyAgICAgICAgd2FudCBub3RpZnk6OmxvYWQt c3RhdHVzIHRvIGJlIGFibGUgdG8gaGFuZGxlIGFsbCBzaXR1YXRpb25zLAorICAgICAgICBzaW5j ZSBXRUJLSVRfTE9BRF9GSU5JU0hFRCBpcyBub3QgZW1pdHRlZCB3aGVuIHRoZXJlJ3MgYW4gZXJy b3IKKyAgICAgICAgYW5kIHdlIGFyZSBsYWNraW5nIGEgbm90aWZpY2F0aW9uIG9mIHRoZSBsb2Fk IGJlaW5nIHN0b3BwZWQuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNs aWVudEd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRj aERpZEZhaWxMb2FkKToKKyAgICAgICAgKiB0ZXN0cy90ZXN0bG9hZGluZy5jOgorICAgICAgICAo d2ViX2xvYWRpbmdfZml4dHVyZV9zZXR1cCk6CisgICAgICAgIChsb2FkX2Vycm9yX3N0YXR1c19j aGFuZ2VkX2NiKToKKyAgICAgICAgKGxvYWRfZXJyb3JfY2IpOgorICAgICAgICAodGVzdF9sb2Fk aW5nX2Vycm9yKToKKyAgICAgICAgKGxvYWRfY2FuY2VsbGVkX2NiKToKKyAgICAgICAgKHN0b3Bf bG9hZCk6CisgICAgICAgIChsb2FkX2NhbmNlbGxlZF9zdGF0dXNfY2hhbmdlZF9jYik6CisgICAg ICAgICh0ZXN0X2xvYWRpbmdfY2FuY2VsbGVkKToKKyAgICAgICAgKG1haW4pOgorICAgICAgICAq IHdlYmtpdC93ZWJraXR3ZWJmcmFtZS5oOgorCisyMDA5LTA5LTIyICBYYW4gTG9wZXogIDx4bG9w ZXpAaWdhbGlhLmNvbT4KKwogICAgICAgICBSZXZpZXdlZCBieSBKYW4gQWxvbnpvLgogCiAgICAg ICAgIEhhcmRjb2RlIGVsZW1lbnQgcG9zaXRpb25zIGF0IDAsMCBzbyB0aGF0IHdlIGtub3cgd2hl cmUgdG8KZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJD bGllbnRHdGsuY3BwIGIvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVu dEd0ay5jcHAKaW5kZXggZWI0MmRkOS4uODRiZGEzZSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9X ZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAKKysrIGIvV2ViS2l0L2d0ay9X ZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAKQEAgLTg5NCw2ICs4OTQsOCBA QCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZEZhaWxQcm92aXNpb25hbExvYWQo Y29uc3QgUmVzb3VyY2VFcnJvciYgZXJybwogCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50OjpkaXNw YXRjaERpZEZhaWxMb2FkKGNvbnN0IFJlc291cmNlRXJyb3ImIGVycm9yKQogeworICAgIG5vdGlm eVN0YXR1cyhtX2ZyYW1lLCBXRUJLSVRfTE9BRF9FUlJPUik7CisKICAgICBXZWJLaXRXZWJWaWV3 KiB3ZWJWaWV3ID0gZ2V0Vmlld0Zyb21GcmFtZShtX2ZyYW1lKTsKICAgICBHRXJyb3IqIHdlYkVy cm9yID0gZ19lcnJvcl9uZXdfbGl0ZXJhbChnX3F1YXJrX2Zyb21fc3RyaW5nKGVycm9yLmRvbWFp bigpLnV0ZjgoKS5kYXRhKCkpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGVycm9yLmVycm9yQ29kZSgpLApkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay90ZXN0cy90 ZXN0bG9hZGluZy5jIGIvV2ViS2l0L2d0ay90ZXN0cy90ZXN0bG9hZGluZy5jCmluZGV4IDI5MWNi ZmIuLmVjZGMzNGUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvdGVzdHMvdGVzdGxvYWRpbmcuYwor KysgYi9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3Rsb2FkaW5nLmMKQEAgLTMxLDYgKzMxLDcgQEAgdHlw ZWRlZiBzdHJ1Y3QgewogICAgIGdib29sZWFuIGhhc19iZWVuX2ZpcnN0X3Zpc3VhbGx5X25vbl9l bXB0eV9sYXlvdXQ7CiAgICAgZ2Jvb2xlYW4gaGFzX2JlZW5fZmluaXNoZWQ7CiAgICAgZ2Jvb2xl YW4gaGFzX2JlZW5fZXJyb3I7CisgICAgZ2Jvb2xlYW4gaGFzX2JlZW5fbG9hZF9lcnJvcjsKIH0g V2ViTG9hZGluZ0ZpeHR1cmU7CiAKIHN0YXRpYyB2b2lkIHdlYl9sb2FkaW5nX2ZpeHR1cmVfc2V0 dXAoV2ViTG9hZGluZ0ZpeHR1cmUqIGZpeHR1cmUsIGdjb25zdHBvaW50ZXIgZGF0YSkKQEAgLTQz LDYgKzQ0LDcgQEAgc3RhdGljIHZvaWQgd2ViX2xvYWRpbmdfZml4dHVyZV9zZXR1cChXZWJMb2Fk aW5nRml4dHVyZSogZml4dHVyZSwgZ2NvbnN0cG9pbnRlcgogICAgIGZpeHR1cmUtPmhhc19iZWVu X2ZpcnN0X3Zpc3VhbGx5X25vbl9lbXB0eV9sYXlvdXQgPSBGQUxTRTsKICAgICBmaXh0dXJlLT5o YXNfYmVlbl9maW5pc2hlZCA9IEZBTFNFOwogICAgIGZpeHR1cmUtPmhhc19iZWVuX2Vycm9yID0g RkFMU0U7CisgICAgZml4dHVyZS0+aGFzX2JlZW5fbG9hZF9lcnJvciA9IEZBTFNFOwogfQogCiBz dGF0aWMgdm9pZCB3ZWJfbG9hZGluZ19maXh0dXJlX3RlYXJkb3duKFdlYkxvYWRpbmdGaXh0dXJl KiBmaXh0dXJlLCBnY29uc3Rwb2ludGVyIGRhdGEpCkBAIC0xMTcsMTcgKzExOSwyMyBAQCBzdGF0 aWMgdm9pZCBsb2FkX2Vycm9yX3N0YXR1c19jaGFuZ2VkX2NiKEdPYmplY3QqIG9iamVjdCwgR1Bh cmFtU3BlYyogcHNwZWMsIFdlYgogCiAgICAgc3dpdGNoKHN0YXR1cykgewogICAgIGNhc2UgV0VC S0lUX0xPQURfUFJPVklTSU9OQUw6Ci0gICAgICAgIGdfYXNzZXJ0KCFmaXh0dXJlLT5oYXNfYmVl bl9wcm92aXNpb25hbCk7Ci0gICAgICAgIGdfYXNzZXJ0KCFmaXh0dXJlLT5oYXNfYmVlbl9lcnJv cik7CisgICAgICAgIC8qIFdlIGFyZSBnb2luZyB0byBnbyB0aHJvdWdoIGhlcmUgdHdpY2UsIHNv IGRvbid0IGFzc2VydAorICAgICAgICAgKiBhbnl0aGluZyAqLwogICAgICAgICBmaXh0dXJlLT5o YXNfYmVlbl9wcm92aXNpb25hbCA9IFRSVUU7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgV0VC S0lUX0xPQURfRklOSVNIRUQ6CiAgICAgICAgIGdfYXNzZXJ0KGZpeHR1cmUtPmhhc19iZWVuX3By b3Zpc2lvbmFsKTsKKyAgICAgICAgZ19hc3NlcnQoZml4dHVyZS0+aGFzX2JlZW5fbG9hZF9lcnJv cik7CiAgICAgICAgIGdfYXNzZXJ0KGZpeHR1cmUtPmhhc19iZWVuX2Vycm9yKTsKICAgICAgICAg LyogV2UgYXJlIGNoZWNraW5nIHRoYXQgb25seSBvbmUgRklOSVNIRUQgaXMgcmVjZWl2ZWQgaW4g dGhlCiAgICAgICAgICAgIHdob2xlIGN5Y2xlLCBzbyBhc3NlcnQgaXQncyBGQUxTRSAqLwogICAg ICAgICBnX2Fzc2VydCghZml4dHVyZS0+aGFzX2JlZW5fZmluaXNoZWQpOwogICAgICAgICBmaXh0 dXJlLT5oYXNfYmVlbl9maW5pc2hlZCA9IFRSVUU7CisgICAgICAgIGdfbWFpbl9sb29wX3F1aXQo Zml4dHVyZS0+bG9vcCk7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgV0VCS0lUX0xPQURfRVJS T1I6CisgICAgICAgIGdfYXNzZXJ0KCFmaXh0dXJlLT5oYXNfYmVlbl9lcnJvcik7CisgICAgICAg IGZpeHR1cmUtPmhhc19iZWVuX2Vycm9yID0gVFJVRTsKICAgICAgICAgYnJlYWs7CiAgICAgZGVm YXVsdDoKICAgICAgICAgYnJlYWs7CkBAIC0xMzcsOCArMTQ1LDggQEAgc3RhdGljIHZvaWQgbG9h ZF9lcnJvcl9zdGF0dXNfY2hhbmdlZF9jYihHT2JqZWN0KiBvYmplY3QsIEdQYXJhbVNwZWMqIHBz cGVjLCBXZWIKIHN0YXRpYyBnYm9vbGVhbiBsb2FkX2Vycm9yX2NiKFdlYktpdFdlYlZpZXcqIHdl YlZpZXcsIFdlYktpdFdlYkZyYW1lKiBmcmFtZSwgY29uc3QgY2hhciogdXJpLCBHRXJyb3IgKmVy cm9yLCBXZWJMb2FkaW5nRml4dHVyZSogZml4dHVyZSkKIHsKICAgICBnX2Fzc2VydChmaXh0dXJl LT5oYXNfYmVlbl9wcm92aXNpb25hbCk7Ci0gICAgZ19hc3NlcnQoIWZpeHR1cmUtPmhhc19iZWVu X2Vycm9yKTsKLSAgICBmaXh0dXJlLT5oYXNfYmVlbl9lcnJvciA9IFRSVUU7CisgICAgZ19hc3Nl cnQoIWZpeHR1cmUtPmhhc19iZWVuX2xvYWRfZXJyb3IpOworICAgIGZpeHR1cmUtPmhhc19iZWVu X2xvYWRfZXJyb3IgPSBUUlVFOwogCiAgICAgcmV0dXJuIEZBTFNFOwogfQpAQCAtMTUxLDYgKzE1 OSw2NSBAQCBzdGF0aWMgdm9pZCB0ZXN0X2xvYWRpbmdfZXJyb3IoV2ViTG9hZGluZ0ZpeHR1cmUq IGZpeHR1cmUsIGdjb25zdHBvaW50ZXIgZGF0YSkKICAgICBnX3NpZ25hbF9jb25uZWN0KGZpeHR1 cmUtPndlYlZpZXcsICJub3RpZnk6OmxvYWQtc3RhdHVzIiwgR19DQUxMQkFDSyhsb2FkX2Vycm9y X3N0YXR1c19jaGFuZ2VkX2NiKSwgZml4dHVyZSk7CiAKICAgICB3ZWJraXRfd2ViX3ZpZXdfbG9h ZF91cmkoZml4dHVyZS0+d2ViVmlldywgImh0dHA6Ly9zbm9ldHVoc2V0dWhzZW91dG9ldXRjLmNv bS8iKTsKKyAgICBnX21haW5fbG9vcF9ydW4oZml4dHVyZS0+bG9vcCk7Cit9CisKKy8qIENhbmNl bGxlZCBsb2FkICovCisKK3N0YXRpYyBnYm9vbGVhbiBsb2FkX2NhbmNlbGxlZF9jYihXZWJLaXRX ZWJWaWV3KiB3ZWJWaWV3LCBXZWJLaXRXZWJGcmFtZSogZnJhbWUsIGNvbnN0IGNoYXIqIHVyaSwg R0Vycm9yICplcnJvciwgV2ViTG9hZGluZ0ZpeHR1cmUqIGZpeHR1cmUpCit7CisgICAgZ19hc3Nl cnQoZml4dHVyZS0+aGFzX2JlZW5fcHJvdmlzaW9uYWwpOworICAgIGdfYXNzZXJ0KGZpeHR1cmUt Pmhhc19iZWVuX2Vycm9yKTsKKyAgICBnX2Fzc2VydCghZml4dHVyZS0+aGFzX2JlZW5fbG9hZF9l cnJvcik7CisgICAgZ19hc3NlcnQoZXJyb3ItPmNvZGUgPT0gV0VCS0lUX05FVFdPUktfRVJST1Jf Q0FOQ0VMTEVEKTsKKyAgICBmaXh0dXJlLT5oYXNfYmVlbl9sb2FkX2Vycm9yID0gVFJVRTsKKwor ICAgIHJldHVybiBUUlVFOworfQorCitzdGF0aWMgZ2Jvb2xlYW4gc3RvcF9sb2FkIChncG9pbnRl ciBkYXRhKQoreworICAgIHdlYmtpdF93ZWJfdmlld19zdG9wX2xvYWRpbmcoV0VCS0lUX1dFQl9W SUVXKGRhdGEpKTsKKyAgICByZXR1cm4gRkFMU0U7Cit9CisKK3N0YXRpYyB2b2lkIGxvYWRfY2Fu Y2VsbGVkX3N0YXR1c19jaGFuZ2VkX2NiKEdPYmplY3QqIG9iamVjdCwgR1BhcmFtU3BlYyogcHNw ZWMsIFdlYkxvYWRpbmdGaXh0dXJlKiBmaXh0dXJlKQoreworICAgIFdlYktpdExvYWRTdGF0dXMg c3RhdHVzID0gd2Via2l0X3dlYl92aWV3X2dldF9sb2FkX3N0YXR1cyhXRUJLSVRfV0VCX1ZJRVco b2JqZWN0KSk7CisKKyAgICBzd2l0Y2goc3RhdHVzKSB7CisgICAgY2FzZSBXRUJLSVRfTE9BRF9Q Uk9WSVNJT05BTDoKKyAgICAgICAgZ19hc3NlcnQoIWZpeHR1cmUtPmhhc19iZWVuX3Byb3Zpc2lv bmFsKTsKKyAgICAgICAgZ19hc3NlcnQoIWZpeHR1cmUtPmhhc19iZWVuX2Vycm9yKTsKKyAgICAg ICAgZml4dHVyZS0+aGFzX2JlZW5fcHJvdmlzaW9uYWwgPSBUUlVFOworICAgICAgICBicmVhazsK KyAgICBjYXNlIFdFQktJVF9MT0FEX0NPTU1JVFRFRDoKKyAgICAgICAgZ19pZGxlX2FkZCAoc3Rv cF9sb2FkLCBvYmplY3QpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIFdFQktJVF9MT0FEX0VS Uk9SOgorICAgICAgICBnX2Fzc2VydChmaXh0dXJlLT5oYXNfYmVlbl9wcm92aXNpb25hbCk7Cisg ICAgICAgIGdfYXNzZXJ0KCFmaXh0dXJlLT5oYXNfYmVlbl9lcnJvcik7CisgICAgICAgIGdfYXNz ZXJ0KCFmaXh0dXJlLT5oYXNfYmVlbl9sb2FkX2Vycm9yKTsKKyAgICAgICAgZml4dHVyZS0+aGFz X2JlZW5fZXJyb3IgPSBUUlVFOworICAgICAgICBnX21haW5fbG9vcF9xdWl0KGZpeHR1cmUtPmxv b3ApOworICAgICAgICBicmVhazsKKyAgICBjYXNlIFdFQktJVF9MT0FEX0ZJTklTSEVEOgorICAg ICAgICBnX2Fzc2VydF9ub3RfcmVhY2hlZCgpOworICAgICAgICBicmVhazsKKyAgICBkZWZhdWx0 OgorICAgICAgICBicmVhazsKKyAgICB9Cit9CisKK3N0YXRpYyB2b2lkIHRlc3RfbG9hZGluZ19j YW5jZWxsZWQoV2ViTG9hZGluZ0ZpeHR1cmUqIGZpeHR1cmUsIGdjb25zdHBvaW50ZXIgZGF0YSkK K3sKKyAgICBnX3Rlc3RfYnVnKCIyOTY0NCIpOworCisgICAgZ19zaWduYWxfY29ubmVjdChmaXh0 dXJlLT53ZWJWaWV3LCAibG9hZC1lcnJvciIsIEdfQ0FMTEJBQ0sobG9hZF9jYW5jZWxsZWRfY2Ip LCBmaXh0dXJlKTsKKyAgICBnX3NpZ25hbF9jb25uZWN0KGZpeHR1cmUtPndlYlZpZXcsICJub3Rp Znk6OmxvYWQtc3RhdHVzIiwgR19DQUxMQkFDSyhsb2FkX2NhbmNlbGxlZF9zdGF0dXNfY2hhbmdl ZF9jYiksIGZpeHR1cmUpOworCisgICAgd2Via2l0X3dlYl92aWV3X2xvYWRfdXJpKGZpeHR1cmUt PndlYlZpZXcsICJodHRwOi8vZ29vZ2xlLmNvbS8iKTsKKyAgICBnX21haW5fbG9vcF9ydW4oZml4 dHVyZS0+bG9vcCk7CiB9CiAKIGludCBtYWluKGludCBhcmdjLCBjaGFyKiogYXJndikKQEAgLTE2 OSw2ICsyMzYsMTEgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqKiBhcmd2KQogICAgICAgICAg ICAgICAgd2ViX2xvYWRpbmdfZml4dHVyZV9zZXR1cCwKICAgICAgICAgICAgICAgIHRlc3RfbG9h ZGluZ19lcnJvciwKICAgICAgICAgICAgICAgIHdlYl9sb2FkaW5nX2ZpeHR1cmVfdGVhcmRvd24p OworICAgIGdfdGVzdF9hZGQoIi93ZWJraXQvbG9hZGluZy9jYW5jZWxsZWQiLAorICAgICAgICAg ICAgICAgV2ViTG9hZGluZ0ZpeHR1cmUsIE5VTEwsCisgICAgICAgICAgICAgICB3ZWJfbG9hZGlu Z19maXh0dXJlX3NldHVwLAorICAgICAgICAgICAgICAgdGVzdF9sb2FkaW5nX2NhbmNlbGxlZCwK KyAgICAgICAgICAgICAgIHdlYl9sb2FkaW5nX2ZpeHR1cmVfdGVhcmRvd24pOwogICAgIHJldHVy biBnX3Rlc3RfcnVuKCk7CiB9CiAKZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtp dHdlYmZyYW1lLmggYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJmcmFtZS5oCmluZGV4IDNk ZmYyYzIuLjRmMTFhNTcgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmZy YW1lLmgKKysrIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZnJhbWUuaApAQCAtNzUsMTIg Kzc1LDE3IEBAIHN0cnVjdCBfV2ViS2l0V2ViRnJhbWVDbGFzcyB7CiAgKiBiZWNhdXNlIHRoZSBk YXRhIGF2YWlsYWJsZSBhdCB0aGUgdGltZSB3YXMgbm90IHNpZ25pZmljYW50IGVub3VnaC4KICAq IEBXRUJLSVRfTE9BRF9GSU5JU0hFRDogVGhpcyBzdGF0ZSBtZWFucyB0aGF0IGV2ZXJ5dGhpbmcg dGhhdCB3YXMKICAqIHJlcXVpcmVkIHRvIGRpc3BsYXkgdGhlIHBhZ2UgaGFzIGJlZW4gbG9hZGVk LgorICogQFdFQktJVF9MT0FEX0VSUk9SOiBUaGlzIHN0YXRlIG1lYW5zIHRoYXQgc29tZSBlcnJv ciBvY2N1cnJlZAorICogZHVyaW5nIHRoZSBwYWdlIGxvYWQgdGhhdCBwcmV2ZW50ZWQgaXQgZnJv bSBiZWluZyBjb21wbGV0ZWQuIFlvdQorICogY2FuIGNvbm5lY3QgdG8gdGhlICNXZWJLaXRXZWJW aWV3Ojpsb2FkLWVycm9yIHNpZ25hbCBpZiB5b3Ugd2FudCB0bworICoga25vdyBwcmVjaXNlbHkg d2hhdCBraW5kIG9mIGVycm9yIG9jY3VycmVkLgogICovCiB0eXBlZGVmIGVudW0gewogICAgIFdF QktJVF9MT0FEX1BST1ZJU0lPTkFMLAogICAgIFdFQktJVF9MT0FEX0NPTU1JVFRFRCwKICAgICBX RUJLSVRfTE9BRF9GSU5JU0hFRCwKLSAgICBXRUJLSVRfTE9BRF9GSVJTVF9WSVNVQUxMWV9OT05f RU1QVFlfTEFZT1VUCisgICAgV0VCS0lUX0xPQURfRklSU1RfVklTVUFMTFlfTk9OX0VNUFRZX0xB WU9VVCwKKyAgICBXRUJLSVRfTE9BRF9FUlJPUgogfSBXZWJLaXRMb2FkU3RhdHVzOwogCiBXRUJL SVRfQVBJIEdUeXBlCi0tIAoxLjYuNC4yCgo=