170963 2017-04-18 13:45:05 -0700 [iOS][WK2] Prevent ephemeral files from being backed up 2022-03-01 02:38:13 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham beidson oldest_to_newest 1298421 0 bfulgham 2017-04-18 13:45:05 -0700 Tell the OS that non-critical/ephemeral loading data should not be backed up or stored for future use. 1298427 1 bfulgham 2017-04-18 14:00:51 -0700 <rdar://problem/30470332> 1298430 2 307415 bfulgham 2017-04-18 14:03:38 -0700 Created attachment 307415 Patch 1298484 3 307415 beidson 2017-04-18 16:04:15 -0700 Comment on attachment 307415 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=307415&action=review > Source/WebKit2/UIProcess/Cocoa/WebResourceLoadStatisticsStoreCocoa.mm:2 > + * Copyright (C) 2011 Apple Inc. All rights reserved. Nope. 1298506 4 bfulgham 2017-04-18 16:38:16 -0700 Committed r215488: <http://trac.webkit.org/changeset/215488> 307415 2017-04-18 14:03:38 -0700 2022-03-01 02:38:13 -0800 Patch bug-170963-20170418140337.patch text/plain 9828 bfulgham SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNTQ3OSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE3LTA0LTE4ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0gUHJldmVu dCBlcGhlbWVyYWwgZmlsZXMgZnJvbSBiZWluZyBiYWNrZWQgdXAKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MDk2MworICAgICAgICA8cmRhcjovL3By b2JsZW0vMzA0NzAzMzI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGVsbCB0aGUgT1MgdG8gc2tpcCB0ZW1wb3JhcnkgZGF0YSBmaWxlcyB3aGVuIHBl cmZvcm1pbmcgYmFja3Vwcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmVDb2NvYS5tbTogQWRkZWQuCisgICAgICAgIChXZWJLaXQ6Oldl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cGxhdGZvcm1FeGNsdWRlRnJvbUJhY2t1cCk6 IEFkZGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6 OndyaXRlRW5jb2RlclRvRGlzayk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0 YXRpc3RpY3NTdG9yZTo6cGxhdGZvcm1FeGNsdWRlRnJvbUJhY2t1cCk6IEFkZCBzdHViIGZvcgor ICAgICAgICBub24taU9TIHBsYXRmb3Jtcy4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlLmg6CisgICAgICAgICogV2ViS2l0Mi54Y29kZXByb2ovcHJv amVjdC5wYnhwcm9qOiBBZGQgbmV3IGZpbGUuCisKIDIwMTctMDQtMTggIFRpbW90aHkgSG9ydG9u ICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIEZvcmNlIHNjcm9sbCB2aWV3 IGluc2V0cyB0byBiZSByZXNwZWN0ZWQgcmVnYXJkbGVzcyBvZiBydWJiZXItYmFuZGluZyBzdGF0 ZQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlJl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAJKHJldmlzaW9uIDIxNTQxNykKKysrIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0yNTEsOCArMjUxLDEwIEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlOjp3cmkKICAgICBpZiAocmVzb3VyY2VMb2cuaXNFbXB0eSgpKQogICAgICAg ICByZXR1cm47CiAKLSAgICBpZiAoIW1fc3RhdGlzdGljc1N0b3JhZ2VQYXRoLmlzRW1wdHkoKSkK KyAgICBpZiAoIW1fc3RhdGlzdGljc1N0b3JhZ2VQYXRoLmlzRW1wdHkoKSkgewogICAgICAgICBt YWtlQWxsRGlyZWN0b3JpZXMobV9zdGF0aXN0aWNzU3RvcmFnZVBhdGgpOworICAgICAgICBwbGF0 Zm9ybUV4Y2x1ZGVGcm9tQmFja3VwKCk7CisgICAgfQogCiAgICAgYXV0byBoYW5kbGUgPSBvcGVu RmlsZShyZXNvdXJjZUxvZywgT3BlbkZvcldyaXRlKTsKICAgICBpZiAoIWhhbmRsZSkKQEAgLTI2 NSw2ICsyNjcsMTMgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OndyaQog ICAgICAgICBXVEZMb2dBbHdheXMoIldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTogV2Ug b25seSB3cm90ZSAlZCBvdXQgb2YgJWQgYnl0ZXMgdG8gZGlzayIsIHN0YXRpY19jYXN0PHVuc2ln bmVkPih3cml0dGVuQnl0ZXMpLCByYXdEYXRhLT5zaXplKCkpOwogfQogCisjaWYgIVBMQVRGT1JN KENPQ09BKQordm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnBsYXRmb3JtRXhj bHVkZUZyb21CYWNrdXAoKSBjb25zdAoreworICAgIC8vIERvIG5vdGhpbmcKK30KKyNlbmRpZgor CiBzdGQ6OnVuaXF1ZV9wdHI8S2V5ZWREZWNvZGVyPiBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNz U3RvcmU6OmNyZWF0ZURlY29kZXJGcm9tRGlzayhjb25zdCBTdHJpbmcmIGxhYmVsKSBjb25zdAog ewogICAgIFN0cmluZyByZXNvdXJjZUxvZyA9IHBlcnNpc3RlbnRTdG9yYWdlUGF0aChsYWJlbCk7 CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlJlc291 cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oCShyZXZpc2lvbiAyMTU0MTcpCisrKyBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgJKHdvcmtpbmcg Y29weSkKQEAgLTkyLDYgKzkyLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHdyaXRlU3RvcmVUb0Rp c2soKTsKICAgICB2b2lkIHdyaXRlRW5jb2RlclRvRGlzayhXZWJDb3JlOjpLZXllZEVuY29kZXIm LCBjb25zdCBTdHJpbmcmIGxhYmVsKSBjb25zdDsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8V2ViQ29y ZTo6S2V5ZWREZWNvZGVyPiBjcmVhdGVEZWNvZGVyRnJvbURpc2soY29uc3QgU3RyaW5nJiBsYWJl bCkgY29uc3Q7CisgICAgdm9pZCBwbGF0Zm9ybUV4Y2x1ZGVGcm9tQmFja3VwKCkgY29uc3Q7CiAK ICAgICBSZWY8V2ViQ29yZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlPiBtX3Jlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZTsKICNpZiBIQVZFKENPUkVfUFJFRElDVElPTikKSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmVDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2Ev V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlQ29jb2EubW0JKG5vbmV4aXN0ZW50KQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZUNvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsNDAgQEAKKy8qCisgKiBDb3B5 cmlnaHQgKEMpIDIwMTEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25z IG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l ci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0 aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9u IGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgor ICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENP TlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJB TlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FS UkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgor ICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBP UiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNU LCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERB TUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICog U1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJ VFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBB TlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBM SUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAq IEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVO IElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLwor CisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW1wb3J0ICJXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNz U3RvcmUuaCIKKwordXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CisKK25hbWVzcGFjZSBXZWJLaXQg eworCit2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cGxhdGZvcm1FeGNsdWRl RnJvbUJhY2t1cCgpIGNvbnN0Cit7CisjaWYgUExBVEZPUk0oSU9TKQorICAgIFtbTlNVUkwgZmls ZVVSTFdpdGhQYXRoOihOU1N0cmluZyAqKW1fc3RhdGlzdGljc1N0b3JhZ2VQYXRoXSBzZXRSZXNv dXJjZVZhbHVlOkBZRVMgZm9yS2V5Ok5TVVJMSXNFeGNsdWRlZEZyb21CYWNrdXBLZXkgZXJyb3I6 bmlsXTsKKyNlbmRpZgorfQorCit9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViS2l0 Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZpc2lvbiAyMTU0MTcpCisrKyBTb3VyY2Uv V2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHdvcmtpbmcgY29weSkK QEAgLTEyMDYsNiArMTIwNiw3IEBACiAJCTdBODIxRjRDMUUyRjY3MzkwMDYwNDU3NyAvKiBMZWdh Y3lDdXN0b21Qcm90b2NvbE1hbmFnZXJDbGllbnQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDdBODIxRjRCMUUyRjY2NDgwMDYwNDU3NyAvKiBMZWdhY3lD dXN0b21Qcm90b2NvbE1hbmFnZXJDbGllbnQuaCAqLzsgfTsKIAkJN0E4MjFGNEUxRTJGNjdBODAw NjA0NTc3IC8qIExlZ2FjeUN1c3RvbVByb3RvY29sTWFuYWdlckNsaWVudC5tbSBpbiBTb3VyY2Vz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDdBODIxRjREMUUyRjY3OUUwMDYw NDU3NyAvKiBMZWdhY3lDdXN0b21Qcm90b2NvbE1hbmFnZXJDbGllbnQubW0gKi87IH07CiAJCTdB ODIxRjUwMUUyRjdBNzUwMDYwNDU3NyAvKiBBUElDdXN0b21Qcm90b2NvbE1hbmFnZXJDbGllbnQu aCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDdBODIxRjRG MUUyRjdBNUMwMDYwNDU3NyAvKiBBUElDdXN0b21Qcm90b2NvbE1hbmFnZXJDbGllbnQuaCAqLzsg fTsKKwkJN0FBRDE3NUYxRUE2QUY5OTAwM0IwODk0IC8qIFdlYlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZUNvY29hLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gN0FBRDE3NUUxRUE2QUYzNzAwM0IwODk0IC8qIFdlYlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZUNvY29hLm1tICovOyB9OwogCQk3QUYyMzYyMDFFNzlBM0U0MDA0MzhBMDUgLyogV2Vi RXJyb3JzLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDdBRjIzNjFFMUU3OUEzQjQwMDQzOEEwNSAvKiBXZWJFcnJvcnMuY3BwICovOyB9OwogCQk3QUYy MzYyMTFFNzlBNDA4MDA0MzhBMDUgLyogV2ViRXJyb3JzLmggaW4gSGVhZGVycyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3QUYyMzYxRjFFNzlBM0Q4MDA0MzhBMDUgLyogV2Vi RXJyb3JzLmggKi87IH07CiAJCTdBRjIzNjIzMUU3OUE0NDQwMDQzOEEwNSAvKiBXZWJFcnJvcnND b2NvYS5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDdB RjIzNjIyMUU3OUE0MzEwMDQzOEEwNSAvKiBXZWJFcnJvcnNDb2NvYS5tbSAqLzsgfTsKQEAgLTM0 NzcsNiArMzQ3OCw3IEBACiAJCTdBOUNEOEMwMUM3Nzk4NDkwMEQ5RjZDNyAvKiBXZWJSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBw YXRoID0gV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKIAkJN0E5Q0Q4QzExQzc3OTg0OTAwRDlGNkM3IC8qIFdlYlJlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXZWJS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK IAkJN0E5Q0Q4QzIxQzc3OUFENjAwRDlGNkM3IC8qIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZS5tZXNzYWdlcy5pbiAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQ7IHBhdGggPSBXZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzU3RvcmUubWVzc2FnZXMuaW47IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJ CTdBQUQxNzVFMUVBNkFGMzcwMDNCMDg5NCAvKiBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmVDb2NvYS5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFdlYlJl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZUNvY29hLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OwogCQk3QUYyMzYxRTFFNzlBM0I0MDA0MzhBMDUgLyogV2ViRXJyb3JzLmNwcCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFdlYkVycm9ycy5jcHA7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CiAJCTdBRjIzNjFGMUU3OUEzRDgwMDQzOEEwNSAvKiBXZWJFcnJvcnMu aCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViRXJyb3JzLmg7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CiAJCTdBRjIzNjIyMUU3OUE0MzEwMDQzOEEwNSAvKiBXZWJFcnJv cnNDb2NvYS5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFdlYkVy cm9yc0NvY29hLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtNDQ4MSw2ICs0NDgz LDcgQEAKIAkJCQkxQTRGOTc2OTEwMEU3QjY2MDA2MzdBMTggLyogQ29uZmlndXJhdGlvbnMgKi8s CiAJCQkJMDg2N0Q2OUFGRTg0MDI4RkMwMkFBQzA3IC8qIEV4dGVybmFsIEZyYW1ld29ya3MgYW5k IExpYnJhcmllcyAqLywKIAkJCQkwMzQ3NjhERkZGMzhBNTA0MTFEQjlDOEIgLyogUHJvZHVjdHMg Ki8sCisJCQkJN0FBRDE3NTgxRUE1NEFBODAwM0IwODk0IC8qIFJlY292ZXJlZCBSZWZlcmVuY2Vz ICovLAogCQkJKTsKIAkJCW5hbWUgPSBXZWJLaXQyOwogCQkJc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsKQEAgLTUxNzAsNiArNTE3Myw3IEBACiAJCQkJQ0RBMjlBMUYxQ0JFQjVGQjAwOTAxQ0NGIC8q IFdlYlBsYXliYWNrU2Vzc2lvbk1hbmFnZXJQcm94eS5tbSAqLywKIAkJCQk3Q0U0RDIxNTFBNDkx NDg0MDBDN0YxNTIgLyogV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbSAqLywKIAkJCQkxQTA0RjYxNzFB NEEzQTdBMDBBMjFCNkUgLyogV2ViUHJvY2Vzc1Byb3h5Q29jb2EubW0gKi8sCisJCQkJN0FBRDE3 NUUxRUE2QUYzNzAwM0IwODk0IC8qIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZUNvY29h Lm1tICovLAogCQkJCTUxRDEyNDMxMUU2REU1MjEwMDJCMjgyMCAvKiBXZWJVUkxTY2hlbWVIYW5k bGVyQ29jb2EuaCAqLywKIAkJCQk1MUQxMjQzMjFFNkRFNTIxMDAyQjI4MjAgLyogV2ViVVJMU2No ZW1lSGFuZGxlckNvY29hLm1tICovLAogCQkJCTUyRDVBMUFBMUM1NzQ5NEUwMERFMzRBMyAvKiBX ZWJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHkuaCAqLywKQEAgLTYzMzgsNiArNjM0MiwxNCBA QAogCQkJbmFtZSA9IG1hYzsKIAkJCXNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7CiAJCX07CisJCTdB QUQxNzU4MUVBNTRBQTgwMDNCMDg5NCAvKiBSZWNvdmVyZWQgUmVmZXJlbmNlcyAqLyA9IHsKKwkJ CWlzYSA9IFBCWEdyb3VwOworCQkJY2hpbGRyZW4gPSAoCisJCQkJQzU4Q0RGMjgxODg3NTQ4QjAw ODcxNTM2IC8qIEludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uLmggKi8sCisJCQkpOwor CQkJbmFtZSA9ICJSZWNvdmVyZWQgUmVmZXJlbmNlcyI7CisJCQlzb3VyY2VUcmVlID0gIjxncm91 cD4iOworCQl9OwogCQk3QzZFNzBGODE4QjJENDdFMDBGMjRFMkUgLyogY29jb2EgKi8gPSB7CiAJ CQlpc2EgPSBQQlhHcm91cDsKIAkJCWNoaWxkcmVuID0gKApAQCAtMTAzNDIsNiArMTAzNTQsNyBA QAogCQkJCTVDNzcwNjc0MUQxMTM4MzgwMDEyNzAwRiAvKiBXZWJTb2NrZXRQcm92aWRlci5jcHAg aW4gU291cmNlcyAqLywKIAkJCQk4MzYwMzQ5RjFBQ0IzNEQ2MDA2MjY1NDkgLyogV2ViU1FMaXRl RGF0YWJhc2VUcmFja2VyLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTFBNTJDMEY3MUEzOENEQzcw MDE2MTYwQSAvKiBXZWJTdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIuY3BwIGluIFNvdXJjZXMgKi8s CisJCQkJN0FBRDE3NUYxRUE2QUY5OTAwM0IwODk0IC8qIFdlYlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZUNvY29hLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJNUMwQjE3N0MxRTdDODg1NDAwRTkx MjNDIC8qIFdlYlNvY2tldFN0cmVhbS5jcHAgaW4gU291cmNlcyAqLywKIAkJCQlCQ0M1NzE1QzEx NUFEQUVGMDAxQ0NBRjkgLyogV2ViU3lzdGVtSW50ZXJmYWNlLm1tIGluIFNvdXJjZXMgKi8sCiAJ CQkJNTEwMzJGMTgxODBGNzNCQjAwOTYxQkI3IC8qIFdlYlRvRGF0YWJhc2VQcm9jZXNzQ29ubmVj dGlvbi5jcHAgaW4gU291cmNlcyAqLywK