44913 2010-08-30 17:37:47 -0700 add missing parts of didFinishDocumentLoadForFrame 2010-08-31 11:41:50 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 alice.barraclough alice.barraclough abecsi aroben kbalazs ossy sam webkit-ews webkit.review.bot zoltan oldest_to_newest 271802 0 65984 alice.barraclough 2010-08-30 17:37:47 -0700 Created attachment 65984 patch Support for didFinishDocumentLoadForFrame is currently only in InjectedBundlePageLoaderClient. Add the rest of it. 271807 1 65984 darin 2010-08-30 17:42:10 -0700 Comment on attachment 65984 patch Changes are good. But need a change log. 271811 2 aroben 2010-08-30 17:47:06 -0700 I think you also need to update DRT (and maybe MiniBrowser) to account for the new callback. 271814 3 webkit-ews 2010-08-30 17:50:03 -0700 Attachment 65984 did not build on qt: Build output: http://queues.webkit.org/results/3815184 271819 4 sam 2010-08-30 17:53:55 -0700 (In reply to comment #2) > I think you also need to update DRT (and maybe MiniBrowser) to account for the new callback. And qwkpage.cpp. 271853 5 65997 alice.barraclough 2010-08-30 18:45:45 -0700 Created attachment 65997 patch with changelog, WKTR, MiniBrowser, and qt changes thanks everyone! 271854 6 webkit.review.bot 2010-08-30 18:47:14 -0700 Attachment 65997 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit2/UIProcess/API/C/WKPage.h:91: Extra space between WKPageDidFinishDocumentLoadForFrameCallback and didFinishDocumentLoadForFrame [whitespace/declaration] [3] WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h:77: Extra space between WKBundlePageDidFinishDocumentLoadForFrameCallback and didFinishDocumentLoadForFrame [whitespace/declaration] [3] Total errors found: 2 in 11 files If any of these errors are false positives, please file a bug against check-webkit-style. 271855 7 65998 alice.barraclough 2010-08-30 18:48:44 -0700 Created attachment 65998 (for real this time) patch with changelog, WKTR, MiniBrowser, and qt changes lol what is wrong with me today 271856 8 webkit.review.bot 2010-08-30 18:50:06 -0700 Attachment 65998 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit2/UIProcess/API/C/WKPage.h:91: Extra space between WKPageDidFinishDocumentLoadForFrameCallback and didFinishDocumentLoadForFrame [whitespace/declaration] [3] WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h:77: Extra space between WKBundlePageDidFinishDocumentLoadForFrameCallback and didFinishDocumentLoadForFrame [whitespace/declaration] [3] Total errors found: 2 in 15 files If any of these errors are false positives, please file a bug against check-webkit-style. 271858 9 webkit-ews 2010-08-30 18:56:24 -0700 Attachment 65997 did not build on qt: Build output: http://queues.webkit.org/results/3854159 271941 10 ossy 2010-08-30 22:54:10 -0700 http://trac.webkit.org/changeset/66448 broke Qt build: ../../../WebKit2/UIProcess/API/qt/qwkpage.cpp: In constructor ‘QWKPage::QWKPage(OpaqueWKPageNamespace*)’: ../../../WebKit2/UIProcess/API/qt/qwkpage.cpp:228: error: ‘qt_wk_didFinishDocumentLoadForFrame’ was not declared in this scope 271983 11 ossy 2010-08-31 01:48:49 -0700 (In reply to comment #10) > http://trac.webkit.org/changeset/66448 broke Qt build: > > ../../../WebKit2/UIProcess/API/qt/qwkpage.cpp: In constructor ‘QWKPage::QWKPage(OpaqueWKPageNamespace*)’: > ../../../WebKit2/UIProcess/API/qt/qwkpage.cpp:228: error: ‘qt_wk_didFinishDocumentLoadForFrame’ was not declared in this scope Fix landed in http://trac.webkit.org/changeset/66466 272237 12 alice.barraclough 2010-08-31 11:40:41 -0700 my apologies. thank you for the qt build fix. (In reply to comment #11) 65984 2010-08-30 17:37:47 -0700 2010-08-30 18:45:45 -0700 patch didFinishDocumentLoad.txt text/plain 11649 alice.barraclough SW5kZXg6IFdlYktpdDIvU2hhcmVkL0NvcmVJUENTdXBwb3J0L1dlYlBhZ2VQcm94eU1lc3NhZ2VL aW5kcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvU2hhcmVkL0NvcmVJUENTdXBwb3J0L1dlYlBh Z2VQcm94eU1lc3NhZ2VLaW5kcy5oCShyZXZpc2lvbiA2NjQwMSkKKysrIFdlYktpdDIvU2hhcmVk L0NvcmVJUENTdXBwb3J0L1dlYlBhZ2VQcm94eU1lc3NhZ2VLaW5kcy5oCSh3b3JraW5nIGNvcHkp CkBAIC01MCw2ICs1MCw3IEBAIGVudW0gS2luZCB7CiAgICAgRGlkQ3JlYXRlU3ViRnJhbWUsCiAg ICAgRGlkRmFpbExvYWRGb3JGcmFtZSwKICAgICBEaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJh bWUsCisgICAgRGlkRmluaXNoRG9jdW1lbnRMb2FkRm9yRnJhbWUsCiAgICAgRGlkRmluaXNoTG9h ZEZvckZyYW1lLAogICAgIERpZEZpbmlzaFByb2dyZXNzLAogICAgIERpZEZpcnN0TGF5b3V0Rm9y RnJhbWUsCkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJMb2FkZXJDbGllbnQuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYkxvYWRlckNsaWVudC5jcHAJKHJldmlzaW9u IDY2NDAxKQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTG9hZGVyQ2xpZW50LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNjcsNiArNjcsMTIgQEAgdm9pZCBXZWJMb2FkZXJDbGllbnQ6OmRpZENvbW1p dExvYWRGb3JGcgogICAgICAgICBtX3BhZ2VMb2FkZXJDbGllbnQuZGlkQ29tbWl0TG9hZEZvckZy YW1lKHRvUmVmKHBhZ2UpLCB0b1JlZihmcmFtZSksIG1fcGFnZUxvYWRlckNsaWVudC5jbGllbnRJ bmZvKTsKIH0KIAordm9pZCBXZWJMb2FkZXJDbGllbnQ6OmRpZEZpbmlzaERvY3VtZW50TG9hZEZv ckZyYW1lKFdlYlBhZ2VQcm94eSogcGFnZSwgV2ViRnJhbWVQcm94eSogZnJhbWUpCit7CisgICAg aWYgKG1fcGFnZUxvYWRlckNsaWVudC5kaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZSkKKyAg ICAgICAgbV9wYWdlTG9hZGVyQ2xpZW50LmRpZEZpbmlzaERvY3VtZW50TG9hZEZvckZyYW1lKHRv UmVmKHBhZ2UpLCB0b1JlZihmcmFtZSksIG1fcGFnZUxvYWRlckNsaWVudC5jbGllbnRJbmZvKTsK K30KKwogdm9pZCBXZWJMb2FkZXJDbGllbnQ6OmRpZEZpbmlzaExvYWRGb3JGcmFtZShXZWJQYWdl UHJveHkqIHBhZ2UsIFdlYkZyYW1lUHJveHkqIGZyYW1lKQogewogICAgIGlmIChtX3BhZ2VMb2Fk ZXJDbGllbnQuZGlkRmluaXNoTG9hZEZvckZyYW1lKQpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViTG9hZGVyQ2xpZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTG9h ZGVyQ2xpZW50LmgJKHJldmlzaW9uIDY2NDAxKQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTG9h ZGVyQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTQzLDYgKzQzLDcgQEAgcHVibGljOgogICAg IHZvaWQgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUo V2ViUGFnZVByb3h5KiwgV2ViRnJhbWVQcm94eSopOwogICAgIHZvaWQgZGlkRmFpbFByb3Zpc2lv bmFsTG9hZFdpdGhFcnJvckZvckZyYW1lKFdlYlBhZ2VQcm94eSosIFdlYkZyYW1lUHJveHkqKTsK ICAgICB2b2lkIGRpZENvbW1pdExvYWRGb3JGcmFtZShXZWJQYWdlUHJveHkqLCBXZWJGcmFtZVBy b3h5Kik7CisgICAgdm9pZCBkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZShXZWJQYWdlUHJv eHkqLCBXZWJGcmFtZVByb3h5Kik7CiAgICAgdm9pZCBkaWRGaW5pc2hMb2FkRm9yRnJhbWUoV2Vi UGFnZVByb3h5KiwgV2ViRnJhbWVQcm94eSopOwogICAgIHZvaWQgZGlkRmFpbExvYWRXaXRoRXJy b3JGb3JGcmFtZShXZWJQYWdlUHJveHkqLCBXZWJGcmFtZVByb3h5Kik7CiAgICAgdm9pZCBkaWRS ZWNlaXZlVGl0bGVGb3JGcmFtZShXZWJQYWdlUHJveHkqLCBXVEY6OlN0cmluZ0ltcGwqLCBXZWJG cmFtZVByb3h5Kik7CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9u IDY2NDAxKQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNDU0LDYgKzQ1NCwxMyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUmVjZWl2ZU1l c3NhZ2UoQ29yCiAgICAgICAgICAgICBkaWRDb21taXRMb2FkRm9yRnJhbWUocHJvY2VzcygpLT53 ZWJGcmFtZShmcmFtZUlEKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQorICAgICAg ICBjYXNlIFdlYlBhZ2VQcm94eU1lc3NhZ2U6OkRpZEZpbmlzaERvY3VtZW50TG9hZEZvckZyYW1l OiB7CisgICAgICAgICAgICB1aW50NjRfdCBmcmFtZUlEOworICAgICAgICAgICAgaWYgKCFhcmd1 bWVudHMtPmRlY29kZShmcmFtZUlEKSkKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAg ICAgICBkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZShwcm9jZXNzKCktPndlYkZyYW1lKGZy YW1lSUQpKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CiAgICAgICAgIGNhc2UgV2Vi UGFnZVByb3h5TWVzc2FnZTo6RGlkRmluaXNoTG9hZEZvckZyYW1lOiB7CiAgICAgICAgICAgICB1 aW50NjRfdCBmcmFtZUlEOwogICAgICAgICAgICAgaWYgKCFhcmd1bWVudHMtPmRlY29kZShmcmFt ZUlEKSkKQEAgLTc5NCw2ICs4MDEsMTEgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZENvbW1pdExv YWRGb3JGcmFtZQogICAgIG1fbG9hZGVyQ2xpZW50LmRpZENvbW1pdExvYWRGb3JGcmFtZSh0aGlz LCBmcmFtZSk7CiB9CiAKK3ZvaWQgV2ViUGFnZVByb3h5OjpkaWRGaW5pc2hEb2N1bWVudExvYWRG b3JGcmFtZShXZWJGcmFtZVByb3h5KiBmcmFtZSkKK3sKKyAgICBtX2xvYWRlckNsaWVudC5kaWRG aW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZSh0aGlzLCBmcmFtZSk7Cit9CisKIHZvaWQgV2ViUGFn ZVByb3h5OjpkaWRGaW5pc2hMb2FkRm9yRnJhbWUoV2ViRnJhbWVQcm94eSogZnJhbWUpCiB7CiAg ICAgZnJhbWUtPmRpZEZpbmlzaExvYWQoKTsKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o CShyZXZpc2lvbiA2NjQwMSkKKysrIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCSh3 b3JraW5nIGNvcHkpCkBAIC0xODMsNiArMTgzLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpZFJl Y2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKFdlYkZyYW1lUHJv eHkqKTsKICAgICB2b2lkIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZShXZWJGcmFtZVBy b3h5Kik7CiAgICAgdm9pZCBkaWRDb21taXRMb2FkRm9yRnJhbWUoV2ViRnJhbWVQcm94eSopOwor ICAgIHZvaWQgZGlkRmluaXNoRG9jdW1lbnRMb2FkRm9yRnJhbWUoV2ViRnJhbWVQcm94eSopOwog ICAgIHZvaWQgZGlkRmluaXNoTG9hZEZvckZyYW1lKFdlYkZyYW1lUHJveHkqKTsKICAgICB2b2lk IGRpZEZhaWxMb2FkRm9yRnJhbWUoV2ViRnJhbWVQcm94eSopOwogICAgIHZvaWQgZGlkUmVjZWl2 ZVRpdGxlRm9yRnJhbWUoV2ViRnJhbWVQcm94eSosIGNvbnN0IFdURjo6U3RyaW5nJik7CkluZGV4 OiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAkocmV2aXNpb24gNjY0MDEpCisrKyBXZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtNjEsNiArNjEsNyBAQCB0 eXBlZGVmIHZvaWQgKCpXS1BhZ2VEaWRTdGFydFByb3Zpc2lvbmFsCiB0eXBlZGVmIHZvaWQgKCpX S1BhZ2VEaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZUNh bGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCAqY2xp ZW50SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpXS1BhZ2VEaWRGYWlsUHJvdmlzaW9uYWxMb2FkV2l0 aEVycm9yRm9yRnJhbWVDYWxsYmFjaykoV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUs IGNvbnN0IHZvaWQgKmNsaWVudEluZm8pOyAvLyBGSVhNRTogQWRkIFdLRXJyb3JSZWYuCiB0eXBl ZGVmIHZvaWQgKCpXS1BhZ2VEaWRDb21taXRMb2FkRm9yRnJhbWVDYWxsYmFjaykoV0tQYWdlUmVm IHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pOwordHlwZWRl ZiB2b2lkICgqV0tQYWdlRGlkRmluaXNoRG9jdW1lbnRMb2FkRm9yRnJhbWVDYWxsYmFjaykoV0tQ YWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pOwog dHlwZWRlZiB2b2lkICgqV0tQYWdlRGlkRmluaXNoTG9hZEZvckZyYW1lQ2FsbGJhY2spKFdLUGFn ZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsKIHR5 cGVkZWYgdm9pZCAoKldLUGFnZURpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWVDYWxsYmFjayko V0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8p OyAvLyBGSVhNRTogQWRkIFdLRXJyb3JSZWYuCiB0eXBlZGVmIHZvaWQgKCpXS1BhZ2VEaWRSZWNl aXZlVGl0bGVGb3JGcmFtZUNhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tTdHJpbmdSZWYgdGl0 bGUsIFdLRnJhbWVSZWYgZnJhbWUsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pOwpAQCAtODcsNiAr ODgsNyBAQCBzdHJ1Y3QgV0tQYWdlTG9hZGVyQ2xpZW50IHsKICAgICBXS1BhZ2VEaWRSZWNlaXZl U2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZUNhbGxiYWNrICAgIGRpZFJl Y2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOwogICAgIFdLUGFn ZURpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3JGb3JGcmFtZUNhbGxiYWNrICAgICAgICAg ICAgICAgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhFcnJvckZvckZyYW1lOwogICAgIFdLUGFn ZURpZENvbW1pdExvYWRGb3JGcmFtZUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZGlkQ29tbWl0TG9hZEZvckZyYW1lOworICAgIFdLUGFnZURpZEZpbmlzaERvY3VtZW50 TG9hZEZvckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgZGlkRmluaXNoRG9j dW1lbnRMb2FkRm9yRnJhbWU7CiAgICAgV0tQYWdlRGlkRmluaXNoTG9hZEZvckZyYW1lQ2FsbGJh Y2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWRGaW5pc2hMb2FkRm9yRnJhbWU7 CiAgICAgV0tQYWdlRGlkRmFpbExvYWRXaXRoRXJyb3JGb3JGcmFtZUNhbGxiYWNrICAgICAgICAg ICAgICAgICAgICAgICAgICBkaWRGYWlsTG9hZFdpdGhFcnJvckZvckZyYW1lOwogICAgIFdLUGFn ZURpZFJlY2VpdmVUaXRsZUZvckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZGlkUmVjZWl2ZVRpdGxlRm9yRnJhbWU7CkluZGV4OiBXZWJLaXQyL1dlYlByb2Nlc3Mv SW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQ YWdlTG9hZGVyQ2xpZW50LmNwcAkocmV2aXNpb24gNjY0MDEpCisrKyBXZWJLaXQyL1dlYlByb2Nl c3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmNwcAkod29y a2luZyBjb3B5KQpAQCAtNzAsNiArNzAsMTIgQEAgdm9pZCBJbmplY3RlZEJ1bmRsZVBhZ2VMb2Fk ZXJDbGllbnQ6OmRpZAogICAgICAgICBtX2NsaWVudC5kaWRDb21taXRMb2FkRm9yRnJhbWUodG9S ZWYocGFnZSksIHRvUmVmKGZyYW1lKSwgbV9jbGllbnQuY2xpZW50SW5mbyk7CiB9CiAKK3ZvaWQg SW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50OjpkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JG cmFtZShXZWJQYWdlKiBwYWdlLCBXZWJGcmFtZSogZnJhbWUpCit7CisgICAgaWYgKG1fY2xpZW50 LmRpZEZpbmlzaERvY3VtZW50TG9hZEZvckZyYW1lKQorICAgICAgICBtX2NsaWVudC5kaWRGaW5p c2hEb2N1bWVudExvYWRGb3JGcmFtZSh0b1JlZihwYWdlKSwgdG9SZWYoZnJhbWUpLCBtX2NsaWVu dC5jbGllbnRJbmZvKTsKK30KKwogdm9pZCBJbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQ6 OmRpZEZpbmlzaExvYWRGb3JGcmFtZShXZWJQYWdlKiBwYWdlLCBXZWJGcmFtZSogZnJhbWUpCiB7 CiAgICAgaWYgKG1fY2xpZW50LmRpZEZpbmlzaExvYWRGb3JGcmFtZSkKQEAgLTExMiwxMiArMTE4 LDYgQEAgdm9pZCBJbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQ6OmRpZAogICAgICAgICBt X2NsaWVudC5kaWRDaGFuZ2VMb2NhdGlvbldpdGhpblBhZ2VGb3JGcmFtZSh0b1JlZihwYWdlKSwg dG9SZWYoZnJhbWUpLCBtX2NsaWVudC5jbGllbnRJbmZvKTsKIH0KIAotdm9pZCBJbmplY3RlZEJ1 bmRsZVBhZ2VMb2FkZXJDbGllbnQ6OmRpZEZpbmlzaERvY3VtZW50TG9hZEZvckZyYW1lKFdlYlBh Z2UqIHBhZ2UsIFdlYkZyYW1lKiBmcmFtZSkKLXsKLSAgICBpZiAobV9jbGllbnQuZGlkRmluaXNo RG9jdW1lbnRMb2FkRm9yRnJhbWUpCi0gICAgICAgIG1fY2xpZW50LmRpZEZpbmlzaERvY3VtZW50 TG9hZEZvckZyYW1lKHRvUmVmKHBhZ2UpLCB0b1JlZihmcmFtZSksIG1fY2xpZW50LmNsaWVudElu Zm8pOwotfQotCiB2b2lkIEluamVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVudDo6ZGlkSGFuZGxl T25sb2FkRXZlbnRzRm9yRnJhbWUoV2ViUGFnZSogcGFnZSwgV2ViRnJhbWUqIGZyYW1lKQogewog ICAgIGlmIChtX2NsaWVudC5kaWRIYW5kbGVPbmxvYWRFdmVudHNGb3JGcmFtZSkKSW5kZXg6IFdl YktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJD bGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUv SW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmgJKHJldmlzaW9uIDY2NDAxKQorKysgV2Vi S2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZUxvYWRlckNs aWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC00NCw2ICs0NCw3IEBAIHB1YmxpYzoKICAgICB2b2lk IGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKFdlYlBh Z2UqLCBXZWJGcmFtZSopOwogICAgIHZvaWQgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhFcnJv ckZvckZyYW1lKFdlYlBhZ2UqLCBXZWJGcmFtZSopOwogICAgIHZvaWQgZGlkQ29tbWl0TG9hZEZv ckZyYW1lKFdlYlBhZ2UqLCBXZWJGcmFtZSopOworICAgIHZvaWQgZGlkRmluaXNoRG9jdW1lbnRM b2FkRm9yRnJhbWUoV2ViUGFnZSosIFdlYkZyYW1lKik7CiAgICAgdm9pZCBkaWRGaW5pc2hMb2Fk Rm9yRnJhbWUoV2ViUGFnZSosIFdlYkZyYW1lKik7CiAgICAgdm9pZCBkaWRGYWlsTG9hZFdpdGhF cnJvckZvckZyYW1lKFdlYlBhZ2UqLCBXZWJGcmFtZSopOwogICAgIHZvaWQgZGlkUmVjZWl2ZVRp dGxlRm9yRnJhbWUoV2ViUGFnZSosIGNvbnN0IFdURjo6U3RyaW5nJiwgV2ViRnJhbWUqKTsKQEAg LTUxLDcgKzUyLDYgQEAgcHVibGljOgogICAgIHZvaWQgZGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3RG b3JGcmFtZShXZWJQYWdlKiwgV2ViRnJhbWUqKTsKICAgICB2b2lkIHdpbGxQZXJmb3JtQ2xpZW50 UmVkaXJlY3RGb3JGcmFtZShXZWJQYWdlKiwgV2ViRnJhbWUqLCBjb25zdCBXVEY6OlN0cmluZyYg dXJsLCBkb3VibGUgZGVsYXksIGRvdWJsZSBkYXRlKTsKICAgICB2b2lkIGRpZENoYW5nZUxvY2F0 aW9uV2l0aGluUGFnZUZvckZyYW1lKFdlYlBhZ2UqLCBXZWJGcmFtZSopOwotICAgIHZvaWQgZGlk RmluaXNoRG9jdW1lbnRMb2FkRm9yRnJhbWUoV2ViUGFnZSosIFdlYkZyYW1lKik7CiAgICAgdm9p ZCBkaWRIYW5kbGVPbmxvYWRFdmVudHNGb3JGcmFtZShXZWJQYWdlKiwgV2ViRnJhbWUqKTsKICAg ICB2b2lkIGRpZERpc3BsYXlJbnNlY3VyZUNvbnRlbnRGb3JGcmFtZShXZWJQYWdlKiwgV2ViRnJh bWUqKTsKICAgICB2b2lkIGRpZFJ1bkluc2VjdXJlQ29udGVudEZvckZyYW1lKFdlYlBhZ2UqLCBX ZWJGcmFtZSopOwpJbmRleDogV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9j L1dLQnVuZGxlUGFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3Rl ZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuaAkocmV2aXNpb24gNjY0MDEpCisrKyBXZWJLaXQy L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlLmgJKHdvcmtpbmcg Y29weSkKQEAgLTUzLDYgKzUzLDcgQEAgdHlwZWRlZiB2b2lkICgqV0tCdW5kbGVQYWdlRGlkU3Rh cnRQcm92aQogdHlwZWRlZiB2b2lkICgqV0tCdW5kbGVQYWdlRGlkUmVjZWl2ZVNlcnZlclJlZGly ZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWVDYWxsYmFjaykoV0tCdW5kbGVQYWdlUmVmIHBh Z2UsIFdLQnVuZGxlRnJhbWVSZWYgZnJhbWUsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pOwogdHlw ZWRlZiB2b2lkICgqV0tCdW5kbGVQYWdlRGlkRmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhFcnJvckZv ckZyYW1lQ2FsbGJhY2spKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBXS0J1bmRsZUZyYW1lUmVmIGZy YW1lLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsgLy8gRklYTUU6IEFkZCBXS0Vycm9yUmVmLgog dHlwZWRlZiB2b2lkICgqV0tCdW5kbGVQYWdlRGlkQ29tbWl0TG9hZEZvckZyYW1lQ2FsbGJhY2sp KFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBXS0J1bmRsZUZyYW1lUmVmIGZyYW1lLCBjb25zdCB2b2lk ICpjbGllbnRJbmZvKTsKK3R5cGVkZWYgdm9pZCAoKldLQnVuZGxlUGFnZURpZERvY3VtZW50Rmlu aXNoTG9hZEZvckZyYW1lQ2FsbGJhY2spKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBXS0J1bmRsZUZy YW1lUmVmIGZyYW1lLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsKIHR5cGVkZWYgdm9pZCAoKldL QnVuZGxlUGFnZURpZEZpbmlzaExvYWRGb3JGcmFtZUNhbGxiYWNrKShXS0J1bmRsZVBhZ2VSZWYg cGFnZSwgV0tCdW5kbGVGcmFtZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7CiB0 eXBlZGVmIHZvaWQgKCpXS0J1bmRsZVBhZ2VEaWRGYWlsTG9hZFdpdGhFcnJvckZvckZyYW1lQ2Fs bGJhY2spKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBXS0J1bmRsZUZyYW1lUmVmIGZyYW1lLCBjb25z dCB2b2lkICpjbGllbnRJbmZvKTsgLy8gRklYTUU6IEFkZCBXS0Vycm9yUmVmLgogdHlwZWRlZiB2 b2lkICgqV0tCdW5kbGVQYWdlRGlkUmVjZWl2ZVRpdGxlRm9yRnJhbWVDYWxsYmFjaykoV0tCdW5k bGVQYWdlUmVmIHBhZ2UsIFdLU3RyaW5nUmVmIHRpdGxlLCBXS0J1bmRsZUZyYW1lUmVmIGZyYW1l LCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsKQEAgLTczLDYgKzc0LDcgQEAgc3RydWN0IFdLQnVu ZGxlUGFnZUxvYWRlckNsaWVudCB7CiAgICAgV0tCdW5kbGVQYWdlRGlkUmVjZWl2ZVNlcnZlclJl ZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWVDYWxsYmFjayAgICBkaWRSZWNlaXZlU2Vy dmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZTsKICAgICBXS0J1bmRsZVBhZ2VE aWRGYWlsUHJvdmlzaW9uYWxMb2FkV2l0aEVycm9yRm9yRnJhbWVDYWxsYmFjayAgICAgICAgIGRp ZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3JGb3JGcmFtZTsKICAgICBXS0J1bmRsZVBhZ2VE aWRDb21taXRMb2FkRm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgIGRp ZENvbW1pdExvYWRGb3JGcmFtZTsKKyAgICBXS0J1bmRsZVBhZ2VEaWRGaW5pc2hEb2N1bWVudExv YWRGb3JGcmFtZUNhbGxiYWNrICAgICAgICAgICAgICAgICAgIGRpZEZpbmlzaERvY3VtZW50TG9h ZEZvckZyYW1lOwogICAgIFdLQnVuZGxlUGFnZURpZEZpbmlzaExvYWRGb3JGcmFtZUNhbGxiYWNr ICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlkRmluaXNoTG9hZEZvckZyYW1lOwogICAgIFdL QnVuZGxlUGFnZURpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAg ICAgICAgICAgZGlkRmFpbExvYWRXaXRoRXJyb3JGb3JGcmFtZTsKICAgICBXS0J1bmRsZVBhZ2VE aWRSZWNlaXZlVGl0bGVGb3JGcmFtZUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgIGRp ZFJlY2VpdmVUaXRsZUZvckZyYW1lOwpAQCAtODAsNyArODIsNiBAQCBzdHJ1Y3QgV0tCdW5kbGVQ YWdlTG9hZGVyQ2xpZW50IHsKICAgICBXS0J1bmRsZVBhZ2VEaWRDYW5jZWxDbGllbnRSZWRpcmVj dEZvckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAgICAgIGRpZENhbmNlbENsaWVudFJlZGlyZWN0 Rm9yRnJhbWU7CiAgICAgV0tCdW5kbGVQYWdlV2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdEZvckZy YW1lQ2FsbGJhY2sgICAgICAgICAgICAgICB3aWxsUGVyZm9ybUNsaWVudFJlZGlyZWN0Rm9yRnJh bWU7CiAgICAgV0tCdW5kbGVQYWdlRGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlRm9yRnJhbWVD YWxsYmFjayAgICAgICAgICAgICBkaWRDaGFuZ2VMb2NhdGlvbldpdGhpblBhZ2VGb3JGcmFtZTsK LSAgICBXS0J1bmRsZVBhZ2VEaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZUNhbGxiYWNrICAg ICAgICAgICAgICAgICAgIGRpZEZpbmlzaERvY3VtZW50TG9hZEZvckZyYW1lOwogICAgIFdLQnVu ZGxlUGFnZURpZEhhbmRsZU9ubG9hZEV2ZW50c0ZvckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAg ICAgICAgZGlkSGFuZGxlT25sb2FkRXZlbnRzRm9yRnJhbWU7CiAgICAgV0tCdW5kbGVQYWdlRGlk RGlzcGxheUluc2VjdXJlQ29udGVudEZvckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAgICBkaWRE aXNwbGF5SW5zZWN1cmVDb250ZW50Rm9yRnJhbWU7CiAgICAgV0tCdW5kbGVQYWdlRGlkUnVuSW5z ZWN1cmVDb250ZW50Rm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICAgICBkaWRSdW5JbnNl Y3VyZUNvbnRlbnRGb3JGcmFtZTsK 65997 2010-08-30 18:45:45 -0700 2010-08-30 18:48:44 -0700 patch with changelog, WKTR, MiniBrowser, and qt changes patchDidFinishDocumentLoad.txt text/plain 13699 alice.barraclough SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NjQ0MykKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjggQEAKKzIwMTAtMDgtMzAgIEFsaWNlIExpdSAgPGFsaWNlLmxpdUBhcHBsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk IG1pc3NpbmcgcGFydHMgb2YgZGlkRmluaXNoRG9jdW1lbnRMb2FkRm9yRnJhbWUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0OTEzCisKKyAgICAgICAg KiBTaGFyZWQvQ29yZUlQQ1N1cHBvcnQvV2ViUGFnZVByb3h5TWVzc2FnZUtpbmRzLmg6IEFkZGVk IG5ldyBraW5kCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHA6CisgICAgICAgIChRV0tQYWdlOjpRV0tQYWdl KTogVXBkYXRlZCBzdHJ1Y3QKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViTG9hZGVyQ2xpZW50LmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViTG9hZGVyQ2xpZW50OjpkaWRGaW5pc2hEb2N1bWVudExv YWRGb3JGcmFtZSk6IEFkZGVkCisgICAgICAgICogVUlQcm9jZXNzL1dlYkxvYWRlckNsaWVudC5o OgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlKTogQWRkZWQgY2FzZSBmb3IgV2ViUGFn ZVByb3h5TWVzc2FnZTo6RGlkRmluaXNoRG9jdW1lbnRMb2FkRm9yRnJhbWUKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5OjpkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZSk6IEFkZGVk CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorCisgICAgICAgIEp1c3QgcmVh cnJhbmdpbmcgZXhpc3RpbmcgY29kZSBpbiB0aGVzZToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0lu amVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3Mv SW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6SW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50OjpkaWRGaW5pc2hEb2N1 bWVudExvYWRGb3JGcmFtZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9J bmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQuaDoKKwogMjAxMC0wOC0zMCAgU2FtIFdlaW5p ZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFRyeSBhbmQgZml4IHRoZSBXZWJLaXQyIGJ1 aWxkYm90LgpJbmRleDogV2ViS2l0Mi9TaGFyZWQvQ29yZUlQQ1N1cHBvcnQvV2ViUGFnZVByb3h5 TWVzc2FnZUtpbmRzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9TaGFyZWQvQ29yZUlQQ1N1cHBv cnQvV2ViUGFnZVByb3h5TWVzc2FnZUtpbmRzLmgJKHJldmlzaW9uIDY2NDAxKQorKysgV2ViS2l0 Mi9TaGFyZWQvQ29yZUlQQ1N1cHBvcnQvV2ViUGFnZVByb3h5TWVzc2FnZUtpbmRzLmgJKHdvcmtp bmcgY29weSkKQEAgLTUwLDYgKzUwLDcgQEAgZW51bSBLaW5kIHsKICAgICBEaWRDcmVhdGVTdWJG cmFtZSwKICAgICBEaWRGYWlsTG9hZEZvckZyYW1lLAogICAgIERpZEZhaWxQcm92aXNpb25hbExv YWRGb3JGcmFtZSwKKyAgICBEaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZSwKICAgICBEaWRG aW5pc2hMb2FkRm9yRnJhbWUsCiAgICAgRGlkRmluaXNoUHJvZ3Jlc3MsCiAgICAgRGlkRmlyc3RM YXlvdXRGb3JGcmFtZSwKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1dlYkxvYWRlckNsaWVudC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTG9hZGVyQ2xpZW50LmNwcAko cmV2aXNpb24gNjY0MDEpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJMb2FkZXJDbGllbnQuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC02Nyw2ICs2NywxMiBAQCB2b2lkIFdlYkxvYWRlckNsaWVudDo6 ZGlkQ29tbWl0TG9hZEZvckZyCiAgICAgICAgIG1fcGFnZUxvYWRlckNsaWVudC5kaWRDb21taXRM b2FkRm9yRnJhbWUodG9SZWYocGFnZSksIHRvUmVmKGZyYW1lKSwgbV9wYWdlTG9hZGVyQ2xpZW50 LmNsaWVudEluZm8pOwogfQogCit2b2lkIFdlYkxvYWRlckNsaWVudDo6ZGlkRmluaXNoRG9jdW1l bnRMb2FkRm9yRnJhbWUoV2ViUGFnZVByb3h5KiBwYWdlLCBXZWJGcmFtZVByb3h5KiBmcmFtZSkK K3sKKyAgICBpZiAobV9wYWdlTG9hZGVyQ2xpZW50LmRpZEZpbmlzaERvY3VtZW50TG9hZEZvckZy YW1lKQorICAgICAgICBtX3BhZ2VMb2FkZXJDbGllbnQuZGlkRmluaXNoRG9jdW1lbnRMb2FkRm9y RnJhbWUodG9SZWYocGFnZSksIHRvUmVmKGZyYW1lKSwgbV9wYWdlTG9hZGVyQ2xpZW50LmNsaWVu dEluZm8pOworfQorCiB2b2lkIFdlYkxvYWRlckNsaWVudDo6ZGlkRmluaXNoTG9hZEZvckZyYW1l KFdlYlBhZ2VQcm94eSogcGFnZSwgV2ViRnJhbWVQcm94eSogZnJhbWUpCiB7CiAgICAgaWYgKG1f cGFnZUxvYWRlckNsaWVudC5kaWRGaW5pc2hMb2FkRm9yRnJhbWUpCkluZGV4OiBXZWJLaXQyL1VJ UHJvY2Vzcy9XZWJMb2FkZXJDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vz cy9XZWJMb2FkZXJDbGllbnQuaAkocmV2aXNpb24gNjY0MDEpCisrKyBXZWJLaXQyL1VJUHJvY2Vz cy9XZWJMb2FkZXJDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtNDMsNiArNDMsNyBAQCBwdWJs aWM6CiAgICAgdm9pZCBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRG b3JGcmFtZShXZWJQYWdlUHJveHkqLCBXZWJGcmFtZVByb3h5Kik7CiAgICAgdm9pZCBkaWRGYWls UHJvdmlzaW9uYWxMb2FkV2l0aEVycm9yRm9yRnJhbWUoV2ViUGFnZVByb3h5KiwgV2ViRnJhbWVQ cm94eSopOwogICAgIHZvaWQgZGlkQ29tbWl0TG9hZEZvckZyYW1lKFdlYlBhZ2VQcm94eSosIFdl YkZyYW1lUHJveHkqKTsKKyAgICB2b2lkIGRpZEZpbmlzaERvY3VtZW50TG9hZEZvckZyYW1lKFdl YlBhZ2VQcm94eSosIFdlYkZyYW1lUHJveHkqKTsKICAgICB2b2lkIGRpZEZpbmlzaExvYWRGb3JG cmFtZShXZWJQYWdlUHJveHkqLCBXZWJGcmFtZVByb3h5Kik7CiAgICAgdm9pZCBkaWRGYWlsTG9h ZFdpdGhFcnJvckZvckZyYW1lKFdlYlBhZ2VQcm94eSosIFdlYkZyYW1lUHJveHkqKTsKICAgICB2 b2lkIGRpZFJlY2VpdmVUaXRsZUZvckZyYW1lKFdlYlBhZ2VQcm94eSosIFdURjo6U3RyaW5nSW1w bCosIFdlYkZyYW1lUHJveHkqKTsKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAko cmV2aXNpb24gNjY0MDEpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC00NTQsNiArNDU0LDEzIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRS ZWNlaXZlTWVzc2FnZShDb3IKICAgICAgICAgICAgIGRpZENvbW1pdExvYWRGb3JGcmFtZShwcm9j ZXNzKCktPndlYkZyYW1lKGZyYW1lSUQpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9 CisgICAgICAgIGNhc2UgV2ViUGFnZVByb3h5TWVzc2FnZTo6RGlkRmluaXNoRG9jdW1lbnRMb2Fk Rm9yRnJhbWU6IHsKKyAgICAgICAgICAgIHVpbnQ2NF90IGZyYW1lSUQ7CisgICAgICAgICAgICBp ZiAoIWFyZ3VtZW50cy0+ZGVjb2RlKGZyYW1lSUQpKQorICAgICAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgICAgIGRpZEZpbmlzaERvY3VtZW50TG9hZEZvckZyYW1lKHByb2Nlc3MoKS0+d2Vi RnJhbWUoZnJhbWVJRCkpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KICAgICAgICAg Y2FzZSBXZWJQYWdlUHJveHlNZXNzYWdlOjpEaWRGaW5pc2hMb2FkRm9yRnJhbWU6IHsKICAgICAg ICAgICAgIHVpbnQ2NF90IGZyYW1lSUQ7CiAgICAgICAgICAgICBpZiAoIWFyZ3VtZW50cy0+ZGVj b2RlKGZyYW1lSUQpKQpAQCAtNzk0LDYgKzgwMSwxMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlk Q29tbWl0TG9hZEZvckZyYW1lCiAgICAgbV9sb2FkZXJDbGllbnQuZGlkQ29tbWl0TG9hZEZvckZy YW1lKHRoaXMsIGZyYW1lKTsKIH0KIAordm9pZCBXZWJQYWdlUHJveHk6OmRpZEZpbmlzaERvY3Vt ZW50TG9hZEZvckZyYW1lKFdlYkZyYW1lUHJveHkqIGZyYW1lKQoreworICAgIG1fbG9hZGVyQ2xp ZW50LmRpZEZpbmlzaERvY3VtZW50TG9hZEZvckZyYW1lKHRoaXMsIGZyYW1lKTsKK30KKwogdm9p ZCBXZWJQYWdlUHJveHk6OmRpZEZpbmlzaExvYWRGb3JGcmFtZShXZWJGcmFtZVByb3h5KiBmcmFt ZSkKIHsKICAgICBmcmFtZS0+ZGlkRmluaXNoTG9hZCgpOwpJbmRleDogV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgJKHJldmlzaW9uIDY2NDAxKQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTE4Myw2ICsxODMsNyBAQCBwcml2YXRlOgogICAgIHZv aWQgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoV2Vi RnJhbWVQcm94eSopOwogICAgIHZvaWQgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKFdl YkZyYW1lUHJveHkqKTsKICAgICB2b2lkIGRpZENvbW1pdExvYWRGb3JGcmFtZShXZWJGcmFtZVBy b3h5Kik7CisgICAgdm9pZCBkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZShXZWJGcmFtZVBy b3h5Kik7CiAgICAgdm9pZCBkaWRGaW5pc2hMb2FkRm9yRnJhbWUoV2ViRnJhbWVQcm94eSopOwog ICAgIHZvaWQgZGlkRmFpbExvYWRGb3JGcmFtZShXZWJGcmFtZVByb3h5Kik7CiAgICAgdm9pZCBk aWRSZWNlaXZlVGl0bGVGb3JGcmFtZShXZWJGcmFtZVByb3h5KiwgY29uc3QgV1RGOjpTdHJpbmcm KTsKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCShyZXZpc2lvbiA2NjQwMSkKKysrIFdl YktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC02MSw2ICs2 MSw3IEBAIHR5cGVkZWYgdm9pZCAoKldLUGFnZURpZFN0YXJ0UHJvdmlzaW9uYWwKIHR5cGVkZWYg dm9pZCAoKldLUGFnZURpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lQ2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBjb25zdCB2 b2lkICpjbGllbnRJbmZvKTsKIHR5cGVkZWYgdm9pZCAoKldLUGFnZURpZEZhaWxQcm92aXNpb25h bExvYWRXaXRoRXJyb3JGb3JGcmFtZUNhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJl ZiBmcmFtZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7IC8vIEZJWE1FOiBBZGQgV0tFcnJvclJl Zi4KIHR5cGVkZWYgdm9pZCAoKldLUGFnZURpZENvbW1pdExvYWRGb3JGcmFtZUNhbGxiYWNrKShX S1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7 Cit0eXBlZGVmIHZvaWQgKCpXS1BhZ2VEaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZUNhbGxi YWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCAqY2xpZW50 SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpXS1BhZ2VEaWRGaW5pc2hMb2FkRm9yRnJhbWVDYWxsYmFj aykoV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIGNvbnN0IHZvaWQgKmNsaWVudElu Zm8pOwogdHlwZWRlZiB2b2lkICgqV0tQYWdlRGlkRmFpbExvYWRXaXRoRXJyb3JGb3JGcmFtZUNh bGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCAqY2xp ZW50SW5mbyk7IC8vIEZJWE1FOiBBZGQgV0tFcnJvclJlZi4KIHR5cGVkZWYgdm9pZCAoKldLUGFn ZURpZFJlY2VpdmVUaXRsZUZvckZyYW1lQ2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmlu Z1JlZiB0aXRsZSwgV0tGcmFtZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7CkBA IC04Nyw2ICs4OCw3IEBAIHN0cnVjdCBXS1BhZ2VMb2FkZXJDbGllbnQgewogICAgIFdLUGFnZURp ZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lQ2FsbGJhY2sg ICAgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU7CiAg ICAgV0tQYWdlRGlkRmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhFcnJvckZvckZyYW1lQ2FsbGJhY2sg ICAgICAgICAgICAgICBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkV2l0aEVycm9yRm9yRnJhbWU7CiAg ICAgV0tQYWdlRGlkQ29tbWl0TG9hZEZvckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBkaWRDb21taXRMb2FkRm9yRnJhbWU7CisgICAgV0tQYWdlRGlkRmluaXNo RG9jdW1lbnRMb2FkRm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICBkaWRG aW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZTsKICAgICBXS1BhZ2VEaWRGaW5pc2hMb2FkRm9yRnJh bWVDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpZEZpbmlzaExvYWRG b3JGcmFtZTsKICAgICBXS1BhZ2VEaWRGYWlsTG9hZFdpdGhFcnJvckZvckZyYW1lQ2FsbGJhY2sg ICAgICAgICAgICAgICAgICAgICAgICAgIGRpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWU7CiAg ICAgV0tQYWdlRGlkUmVjZWl2ZVRpdGxlRm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBkaWRSZWNlaXZlVGl0bGVGb3JGcmFtZTsKSW5kZXg6IFdlYktpdDIvVUlQ cm9jZXNzL0FQSS9xdC9xd2twYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vz cy9BUEkvcXQvcXdrcGFnZS5jcHAJKHJldmlzaW9uIDY2NDAxKQorKysgV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL3F0L3F3a3BhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMjUsNiArMjI1LDcgQEAg UVdLUGFnZTo6UVdLUGFnZShXS1BhZ2VOYW1lc3BhY2VSZWYgbmFtZQogICAgICAgICBxdF93a19k aWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSwKICAgICAg ICAgcXRfd2tfZGlkRmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhFcnJvckZvckZyYW1lLAogICAgICAg ICBxdF93a19kaWRDb21taXRMb2FkRm9yRnJhbWUsCisgICAgICAgIHF0X3drX2RpZEZpbmlzaERv Y3VtZW50TG9hZEZvckZyYW1lLAogICAgICAgICBxdF93a19kaWRGaW5pc2hMb2FkRm9yRnJhbWUs CiAgICAgICAgIHF0X3drX2RpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWUsCiAgICAgICAgIHF0 X3drX2RpZFJlY2VpdmVUaXRsZUZvckZyYW1lLApJbmRleDogV2ViS2l0Mi9XZWJQcm9jZXNzL0lu amVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVudC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFn ZUxvYWRlckNsaWVudC5jcHAJKHJldmlzaW9uIDY2NDAxKQorKysgV2ViS2l0Mi9XZWJQcm9jZXNz L0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVudC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTcwLDYgKzcwLDEyIEBAIHZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVy Q2xpZW50OjpkaWQKICAgICAgICAgbV9jbGllbnQuZGlkQ29tbWl0TG9hZEZvckZyYW1lKHRvUmVm KHBhZ2UpLCB0b1JlZihmcmFtZSksIG1fY2xpZW50LmNsaWVudEluZm8pOwogfQogCit2b2lkIElu amVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVudDo6ZGlkRmluaXNoRG9jdW1lbnRMb2FkRm9yRnJh bWUoV2ViUGFnZSogcGFnZSwgV2ViRnJhbWUqIGZyYW1lKQoreworICAgIGlmIChtX2NsaWVudC5k aWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZSkKKyAgICAgICAgbV9jbGllbnQuZGlkRmluaXNo RG9jdW1lbnRMb2FkRm9yRnJhbWUodG9SZWYocGFnZSksIHRvUmVmKGZyYW1lKSwgbV9jbGllbnQu Y2xpZW50SW5mbyk7Cit9CisKIHZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50Ojpk aWRGaW5pc2hMb2FkRm9yRnJhbWUoV2ViUGFnZSogcGFnZSwgV2ViRnJhbWUqIGZyYW1lKQogewog ICAgIGlmIChtX2NsaWVudC5kaWRGaW5pc2hMb2FkRm9yRnJhbWUpCkBAIC0xMTIsMTIgKzExOCw2 IEBAIHZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50OjpkaWQKICAgICAgICAgbV9j bGllbnQuZGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlRm9yRnJhbWUodG9SZWYocGFnZSksIHRv UmVmKGZyYW1lKSwgbV9jbGllbnQuY2xpZW50SW5mbyk7CiB9CiAKLXZvaWQgSW5qZWN0ZWRCdW5k bGVQYWdlTG9hZGVyQ2xpZW50OjpkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZShXZWJQYWdl KiBwYWdlLCBXZWJGcmFtZSogZnJhbWUpCi17Ci0gICAgaWYgKG1fY2xpZW50LmRpZEZpbmlzaERv Y3VtZW50TG9hZEZvckZyYW1lKQotICAgICAgICBtX2NsaWVudC5kaWRGaW5pc2hEb2N1bWVudExv YWRGb3JGcmFtZSh0b1JlZihwYWdlKSwgdG9SZWYoZnJhbWUpLCBtX2NsaWVudC5jbGllbnRJbmZv KTsKLX0KLQogdm9pZCBJbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQ6OmRpZEhhbmRsZU9u bG9hZEV2ZW50c0ZvckZyYW1lKFdlYlBhZ2UqIHBhZ2UsIFdlYkZyYW1lKiBmcmFtZSkKIHsKICAg ICBpZiAobV9jbGllbnQuZGlkSGFuZGxlT25sb2FkRXZlbnRzRm9yRnJhbWUpCkluZGV4OiBXZWJL aXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xp ZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0lu amVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVudC5oCShyZXZpc2lvbiA2NjQwMSkKKysrIFdlYktp dDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGll bnQuaAkod29ya2luZyBjb3B5KQpAQCAtNDQsNiArNDQsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBk aWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZShXZWJQYWdl KiwgV2ViRnJhbWUqKTsKICAgICB2b2lkIGRpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3JG b3JGcmFtZShXZWJQYWdlKiwgV2ViRnJhbWUqKTsKICAgICB2b2lkIGRpZENvbW1pdExvYWRGb3JG cmFtZShXZWJQYWdlKiwgV2ViRnJhbWUqKTsKKyAgICB2b2lkIGRpZEZpbmlzaERvY3VtZW50TG9h ZEZvckZyYW1lKFdlYlBhZ2UqLCBXZWJGcmFtZSopOwogICAgIHZvaWQgZGlkRmluaXNoTG9hZEZv ckZyYW1lKFdlYlBhZ2UqLCBXZWJGcmFtZSopOwogICAgIHZvaWQgZGlkRmFpbExvYWRXaXRoRXJy b3JGb3JGcmFtZShXZWJQYWdlKiwgV2ViRnJhbWUqKTsKICAgICB2b2lkIGRpZFJlY2VpdmVUaXRs ZUZvckZyYW1lKFdlYlBhZ2UqLCBjb25zdCBXVEY6OlN0cmluZyYsIFdlYkZyYW1lKik7CkBAIC01 MSw3ICs1Miw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpZENhbmNlbENsaWVudFJlZGlyZWN0Rm9y RnJhbWUoV2ViUGFnZSosIFdlYkZyYW1lKik7CiAgICAgdm9pZCB3aWxsUGVyZm9ybUNsaWVudFJl ZGlyZWN0Rm9yRnJhbWUoV2ViUGFnZSosIFdlYkZyYW1lKiwgY29uc3QgV1RGOjpTdHJpbmcmIHVy bCwgZG91YmxlIGRlbGF5LCBkb3VibGUgZGF0ZSk7CiAgICAgdm9pZCBkaWRDaGFuZ2VMb2NhdGlv bldpdGhpblBhZ2VGb3JGcmFtZShXZWJQYWdlKiwgV2ViRnJhbWUqKTsKLSAgICB2b2lkIGRpZEZp bmlzaERvY3VtZW50TG9hZEZvckZyYW1lKFdlYlBhZ2UqLCBXZWJGcmFtZSopOwogICAgIHZvaWQg ZGlkSGFuZGxlT25sb2FkRXZlbnRzRm9yRnJhbWUoV2ViUGFnZSosIFdlYkZyYW1lKik7CiAgICAg dm9pZCBkaWREaXNwbGF5SW5zZWN1cmVDb250ZW50Rm9yRnJhbWUoV2ViUGFnZSosIFdlYkZyYW1l Kik7CiAgICAgdm9pZCBkaWRSdW5JbnNlY3VyZUNvbnRlbnRGb3JGcmFtZShXZWJQYWdlKiwgV2Vi RnJhbWUqKTsKSW5kZXg6IFdlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9X S0J1bmRsZVBhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRC dW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlLmgJKHJldmlzaW9uIDY2NDAxKQorKysgV2ViS2l0Mi9X ZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5oCSh3b3JraW5nIGNv cHkpCkBAIC01Myw2ICs1Myw3IEBAIHR5cGVkZWYgdm9pZCAoKldLQnVuZGxlUGFnZURpZFN0YXJ0 UHJvdmkKIHR5cGVkZWYgdm9pZCAoKldLQnVuZGxlUGFnZURpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVj dEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lQ2FsbGJhY2spKFdLQnVuZGxlUGFnZVJlZiBwYWdl LCBXS0J1bmRsZUZyYW1lUmVmIGZyYW1lLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsKIHR5cGVk ZWYgdm9pZCAoKldLQnVuZGxlUGFnZURpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3JGb3JG cmFtZUNhbGxiYWNrKShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tCdW5kbGVGcmFtZVJlZiBmcmFt ZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7IC8vIEZJWE1FOiBBZGQgV0tFcnJvclJlZi4KIHR5 cGVkZWYgdm9pZCAoKldLQnVuZGxlUGFnZURpZENvbW1pdExvYWRGb3JGcmFtZUNhbGxiYWNrKShX S0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tCdW5kbGVGcmFtZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCAq Y2xpZW50SW5mbyk7Cit0eXBlZGVmIHZvaWQgKCpXS0J1bmRsZVBhZ2VEaWREb2N1bWVudEZpbmlz aExvYWRGb3JGcmFtZUNhbGxiYWNrKShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tCdW5kbGVGcmFt ZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpXS0J1 bmRsZVBhZ2VEaWRGaW5pc2hMb2FkRm9yRnJhbWVDYWxsYmFjaykoV0tCdW5kbGVQYWdlUmVmIHBh Z2UsIFdLQnVuZGxlRnJhbWVSZWYgZnJhbWUsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pOwogdHlw ZWRlZiB2b2lkICgqV0tCdW5kbGVQYWdlRGlkRmFpbExvYWRXaXRoRXJyb3JGb3JGcmFtZUNhbGxi YWNrKShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tCdW5kbGVGcmFtZVJlZiBmcmFtZSwgY29uc3Qg dm9pZCAqY2xpZW50SW5mbyk7IC8vIEZJWE1FOiBBZGQgV0tFcnJvclJlZi4KIHR5cGVkZWYgdm9p ZCAoKldLQnVuZGxlUGFnZURpZFJlY2VpdmVUaXRsZUZvckZyYW1lQ2FsbGJhY2spKFdLQnVuZGxl UGFnZVJlZiBwYWdlLCBXS1N0cmluZ1JlZiB0aXRsZSwgV0tCdW5kbGVGcmFtZVJlZiBmcmFtZSwg Y29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7CkBAIC03Myw2ICs3NCw3IEBAIHN0cnVjdCBXS0J1bmRs ZVBhZ2VMb2FkZXJDbGllbnQgewogICAgIFdLQnVuZGxlUGFnZURpZFJlY2VpdmVTZXJ2ZXJSZWRp cmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lQ2FsbGJhY2sgICAgZGlkUmVjZWl2ZVNlcnZl clJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU7CiAgICAgV0tCdW5kbGVQYWdlRGlk RmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhFcnJvckZvckZyYW1lQ2FsbGJhY2sgICAgICAgICBkaWRG YWlsUHJvdmlzaW9uYWxMb2FkV2l0aEVycm9yRm9yRnJhbWU7CiAgICAgV0tCdW5kbGVQYWdlRGlk Q29tbWl0TG9hZEZvckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWRD b21taXRMb2FkRm9yRnJhbWU7CisgICAgV0tCdW5kbGVQYWdlRGlkRmluaXNoRG9jdW1lbnRMb2Fk Rm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICAgICBkaWRGaW5pc2hEb2N1bWVudExvYWRG b3JGcmFtZTsKICAgICBXS0J1bmRsZVBhZ2VEaWRGaW5pc2hMb2FkRm9yRnJhbWVDYWxsYmFjayAg ICAgICAgICAgICAgICAgICAgICAgICAgIGRpZEZpbmlzaExvYWRGb3JGcmFtZTsKICAgICBXS0J1 bmRsZVBhZ2VEaWRGYWlsTG9hZFdpdGhFcnJvckZvckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAg ICAgICAgIGRpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWU7CiAgICAgV0tCdW5kbGVQYWdlRGlk UmVjZWl2ZVRpdGxlRm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICBkaWRS ZWNlaXZlVGl0bGVGb3JGcmFtZTsKQEAgLTgwLDcgKzgyLDYgQEAgc3RydWN0IFdLQnVuZGxlUGFn ZUxvYWRlckNsaWVudCB7CiAgICAgV0tCdW5kbGVQYWdlRGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3RG b3JGcmFtZUNhbGxiYWNrICAgICAgICAgICAgICAgICBkaWRDYW5jZWxDbGllbnRSZWRpcmVjdEZv ckZyYW1lOwogICAgIFdLQnVuZGxlUGFnZVdpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3RGb3JGcmFt ZUNhbGxiYWNrICAgICAgICAgICAgICAgd2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdEZvckZyYW1l OwogICAgIFdLQnVuZGxlUGFnZURpZENoYW5nZUxvY2F0aW9uV2l0aGluUGFnZUZvckZyYW1lQ2Fs bGJhY2sgICAgICAgICAgICAgZGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlRm9yRnJhbWU7Ci0g ICAgV0tCdW5kbGVQYWdlRGlkRmluaXNoRG9jdW1lbnRMb2FkRm9yRnJhbWVDYWxsYmFjayAgICAg ICAgICAgICAgICAgICBkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZTsKICAgICBXS0J1bmRs ZVBhZ2VEaWRIYW5kbGVPbmxvYWRFdmVudHNGb3JGcmFtZUNhbGxiYWNrICAgICAgICAgICAgICAg ICAgIGRpZEhhbmRsZU9ubG9hZEV2ZW50c0ZvckZyYW1lOwogICAgIFdLQnVuZGxlUGFnZURpZERp c3BsYXlJbnNlY3VyZUNvbnRlbnRGb3JGcmFtZUNhbGxiYWNrICAgICAgICAgICAgICAgZGlkRGlz cGxheUluc2VjdXJlQ29udGVudEZvckZyYW1lOwogICAgIFdLQnVuZGxlUGFnZURpZFJ1bkluc2Vj dXJlQ29udGVudEZvckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgZGlkUnVuSW5zZWN1 cmVDb250ZW50Rm9yRnJhbWU7Cg== 65998 2010-08-30 18:48:44 -0700 2010-08-30 18:54:52 -0700 (for real this time) patch with changelog, WKTR, MiniBrowser, and qt changes patch-fromOpensourceDir.txt text/plain 17120 alice.barraclough SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NjQ0MykKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjggQEAKKzIwMTAtMDgtMzAgIEFsaWNlIExpdSAgPGFsaWNlLmxpdUBhcHBsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk IG1pc3NpbmcgcGFydHMgb2YgZGlkRmluaXNoRG9jdW1lbnRMb2FkRm9yRnJhbWUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0OTEzCisKKyAgICAgICAg KiBTaGFyZWQvQ29yZUlQQ1N1cHBvcnQvV2ViUGFnZVByb3h5TWVzc2FnZUtpbmRzLmg6IEFkZGVk IG5ldyBraW5kCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHA6CisgICAgICAgIChRV0tQYWdlOjpRV0tQYWdl KTogVXBkYXRlZCBzdHJ1Y3QKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViTG9hZGVyQ2xpZW50LmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViTG9hZGVyQ2xpZW50OjpkaWRGaW5pc2hEb2N1bWVudExv YWRGb3JGcmFtZSk6IEFkZGVkCisgICAgICAgICogVUlQcm9jZXNzL1dlYkxvYWRlckNsaWVudC5o OgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlKTogQWRkZWQgY2FzZSBmb3IgV2ViUGFn ZVByb3h5TWVzc2FnZTo6RGlkRmluaXNoRG9jdW1lbnRMb2FkRm9yRnJhbWUKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5OjpkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZSk6IEFkZGVk CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorCisgICAgICAgIEp1c3QgcmVh cnJhbmdpbmcgZXhpc3RpbmcgY29kZSBpbiB0aGVzZToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0lu amVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3Mv SW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6SW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50OjpkaWRGaW5pc2hEb2N1 bWVudExvYWRGb3JGcmFtZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9J bmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQuaDoKKwogMjAxMC0wOC0zMCAgU2FtIFdlaW5p ZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFRyeSBhbmQgZml4IHRoZSBXZWJLaXQyIGJ1 aWxkYm90LgpJbmRleDogV2ViS2l0Mi9TaGFyZWQvQ29yZUlQQ1N1cHBvcnQvV2ViUGFnZVByb3h5 TWVzc2FnZUtpbmRzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9TaGFyZWQvQ29yZUlQQ1N1cHBv cnQvV2ViUGFnZVByb3h5TWVzc2FnZUtpbmRzLmgJKHJldmlzaW9uIDY2NDAxKQorKysgV2ViS2l0 Mi9TaGFyZWQvQ29yZUlQQ1N1cHBvcnQvV2ViUGFnZVByb3h5TWVzc2FnZUtpbmRzLmgJKHdvcmtp bmcgY29weSkKQEAgLTUwLDYgKzUwLDcgQEAgZW51bSBLaW5kIHsKICAgICBEaWRDcmVhdGVTdWJG cmFtZSwKICAgICBEaWRGYWlsTG9hZEZvckZyYW1lLAogICAgIERpZEZhaWxQcm92aXNpb25hbExv YWRGb3JGcmFtZSwKKyAgICBEaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZSwKICAgICBEaWRG aW5pc2hMb2FkRm9yRnJhbWUsCiAgICAgRGlkRmluaXNoUHJvZ3Jlc3MsCiAgICAgRGlkRmlyc3RM YXlvdXRGb3JGcmFtZSwKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1dlYkxvYWRlckNsaWVudC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTG9hZGVyQ2xpZW50LmNwcAko cmV2aXNpb24gNjY0MDEpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJMb2FkZXJDbGllbnQuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC02Nyw2ICs2NywxMiBAQCB2b2lkIFdlYkxvYWRlckNsaWVudDo6 ZGlkQ29tbWl0TG9hZEZvckZyCiAgICAgICAgIG1fcGFnZUxvYWRlckNsaWVudC5kaWRDb21taXRM b2FkRm9yRnJhbWUodG9SZWYocGFnZSksIHRvUmVmKGZyYW1lKSwgbV9wYWdlTG9hZGVyQ2xpZW50 LmNsaWVudEluZm8pOwogfQogCit2b2lkIFdlYkxvYWRlckNsaWVudDo6ZGlkRmluaXNoRG9jdW1l bnRMb2FkRm9yRnJhbWUoV2ViUGFnZVByb3h5KiBwYWdlLCBXZWJGcmFtZVByb3h5KiBmcmFtZSkK K3sKKyAgICBpZiAobV9wYWdlTG9hZGVyQ2xpZW50LmRpZEZpbmlzaERvY3VtZW50TG9hZEZvckZy YW1lKQorICAgICAgICBtX3BhZ2VMb2FkZXJDbGllbnQuZGlkRmluaXNoRG9jdW1lbnRMb2FkRm9y RnJhbWUodG9SZWYocGFnZSksIHRvUmVmKGZyYW1lKSwgbV9wYWdlTG9hZGVyQ2xpZW50LmNsaWVu dEluZm8pOworfQorCiB2b2lkIFdlYkxvYWRlckNsaWVudDo6ZGlkRmluaXNoTG9hZEZvckZyYW1l KFdlYlBhZ2VQcm94eSogcGFnZSwgV2ViRnJhbWVQcm94eSogZnJhbWUpCiB7CiAgICAgaWYgKG1f cGFnZUxvYWRlckNsaWVudC5kaWRGaW5pc2hMb2FkRm9yRnJhbWUpCkluZGV4OiBXZWJLaXQyL1VJ UHJvY2Vzcy9XZWJMb2FkZXJDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vz cy9XZWJMb2FkZXJDbGllbnQuaAkocmV2aXNpb24gNjY0MDEpCisrKyBXZWJLaXQyL1VJUHJvY2Vz cy9XZWJMb2FkZXJDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtNDMsNiArNDMsNyBAQCBwdWJs aWM6CiAgICAgdm9pZCBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRG b3JGcmFtZShXZWJQYWdlUHJveHkqLCBXZWJGcmFtZVByb3h5Kik7CiAgICAgdm9pZCBkaWRGYWls UHJvdmlzaW9uYWxMb2FkV2l0aEVycm9yRm9yRnJhbWUoV2ViUGFnZVByb3h5KiwgV2ViRnJhbWVQ cm94eSopOwogICAgIHZvaWQgZGlkQ29tbWl0TG9hZEZvckZyYW1lKFdlYlBhZ2VQcm94eSosIFdl YkZyYW1lUHJveHkqKTsKKyAgICB2b2lkIGRpZEZpbmlzaERvY3VtZW50TG9hZEZvckZyYW1lKFdl YlBhZ2VQcm94eSosIFdlYkZyYW1lUHJveHkqKTsKICAgICB2b2lkIGRpZEZpbmlzaExvYWRGb3JG cmFtZShXZWJQYWdlUHJveHkqLCBXZWJGcmFtZVByb3h5Kik7CiAgICAgdm9pZCBkaWRGYWlsTG9h ZFdpdGhFcnJvckZvckZyYW1lKFdlYlBhZ2VQcm94eSosIFdlYkZyYW1lUHJveHkqKTsKICAgICB2 b2lkIGRpZFJlY2VpdmVUaXRsZUZvckZyYW1lKFdlYlBhZ2VQcm94eSosIFdURjo6U3RyaW5nSW1w bCosIFdlYkZyYW1lUHJveHkqKTsKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAko cmV2aXNpb24gNjY0MDEpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC00NTQsNiArNDU0LDEzIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRS ZWNlaXZlTWVzc2FnZShDb3IKICAgICAgICAgICAgIGRpZENvbW1pdExvYWRGb3JGcmFtZShwcm9j ZXNzKCktPndlYkZyYW1lKGZyYW1lSUQpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9 CisgICAgICAgIGNhc2UgV2ViUGFnZVByb3h5TWVzc2FnZTo6RGlkRmluaXNoRG9jdW1lbnRMb2Fk Rm9yRnJhbWU6IHsKKyAgICAgICAgICAgIHVpbnQ2NF90IGZyYW1lSUQ7CisgICAgICAgICAgICBp ZiAoIWFyZ3VtZW50cy0+ZGVjb2RlKGZyYW1lSUQpKQorICAgICAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgICAgIGRpZEZpbmlzaERvY3VtZW50TG9hZEZvckZyYW1lKHByb2Nlc3MoKS0+d2Vi RnJhbWUoZnJhbWVJRCkpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KICAgICAgICAg Y2FzZSBXZWJQYWdlUHJveHlNZXNzYWdlOjpEaWRGaW5pc2hMb2FkRm9yRnJhbWU6IHsKICAgICAg ICAgICAgIHVpbnQ2NF90IGZyYW1lSUQ7CiAgICAgICAgICAgICBpZiAoIWFyZ3VtZW50cy0+ZGVj b2RlKGZyYW1lSUQpKQpAQCAtNzk0LDYgKzgwMSwxMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlk Q29tbWl0TG9hZEZvckZyYW1lCiAgICAgbV9sb2FkZXJDbGllbnQuZGlkQ29tbWl0TG9hZEZvckZy YW1lKHRoaXMsIGZyYW1lKTsKIH0KIAordm9pZCBXZWJQYWdlUHJveHk6OmRpZEZpbmlzaERvY3Vt ZW50TG9hZEZvckZyYW1lKFdlYkZyYW1lUHJveHkqIGZyYW1lKQoreworICAgIG1fbG9hZGVyQ2xp ZW50LmRpZEZpbmlzaERvY3VtZW50TG9hZEZvckZyYW1lKHRoaXMsIGZyYW1lKTsKK30KKwogdm9p ZCBXZWJQYWdlUHJveHk6OmRpZEZpbmlzaExvYWRGb3JGcmFtZShXZWJGcmFtZVByb3h5KiBmcmFt ZSkKIHsKICAgICBmcmFtZS0+ZGlkRmluaXNoTG9hZCgpOwpJbmRleDogV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgJKHJldmlzaW9uIDY2NDAxKQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTE4Myw2ICsxODMsNyBAQCBwcml2YXRlOgogICAgIHZv aWQgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoV2Vi RnJhbWVQcm94eSopOwogICAgIHZvaWQgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKFdl YkZyYW1lUHJveHkqKTsKICAgICB2b2lkIGRpZENvbW1pdExvYWRGb3JGcmFtZShXZWJGcmFtZVBy b3h5Kik7CisgICAgdm9pZCBkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZShXZWJGcmFtZVBy b3h5Kik7CiAgICAgdm9pZCBkaWRGaW5pc2hMb2FkRm9yRnJhbWUoV2ViRnJhbWVQcm94eSopOwog ICAgIHZvaWQgZGlkRmFpbExvYWRGb3JGcmFtZShXZWJGcmFtZVByb3h5Kik7CiAgICAgdm9pZCBk aWRSZWNlaXZlVGl0bGVGb3JGcmFtZShXZWJGcmFtZVByb3h5KiwgY29uc3QgV1RGOjpTdHJpbmcm KTsKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCShyZXZpc2lvbiA2NjQwMSkKKysrIFdl YktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC02MSw2ICs2 MSw3IEBAIHR5cGVkZWYgdm9pZCAoKldLUGFnZURpZFN0YXJ0UHJvdmlzaW9uYWwKIHR5cGVkZWYg dm9pZCAoKldLUGFnZURpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lQ2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBjb25zdCB2 b2lkICpjbGllbnRJbmZvKTsKIHR5cGVkZWYgdm9pZCAoKldLUGFnZURpZEZhaWxQcm92aXNpb25h bExvYWRXaXRoRXJyb3JGb3JGcmFtZUNhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJl ZiBmcmFtZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7IC8vIEZJWE1FOiBBZGQgV0tFcnJvclJl Zi4KIHR5cGVkZWYgdm9pZCAoKldLUGFnZURpZENvbW1pdExvYWRGb3JGcmFtZUNhbGxiYWNrKShX S1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7 Cit0eXBlZGVmIHZvaWQgKCpXS1BhZ2VEaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZUNhbGxi YWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCAqY2xpZW50 SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpXS1BhZ2VEaWRGaW5pc2hMb2FkRm9yRnJhbWVDYWxsYmFj aykoV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIGNvbnN0IHZvaWQgKmNsaWVudElu Zm8pOwogdHlwZWRlZiB2b2lkICgqV0tQYWdlRGlkRmFpbExvYWRXaXRoRXJyb3JGb3JGcmFtZUNh bGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCAqY2xp ZW50SW5mbyk7IC8vIEZJWE1FOiBBZGQgV0tFcnJvclJlZi4KIHR5cGVkZWYgdm9pZCAoKldLUGFn ZURpZFJlY2VpdmVUaXRsZUZvckZyYW1lQ2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmlu Z1JlZiB0aXRsZSwgV0tGcmFtZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7CkBA IC04Nyw2ICs4OCw3IEBAIHN0cnVjdCBXS1BhZ2VMb2FkZXJDbGllbnQgewogICAgIFdLUGFnZURp ZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lQ2FsbGJhY2sg ICAgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU7CiAg ICAgV0tQYWdlRGlkRmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhFcnJvckZvckZyYW1lQ2FsbGJhY2sg ICAgICAgICAgICAgICBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkV2l0aEVycm9yRm9yRnJhbWU7CiAg ICAgV0tQYWdlRGlkQ29tbWl0TG9hZEZvckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBkaWRDb21taXRMb2FkRm9yRnJhbWU7CisgICAgV0tQYWdlRGlkRmluaXNo RG9jdW1lbnRMb2FkRm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICBkaWRG aW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZTsKICAgICBXS1BhZ2VEaWRGaW5pc2hMb2FkRm9yRnJh bWVDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpZEZpbmlzaExvYWRG b3JGcmFtZTsKICAgICBXS1BhZ2VEaWRGYWlsTG9hZFdpdGhFcnJvckZvckZyYW1lQ2FsbGJhY2sg ICAgICAgICAgICAgICAgICAgICAgICAgIGRpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWU7CiAg ICAgV0tQYWdlRGlkUmVjZWl2ZVRpdGxlRm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBkaWRSZWNlaXZlVGl0bGVGb3JGcmFtZTsKSW5kZXg6IFdlYktpdDIvVUlQ cm9jZXNzL0FQSS9xdC9xd2twYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vz cy9BUEkvcXQvcXdrcGFnZS5jcHAJKHJldmlzaW9uIDY2NDAxKQorKysgV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL3F0L3F3a3BhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMjUsNiArMjI1LDcgQEAg UVdLUGFnZTo6UVdLUGFnZShXS1BhZ2VOYW1lc3BhY2VSZWYgbmFtZQogICAgICAgICBxdF93a19k aWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSwKICAgICAg ICAgcXRfd2tfZGlkRmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhFcnJvckZvckZyYW1lLAogICAgICAg ICBxdF93a19kaWRDb21taXRMb2FkRm9yRnJhbWUsCisgICAgICAgIHF0X3drX2RpZEZpbmlzaERv Y3VtZW50TG9hZEZvckZyYW1lLAogICAgICAgICBxdF93a19kaWRGaW5pc2hMb2FkRm9yRnJhbWUs CiAgICAgICAgIHF0X3drX2RpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWUsCiAgICAgICAgIHF0 X3drX2RpZFJlY2VpdmVUaXRsZUZvckZyYW1lLApJbmRleDogV2ViS2l0Mi9XZWJQcm9jZXNzL0lu amVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVudC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFn ZUxvYWRlckNsaWVudC5jcHAJKHJldmlzaW9uIDY2NDAxKQorKysgV2ViS2l0Mi9XZWJQcm9jZXNz L0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVudC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTcwLDYgKzcwLDEyIEBAIHZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVy Q2xpZW50OjpkaWQKICAgICAgICAgbV9jbGllbnQuZGlkQ29tbWl0TG9hZEZvckZyYW1lKHRvUmVm KHBhZ2UpLCB0b1JlZihmcmFtZSksIG1fY2xpZW50LmNsaWVudEluZm8pOwogfQogCit2b2lkIElu amVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVudDo6ZGlkRmluaXNoRG9jdW1lbnRMb2FkRm9yRnJh bWUoV2ViUGFnZSogcGFnZSwgV2ViRnJhbWUqIGZyYW1lKQoreworICAgIGlmIChtX2NsaWVudC5k aWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZSkKKyAgICAgICAgbV9jbGllbnQuZGlkRmluaXNo RG9jdW1lbnRMb2FkRm9yRnJhbWUodG9SZWYocGFnZSksIHRvUmVmKGZyYW1lKSwgbV9jbGllbnQu Y2xpZW50SW5mbyk7Cit9CisKIHZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50Ojpk aWRGaW5pc2hMb2FkRm9yRnJhbWUoV2ViUGFnZSogcGFnZSwgV2ViRnJhbWUqIGZyYW1lKQogewog ICAgIGlmIChtX2NsaWVudC5kaWRGaW5pc2hMb2FkRm9yRnJhbWUpCkBAIC0xMTIsMTIgKzExOCw2 IEBAIHZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50OjpkaWQKICAgICAgICAgbV9j bGllbnQuZGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlRm9yRnJhbWUodG9SZWYocGFnZSksIHRv UmVmKGZyYW1lKSwgbV9jbGllbnQuY2xpZW50SW5mbyk7CiB9CiAKLXZvaWQgSW5qZWN0ZWRCdW5k bGVQYWdlTG9hZGVyQ2xpZW50OjpkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZShXZWJQYWdl KiBwYWdlLCBXZWJGcmFtZSogZnJhbWUpCi17Ci0gICAgaWYgKG1fY2xpZW50LmRpZEZpbmlzaERv Y3VtZW50TG9hZEZvckZyYW1lKQotICAgICAgICBtX2NsaWVudC5kaWRGaW5pc2hEb2N1bWVudExv YWRGb3JGcmFtZSh0b1JlZihwYWdlKSwgdG9SZWYoZnJhbWUpLCBtX2NsaWVudC5jbGllbnRJbmZv KTsKLX0KLQogdm9pZCBJbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQ6OmRpZEhhbmRsZU9u bG9hZEV2ZW50c0ZvckZyYW1lKFdlYlBhZ2UqIHBhZ2UsIFdlYkZyYW1lKiBmcmFtZSkKIHsKICAg ICBpZiAobV9jbGllbnQuZGlkSGFuZGxlT25sb2FkRXZlbnRzRm9yRnJhbWUpCkluZGV4OiBXZWJL aXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xp ZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0lu amVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVudC5oCShyZXZpc2lvbiA2NjQwMSkKKysrIFdlYktp dDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGll bnQuaAkod29ya2luZyBjb3B5KQpAQCAtNDQsNiArNDQsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBk aWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZShXZWJQYWdl KiwgV2ViRnJhbWUqKTsKICAgICB2b2lkIGRpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3JG b3JGcmFtZShXZWJQYWdlKiwgV2ViRnJhbWUqKTsKICAgICB2b2lkIGRpZENvbW1pdExvYWRGb3JG cmFtZShXZWJQYWdlKiwgV2ViRnJhbWUqKTsKKyAgICB2b2lkIGRpZEZpbmlzaERvY3VtZW50TG9h ZEZvckZyYW1lKFdlYlBhZ2UqLCBXZWJGcmFtZSopOwogICAgIHZvaWQgZGlkRmluaXNoTG9hZEZv ckZyYW1lKFdlYlBhZ2UqLCBXZWJGcmFtZSopOwogICAgIHZvaWQgZGlkRmFpbExvYWRXaXRoRXJy b3JGb3JGcmFtZShXZWJQYWdlKiwgV2ViRnJhbWUqKTsKICAgICB2b2lkIGRpZFJlY2VpdmVUaXRs ZUZvckZyYW1lKFdlYlBhZ2UqLCBjb25zdCBXVEY6OlN0cmluZyYsIFdlYkZyYW1lKik7CkBAIC01 MSw3ICs1Miw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpZENhbmNlbENsaWVudFJlZGlyZWN0Rm9y RnJhbWUoV2ViUGFnZSosIFdlYkZyYW1lKik7CiAgICAgdm9pZCB3aWxsUGVyZm9ybUNsaWVudFJl ZGlyZWN0Rm9yRnJhbWUoV2ViUGFnZSosIFdlYkZyYW1lKiwgY29uc3QgV1RGOjpTdHJpbmcmIHVy bCwgZG91YmxlIGRlbGF5LCBkb3VibGUgZGF0ZSk7CiAgICAgdm9pZCBkaWRDaGFuZ2VMb2NhdGlv bldpdGhpblBhZ2VGb3JGcmFtZShXZWJQYWdlKiwgV2ViRnJhbWUqKTsKLSAgICB2b2lkIGRpZEZp bmlzaERvY3VtZW50TG9hZEZvckZyYW1lKFdlYlBhZ2UqLCBXZWJGcmFtZSopOwogICAgIHZvaWQg ZGlkSGFuZGxlT25sb2FkRXZlbnRzRm9yRnJhbWUoV2ViUGFnZSosIFdlYkZyYW1lKik7CiAgICAg dm9pZCBkaWREaXNwbGF5SW5zZWN1cmVDb250ZW50Rm9yRnJhbWUoV2ViUGFnZSosIFdlYkZyYW1l Kik7CiAgICAgdm9pZCBkaWRSdW5JbnNlY3VyZUNvbnRlbnRGb3JGcmFtZShXZWJQYWdlKiwgV2Vi RnJhbWUqKTsKSW5kZXg6IFdlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9X S0J1bmRsZVBhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRC dW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlLmgJKHJldmlzaW9uIDY2NDAxKQorKysgV2ViS2l0Mi9X ZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5oCSh3b3JraW5nIGNv cHkpCkBAIC01Myw2ICs1Myw3IEBAIHR5cGVkZWYgdm9pZCAoKldLQnVuZGxlUGFnZURpZFN0YXJ0 UHJvdmkKIHR5cGVkZWYgdm9pZCAoKldLQnVuZGxlUGFnZURpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVj dEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lQ2FsbGJhY2spKFdLQnVuZGxlUGFnZVJlZiBwYWdl LCBXS0J1bmRsZUZyYW1lUmVmIGZyYW1lLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsKIHR5cGVk ZWYgdm9pZCAoKldLQnVuZGxlUGFnZURpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3JGb3JG cmFtZUNhbGxiYWNrKShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tCdW5kbGVGcmFtZVJlZiBmcmFt ZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7IC8vIEZJWE1FOiBBZGQgV0tFcnJvclJlZi4KIHR5 cGVkZWYgdm9pZCAoKldLQnVuZGxlUGFnZURpZENvbW1pdExvYWRGb3JGcmFtZUNhbGxiYWNrKShX S0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tCdW5kbGVGcmFtZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCAq Y2xpZW50SW5mbyk7Cit0eXBlZGVmIHZvaWQgKCpXS0J1bmRsZVBhZ2VEaWREb2N1bWVudEZpbmlz aExvYWRGb3JGcmFtZUNhbGxiYWNrKShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tCdW5kbGVGcmFt ZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpXS0J1 bmRsZVBhZ2VEaWRGaW5pc2hMb2FkRm9yRnJhbWVDYWxsYmFjaykoV0tCdW5kbGVQYWdlUmVmIHBh Z2UsIFdLQnVuZGxlRnJhbWVSZWYgZnJhbWUsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pOwogdHlw ZWRlZiB2b2lkICgqV0tCdW5kbGVQYWdlRGlkRmFpbExvYWRXaXRoRXJyb3JGb3JGcmFtZUNhbGxi YWNrKShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tCdW5kbGVGcmFtZVJlZiBmcmFtZSwgY29uc3Qg dm9pZCAqY2xpZW50SW5mbyk7IC8vIEZJWE1FOiBBZGQgV0tFcnJvclJlZi4KIHR5cGVkZWYgdm9p ZCAoKldLQnVuZGxlUGFnZURpZFJlY2VpdmVUaXRsZUZvckZyYW1lQ2FsbGJhY2spKFdLQnVuZGxl UGFnZVJlZiBwYWdlLCBXS1N0cmluZ1JlZiB0aXRsZSwgV0tCdW5kbGVGcmFtZVJlZiBmcmFtZSwg Y29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7CkBAIC03Myw2ICs3NCw3IEBAIHN0cnVjdCBXS0J1bmRs ZVBhZ2VMb2FkZXJDbGllbnQgewogICAgIFdLQnVuZGxlUGFnZURpZFJlY2VpdmVTZXJ2ZXJSZWRp cmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lQ2FsbGJhY2sgICAgZGlkUmVjZWl2ZVNlcnZl clJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU7CiAgICAgV0tCdW5kbGVQYWdlRGlk RmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhFcnJvckZvckZyYW1lQ2FsbGJhY2sgICAgICAgICBkaWRG YWlsUHJvdmlzaW9uYWxMb2FkV2l0aEVycm9yRm9yRnJhbWU7CiAgICAgV0tCdW5kbGVQYWdlRGlk Q29tbWl0TG9hZEZvckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWRD b21taXRMb2FkRm9yRnJhbWU7CisgICAgV0tCdW5kbGVQYWdlRGlkRmluaXNoRG9jdW1lbnRMb2Fk Rm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICAgICBkaWRGaW5pc2hEb2N1bWVudExvYWRG b3JGcmFtZTsKICAgICBXS0J1bmRsZVBhZ2VEaWRGaW5pc2hMb2FkRm9yRnJhbWVDYWxsYmFjayAg ICAgICAgICAgICAgICAgICAgICAgICAgIGRpZEZpbmlzaExvYWRGb3JGcmFtZTsKICAgICBXS0J1 bmRsZVBhZ2VEaWRGYWlsTG9hZFdpdGhFcnJvckZvckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAg ICAgICAgIGRpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWU7CiAgICAgV0tCdW5kbGVQYWdlRGlk UmVjZWl2ZVRpdGxlRm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICBkaWRS ZWNlaXZlVGl0bGVGb3JGcmFtZTsKQEAgLTgwLDcgKzgyLDYgQEAgc3RydWN0IFdLQnVuZGxlUGFn ZUxvYWRlckNsaWVudCB7CiAgICAgV0tCdW5kbGVQYWdlRGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3RG b3JGcmFtZUNhbGxiYWNrICAgICAgICAgICAgICAgICBkaWRDYW5jZWxDbGllbnRSZWRpcmVjdEZv ckZyYW1lOwogICAgIFdLQnVuZGxlUGFnZVdpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3RGb3JGcmFt ZUNhbGxiYWNrICAgICAgICAgICAgICAgd2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdEZvckZyYW1l OwogICAgIFdLQnVuZGxlUGFnZURpZENoYW5nZUxvY2F0aW9uV2l0aGluUGFnZUZvckZyYW1lQ2Fs bGJhY2sgICAgICAgICAgICAgZGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlRm9yRnJhbWU7Ci0g ICAgV0tCdW5kbGVQYWdlRGlkRmluaXNoRG9jdW1lbnRMb2FkRm9yRnJhbWVDYWxsYmFjayAgICAg ICAgICAgICAgICAgICBkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZTsKICAgICBXS0J1bmRs ZVBhZ2VEaWRIYW5kbGVPbmxvYWRFdmVudHNGb3JGcmFtZUNhbGxiYWNrICAgICAgICAgICAgICAg ICAgIGRpZEhhbmRsZU9ubG9hZEV2ZW50c0ZvckZyYW1lOwogICAgIFdLQnVuZGxlUGFnZURpZERp c3BsYXlJbnNlY3VyZUNvbnRlbnRGb3JGcmFtZUNhbGxiYWNrICAgICAgICAgICAgICAgZGlkRGlz cGxheUluc2VjdXJlQ29udGVudEZvckZyYW1lOwogICAgIFdLQnVuZGxlUGFnZURpZFJ1bkluc2Vj dXJlQ29udGVudEZvckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgZGlkUnVuSW5zZWN1 cmVDb250ZW50Rm9yRnJhbWU7CkluZGV4OiBXZWJLaXRUb29scy9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA2NjQ0MSkKKysrIFdlYktpdFRv b2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEwLTA4LTMw ICBBbGljZSBMaXUgIDxhbGljZS5saXVAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBtaXNzaW5nIHBhcnRzIG9mIGRpZEZpbmlz aERvY3VtZW50TG9hZEZvckZyYW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD00NDkxMworCisgICAgICAgICogTWluaUJyb3dzZXIvbWFjL0Jyb3dzZXJX aW5kb3dDb250cm9sbGVyLm06CisgICAgICAgIChkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFt ZSk6IEFkZGVkCisgICAgICAgICgtW0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyIGF3YWtlRnJvbU5p Yl0pOiBVcGRhdGVkIHN0cnVjdAorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRC dW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmNwcDoKKyAgICAgICAgKFdUUjo6SW5qZWN0ZWRCdW5k bGVQYWdlOjpJbmplY3RlZEJ1bmRsZVBhZ2UpOiBSZWFycmFuZ2VkIGZ1bmN0aW9uIHB0cgorICAg ICAgICAqIFdlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV1RS OjpUZXN0Q29udHJvbGxlcjo6aW5pdGlhbGl6ZSk6IFVwZGF0ZWQgc3RydWN0CisKIDIwMTAtMDgt MzAgIFZhbmdlbGlzIEtva2tldmlzICA8dmFuZ2VsaXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFVucmV2aWV3ZWQ6IEFkZCBteXNlbGYgdG8gdGhlIGxpc3Qgb2YgQ29tbWl0dGVycy4KSW5kZXg6 IFdlYktpdFRvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93Q29udHJvbGxlci5tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93Q29u dHJvbGxlci5tCShyZXZpc2lvbiA2NjQwMSkKKysrIFdlYktpdFRvb2xzL01pbmlCcm93c2VyL21h Yy9Ccm93c2VyV2luZG93Q29udHJvbGxlci5tCSh3b3JraW5nIGNvcHkpCkBAIC0xNzIsNiArMTcy LDExIEBAIHN0YXRpYyB2b2lkIGRpZENvbW1pdExvYWRGb3JGcmFtZShXS1BhZ2UKICAgICBbKEJy b3dzZXJXaW5kb3dDb250cm9sbGVyICopY2xpZW50SW5mbyBkaWRDb21taXRMb2FkRm9yRnJhbWU6 ZnJhbWVdOwogfQogCitzdGF0aWMgdm9pZCBkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZShX S1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbykK K3sKKyAgICBMT0coQCJkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZSIpOworfQorCiBzdGF0 aWMgdm9pZCBkaWRGaW5pc2hMb2FkRm9yRnJhbWUoV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYg ZnJhbWUsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pCiB7CiAgICAgTE9HKEAiZGlkRmluaXNoTG9h ZEZvckZyYW1lIik7CkBAIC0zNzksNiArMzg0LDcgQEAgLSAodm9pZClhd2FrZUZyb21OaWIKICAg ICAgICAgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUs CiAgICAgICAgIGRpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3JGb3JGcmFtZSwKICAgICAg ICAgZGlkQ29tbWl0TG9hZEZvckZyYW1lLAorICAgICAgICBkaWRGaW5pc2hEb2N1bWVudExvYWRG b3JGcmFtZSwKICAgICAgICAgZGlkRmluaXNoTG9hZEZvckZyYW1lLAogICAgICAgICBkaWRGYWls TG9hZFdpdGhFcnJvckZvckZyYW1lLAogICAgICAgICBkaWRSZWNlaXZlVGl0bGVGb3JGcmFtZSwK SW5kZXg6IFdlYktpdFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIu Y3BwCShyZXZpc2lvbiA2NjQwMSkKKysrIFdlYktpdFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVz dENvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNzEsNiArMTcxLDcgQEAgdm9pZCBU ZXN0Q29udHJvbGxlcjo6aW5pdGlhbGl6ZShpbnQgYXJnYwogICAgICAgICAwLAogICAgICAgICAw LAogICAgICAgICAwLAorICAgICAgICAwLAogICAgICAgICBkaWRGaW5pc2hMb2FkRm9yRnJhbWUs CiAgICAgICAgIDAsCiAgICAgICAgIDAsCkluZGV4OiBXZWJLaXRUb29scy9XZWJLaXRUZXN0UnVu bmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRs ZVBhZ2UuY3BwCShyZXZpc2lvbiA2NjQwMSkKKysrIFdlYktpdFRvb2xzL1dlYktpdFRlc3RSdW5u ZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTAwLDYgKzEwMCw3IEBAIEluamVjdGVkQnVuZGxlUGFnZTo6SW5qZWN0ZWRCdW5kbGVQYWdl KFcKICAgICAgICAgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9y RnJhbWUsCiAgICAgICAgIGRpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3JGb3JGcmFtZSwK ICAgICAgICAgZGlkQ29tbWl0TG9hZEZvckZyYW1lLAorICAgICAgICBkaWRGaW5pc2hEb2N1bWVu dExvYWRGb3JGcmFtZSwKICAgICAgICAgZGlkRmluaXNoTG9hZEZvckZyYW1lLAogICAgICAgICBk aWRGYWlsTG9hZFdpdGhFcnJvckZvckZyYW1lLAogICAgICAgICBkaWRSZWNlaXZlVGl0bGVGb3JG cmFtZSwKQEAgLTEwNyw3ICsxMDgsNiBAQCBJbmplY3RlZEJ1bmRsZVBhZ2U6OkluamVjdGVkQnVu ZGxlUGFnZShXCiAgICAgICAgIGRpZENhbmNlbENsaWVudFJlZGlyZWN0Rm9yRnJhbWUsCiAgICAg ICAgIHdpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3RGb3JGcmFtZSwKICAgICAgICAgZGlkQ2hhbmdl TG9jYXRpb25XaXRoaW5QYWdlRm9yRnJhbWUsCi0gICAgICAgIGRpZEZpbmlzaERvY3VtZW50TG9h ZEZvckZyYW1lLAogICAgICAgICBkaWRIYW5kbGVPbmxvYWRFdmVudHNGb3JGcmFtZSwKICAgICAg ICAgZGlkRGlzcGxheUluc2VjdXJlQ29udGVudEZvckZyYW1lLAogICAgICAgICBkaWRSdW5JbnNl Y3VyZUNvbnRlbnRGb3JGcmFtZQo=