157370 2016-05-04 21:45:41 -0700 CORS check is sometimes incorrectly failing for media loads 2016-06-19 17:47:41 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=158921 InRadar P1 Normal --- 1 cdumez cdumez achristensen commit-queue eric.carlson jer.noble mcatanzaro oldest_to_newest 1190319 0 cdumez 2016-05-04 21:45:41 -0700 CORS check is sometimes incorrectly failing for media loads. This happens when our media library issues a conditional request and when the sever responds with a "304 Not Modified" response which does not have the "Access-Control-Allow-Origin: *" header. Apache for example does not provide such header for 304 responses. 1190320 1 cdumez 2016-05-04 21:46:18 -0700 <rdar://problem/26071607> 1190321 2 278156 cdumez 2016-05-04 21:48:21 -0700 Created attachment 278156 WIP Patch 1190381 3 278156 achristensen 2016-05-05 10:30:11 -0700 Comment on attachment 278156 WIP Patch View in context: https://bugs.webkit.org/attachment.cgi?id=278156&action=review > Source/WebCore/loader/MediaResourceLoader.cpp:73 > + if (updatedRequest.isConditional() && corsPolicy == PotentiallyCrossOriginEnabled) { We shouldn't need to check if a request is conditional. Just make it unconditional, which won't do anything if it is not conditional. This will reduce iterating. We also don't need to make a new ResourceRequest for non-cors requests. 1190386 4 278156 cdumez 2016-05-05 10:32:22 -0700 Comment on attachment 278156 WIP Patch View in context: https://bugs.webkit.org/attachment.cgi?id=278156&action=review >> Source/WebCore/loader/MediaResourceLoader.cpp:73 >> + if (updatedRequest.isConditional() && corsPolicy == PotentiallyCrossOriginEnabled) { > > We shouldn't need to check if a request is conditional. Just make it unconditional, which won't do anything if it is not conditional. This will reduce iterating. > We also don't need to make a new ResourceRequest for non-cors requests. Yes, I thought about calling makeUnconditional() directly as well. I have it done locally already. It is true we do not have to copy the request in the non-CORS case, it is just easier to write this way. 1190467 5 278193 cdumez 2016-05-05 15:07:06 -0700 Created attachment 278193 Patch 1190510 6 278193 commit-queue 2016-05-05 16:26:28 -0700 Comment on attachment 278193 Patch Clearing flags on attachment: 278193 Committed r200493: <http://trac.webkit.org/changeset/200493> 1190511 7 commit-queue 2016-05-05 16:26:36 -0700 All reviewed patches have been landed. Closing bug. 1203668 8 mcatanzaro 2016-06-19 17:47:41 -0700 This test is timing out for GTK, see bug #158921. 278156 2016-05-04 21:48:21 -0700 2016-05-05 15:07:02 -0700 WIP Patch media_CORS.patch text/plain 2955 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9NZWRpYVJlc291cmNlTG9hZGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9NZWRpYVJlc291cmNlTG9hZGVyLmNwcAppbmRleCBi ZTA2YmYxLi41OWZjNTliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTWVkaWFS ZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL01lZGlhUmVzb3Vy Y2VMb2FkZXIuY3BwCkBAIC02Niw5ICs2NiwxOSBAQCBSZWZQdHI8UGxhdGZvcm1NZWRpYVJlc291 cmNlPiBNZWRpYVJlc291cmNlTG9hZGVyOjpyZXF1ZXN0UmVzb3VyY2UoY29uc3QgUmVzb3VyYwog ICAgIFJlcXVlc3RPcmlnaW5Qb2xpY3kgY29yc1BvbGljeSA9ICFtX2Nyb3NzT3JpZ2luTW9kZS5p c051bGwoKSA/IFBvdGVudGlhbGx5Q3Jvc3NPcmlnaW5FbmFibGVkIDogVXNlRGVmYXVsdE9yaWdp blJlc3RyaWN0aW9uc0ZvclR5cGU7CiAgICAgU3RvcmVkQ3JlZGVudGlhbHMgYWxsb3dDcmVkZW50 aWFscyA9IG1fY3Jvc3NPcmlnaW5Nb2RlLmlzTnVsbCgpIHx8IGVxdWFsTGV0dGVyc0lnbm9yaW5n QVNDSUlDYXNlKG1fY3Jvc3NPcmlnaW5Nb2RlLCAidXNlLWNyZWRlbnRpYWxzIikgPyBBbGxvd1N0 b3JlZENyZWRlbnRpYWxzIDogRG9Ob3RBbGxvd1N0b3JlZENyZWRlbnRpYWxzOwogCisgICAgYXV0 byB1cGRhdGVkUmVxdWVzdCA9IHJlcXVlc3Q7CisjaWYgUExBVEZPUk0oTUFDKSAmJiBfX01BQ19P U19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTIwMAorICAgIC8vIEZJWE1FOiBXb3JrYXJv dW5kIGZvciA8cmRhcjovL3Byb2JsZW0vMjYwNzE2MDc+LiBXZSBhcmUgbm90IGFibGUgdG8gZG8g Q09SUyBjaGVja2luZyBvbiAzMDQgcmVzcG9uc2VzIGJlY2F1c2UgdGhleQorICAgIC8vIGFyZSB1 c3VhbGx5IG1pc3NpbmcgdGhlIGhlYWRlcnMgd2UgbmVlZC4KKyAgICBpZiAodXBkYXRlZFJlcXVl c3QuaXNDb25kaXRpb25hbCgpICYmIGNvcnNQb2xpY3kgPT0gUG90ZW50aWFsbHlDcm9zc09yaWdp bkVuYWJsZWQpIHsKKyAgICAgICAgdXBkYXRlZFJlcXVlc3QubWFrZVVuY29uZGl0aW9uYWwoKTsK KyAgICAgICAgV1RGTG9nQWx3YXlzKCJyZXF1ZXN0UmVzb3VyY2UoJXMpIENPUlMgcmVxdWVzdCB3 YXMgY29uZGl0aW9uYWwsIG1hZGUgdW5jb25kaXRpb25hbCIsIHJlcXVlc3QudXJsKCkuc3RyaW5n KCkudXRmOCgpLmRhdGEoKSk7CisgICAgfQorI2VuZGlmCisKICAgICAvLyBGSVhNRTogU2tpcCBD b250ZW50IFNlY3VyaXR5IFBvbGljeSBjaGVjayBpZiB0aGUgZWxlbWVudCB0aGF0IGluaXRpdGF0 ZWQgdGhpcyByZXF1ZXN0CiAgICAgLy8gaXMgaW4gYSB1c2VyLWFnZW50IHNoYWRvdyB0cmVlLiBT ZWUgPGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTU1MDU+LgotICAg IENhY2hlZFJlc291cmNlUmVxdWVzdCBjYWNoZVJlcXVlc3QocmVxdWVzdCwgUmVzb3VyY2VMb2Fk ZXJPcHRpb25zKFNlbmRDYWxsYmFja3MsIERvTm90U25pZmZDb250ZW50LCBidWZmZXJpbmdQb2xp Y3ksIGFsbG93Q3JlZGVudGlhbHMsIERvTm90QXNrQ2xpZW50Rm9yQ3Jvc3NPcmlnaW5DcmVkZW50 aWFscywgQ2xpZW50RGlkTm90UmVxdWVzdENyZWRlbnRpYWxzLCBEb1NlY3VyaXR5Q2hlY2ssIGNv cnNQb2xpY3ksIERvTm90SW5jbHVkZUNlcnRpZmljYXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9s aWN5SW1wb3NpdGlvbjo6RG9Qb2xpY3lDaGVjaywgRGVmZXJzTG9hZGluZ1BvbGljeTo6QWxsb3dE ZWZlcnNMb2FkaW5nLCBDYWNoaW5nUG9saWN5OjpBbGxvd0NhY2hpbmcpKTsKKyAgICBDYWNoZWRS ZXNvdXJjZVJlcXVlc3QgY2FjaGVSZXF1ZXN0KHVwZGF0ZWRSZXF1ZXN0LCBSZXNvdXJjZUxvYWRl ck9wdGlvbnMoU2VuZENhbGxiYWNrcywgRG9Ob3RTbmlmZkNvbnRlbnQsIGJ1ZmZlcmluZ1BvbGlj eSwgYWxsb3dDcmVkZW50aWFscywgRG9Ob3RBc2tDbGllbnRGb3JDcm9zc09yaWdpbkNyZWRlbnRp YWxzLCBDbGllbnREaWROb3RSZXF1ZXN0Q3JlZGVudGlhbHMsIERvU2VjdXJpdHlDaGVjaywgY29y c1BvbGljeSwgRG9Ob3RJbmNsdWRlQ2VydGlmaWNhdGVJbmZvLCBDb250ZW50U2VjdXJpdHlQb2xp Y3lJbXBvc2l0aW9uOjpEb1BvbGljeUNoZWNrLCBEZWZlcnNMb2FkaW5nUG9saWN5OjpBbGxvd0Rl ZmVyc0xvYWRpbmcsIENhY2hpbmdQb2xpY3k6OkFsbG93Q2FjaGluZykpOwogCiAgICAgaWYgKCFt X2Nyb3NzT3JpZ2luTW9kZS5pc051bGwoKSkKICAgICAgICAgdXBkYXRlUmVxdWVzdEZvckFjY2Vz c0NvbnRyb2woY2FjaGVSZXF1ZXN0Lm11dGFibGVSZXNvdXJjZVJlcXVlc3QoKSwgbV9kb2N1bWVu dC0+c2VjdXJpdHlPcmlnaW4oKSwgYWxsb3dDcmVkZW50aWFscyk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVxdWVzdEJhc2UuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlcXVlc3RCYXNlLmNwcAppbmRl eCA3ODgxYzgzLi5kZTI4ZjNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL1Jlc291cmNlUmVxdWVzdEJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvUmVzb3VyY2VSZXF1ZXN0QmFzZS5jcHAKQEAgLTU0NSw2ICs1NDUsOCBAQCBz dGF0aWMgY29uc3QgSFRUUEhlYWRlck5hbWUgY29uZGl0aW9uYWxIZWFkZXJOYW1lc1tdID0gewog CiBib29sIFJlc291cmNlUmVxdWVzdEJhc2U6OmlzQ29uZGl0aW9uYWwoKSBjb25zdAogeworICAg IHVwZGF0ZVJlc291cmNlUmVxdWVzdCgpOworCiAgICAgZm9yIChhdXRvIGhlYWRlck5hbWUgOiBj b25kaXRpb25hbEhlYWRlck5hbWVzKSB7CiAgICAgICAgIGlmIChtX2h0dHBIZWFkZXJGaWVsZHMu Y29udGFpbnMoaGVhZGVyTmFtZSkpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsK 278193 2016-05-05 15:07:06 -0700 2016-05-05 16:26:28 -0700 Patch bug-157370-20160505150747.patch text/plain 9697 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjAwNDQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTM2OTMxZTNjZTY3YTli Zjg4Njg0Y2NkZmEzZjIxYjg1ODg3YjMyYy4uNGJmODA5YmMzOTFjNjA5NjU5OTcwMWU5YTg4Yzg5 OWY0MzFmNzk1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ1IEBACisyMDE2LTA1LTA1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQ09SUyBjaGVjayBpcyBzb21l dGltZXMgaW5jb3JyZWN0bHkgZmFpbGluZyBmb3IgbWVkaWEgbG9hZHMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzM3MAorICAgICAgICA8cmRhcjov L3Byb2JsZW0vMjYwNzE2MDc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV2hlbiB0aGUgbWVkaWEgbGlicmFyeSBpcyBpc3N1aW5nIGEgY29uZGl0aW9u YWwgcmVxdWVzdCBmb3IgYSBtZWRpYQorICAgICAgICBlbGVtZW50IHRoYXQgaGFkIHRoZSAnY3Jv c3NvcmlnaW4nIGF0dHJpYnV0ZSwgd2Ugd291bGQgZmFpbCB0aGUgQ09SUworICAgICAgICBjaGVj ayBhbmQgbG9nIGFuIGVycm9yIGlmIHRoZSBzZXJ2ZXIgd2VyZSB0byByZXNwb25kIHdpdGggYSAi MzA0IE5vdAorICAgICAgICBNb2RpZmllZCIgcmVzcG9uc2UgYmVjYXVzZSB0aGUgMzA0IHJlc3Bv bnNlIHVzdWFsbHkgZG9lcyBub3QgaGF2ZQorICAgICAgICB0aGUgbmVjZXNzYXJ5ICJBY2Nlc3Mt Q29udHJvbC1BbGxvdy1PcmlnaW46ICoiIGhlYWRlciAoQXQgbGVhc3QgZm9yCisgICAgICAgIEFw YWNoZSkgYW5kIHdlIGNhbm5vdCB1c2UgdGhlIGNhY2hlZCBoZWFkZXJzIGVpdGhlciBzaW5jZSBX ZWJLaXQKKyAgICAgICAgZG9lcyBub3QgaGF2ZSB0aGVtLgorCisgICAgICAgIFRvIHdvcmsgYXJv dW5kIHRoZSBwcm9ibGVtIGluIHRoZSBzaG9ydCB0ZXJtLCB3ZSBub3cgZHJvcCB0aGUKKyAgICAg ICAgY29uZGl0aW9uYWwgaGVhZGVycyBmcm9tIHRoZSByZXF1ZXN0IHRoYXQgdGhlIG1lZGlhIGxp YnJhcnkgaXMKKyAgICAgICAgZ2l2aW5nIHVzIHdoZW4gdGhlIG1lZGlhIGVsZW1lbnQgaGFzIHRo ZSAnY3Jvc3NvcmlnaW4nIGF0dHJpYnV0ZQorICAgICAgICBzZXQuIEFzIGEgcmVzdWx0LCB0aGUg c2VydmVyIHdpbGwgbmV2ZXIgcmVzcG9uZCB3aXRoIGEgMzA0IGFuZCB3ZQorICAgICAgICB3aWxs IGJlIGFibGUgdG8gZG8gYSBDT1JTIGNoZWNrIG9uIHRoZSBmdWxsIChlLmcuIDIwNikgcmVzcG9u c2UuCisKKyAgICAgICAgSW4gdGhlIGxvbmcgdGVybSwgd2UgbmVlZCB0byBkZWFsIHdpdGggdGhp cyBiZXR0ZXIgYXMgdGhpcyBtZWFucworICAgICAgICB3ZSBtYXkgc29tZXRpbWVzIGZhaWwgdG8g cmV1c2UgY2FjaGVkIGRhdGEuIEZvciBub3csIHRoaXMgaXMgb25seQorICAgICAgICBwb3RlbnRp YWxseSBpbmVmZmljaWVudCBpbiB0aGUgY2FzZXMgdGhhdCB3ZXJlIGJyb2tlbiAoaS5lLiBubwor ICAgICAgICB2aWRlbyB3b3VsZCBwbGF5IGFuZCB3ZSB3b3VsZCBsb2cgYW4gZXJyb3IgaW4gdGhl IGNvbnNvbGUpLgorCisgICAgICAgIFRlc3Q6IGh0dHAvdGVzdHMvc2VjdXJpdHkvdmlkZW8tY3Jv c3Mtb3JpZ2luLWNhY2hpbmcuaHRtbAorCisgICAgICAgICogbG9hZGVyL01lZGlhUmVzb3VyY2VM b2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFSZXNvdXJjZUxvYWRlcjo6cmVxdWVz dFJlc291cmNlKToKKyAgICAgICAgTWFrZSB0aGUgcmVxdWVzdCB1bmNvbmRpdGlvbmFsIGlmIHRo ZSBtZWRpYSBlbGVtZW50IGhhcyB0aGUKKyAgICAgICAgJ2Nyb3Nzb3JpZ2luJyBhdHRyaWJ1dGUg c2V0LgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlcXVlc3RCYXNlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdEJhc2U6OmlzQ29uZGl0aW9uYWwp OgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0QmFzZTo6bWFrZVVuY29uZGl0aW9u YWwpOgorICAgICAgICBXaGVuIGZpeGluZyB0aGUgYnVnIGFib3ZlLCBJIG5vdGljZWQgdGhhdCB0 aG9zZSBtZXRob2QgZG8gbm90IGRvCisgICAgICAgIHRoZSByaWdodCB0aGluZyBpZiB0aGUgbV9o dHRwSGVhZGVyRmllbGRzIGRhdGEgbWVtYmVyIGhhcyBub3QKKyAgICAgICAgYmVlbiBwb3B1bGF0 ZWQgeWV0LiBtX2h0dHBIZWFkZXJGaWVsZHMgaXMgbGF6aWx5IGluaXRpYWxpemVkIHNvCisgICAg ICAgIHdlIG5lZWQgdG8gY2FsbCB1cGRhdGVSZXNvdXJjZVJlcXVlc3QoKSBiZWZvcmUgdXNpbmcg aXQuCisKIDIwMTYtMDUtMDQgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+ CiAKICAgICAgICAgW2lPU10gUGxheWJhY2sgZG9lcyBub3QgcGF1c2Ugd2hlbiBsb2NraW5nIHNj cmVlbiBhZnRlciBwbGF5aW5nIHRvIEFpclBsYXkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvTWVkaWFSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv TWVkaWFSZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggYmUwNmJmMTdlMjc3NTE0ODk4ZTQ3NmMxZWQz MzQzNDY2ZTZlZWU2OS4uOTZjNjkyZGUxOTlmYTRjZDY0MDk1MjJjYjA1MzFlODllNGRmMmY5ZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL01lZGlhUmVzb3VyY2VMb2FkZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9NZWRpYVJlc291cmNlTG9hZGVyLmNwcApAQCAt NjYsOSArNjYsMTcgQEAgUmVmUHRyPFBsYXRmb3JtTWVkaWFSZXNvdXJjZT4gTWVkaWFSZXNvdXJj ZUxvYWRlcjo6cmVxdWVzdFJlc291cmNlKGNvbnN0IFJlc291cmMKICAgICBSZXF1ZXN0T3JpZ2lu UG9saWN5IGNvcnNQb2xpY3kgPSAhbV9jcm9zc09yaWdpbk1vZGUuaXNOdWxsKCkgPyBQb3RlbnRp YWxseUNyb3NzT3JpZ2luRW5hYmxlZCA6IFVzZURlZmF1bHRPcmlnaW5SZXN0cmljdGlvbnNGb3JU eXBlOwogICAgIFN0b3JlZENyZWRlbnRpYWxzIGFsbG93Q3JlZGVudGlhbHMgPSBtX2Nyb3NzT3Jp Z2luTW9kZS5pc051bGwoKSB8fCBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShtX2Nyb3Nz T3JpZ2luTW9kZSwgInVzZS1jcmVkZW50aWFscyIpID8gQWxsb3dTdG9yZWRDcmVkZW50aWFscyA6 IERvTm90QWxsb3dTdG9yZWRDcmVkZW50aWFsczsKIAorICAgIGF1dG8gdXBkYXRlZFJlcXVlc3Qg PSByZXF1ZXN0OworI2lmIEhBVkUoQVZGT1VOREFUSU9OX0xPQURFUl9ERUxFR0FURSkgJiYgUExB VEZPUk0oTUFDKQorICAgIC8vIEZJWE1FOiBXb3JrYXJvdW5kIGZvciA8cmRhcjovL3Byb2JsZW0v MjYwNzE2MDc+LiBXZSBhcmUgbm90IGFibGUgdG8gZG8gQ09SUyBjaGVja2luZyBvbiAzMDQgcmVz cG9uc2VzIGJlY2F1c2UgdGhleQorICAgIC8vIGFyZSB1c3VhbGx5IG1pc3NpbmcgdGhlIGhlYWRl cnMgd2UgbmVlZC4KKyAgICBpZiAoY29yc1BvbGljeSA9PSBQb3RlbnRpYWxseUNyb3NzT3JpZ2lu RW5hYmxlZCkKKyAgICAgICAgdXBkYXRlZFJlcXVlc3QubWFrZVVuY29uZGl0aW9uYWwoKTsKKyNl bmRpZgorCiAgICAgLy8gRklYTUU6IFNraXAgQ29udGVudCBTZWN1cml0eSBQb2xpY3kgY2hlY2sg aWYgdGhlIGVsZW1lbnQgdGhhdCBpbml0aXRhdGVkIHRoaXMgcmVxdWVzdAogICAgIC8vIGlzIGlu IGEgdXNlci1hZ2VudCBzaGFkb3cgdHJlZS4gU2VlIDxodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTU1NTA1Pi4KLSAgICBDYWNoZWRSZXNvdXJjZVJlcXVlc3QgY2FjaGVS ZXF1ZXN0KHJlcXVlc3QsIFJlc291cmNlTG9hZGVyT3B0aW9ucyhTZW5kQ2FsbGJhY2tzLCBEb05v dFNuaWZmQ29udGVudCwgYnVmZmVyaW5nUG9saWN5LCBhbGxvd0NyZWRlbnRpYWxzLCBEb05vdEFz a0NsaWVudEZvckNyb3NzT3JpZ2luQ3JlZGVudGlhbHMsIENsaWVudERpZE5vdFJlcXVlc3RDcmVk ZW50aWFscywgRG9TZWN1cml0eUNoZWNrLCBjb3JzUG9saWN5LCBEb05vdEluY2x1ZGVDZXJ0aWZp Y2F0ZUluZm8sIENvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb246OkRvUG9saWN5Q2hlY2ss IERlZmVyc0xvYWRpbmdQb2xpY3k6OkFsbG93RGVmZXJzTG9hZGluZywgQ2FjaGluZ1BvbGljeTo6 QWxsb3dDYWNoaW5nKSk7CisgICAgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0IGNhY2hlUmVxdWVzdCh1 cGRhdGVkUmVxdWVzdCwgUmVzb3VyY2VMb2FkZXJPcHRpb25zKFNlbmRDYWxsYmFja3MsIERvTm90 U25pZmZDb250ZW50LCBidWZmZXJpbmdQb2xpY3ksIGFsbG93Q3JlZGVudGlhbHMsIERvTm90QXNr Q2xpZW50Rm9yQ3Jvc3NPcmlnaW5DcmVkZW50aWFscywgQ2xpZW50RGlkTm90UmVxdWVzdENyZWRl bnRpYWxzLCBEb1NlY3VyaXR5Q2hlY2ssIGNvcnNQb2xpY3ksIERvTm90SW5jbHVkZUNlcnRpZmlj YXRlSW5mbywgQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6RG9Qb2xpY3lDaGVjaywg RGVmZXJzTG9hZGluZ1BvbGljeTo6QWxsb3dEZWZlcnNMb2FkaW5nLCBDYWNoaW5nUG9saWN5OjpB bGxvd0NhY2hpbmcpKTsKIAogICAgIGlmICghbV9jcm9zc09yaWdpbk1vZGUuaXNOdWxsKCkpCiAg ICAgICAgIHVwZGF0ZVJlcXVlc3RGb3JBY2Nlc3NDb250cm9sKGNhY2hlUmVxdWVzdC5tdXRhYmxl UmVzb3VyY2VSZXF1ZXN0KCksIG1fZG9jdW1lbnQtPnNlY3VyaXR5T3JpZ2luKCksIGFsbG93Q3Jl ZGVudGlhbHMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9S ZXNvdXJjZVJlcXVlc3RCYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv UmVzb3VyY2VSZXF1ZXN0QmFzZS5jcHAKaW5kZXggNzg4MWM4M2QwNjQ0M2NiZGMyZWNiOTc1NTRi NWFmYThkOTI1M2IxYS4uNjI0Zjk5YjI0ODQyZmZiMTFmOGQ2NGYwYzM3OGIzZGJmZTI0ZmRlNCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlcXVl c3RCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNl UmVxdWVzdEJhc2UuY3BwCkBAIC01NDUsNiArNTQ1LDggQEAgc3RhdGljIGNvbnN0IEhUVFBIZWFk ZXJOYW1lIGNvbmRpdGlvbmFsSGVhZGVyTmFtZXNbXSA9IHsKIAogYm9vbCBSZXNvdXJjZVJlcXVl c3RCYXNlOjppc0NvbmRpdGlvbmFsKCkgY29uc3QKIHsKKyAgICB1cGRhdGVSZXNvdXJjZVJlcXVl c3QoKTsKKwogICAgIGZvciAoYXV0byBoZWFkZXJOYW1lIDogY29uZGl0aW9uYWxIZWFkZXJOYW1l cykgewogICAgICAgICBpZiAobV9odHRwSGVhZGVyRmllbGRzLmNvbnRhaW5zKGhlYWRlck5hbWUp KQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC01NTUsNiArNTU3LDggQEAgYm9vbCBSZXNv dXJjZVJlcXVlc3RCYXNlOjppc0NvbmRpdGlvbmFsKCkgY29uc3QKIAogdm9pZCBSZXNvdXJjZVJl cXVlc3RCYXNlOjptYWtlVW5jb25kaXRpb25hbCgpCiB7CisgICAgdXBkYXRlUmVzb3VyY2VSZXF1 ZXN0KCk7CisKICAgICBmb3IgKGF1dG8gaGVhZGVyTmFtZSA6IGNvbmRpdGlvbmFsSGVhZGVyTmFt ZXMpCiAgICAgICAgIG1faHR0cEhlYWRlckZpZWxkcy5yZW1vdmUoaGVhZGVyTmFtZSk7CiB9CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK aW5kZXggMTA1ODRlNTI0YWQ0N2M2MWVkYWY0MDhjZjJhY2M2ZThlODM0ZTdlZS4uMmYwYTA1NzMx ZGNmMDMzMTBlZmQxMGFiNTRiZTBkZTFkZjcxNzQ2MyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisy MDE2LTA1LTA1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQ09S UyBjaGVjayBpcyBzb21ldGltZXMgaW5jb3JyZWN0bHkgZmFpbGluZyBmb3IgbWVkaWEgbG9hZHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzM3MAor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjYwNzE2MDc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgcmVncmVzc2lvbiB0ZXN0IGZvciA8cmRh cjovL3Byb2JsZW0vMjYwNzE2MDc+LgorCisgICAgICAgICogaHR0cC90ZXN0cy9tZWRpYS9yZXNv dXJjZXMvcmVmZXJlbmNlLm1vdjogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9zZWN1cml0 eS9yZXNvdXJjZXMvcmVmZXJlbmNlLW1vdmllLWNyb3NzLW9yaWdpbi1hbGxvdy5waHA6IEFkZGVk LgorICAgICAgICAqIGh0dHAvdGVzdHMvc2VjdXJpdHkvdmlkZW8tY3Jvc3Mtb3JpZ2luLWNhY2hp bmctZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL3NlY3VyaXR5L3Zp ZGVvLWNyb3NzLW9yaWdpbi1jYWNoaW5nLmh0bWw6IEFkZGVkLgorCiAyMDE2LTA1LTA0ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBDU1A6IFBlcmZvcm0gY2Fz ZSBzZW5zaXRpdmUgbWF0Y2ggYWdhaW5zdCBwYXRoIHBvcnRpb24gb2Ygc291cmNlIGV4cHJlc3Np b24gVVJMIHRoYXQgZW5kcyBpbiAnLycKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVz dHMvbWVkaWEvcmVzb3VyY2VzL3JlZmVyZW5jZS5tb3YgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L21lZGlhL3Jlc291cmNlcy9yZWZlcmVuY2UubW92Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmFmM2RkZDE4YzI1MTEz YjI2YzU1MDRiYzA1NTI3ZDJhYzkwZmZkZDgKR0lUIGJpbmFyeSBwYXRjaApsaXRlcmFsIDE0NAp6 Y21aUXpWQ2NgeSZvNShPVX0hSk9FbExFXl4rbVpVQWxrVm9yNj4oWkduNXdQQzslel9qRk9UOUR9 OC1LQlhkMGkKekFUK2VIRmZjSUMmck1DcU93PXoqRXpVMTNOPV99LUZHKCNmKGFTOWAwcUdPfjhk VV5oRmZmUWQwMV8laXh5ZE9ZClJVVTVvbEdFZmMzOGYzdTgxcHFUPUFYV2VYCgpsaXRlcmFsIDAK SGNtVj9kMDAwMDEKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5 L3Jlc291cmNlcy9yZWZlcmVuY2UtbW92aWUtY3Jvc3Mtb3JpZ2luLWFsbG93LnBocCBiL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvcmVzb3VyY2VzL3JlZmVyZW5jZS1tb3ZpZS1jcm9z cy1vcmlnaW4tYWxsb3cucGhwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQzODhmODYyYTg5MzhmNzU3ZDJlYjUxMjNk MjBhZmVjMDMyODljNWYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L3NlY3VyaXR5L3Jlc291cmNlcy9yZWZlcmVuY2UtbW92aWUtY3Jvc3Mtb3JpZ2luLWFsbG93LnBo cApAQCAtMCwwICsxLDE2IEBACis8P3BocAorCitpZiAoaXNzZXQoJF9TRVJWRVJbIkhUVFBfSUZf TU9ESUZJRURfU0lOQ0UiXSkgfHwgaXNzZXQoJF9TRVJWRVJbIkhUVFBfSUZfTk9ORV9NQVRDSCJd KSkgeworICAgIC8vIEFsd2F5cyByZXNwb25kIHRvIGNvbmRpdGlvbmFsIHJlcXVlc3RzIHdpdGgg YSAzMDQuCisgICAgaGVhZGVyKCJIVFRQLzEuMSAzMDQgTm90IE1vZGlmaWVkIik7CisgICAgcmV0 dXJuOworfQorCitoZWFkZXIoIkFjY2Vzcy1Db250cm9sLUFsbG93LU9yaWdpbjogKiIpOworaGVh ZGVyKCJFVGFnOiBmb28iKTsKK2hlYWRlcigiTGFzdC1Nb2RpZmllZDogVGh1LCAwMSBKYW4gMjAw MCAwMDowMDowMCBHTVQiKTsKK2hlYWRlcigiQ2FjaGUtQ29udHJvbDogbWF4LWFnZT0wIik7CisK K0BpbmNsdWRlKCIuLi8uLi9tZWRpYS9yZXNvdXJjZXMvcmVmZXJlbmNlLm1vdiIpOworCis/Pgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS92aWRlby1jcm9zcy1v cmlnaW4tY2FjaGluZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3Vy aXR5L3ZpZGVvLWNyb3NzLW9yaWdpbi1jYWNoaW5nLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5h MjcyMTk4NWM3ZWY0NWQ2ZDM4ZDA2ZmRmYjY1MmVhM2Y4ZWQxYTE0Ci0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS92aWRlby1jcm9zcy1vcmlnaW4tY2Fj aGluZy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw3IEBACisKK1RoaXMgdGVzdCBwYXNzZXMgaWYg eW91IGRvIG5vdCBzZWUgYSBDT1JTIGVycm9yLgorCitFVkVOVChwbGF5aW5nKQorRVZFTlQocGxh eWluZykKK0VORCBPRiBURVNUCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv c2VjdXJpdHkvdmlkZW8tY3Jvc3Mtb3JpZ2luLWNhY2hpbmcuaHRtbCBiL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvc2VjdXJpdHkvdmlkZW8tY3Jvc3Mtb3JpZ2luLWNhY2hpbmcuaHRtbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi4zMjA4ZGNmNzVjOTRkNDE1NWRkN2Y4OWQ2NTg4YmMxZjk2N2FlMDZiCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS92aWRlby1jcm9zcy1vcmln aW4tY2FjaGluZy5odG1sCkBAIC0wLDAgKzEsMzQgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+ CisgIDxoZWFkPgorICAgIDxzY3JpcHQgc3JjPS4uLy4uL21lZGlhLXJlc291cmNlcy92aWRlby10 ZXN0LmpzPjwvc2NyaXB0PgorICAgIDxzY3JpcHQ+CisgICAgICAgIHZhciBpc0ZpcnN0TG9hZCA9 IHRydWU7CisgICAgICAgIHZhciB0ZXN0VVJMID0gImh0dHA6Ly9sb2NhbGhvc3Q6ODAwMC9zZWN1 cml0eS9yZXNvdXJjZXMvcmVmZXJlbmNlLW1vdmllLWNyb3NzLW9yaWdpbi1hbGxvdy5waHAiOwor CisgICAgICAgIHdhaXRGb3JFdmVudCgncGxheWluZycsIGZ1bmN0aW9uKCkgeworICAgICAgICAg IGlmICghaXNGaXJzdExvYWQpIHsKKyAgICAgICAgICAgICAgZW5kVGVzdCgpOworICAgICAgICAg ICAgICByZXR1cm47CisgICAgICAgICAgfQorICAgICAgICAgIGlzRmlyc3RMb2FkID0gZmFsc2U7 CisKKyAgICAgICAgICB2aWRlby5zcmMgPSAiIjsKKyAgICAgICAgICBzZXRUaW1lb3V0KGZ1bmN0 aW9uKCkgeworICAgICAgICAgICAgICB2aWRlby5zcmMgPSB0ZXN0VVJMOworICAgICAgICAgICAg ICB2aWRlby5wbGF5KCk7CisgICAgICAgICAgfSwgMCk7CisgICAgICAgIH0pOworCisgICAgICAg IGZ1bmN0aW9uIHN0YXJ0KCkgeworICAgICAgICAgICAgZmluZE1lZGlhRWxlbWVudCgpOworICAg ICAgICAgICAgdmlkZW8uc3JjID0gdGVzdFVSTDsKKyAgICAgICAgICAgIHZpZGVvLnBsYXkoKTsK KyAgICAgICAgfQorICAgIDwvc2NyaXB0PgorICA8L2hlYWQ+CisgIDxib2R5IG9ubG9hZD0ic3Rh cnQoKSI+CisgICAgPHZpZGVvIGNyb3Nzb3JpZ2luPjwvdmlkZW8+CisgICAgPHA+VGhpcyB0ZXN0 IHBhc3NlcyBpZiB5b3UgZG8gbm90IHNlZSBhIENPUlMgZXJyb3IuPC9wPgorICA8L2JvZHk+Cis8 L2h0bWw+Cg==