180794 2017-12-13 19:01:38 -0800 WebsiteDataStore::defaultDataStoreConfiguration() fails to set default value for serviceWorkerRegistrationDirectory 2017-12-14 11:09:31 -0800 1 1 1 Unclassified WebKit Service Workers WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=180784 InRadar P2 Normal --- 1 cdumez cdumez beidson berto cgarcia commit-queue ews-watchlist ggaren gustavo mcatanzaro webkit-bug-importer youennf oldest_to_newest 1381460 0 cdumez 2017-12-13 19:01:38 -0800 Add SPI to set the service worker registration directory to _WKWebsiteDataStoreConfiguration, similarly to what we do for IndexedDB. 1381461 1 cdumez 2017-12-13 19:01:51 -0800 <rdar://problem/36034667> 1381462 2 329310 cdumez 2017-12-13 19:04:23 -0800 Created attachment 329310 Patch 1381514 3 329310 ggaren 2017-12-13 22:45:23 -0800 Comment on attachment 329310 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=329310&action=review r=me > Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h:42 > @property (nonatomic, copy, setter=_setWebStorageDirectory:) NSURL *_webStorageDirectory; > @property (nonatomic, copy, setter=_setIndexedDBDatabaseDirectory:) NSURL *_indexedDBDatabaseDirectory; > +@property (nonatomic, copy, setter=_setServiceWorkerRegistrationDirectory:) NSURL *_serviceWorkerRegistrationDirectory WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA)); > @property (nonatomic, copy, setter=_setWebSQLDatabaseDirectory:) NSURL *_webSQLDatabaseDirectory; > @property (nonatomic, copy, setter=_setCookieStorageFile:) NSURL *_cookieStorageFile; > @property (nonatomic, copy, setter=_setResourceLoadStatisticsDirectory:) NSURL *_resourceLoadStatisticsDirectory WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA)); Seems kinda crazy that we require the client to set these separately for correct behavior. 1381628 4 cdumez 2017-12-14 08:50:35 -0800 (In reply to Geoffrey Garen from comment #3) > Comment on attachment 329310 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=329310&action=review > > r=me > > > Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h:42 > > @property (nonatomic, copy, setter=_setWebStorageDirectory:) NSURL *_webStorageDirectory; > > @property (nonatomic, copy, setter=_setIndexedDBDatabaseDirectory:) NSURL *_indexedDBDatabaseDirectory; > > +@property (nonatomic, copy, setter=_setServiceWorkerRegistrationDirectory:) NSURL *_serviceWorkerRegistrationDirectory WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA)); > > @property (nonatomic, copy, setter=_setWebSQLDatabaseDirectory:) NSURL *_webSQLDatabaseDirectory; > > @property (nonatomic, copy, setter=_setCookieStorageFile:) NSURL *_cookieStorageFile; > > @property (nonatomic, copy, setter=_setResourceLoadStatisticsDirectory:) NSURL *_resourceLoadStatisticsDirectory WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA)); > > Seems kinda crazy that we require the client to set these separately for > correct behavior. Agreed, I may have a better fix. I am currently trying it out. 1381656 5 329357 cdumez 2017-12-14 09:48:07 -0800 Created attachment 329357 Patch 1381659 6 ews-watchlist 2017-12-14 09:50:49 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1381686 7 329357 commit-queue 2017-12-14 11:08:35 -0800 Comment on attachment 329357 Patch Clearing flags on attachment: 329357 Committed r225911: <https://trac.webkit.org/changeset/225911> 1381687 8 commit-queue 2017-12-14 11:08:37 -0800 All reviewed patches have been landed. Closing bug. 1381689 9 webkit-bug-importer 2017-12-14 11:09:31 -0800 <rdar://problem/36052798> 329310 2017-12-13 19:04:23 -0800 2017-12-14 09:48:06 -0800 Patch bug-180794-20171213190422.patch text/plain 4811 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1ODE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDg2Y2E4ZDQ1MDFkOTI4NjFm ODc3YjJiNWZkOGY1YWJiMDk4MjU3MzMuLjAwNWU1MTFlYjZjYTQ4ZDc3YTEyMDg0NGQ5ZGY2NGFi ZjQzY2EyMmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTctMTItMTMgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgU1BJIHRvIHNldCB0aGUgc2Vy dmljZSB3b3JrZXIgcmVnaXN0cmF0aW9uIGRpcmVjdG9yeSB0byBfV0tXZWJzaXRlRGF0YVN0b3Jl Q29uZmlndXJhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTgwNzk0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNjAzNDY2Nz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgU1BJIHRvIHNldCB0 aGUgc2VydmljZSB3b3JrZXIgcmVnaXN0cmF0aW9uIGRpcmVjdG9yeSB0byBfV0tXZWJzaXRlRGF0 YVN0b3JlQ29uZmlndXJhdGlvbiwKKyAgICAgICAgc2ltaWxhcmx5IHRvIHdoYXQgd2UgZG8gZm9y IEluZGV4ZWREQi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0 YVN0b3JlLm1tOgorICAgICAgICAoLVtXS1dlYnNpdGVEYXRhU3RvcmUgX2luaXRXaXRoQ29uZmln dXJhdGlvbjpdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRh U3RvcmVDb25maWd1cmF0aW9uLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tX ZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5tbToKKyAgICAgICAgKC1bX1dLV2Vic2l0ZURh dGFTdG9yZUNvbmZpZ3VyYXRpb24gX3NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3Rvcnld KToKKyAgICAgICAgKC1bX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24gX3NldFNlcnZp Y2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3Rvcnk6XSk6CisKIDIwMTctMTItMTIgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBUYWtlIHByb2Nlc3MgYXNz ZXJ0aW9uIHRvIHByZXZlbnQgdGhlIHNlcnZpY2Ugd29ya2VyIHByb2Nlc3MgZnJvbSBnZXR0aW5n IHN1c3BlbmRlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L1dLV2Vic2l0ZURhdGFTdG9yZS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYnNpdGVEYXRhU3RvcmUubW0KaW5kZXggMzFlOTY1YTY5NzUxMzBmODY4NzQyNDFiMDBi ZDNhMTY5ZjFjNGYwNS4uNDg3ZDQwZWJlMzIwNWUzNzlkNjIwYTEwMGM2NjhlNWJlZWRiYTdkZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURh dGFTdG9yZS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJz aXRlRGF0YVN0b3JlLm1tCkBAIC0xOTIsNiArMTkyLDggQEAgLSAoaW5zdGFuY2V0eXBlKV9pbml0 V2l0aENvbmZpZ3VyYXRpb246KF9XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uICopY29u ZmkKICAgICAgICAgY29uZmlnLndlYlNRTERhdGFiYXNlRGlyZWN0b3J5ID0gY29uZmlndXJhdGlv bi5fd2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkucGF0aDsKICAgICBpZiAoY29uZmlndXJhdGlvbi5f aW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkpCiAgICAgICAgIGNvbmZpZy5pbmRleGVkREJEYXRh YmFzZURpcmVjdG9yeSA9IGNvbmZpZ3VyYXRpb24uX2luZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5 LnBhdGg7CisgICAgaWYgKGNvbmZpZ3VyYXRpb24uX3NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25E aXJlY3RvcnkpCisgICAgICAgIGNvbmZpZy5zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0 b3J5ID0gY29uZmlndXJhdGlvbi5fc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9yeS5w YXRoOwogICAgIGlmIChjb25maWd1cmF0aW9uLl9jb29raWVTdG9yYWdlRmlsZSkKICAgICAgICAg Y29uZmlnLmNvb2tpZVN0b3JhZ2VGaWxlID0gY29uZmlndXJhdGlvbi5fY29va2llU3RvcmFnZUZp bGUucGF0aDsKICAgICBpZiAoY29uZmlndXJhdGlvbi5fcmVzb3VyY2VMb2FkU3RhdGlzdGljc0Rp cmVjdG9yeSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9f V0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLmgKaW5kZXggNGVk ZGY2MDE0ZDNkZWYzOWY2ZWJmMGExN2FjM2M3MDA1YmM2MWQ5Yi4uNjI0MGY4ZjUwMWY1YzdlYWEx MDg4Y2U0NGU1MGEyMjI0OTM4NGMxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLmgKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1 cmF0aW9uLmgKQEAgLTM2LDYgKzM2LDcgQEAgV0tfQ0xBU1NfQVZBSUxBQkxFKG1hY29zeCgxMC4x MyksIGlvcygxMS4wKSkKIAogQHByb3BlcnR5IChub25hdG9taWMsIGNvcHksIHNldHRlcj1fc2V0 V2ViU3RvcmFnZURpcmVjdG9yeTopIE5TVVJMICpfd2ViU3RvcmFnZURpcmVjdG9yeTsKIEBwcm9w ZXJ0eSAobm9uYXRvbWljLCBjb3B5LCBzZXR0ZXI9X3NldEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0 b3J5OikgTlNVUkwgKl9pbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeTsKK0Bwcm9wZXJ0eSAobm9u YXRvbWljLCBjb3B5LCBzZXR0ZXI9X3NldFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3Rv cnk6KSBOU1VSTCAqX3NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkgV0tfQVBJX0FW QUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CiBAcHJvcGVydHkg KG5vbmF0b21pYywgY29weSwgc2V0dGVyPV9zZXRXZWJTUUxEYXRhYmFzZURpcmVjdG9yeTopIE5T VVJMICpfd2ViU1FMRGF0YWJhc2VEaXJlY3Rvcnk7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgY29w eSwgc2V0dGVyPV9zZXRDb29raWVTdG9yYWdlRmlsZTopIE5TVVJMICpfY29va2llU3RvcmFnZUZp bGU7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgY29weSwgc2V0dGVyPV9zZXRSZXNvdXJjZUxvYWRT dGF0aXN0aWNzRGlyZWN0b3J5OikgTlNVUkwgKl9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0 b3J5IFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNp dGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0NvY29hL19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLm1tCmluZGV4IGUwMDFlYmQ5 OGYyYzY5OTZlMzE1YzUxNzJkYzU5MTE3N2Y0MTY3MmMuLjkxNTE0MjQzNWU3MjdjOWJkMDg5YWQw OWZiYmFmZjc3OGI0NDM0MDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRp b24ubW0KQEAgLTM5LDYgKzM5LDcgQEAgc3RhdGljIHZvaWQgY2hlY2tVUkxBcmd1bWVudChOU1VS TCAqdXJsKQogQGltcGxlbWVudGF0aW9uIF9XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9u IHsKICAgICBSZXRhaW5QdHI8TlNVUkw+IF93ZWJTdG9yYWdlRGlyZWN0b3J5VVJMOwogICAgIFJl dGFpblB0cjxOU1VSTD4gX2luZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5VVJMOworICAgIFJldGFp blB0cjxOU1VSTD4gX3NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnlVUkw7CiAgICAg UmV0YWluUHRyPE5TVVJMPiBfd2ViU1FMRGF0YWJhc2VEaXJlY3RvcnlVUkw7CiAgICAgUmV0YWlu UHRyPE5TVVJMPiBfY29va2llU3RvcmFnZUZpbGVVUkw7CiAgICAgUmV0YWluUHRyPE5TVVJMPiBf cmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeVVSTDsKQEAgLTY2LDYgKzY3LDE3IEBAIC0g KHZvaWQpX3NldEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5OihOU1VSTCAqKXVybAogICAgIF9p bmRleGVkREJEYXRhYmFzZURpcmVjdG9yeVVSTCA9IGFkb3B0TlMoW3VybCBjb3B5XSk7CiB9CiAK Ky0gKE5TVVJMICopX3NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkKK3sKKyAgICBy ZXR1cm4gX3NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnlVUkwuZ2V0KCk7Cit9CisK Ky0gKHZvaWQpX3NldFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3Rvcnk6KE5TVVJMICop dXJsCit7CisgICAgY2hlY2tVUkxBcmd1bWVudCh1cmwpOworICAgIF9zZXJ2aWNlV29ya2VyUmVn aXN0cmF0aW9uRGlyZWN0b3J5VVJMID0gYWRvcHROUyhbdXJsIGNvcHldKTsKK30KKwogLSAoTlNV UkwgKilfd2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkKIHsKICAgICByZXR1cm4gX3dlYlNRTERhdGFi YXNlRGlyZWN0b3J5VVJMLmdldCgpOwo= 329357 2017-12-14 09:48:07 -0800 2017-12-14 11:08:35 -0800 Patch bug-180794-20171214094806.patch text/plain 3255 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1OTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGI1Yzk1NzM0MjdmMDU4NTZm MzZlNTkxOGRkZTNjNmM5YzgwMjIyYjQuLjU3ZDM1N2UwNGE5YmQwN2MwZWY1MjZhODM4MzQyMzQ1 ZGU3NDlkZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTctMTItMTQgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBXZWJzaXRlRGF0YVN0b3JlOjpkZWZh dWx0RGF0YVN0b3JlQ29uZmlndXJhdGlvbigpIGZhaWxzIHRvIHNldCBkZWZhdWx0IHZhbHVlIGZv ciBzZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODA3OTQKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzM2MDM0NjY3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFNldCB0aGUgZGVmYXVsdCBJbmRleGVkREIgYW5kIFNlcnZpY2VXb3JrZXIgZGF0YWJh c2UgcGF0aHMgaW4gV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9yZUNvbmZpZ3VyYXRp b24oKS4KKyAgICAgICAgV2l0aG91dCB0aGlzLCB0aGUgY2xpZW50IGlzIGZvcmNlZCB0byBzZXQg dGhlIGV4cGVjdGVkIHBhdGguCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL0FQSVdl YnNpdGVEYXRhU3RvcmVDb2NvYS5tbToKKyAgICAgICAgKEFQSTo6V2Vic2l0ZURhdGFTdG9yZTo6 ZGVmYXVsdERhdGFTdG9yZUNvbmZpZ3VyYXRpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Z2xpYi9BUElXZWJzaXRlRGF0YVN0b3JlR0xpYi5jcHA6CisgICAgICAgIChBUEk6OldlYnNpdGVE YXRhU3RvcmU6OmRlZmF1bHREYXRhU3RvcmVDb25maWd1cmF0aW9uKToKKwogMjAxNy0xMi0xMyAg Q2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBjb3B5L3Bhc3Rl IGVycm9yIGluIFByb2Nlc3NQb29sQ29uZmlndXJhdGlvbjo6Y3JlYXRlV2l0aFdlYnNpdGVEYXRh U3RvcmVDb25maWd1cmF0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9Db2NvYS9BUElXZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvQVBJV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCmluZGV4IGU5MmZj M2MyNTQ1YTU3YzkxM2E3NWE2NTcyMzA5OWQyNDMwMTliNGUuLjA3OWM4Y2RkMTVmM2NhNTFkYTJl YjFiZTJkYTFkOTM5YWQ1ZTZlNjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9Db2NvYS9BUElXZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL0FQSVdlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbQpAQCAtMTk3 LDYgKzE5Nyw4IEBAIFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6Q29uZmlndXJhdGlvbiBXZWJz aXRlRGF0YVN0b3JlOjpkZWZhdWx0RGF0YVN0b3JlQ29uZmlnCiAgICAgY29uZmlndXJhdGlvbi5u ZXR3b3JrQ2FjaGVEaXJlY3RvcnkgPSBkZWZhdWx0TmV0d29ya0NhY2hlRGlyZWN0b3J5KCk7CiAg ICAgY29uZmlndXJhdGlvbi5tZWRpYUNhY2hlRGlyZWN0b3J5ID0gZGVmYXVsdE1lZGlhQ2FjaGVE aXJlY3RvcnkoKTsKIAorICAgIGNvbmZpZ3VyYXRpb24uaW5kZXhlZERCRGF0YWJhc2VEaXJlY3Rv cnkgPSBkZWZhdWx0SW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkoKTsKKyAgICBjb25maWd1cmF0 aW9uLnNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkgPSBkZWZhdWx0U2VydmljZVdv cmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9yeSgpOwogICAgIGNvbmZpZ3VyYXRpb24ud2ViU1FMRGF0 YWJhc2VEaXJlY3RvcnkgPSBkZWZhdWx0V2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkoKTsKICAgICBj b25maWd1cmF0aW9uLmxvY2FsU3RvcmFnZURpcmVjdG9yeSA9IGRlZmF1bHRMb2NhbFN0b3JhZ2VE aXJlY3RvcnkoKTsKICAgICBjb25maWd1cmF0aW9uLm1lZGlhS2V5c1N0b3JhZ2VEaXJlY3Rvcnkg PSBkZWZhdWx0TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeSgpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvQVBJV2Vic2l0ZURhdGFTdG9yZUdMaWIuY3BwIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvQVBJV2Vic2l0ZURhdGFTdG9yZUdMaWIu Y3BwCmluZGV4IGViMDI0YmIxNmJjNzQxMTRjMGU2NTQ3NTQzZmM4MTdlZmUxOThiNTguLmQyZGU5 NzRmZTkxZTc4MWQ5NGRkMWEzZDhhNDUyZDZhYTBiM2IwM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL0FQSVdlYnNpdGVEYXRhU3RvcmVHTGliLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9BUElXZWJzaXRlRGF0YVN0b3JlR0xp Yi5jcHAKQEAgLTEwMSw2ICsxMDEsOCBAQCBXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OkNvbmZp Z3VyYXRpb24gV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9yZUNvbmZpZwogICAgIGNv bmZpZ3VyYXRpb24uYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSA9IGRlZmF1bHRBcHBsaWNhdGlv bkNhY2hlRGlyZWN0b3J5KCk7CiAgICAgY29uZmlndXJhdGlvbi5uZXR3b3JrQ2FjaGVEaXJlY3Rv cnkgPSBkZWZhdWx0TmV0d29ya0NhY2hlRGlyZWN0b3J5KCk7CiAKKyAgICBjb25maWd1cmF0aW9u LmluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5ID0gZGVmYXVsdEluZGV4ZWREQkRhdGFiYXNlRGly ZWN0b3J5KCk7CisgICAgY29uZmlndXJhdGlvbi5zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGly ZWN0b3J5ID0gZGVmYXVsdFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkoKTsKICAg ICBjb25maWd1cmF0aW9uLndlYlNRTERhdGFiYXNlRGlyZWN0b3J5ID0gZGVmYXVsdFdlYlNRTERh dGFiYXNlRGlyZWN0b3J5KCk7CiAgICAgY29uZmlndXJhdGlvbi5sb2NhbFN0b3JhZ2VEaXJlY3Rv cnkgPSBkZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KCk7CiAgICAgY29uZmlndXJhdGlvbi5t ZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5ID0gZGVmYXVsdE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3Rv cnkoKTsK