128557 2014-02-10 15:33:12 -0800 Bring third-party app cache blocking behavior in line with private browsing app cache blocking behavior 2014-04-18 12:33:14 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 131263 1 jeffrey+webkit jeffrey+webkit ap commit-queue ddkilzer japhet oldest_to_newest 979092 0 jeffrey+webkit 2014-02-10 15:33:12 -0800 As of r163823, in private browsing mode, application cache is blocked with a specific behavior (raising errors when blocking the cache). However, the third-party data blocking approach silently fails. We should bring the third-party data blocking approach in line with the new behavior for application cache blocking. 979206 1 jeffrey+webkit 2014-02-10 19:11:26 -0800 <rdar://problem/16033265> 979213 2 223792 jeffrey+webkit 2014-02-10 19:26:14 -0800 Created attachment 223792 Patch 979621 3 jeffrey+webkit 2014-02-11 15:03:05 -0800 Committed r163914: <http://trac.webkit.org/changeset/163914> 1001978 4 ddkilzer 2014-04-18 12:33:14 -0700 This caused the following regression: REGRESSION (r163914): Application cache cannot be used in main frame https://bugs.webkit.org/show_bug.cgi?id=131263 223792 2014-02-10 19:26:14 -0800 2014-02-10 22:33:10 -0800 Patch bug-128557-20140210192614.patch text/plain 13588 jeffrey+webkit U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzODQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjJhNmE3Mzc3ZGFiMTU5 Yjk4YTUzZmE4OWI4NDE5ZjgxM2M3NWVkOS4uY2IzYzRmZDI2ZjkyM2VjMTQ5ZGM1NjQ2YzdjZjQ3 ZWI2OTI5N2FkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTAyLTEwICBKZWZm cmV5IFBmYXUgIDxqcGZhdUBhcHBsZS5jb20+CisKKyAgICAgICAgQnJpbmcgdGhpcmQtcGFydHkg YXBwIGNhY2hlIGJsb2NraW5nIGJlaGF2aW9yIGluIGxpbmUgd2l0aCBwcml2YXRlIGJyb3dzaW5n IGFwcCBjYWNoZSBibG9ja2luZyBiZWhhdmlvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4NTU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdy b3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6Y2FjaGVG b3JNYWluUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlR3JvdXA6 OnNlbGVjdENhY2hlKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6 c2VsZWN0Q2FjaGVXaXRob3V0TWFuaWZlc3RVUkwpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbGlj YXRpb25DYWNoZUdyb3VwOjp1cGRhdGUpOgorICAgICAgICAqIGxvYWRlci9hcHBjYWNoZS9BcHBs aWNhdGlvbkNhY2hlSG9zdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hl SG9zdDo6bWF5YmVMb2FkTWFpblJlc291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0 aW9uQ2FjaGVIb3N0OjptYXliZUxvYWRGYWxsYmFja0Zvck1haW5SZXNwb25zZSk6CisgICAgICAg IChXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlSG9zdDo6bWF5YmVMb2FkRmFsbGJhY2tGb3JNYWlu RXJyb3IpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbGljYXRpb25DYWNoZUhvc3Q6Om1heWJlTG9h ZFJlc291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVIb3N0OjpzY2hl ZHVsZUxvYWRGYWxsYmFja1Jlc291cmNlRnJvbUFwcGxpY2F0aW9uQ2FjaGUpOgorICAgICAgICAo V2ViQ29yZTo6QXBwbGljYXRpb25DYWNoZUhvc3Q6OmlzQXBwbGljYXRpb25DYWNoZUJsb2NrZWRG b3JSZXF1ZXN0KToKKyAgICAgICAgKiBsb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUhv c3QuaDoKKwogMjAxNC0wMi0xMCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAog ICAgICAgICBBZGRyZXNzIHRoZSByZXZpZXcgY29tbWVudHMgZm9yIHIxNjM4MjUuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdyb3Vw LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlR3Jv dXAuY3BwCmluZGV4IDdkMGZjOGFhZjBiZDA4ZWU0NGZiNzIwNjg2Nzk2NjBjY2Q3NGNiZmUuLjY0 MDdiMWQ2OWQ3NDhlYjUwMTk1YzA5ZDk0ZjAwOTEyYTFjMWZkY2QgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlR3JvdXAuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlR3JvdXAuY3Bw CkBAIC0xMDUsNyArMTA1LDcgQEAgQXBwbGljYXRpb25DYWNoZSogQXBwbGljYXRpb25DYWNoZUdy b3VwOjpjYWNoZUZvck1haW5SZXF1ZXN0KGNvbnN0IFJlc291cmNlUmVxdWUKICAgICBpZiAodXJs Lmhhc0ZyYWdtZW50SWRlbnRpZmllcigpKQogICAgICAgICB1cmwucmVtb3ZlRnJhZ21lbnRJZGVu dGlmaWVyKCk7CiAKLSAgICBpZiAoZG9jdW1lbnRMb2FkZXItPmZyYW1lKCkgJiYgZG9jdW1lbnRM b2FkZXItPmZyYW1lKCktPnNldHRpbmdzKCkucHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgpKQorICAg IGlmIChkb2N1bWVudExvYWRlci0+ZnJhbWUoKSAmJiAoZG9jdW1lbnRMb2FkZXItPmZyYW1lKCkt PnNldHRpbmdzKCkucHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgpIHx8ICFkb2N1bWVudExvYWRlci0+ ZnJhbWUoKS0+ZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKS0+Y2FuQWNjZXNzQXBwbGljYXRp b25DYWNoZShkb2N1bWVudExvYWRlci0+ZnJhbWUoKS0+dHJlZSgpLnRvcCgpLmRvY3VtZW50KCkt PnNlY3VyaXR5T3JpZ2luKCkpKSkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBpZiAoQXBwbGlj YXRpb25DYWNoZUdyb3VwKiBncm91cCA9IGNhY2hlU3RvcmFnZSgpLmNhY2hlR3JvdXBGb3JVUkwo dXJsKSkgewpAQCAtMTQzLDkgKzE0Myw2IEBAIHZvaWQgQXBwbGljYXRpb25DYWNoZUdyb3VwOjpz ZWxlY3RDYWNoZShGcmFtZSogZnJhbWUsIGNvbnN0IFVSTCYgcGFzc2VkTWFuaWZlc3RVCiAgICAg CiAgICAgaWYgKCFmcmFtZS0+c2V0dGluZ3MoKS5vZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVu YWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwotCi0gICAgaWYgKCFmcmFtZS0+ZG9jdW1lbnQoKS0+ c2VjdXJpdHlPcmlnaW4oKS0+Y2FuQWNjZXNzQXBwbGljYXRpb25DYWNoZShmcmFtZS0+dHJlZSgp LnRvcCgpLmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCkpKQotICAgICAgICByZXR1cm47CiAg ICAgCiAgICAgRG9jdW1lbnRMb2FkZXIqIGRvY3VtZW50TG9hZGVyID0gZnJhbWUtPmxvYWRlcigp LmRvY3VtZW50TG9hZGVyKCk7CiAgICAgQVNTRVJUKCFkb2N1bWVudExvYWRlci0+YXBwbGljYXRp b25DYWNoZUhvc3QoKS0+YXBwbGljYXRpb25DYWNoZSgpKTsKQEAgLTE1Niw3ICsxNTMsNyBAQCB2 b2lkIEFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6c2VsZWN0Q2FjaGUoRnJhbWUqIGZyYW1lLCBjb25z dCBVUkwmIHBhc3NlZE1hbmlmZXN0VQogICAgIH0KIAogICAgIC8vIERvbid0IGFjY2VzcyBhbnl0 aGluZyBvbiBkaXNrIGlmIHByaXZhdGUgYnJvd3NpbmcgaXMgZW5hYmxlZC4KLSAgICBpZiAoZnJh bWUtPnNldHRpbmdzKCkucHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgpKSB7CisgICAgaWYgKGZyYW1l LT5zZXR0aW5ncygpLnByaXZhdGVCcm93c2luZ0VuYWJsZWQoKSB8fCAhZnJhbWUtPmRvY3VtZW50 KCktPnNlY3VyaXR5T3JpZ2luKCktPmNhbkFjY2Vzc0FwcGxpY2F0aW9uQ2FjaGUoZnJhbWUtPnRy ZWUoKS50b3AoKS5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpKSkgewogICAgICAgICBwb3N0 TGlzdGVuZXJUYXNrKEFwcGxpY2F0aW9uQ2FjaGVIb3N0OjpDSEVDS0lOR19FVkVOVCwgZG9jdW1l bnRMb2FkZXIpOwogICAgICAgICBwb3N0TGlzdGVuZXJUYXNrKEFwcGxpY2F0aW9uQ2FjaGVIb3N0 OjpFUlJPUl9FVkVOVCwgZG9jdW1lbnRMb2FkZXIpOwogICAgICAgICByZXR1cm47CkBAIC0yMjAs MTQgKzIxNywxMSBAQCB2b2lkIEFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6c2VsZWN0Q2FjaGVXaXRo b3V0TWFuaWZlc3RVUkwoRnJhbWUqIGZyYW1lKQogICAgIGlmICghZnJhbWUtPnNldHRpbmdzKCku b2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKCkpCiAgICAgICAgIHJldHVybjsKIAot ICAgIGlmICghZnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCktPmNhbkFjY2Vzc0Fw cGxpY2F0aW9uQ2FjaGUoZnJhbWUtPnRyZWUoKS50b3AoKS5kb2N1bWVudCgpLT5zZWN1cml0eU9y aWdpbigpKSkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgRG9jdW1lbnRMb2FkZXIqIGRvY3VtZW50 TG9hZGVyID0gZnJhbWUtPmxvYWRlcigpLmRvY3VtZW50TG9hZGVyKCk7CiAgICAgQVNTRVJUKCFk b2N1bWVudExvYWRlci0+YXBwbGljYXRpb25DYWNoZUhvc3QoKS0+YXBwbGljYXRpb25DYWNoZSgp KTsKIAogICAgIC8vIERvbid0IGFjY2VzcyBhbnl0aGluZyBvbiBkaXNrIGlmIHByaXZhdGUgYnJv d3NpbmcgaXMgZW5hYmxlZC4KLSAgICBpZiAoZnJhbWUtPnNldHRpbmdzKCkucHJpdmF0ZUJyb3dz aW5nRW5hYmxlZCgpKSB7CisgICAgaWYgKGZyYW1lLT5zZXR0aW5ncygpLnByaXZhdGVCcm93c2lu Z0VuYWJsZWQoKSB8fCAhZnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCktPmNhbkFj Y2Vzc0FwcGxpY2F0aW9uQ2FjaGUoZnJhbWUtPnRyZWUoKS50b3AoKS5kb2N1bWVudCgpLT5zZWN1 cml0eU9yaWdpbigpKSkgewogICAgICAgICBwb3N0TGlzdGVuZXJUYXNrKEFwcGxpY2F0aW9uQ2Fj aGVIb3N0OjpDSEVDS0lOR19FVkVOVCwgZG9jdW1lbnRMb2FkZXIpOwogICAgICAgICBwb3N0TGlz dGVuZXJUYXNrKEFwcGxpY2F0aW9uQ2FjaGVIb3N0OjpFUlJPUl9FVkVOVCwgZG9jdW1lbnRMb2Fk ZXIpOwogICAgICAgICByZXR1cm47CkBAIC00NDIsNyArNDM2LDcgQEAgdm9pZCBBcHBsaWNhdGlv bkNhY2hlR3JvdXA6OnVwZGF0ZShGcmFtZSogZnJhbWUsIEFwcGxpY2F0aW9uQ2FjaGVVcGRhdGVP cHRpb24gdXAKICAgICB9CiAKICAgICAvLyBEb24ndCBhY2Nlc3MgYW55dGhpbmcgb24gZGlzayBp ZiBwcml2YXRlIGJyb3dzaW5nIGlzIGVuYWJsZWQuCi0gICAgaWYgKGZyYW1lLT5zZXR0aW5ncygp LnByaXZhdGVCcm93c2luZ0VuYWJsZWQoKSkgeworICAgIGlmIChmcmFtZS0+c2V0dGluZ3MoKS5w cml2YXRlQnJvd3NpbmdFbmFibGVkKCkgfHwgIWZyYW1lLT5kb2N1bWVudCgpLT5zZWN1cml0eU9y aWdpbigpLT5jYW5BY2Nlc3NBcHBsaWNhdGlvbkNhY2hlKGZyYW1lLT50cmVlKCkudG9wKCkuZG9j dW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKSkpIHsKICAgICAgICAgQVNTRVJUKG1fcGVuZGluZ01h c3RlclJlc291cmNlTG9hZGVycy5pc0VtcHR5KCkpOwogICAgICAgICBBU1NFUlQobV9wZW5kaW5n RW50cmllcy5pc0VtcHR5KCkpOwogICAgICAgICBBU1NFUlQoIW1fY2FjaGVCZWluZ1VwZGF0ZWQp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9u Q2FjaGVIb3N0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlv bkNhY2hlSG9zdC5jcHAKaW5kZXggZjNkZTY0MWNiNGZmMmNhOGJiNzM4NmYzMTMwZDI2NGVmYjc4 YmQ4Zi4uOWM2OWJlZjcwYTNlNjgzNGYwNTU1ZGY4ZDE0OGY4YzEwNWMyZTIzNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVIb3N0LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUhv c3QuY3BwCkBAIC03NSw3ICs3NSw3IEBAIHZvaWQgQXBwbGljYXRpb25DYWNoZUhvc3Q6OnNlbGVj dENhY2hlV2l0aE1hbmlmZXN0KGNvbnN0IFVSTCYgbWFuaWZlc3RVUkwpCiB2b2lkIEFwcGxpY2F0 aW9uQ2FjaGVIb3N0OjptYXliZUxvYWRNYWluUmVzb3VyY2UoUmVzb3VyY2VSZXF1ZXN0JiByZXF1 ZXN0LCBTdWJzdGl0dXRlRGF0YSYgc3Vic3RpdHV0ZURhdGEpCiB7CiAgICAgLy8gQ2hlY2sgaWYg dGhpcyByZXF1ZXN0IHNob3VsZCBiZSBsb2FkZWQgZnJvbSB0aGUgYXBwbGljYXRpb24gY2FjaGUK LSAgICBpZiAoIXN1YnN0aXR1dGVEYXRhLmlzVmFsaWQoKSAmJiBpc0FwcGxpY2F0aW9uQ2FjaGVF bmFibGVkKCkpIHsKKyAgICBpZiAoIXN1YnN0aXR1dGVEYXRhLmlzVmFsaWQoKSAmJiBpc0FwcGxp Y2F0aW9uQ2FjaGVFbmFibGVkKCkgJiYgIWlzQXBwbGljYXRpb25DYWNoZUJsb2NrZWRGb3JSZXF1 ZXN0KHJlcXVlc3QpKSB7CiAgICAgICAgIEFTU0VSVCghbV9tYWluUmVzb3VyY2VBcHBsaWNhdGlv bkNhY2hlKTsKIAogICAgICAgICBtX21haW5SZXNvdXJjZUFwcGxpY2F0aW9uQ2FjaGUgPSBBcHBs aWNhdGlvbkNhY2hlR3JvdXA6OmNhY2hlRm9yTWFpblJlcXVlc3QocmVxdWVzdCwgbV9kb2N1bWVu dExvYWRlcik7CkBAIC0xMDMsNyArMTAzLDcgQEAgYm9vbCBBcHBsaWNhdGlvbkNhY2hlSG9zdDo6 bWF5YmVMb2FkRmFsbGJhY2tGb3JNYWluUmVzcG9uc2UoY29uc3QgUmVzb3VyY2VSZXF1ZXMKIHsK ICAgICBpZiAoci5odHRwU3RhdHVzQ29kZSgpIC8gMTAwID09IDQgfHwgci5odHRwU3RhdHVzQ29k ZSgpIC8gMTAwID09IDUpIHsKICAgICAgICAgQVNTRVJUKCFtX21haW5SZXNvdXJjZUFwcGxpY2F0 aW9uQ2FjaGUpOwotICAgICAgICBpZiAoaXNBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCgpKSB7Cisg ICAgICAgIGlmIChpc0FwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKCkgJiYgIWlzQXBwbGljYXRpb25D YWNoZUJsb2NrZWRGb3JSZXF1ZXN0KHJlcXVlc3QpKSB7CiAgICAgICAgICAgICBtX21haW5SZXNv dXJjZUFwcGxpY2F0aW9uQ2FjaGUgPSBBcHBsaWNhdGlvbkNhY2hlR3JvdXA6OmZhbGxiYWNrQ2Fj aGVGb3JNYWluUmVxdWVzdChyZXF1ZXN0LCBkb2N1bWVudExvYWRlcigpKTsKIAogICAgICAgICAg ICAgaWYgKHNjaGVkdWxlTG9hZEZhbGxiYWNrUmVzb3VyY2VGcm9tQXBwbGljYXRpb25DYWNoZShk b2N1bWVudExvYWRlcigpLT5tYWluUmVzb3VyY2VMb2FkZXIoKSwgbV9tYWluUmVzb3VyY2VBcHBs aWNhdGlvbkNhY2hlLmdldCgpKSkKQEAgLTExNyw3ICsxMTcsNyBAQCBib29sIEFwcGxpY2F0aW9u Q2FjaGVIb3N0OjptYXliZUxvYWRGYWxsYmFja0Zvck1haW5FcnJvcihjb25zdCBSZXNvdXJjZVJl cXVlc3QmCiB7CiAgICAgaWYgKCFlcnJvci5pc0NhbmNlbGxhdGlvbigpKSB7CiAgICAgICAgIEFT U0VSVCghbV9tYWluUmVzb3VyY2VBcHBsaWNhdGlvbkNhY2hlKTsKLSAgICAgICAgaWYgKGlzQXBw bGljYXRpb25DYWNoZUVuYWJsZWQoKSkgeworICAgICAgICBpZiAoaXNBcHBsaWNhdGlvbkNhY2hl RW5hYmxlZCgpICYmICFpc0FwcGxpY2F0aW9uQ2FjaGVCbG9ja2VkRm9yUmVxdWVzdChyZXF1ZXN0 KSkgewogICAgICAgICAgICAgbV9tYWluUmVzb3VyY2VBcHBsaWNhdGlvbkNhY2hlID0gQXBwbGlj YXRpb25DYWNoZUdyb3VwOjpmYWxsYmFja0NhY2hlRm9yTWFpblJlcXVlc3QocmVxdWVzdCwgbV9k b2N1bWVudExvYWRlcik7CiAKICAgICAgICAgICAgIGlmIChzY2hlZHVsZUxvYWRGYWxsYmFja1Jl c291cmNlRnJvbUFwcGxpY2F0aW9uQ2FjaGUoZG9jdW1lbnRMb2FkZXIoKS0+bWFpblJlc291cmNl TG9hZGVyKCksIG1fbWFpblJlc291cmNlQXBwbGljYXRpb25DYWNoZS5nZXQoKSkpCkBAIC0xNTks NyArMTU5LDcgQEAgdm9pZCBBcHBsaWNhdGlvbkNhY2hlSG9zdDo6ZmluaXNoZWRMb2FkaW5nTWFp blJlc291cmNlKCkKIAogYm9vbCBBcHBsaWNhdGlvbkNhY2hlSG9zdDo6bWF5YmVMb2FkUmVzb3Vy Y2UoUmVzb3VyY2VMb2FkZXIqIGxvYWRlciwgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25z dCBVUkwmIG9yaWdpbmFsVVJMKQogewotICAgIGlmICghaXNBcHBsaWNhdGlvbkNhY2hlRW5hYmxl ZCgpKQorICAgIGlmICghaXNBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCgpICYmICFpc0FwcGxpY2F0 aW9uQ2FjaGVCbG9ja2VkRm9yUmVxdWVzdChyZXF1ZXN0KSkKICAgICAgICAgcmV0dXJuIGZhbHNl OwogICAgIAogICAgIGlmIChyZXF1ZXN0LnVybCgpICE9IG9yaWdpbmFsVVJMKQpAQCAtMzkxLDcg KzM5MSw3IEBAIGJvb2wgQXBwbGljYXRpb25DYWNoZUhvc3Q6OmdldEFwcGxpY2F0aW9uQ2FjaGVG YWxsYmFja1Jlc291cmNlKGNvbnN0IFJlc291cmNlUmVxCiAKIGJvb2wgQXBwbGljYXRpb25DYWNo ZUhvc3Q6OnNjaGVkdWxlTG9hZEZhbGxiYWNrUmVzb3VyY2VGcm9tQXBwbGljYXRpb25DYWNoZShS ZXNvdXJjZUxvYWRlciogbG9hZGVyLCBBcHBsaWNhdGlvbkNhY2hlKiBjYWNoZSkKIHsKLSAgICBp ZiAoIWlzQXBwbGljYXRpb25DYWNoZUVuYWJsZWQoKSkKKyAgICBpZiAoIWlzQXBwbGljYXRpb25D YWNoZUVuYWJsZWQoKSAmJiAhaXNBcHBsaWNhdGlvbkNhY2hlQmxvY2tlZEZvclJlcXVlc3QobG9h ZGVyLT5yZXF1ZXN0KCkpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBBcHBsaWNhdGlv bkNhY2hlUmVzb3VyY2UqIHJlc291cmNlOwpAQCAtNDc5LDQgKzQ3OSwxMCBAQCBib29sIEFwcGxp Y2F0aW9uQ2FjaGVIb3N0Ojppc0FwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKCkKICAgICByZXR1cm4g bV9kb2N1bWVudExvYWRlci0+ZnJhbWUoKSAmJiBtX2RvY3VtZW50TG9hZGVyLT5mcmFtZSgpLT5z ZXR0aW5ncygpLm9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCgpICYmICFtX2RvY3Vt ZW50TG9hZGVyLT5mcmFtZSgpLT5zZXR0aW5ncygpLnByaXZhdGVCcm93c2luZ0VuYWJsZWQoKTsK IH0KIAorYm9vbCBBcHBsaWNhdGlvbkNhY2hlSG9zdDo6aXNBcHBsaWNhdGlvbkNhY2hlQmxvY2tl ZEZvclJlcXVlc3QoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQoreworICAgIFJlZlB0 cjxTZWN1cml0eU9yaWdpbj4gb3JpZ2luID0gU2VjdXJpdHlPcmlnaW46OmNyZWF0ZShyZXF1ZXN0 LnVybCgpKTsKKyAgICByZXR1cm4gbV9kb2N1bWVudExvYWRlci0+ZnJhbWUoKSAmJiAhb3JpZ2lu LT5jYW5BY2Nlc3NBcHBsaWNhdGlvbkNhY2hlKG1fZG9jdW1lbnRMb2FkZXItPmZyYW1lKCktPmRv Y3VtZW50KCktPnRvcE9yaWdpbigpKTsKK30KKwogfSAgLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hl SG9zdC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVI b3N0LmgKaW5kZXggZjZlMGQwYjk0MWUyZmEyM2EyNTI2ZjJmN2MxNjlhNDlkODU1ZGUxMy4uY2I5 MDUyMTY2N2VhYjBkMDIwNjJmMTc0MmQ5MWVlNjliODVhZThiNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVIb3N0LmgKKysrIGIvU291 cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVIb3N0LmgKQEAgLTE1 NSw2ICsxNTUsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICBwcml2YXRlOgogICAgICAg ICBib29sIGlzQXBwbGljYXRpb25DYWNoZUVuYWJsZWQoKTsKKyAgICAgICAgYm9vbCBpc0FwcGxp Y2F0aW9uQ2FjaGVCbG9ja2VkRm9yUmVxdWVzdChjb25zdCBSZXNvdXJjZVJlcXVlc3QmKTsKICAg ICAgICAgRG9jdW1lbnRMb2FkZXIqIGRvY3VtZW50TG9hZGVyKCkgY29uc3QgeyByZXR1cm4gbV9k b2N1bWVudExvYWRlcjsgfQogCiAgICAgICAgIHN0cnVjdCBEZWZlcnJlZEV2ZW50IHsKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl eCBiNGFlYzQ4MmI4YmFmOTRlMWJlMmVmMjFjODBkZjZhNDBiMDAzZDc2Li41NDNjZjc4N2Q0MWIz MzdjOTgzYmZkMzJlMDA5NDU2YTQ1YWNhYmNjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTQt MDItMTAgIEplZmZyZXkgUGZhdSAgPGpwZmF1QGFwcGxlLmNvbT4KKworICAgICAgICBCcmluZyB0 aGlyZC1wYXJ0eSBhcHAgY2FjaGUgYmxvY2tpbmcgYmVoYXZpb3IgaW4gbGluZSB3aXRoIHByaXZh dGUgYnJvd3NpbmcgYXBwIGNhY2hlIGJsb2NraW5nIGJlaGF2aW9yCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg1NTcKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvc2VjdXJpdHkvcmVz b3VyY2VzL2Nyb3NzLW9yaWdpbi1pZnJhbWUtZm9yLWFwcGNhY2hlLWFsbG93ZWQuaHRtbDoKKyAg ICAgICAgKiBodHRwL3Rlc3RzL3NlY3VyaXR5L3Jlc291cmNlcy9jcm9zcy1vcmlnaW4taWZyYW1l LWZvci1hcHBjYWNoZS5odG1sOgorICAgICAgICAqIGh0dHAvdGVzdHMvc2VjdXJpdHkvcmVzb3Vy Y2VzL3NhbWUtb3JpZ2luLWlmcmFtZS1mb3ItYXBwY2FjaGUtYmxvY2tlZC5odG1sOgorCiAyMDE0 LTAyLTA5ICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBVcGRhdGUg YXNwZWN0LXJhdGlvIHByb3BlcnR5IHRvIGhhdmUgY29uc3RyYWluaW5nIGtleXdvcmRzCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L3Jlc291cmNlcy9jcm9zcy1v cmlnaW4taWZyYW1lLWZvci1hcHBjYWNoZS1hbGxvd2VkLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRw L3Rlc3RzL3NlY3VyaXR5L3Jlc291cmNlcy9jcm9zcy1vcmlnaW4taWZyYW1lLWZvci1hcHBjYWNo ZS1hbGxvd2VkLmh0bWwKaW5kZXggMjE5ZGIwYmVjOTZjMTMwZTA4NTNhZjEzZjQ5ODcwYmE1OTZk YjQ0OS4uYjgxYmU4NTRmNGVhMTk4ZDhjMGM5YzYwNDc3MDFlOTI5NTA3YTUzNyAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9yZXNvdXJjZXMvY3Jvc3Mtb3JpZ2lu LWlmcmFtZS1mb3ItYXBwY2FjaGUtYWxsb3dlZC5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAv dGVzdHMvc2VjdXJpdHkvcmVzb3VyY2VzL2Nyb3NzLW9yaWdpbi1pZnJhbWUtZm9yLWFwcGNhY2hl LWFsbG93ZWQuaHRtbApAQCAtNiwyNSArNiwxOSBAQCBmdW5jdGlvbiBjb21wbGV0ZSgpIHsKIAlj bGVhbnVwKCk7CiB9CiAKLWZ1bmN0aW9uIHRpbWVkT3V0KCkgewotCXRyeSB7Ci0JCWFwcGxpY2F0 aW9uQ2FjaGUudXBkYXRlKCk7Ci0JCXRpbWVyID0gc2V0VGltZW91dChjbGVhbnVwLCA1MDAwKTsK LQl9IGNhdGNoIChlKSB7Ci0JCWRvY3VtZW50LndyaXRlKCdDYWNoZSBub3QgZm91bmQnKTsKLQkJ Y2xlYW51cCgpOwotCX0KK2Z1bmN0aW9uIGVycm9yKCkgeworCWRvY3VtZW50LndyaXRlKCdDYWNo ZSBub3QgZm91bmQnKTsKKwljbGVhbnVwKCk7CiB9CiAKIGZ1bmN0aW9uIGNsZWFudXAoKSB7Ci0J Y2xlYXJUaW1lb3V0KHRpbWVyKTsKIAl0b3AucG9zdE1lc3NhZ2UoJ2RvbmUnLCAnKicpOwogfQog CiB0cnkgewotCXRpbWVyID0gc2V0VGltZW91dCh0aW1lZE91dCwgNTAwMCk7CiAJYXBwbGljYXRp b25DYWNoZS5hZGRFdmVudExpc3RlbmVyKCdub3VwZGF0ZScsIGNvbXBsZXRlLCBmYWxzZSk7CiAJ YXBwbGljYXRpb25DYWNoZS5hZGRFdmVudExpc3RlbmVyKCdjYWNoZWQnLCBjb21wbGV0ZSwgZmFs c2UpOworCWFwcGxpY2F0aW9uQ2FjaGUuYWRkRXZlbnRMaXN0ZW5lcignZXJyb3InLCBlcnJvciwg ZmFsc2UpOwogfSBjYXRjaCAoZSkgewogCWRvY3VtZW50LndyaXRlKCdDYWNoZSBub3QgZm91bmQn KTsKIAljbGVhbnVwKCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3Vy aXR5L3Jlc291cmNlcy9jcm9zcy1vcmlnaW4taWZyYW1lLWZvci1hcHBjYWNoZS5odG1sIGIvTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9yZXNvdXJjZXMvY3Jvc3Mtb3JpZ2luLWlmcmFt ZS1mb3ItYXBwY2FjaGUuaHRtbAppbmRleCBkYTE1NjQxZGZmYjNhNDExODQ0M2U5NjUwYzU3ZGRm MTBkMWE0ZDc1Li40MGRlNjI0N2U0ZTc0MDljMDRkNWMxYjYyYzc5M2MwNmI4ZWVkMDhlIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L3Jlc291cmNlcy9jcm9zcy1v cmlnaW4taWZyYW1lLWZvci1hcHBjYWNoZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVz dHMvc2VjdXJpdHkvcmVzb3VyY2VzL2Nyb3NzLW9yaWdpbi1pZnJhbWUtZm9yLWFwcGNhY2hlLmh0 bWwKQEAgLTYsMjUgKzYsMTkgQEAgZnVuY3Rpb24gY29tcGxldGUoKSB7CiAJY2xlYW51cCgpOwog fQogCi1mdW5jdGlvbiB0aW1lZE91dCgpIHsKLQl0cnkgewotCQlhcHBsaWNhdGlvbkNhY2hlLnVw ZGF0ZSgpOwotCQl0aW1lciA9IHNldFRpbWVvdXQoY2xlYW51cCwgNTAwMCk7Ci0JfSBjYXRjaCAo ZSkgewotCQlkb2N1bWVudC53cml0ZSgnQ2FjaGUgbm90IGZvdW5kJyk7Ci0JCWNsZWFudXAoKTsK LQl9CitmdW5jdGlvbiBlcnJvcigpIHsKKwlkb2N1bWVudC53cml0ZSgnQ2FjaGUgbm90IGZvdW5k Jyk7CisJY2xlYW51cCgpOwogfQogCiBmdW5jdGlvbiBjbGVhbnVwKCkgewotCWNsZWFyVGltZW91 dCh0aW1lcik7CiAJdG9wLnBvc3RNZXNzYWdlKCdkb25lJywgJyonKTsKIH0KIAogdHJ5IHsKLQl0 aW1lciA9IHNldFRpbWVvdXQodGltZWRPdXQsIDUwMDApOwogCWFwcGxpY2F0aW9uQ2FjaGUuYWRk RXZlbnRMaXN0ZW5lcignbm91cGRhdGUnLCBjb21wbGV0ZSwgZmFsc2UpOwogCWFwcGxpY2F0aW9u Q2FjaGUuYWRkRXZlbnRMaXN0ZW5lcignY2FjaGVkJywgY29tcGxldGUsIGZhbHNlKTsKKwlhcHBs aWNhdGlvbkNhY2hlLmFkZEV2ZW50TGlzdGVuZXIoJ2Vycm9yJywgZXJyb3IsIGZhbHNlKTsKIH0g Y2F0Y2ggKGUpIHsKIAlkb2N1bWVudC53cml0ZSgnQ2FjaGUgbm90IGZvdW5kJyk7CiAJY2xlYW51 cCgpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9yZXNvdXJj ZXMvc2FtZS1vcmlnaW4taWZyYW1lLWZvci1hcHBjYWNoZS1ibG9ja2VkLmh0bWwgYi9MYXlvdXRU ZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L3Jlc291cmNlcy9zYW1lLW9yaWdpbi1pZnJhbWUtZm9y LWFwcGNhY2hlLWJsb2NrZWQuaHRtbAppbmRleCAzZTg4ODE5N2VlNWVmZTAxYjI4Yjc4YTU1ZGJh NTc5MWE3MjUzODcyLi5mZTJlZTNkMWJlNzk2ZmU1ZjAzMjU1MjEwZTQyYmIwMzMyM2I5MzNkIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L3Jlc291cmNlcy9zYW1l LW9yaWdpbi1pZnJhbWUtZm9yLWFwcGNhY2hlLWJsb2NrZWQuaHRtbAorKysgYi9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL3NlY3VyaXR5L3Jlc291cmNlcy9zYW1lLW9yaWdpbi1pZnJhbWUtZm9yLWFw cGNhY2hlLWJsb2NrZWQuaHRtbApAQCAtNiwyNSArNiwxOSBAQCBmdW5jdGlvbiBjb21wbGV0ZSgp IHsKIAljbGVhbnVwKCk7CiB9CiAKLWZ1bmN0aW9uIHRpbWVkT3V0KCkgewotCXRyeSB7Ci0JCWFw cGxpY2F0aW9uQ2FjaGUudXBkYXRlKCk7Ci0JCXRpbWVyID0gc2V0VGltZW91dChjbGVhbnVwLCA1 MDAwKTsKLQl9IGNhdGNoIChlKSB7Ci0JCWRvY3VtZW50LndyaXRlKCdDYWNoZSBub3QgZm91bmQn KTsKLQkJY2xlYW51cCgpOwotCX0KK2Z1bmN0aW9uIGVycm9yKCkgeworCWRvY3VtZW50LndyaXRl KCdDYWNoZSBub3QgZm91bmQnKTsKKwljbGVhbnVwKCk7CiB9CiAKIGZ1bmN0aW9uIGNsZWFudXAo KSB7Ci0JY2xlYXJUaW1lb3V0KHRpbWVyKTsKIAl0b3AucG9zdE1lc3NhZ2UoJ2RvbmUnLCAnKicp OwogfQogCiB0cnkgewotCXRpbWVyID0gc2V0VGltZW91dCh0aW1lZE91dCwgNTAwMCk7CiAJYXBw bGljYXRpb25DYWNoZS5hZGRFdmVudExpc3RlbmVyKCdub3VwZGF0ZScsIGNvbXBsZXRlLCBmYWxz ZSk7CiAJYXBwbGljYXRpb25DYWNoZS5hZGRFdmVudExpc3RlbmVyKCdjYWNoZWQnLCBjb21wbGV0 ZSwgZmFsc2UpOworCWFwcGxpY2F0aW9uQ2FjaGUuYWRkRXZlbnRMaXN0ZW5lcignZXJyb3InLCBl cnJvciwgZmFsc2UpOwogfSBjYXRjaCAoZSkgewogCWRvY3VtZW50LndyaXRlKCdDYWNoZSBub3Qg Zm91bmQnKTsKIAljbGVhbnVwKCk7Cg==