163003 2016-10-06 03:09:06 -0700 [Readable Streams API] Implement generic reader functions 2016-10-07 08:13:20 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 romain.wkt romain.wkt calvaris commit-queue youennf oldest_to_newest 1236982 0 romain.wkt 2016-10-06 03:09:06 -0700 To prepare implementation of BYOBReader, reader generic functions should be implemented (readableStreamReaderGenericCancel/Initialize/Release). 1236990 1 290808 romain.wkt 2016-10-06 03:29:29 -0700 Created attachment 290808 Patch 1237249 2 290808 commit-queue 2016-10-06 12:39:13 -0700 Comment on attachment 290808 Patch Rejecting attachment 290808 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 290808, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: ded at 1 with fuzz 3. patching file Source/WebCore/Modules/streams/ReadableStreamDefaultReader.js Hunk #2 FAILED at 57. 1 out of 2 hunks FAILED -- saving rejects to file Source/WebCore/Modules/streams/ReadableStreamDefaultReader.js.rej patching file Source/WebCore/Modules/streams/ReadableStreamInternals.js Hunk #1 succeeded at 36 with fuzz 2. Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Darin Adler']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.webkit.org/results/2233005 1237529 3 290913 romain.wkt 2016-10-07 01:21:51 -0700 Created attachment 290913 Patch 1237532 4 romain.wkt 2016-10-07 01:23:43 -0700 Commit queue failed due to a previous commit (usage of @throwTypeError). Appropriate merge was done in the new version of the patch. 1237597 5 290913 commit-queue 2016-10-07 08:13:17 -0700 Comment on attachment 290913 Patch Clearing flags on attachment: 290913 Committed r206912: <http://trac.webkit.org/changeset/206912> 1237598 6 commit-queue 2016-10-07 08:13:20 -0700 All reviewed patches have been landed. Closing bug. 290808 2016-10-06 03:29:29 -0700 2016-10-07 01:21:45 -0700 Patch bug-163003-20161006122614.patch text/plain 6043 romain.wkt U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2ODUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjdlYzNhOGI5OGM3OGNh ZTc4ZGQ0NWY4MjBlNGM0MzY0ZTUyZjk5Yi4uODM2NDYxYzIzZTczNGQxZTgyMDkxY2NjMjUwZmU4 MTk5M2FmNDRmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE2LTEwLTA2ICBSb21h aW4gQmVsbGVzc29ydCAgPHJvbWFpbi5iZWxsZXNzb3J0QGNyZi5jYW5vbi5mcj4KKworICAgICAg ICBbUmVhZGFibGUgU3RyZWFtcyBBUEldIEltcGxlbWVudCBnZW5lcmljIHJlYWRlciBmdW5jdGlv bnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MzAw MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxl bWVudHMgcmVhZGVyIGdlbmVyaWMgZnVuY3Rpb25zIGRlZmluZWQgYnkgc3BlYyBpbiBvcmRlciB0 byBwcmVwYXJlIEJZT0JSZWFkZXIgaW50ZWdyYXRpb24uCisgICAgICAgIEdlbmVyaWMgZnVuY3Rp b25zIGZhY3Rvcml6ZSBzb21lIGNvZGUgdGhhdCBpcyB1c2VkIGJ5IGJvdGggRGVmYXVsdFJlYWRl ciBhbmQgQllPQlJlYWRlci4KKworICAgICAgICBObyBjaGFuZ2UgaW4gYmVoYXZpb3VyLgorCisg ICAgICAgICogTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtRGVmYXVsdFJlYWRlci5qczoK KyAgICAgICAgKGNhbmNlbCk6IFJlbHkgb24gcmVhZGFibGVTdHJlYW1SZWFkZXJHZW5lcmljQ2Fu Y2VsLgorICAgICAgICAocmVsZWFzZUxvY2spOiBSZWx5IG9uIHJlYWRhYmxlU3RyZWFtUmVhZGVy R2VuZXJpY1JlbGVhc2UuCisgICAgICAgICogTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFt SW50ZXJuYWxzLmpzOgorICAgICAgICAocHJpdmF0ZUluaXRpYWxpemVSZWFkYWJsZVN0cmVhbURl ZmF1bHRSZWFkZXIpOiBSZWx5IG9uIHJlYWRhYmxlU3RyZWFtUmVhZGVyR2VuZXJpY0luaXRpYWxp emUuCisgICAgICAgIChyZWFkYWJsZVN0cmVhbVJlYWRlckdlbmVyaWNJbml0aWFsaXplKTogQWRk ZWQuCisgICAgICAgIChyZWFkYWJsZVN0cmVhbVJlYWRlckdlbmVyaWNDYW5jZWwpOiBBZGRlZC4K KyAgICAgICAgKHJlYWRhYmxlU3RyZWFtUmVhZGVyR2VuZXJpY1JlbGVhc2UpOiBBZGRlZC4KKwog MjAxNi0xMC0wNSAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIwNjg0NS4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbURlZmF1bHRSZWFkZXIuanMg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW1EZWZhdWx0UmVh ZGVyLmpzCmluZGV4IGQ1YWMxZjVmMTY4NTE3MjdhZTY1ZmRjYTg4OGNhODFmZDYxYjliMzUuLjQ1 M2MxNTIxZGE1ZDAzYmU3YzM3MzUwMzM4NzdjYjk1NTZkMmNlZjkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbURlZmF1bHRSZWFkZXIuanMK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtRGVmYXVs dFJlYWRlci5qcwpAQCAtMzUsNyArMzUsNyBAQCBmdW5jdGlvbiBjYW5jZWwocmVhc29uKQogICAg IGlmICghdGhpcy5Ab3duZXJSZWFkYWJsZVN0cmVhbSkKICAgICAgICAgcmV0dXJuIEBQcm9taXNl LkByZWplY3QobmV3IEBUeXBlRXJyb3IoImNhbmNlbCgpIGNhbGxlZCBvbiBhIHJlYWRlciBvd25l ZCBieSBubyByZWFkYWJsZSBzdHJlYW0iKSk7CiAKLSAgICByZXR1cm4gQHJlYWRhYmxlU3RyZWFt Q2FuY2VsKHRoaXMuQG93bmVyUmVhZGFibGVTdHJlYW0sIHJlYXNvbik7CisgICAgcmV0dXJuIEBy ZWFkYWJsZVN0cmVhbVJlYWRlckdlbmVyaWNDYW5jZWwodGhpcywgcmVhc29uKTsKIH0KIAogZnVu Y3Rpb24gcmVhZCgpCkBAIC01NywyMCArNTcsMTMgQEAgZnVuY3Rpb24gcmVsZWFzZUxvY2soKQog ICAgIGlmICghQGlzUmVhZGFibGVTdHJlYW1EZWZhdWx0UmVhZGVyKHRoaXMpKQogICAgICAgICB0 aHJvdyBAbWFrZVRoaXNUeXBlRXJyb3IoIlJlYWRhYmxlU3RyZWFtRGVmYXVsdFJlYWRlciIsICJy ZWxlYXNlTG9jayIpOwogCi0gICAgY29uc3Qgc3RyZWFtID0gdGhpcy5Ab3duZXJSZWFkYWJsZVN0 cmVhbTsKLSAgICBpZiAoIXN0cmVhbSkKKyAgICBpZiAoIXRoaXMuQG93bmVyUmVhZGFibGVTdHJl YW0pCiAgICAgICAgICByZXR1cm47CiAKICAgICBpZiAodGhpcy5AcmVhZFJlcXVlc3RzLmxlbmd0 aCkKICAgICAgICAgdGhyb3cgbmV3IEBUeXBlRXJyb3IoIlRoZXJlIGFyZSBzdGlsbCBwZW5kaW5n IHJlYWQgcmVxdWVzdHMsIGNhbm5vdCByZWxlYXNlIHRoZSBsb2NrIik7CiAKLSAgICBpZiAoc3Ry ZWFtLkBzdGF0ZSA9PT0gQHN0cmVhbVJlYWRhYmxlKQotICAgICAgICB0aGlzLkBjbG9zZWRQcm9t aXNlQ2FwYWJpbGl0eS5AcmVqZWN0LkBjYWxsKEB1bmRlZmluZWQsIG5ldyBAVHlwZUVycm9yKCJy ZWxlYXNpbmcgbG9jayBvZiByZWFkZXIgd2hvc2Ugc3RyZWFtIGlzIHN0aWxsIGluIHJlYWRhYmxl IHN0YXRlIikpOwotICAgIGVsc2UKLSAgICAgICAgdGhpcy5AY2xvc2VkUHJvbWlzZUNhcGFiaWxp dHkgPSB7IEBwcm9taXNlOiBAUHJvbWlzZS5AcmVqZWN0KG5ldyBAVHlwZUVycm9yKCJyZWFkZXIg cmVsZWFzZWQgbG9jayIpKSB9OwotCi0gICAgc3RyZWFtLkByZWFkZXIgPSBAdW5kZWZpbmVkOwot ICAgIHRoaXMuQG93bmVyUmVhZGFibGVTdHJlYW0gPSBudWxsOworICAgIEByZWFkYWJsZVN0cmVh bVJlYWRlckdlbmVyaWNSZWxlYXNlKHRoaXMpOwogfQogCiBmdW5jdGlvbiBjbG9zZWQoKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtSW50 ZXJuYWxzLmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFt SW50ZXJuYWxzLmpzCmluZGV4IGY2OGVhY2QwZmRmNGEyYmExZTI4YTg2NDcwOWM4YmRjYWIxYzlh ZTUuLmI3OGY2YTYwNTczZDFiMjZiYmRmMDEwYzRkZTQxZTNjMzFjNDE3MDkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbUludGVybmFscy5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW1JbnRl cm5hbHMuanMKQEAgLTM2LDIzICszNiwyOCBAQCBmdW5jdGlvbiBwcml2YXRlSW5pdGlhbGl6ZVJl YWRhYmxlU3RyZWFtRGVmYXVsdFJlYWRlcihzdHJlYW0pCiAgICAgaWYgKEBpc1JlYWRhYmxlU3Ry ZWFtTG9ja2VkKHN0cmVhbSkpCiAgICAgICAgdGhyb3cgbmV3IEBUeXBlRXJyb3IoIlJlYWRhYmxl U3RyZWFtIGlzIGxvY2tlZCIpOwogCisgICAgQHJlYWRhYmxlU3RyZWFtUmVhZGVyR2VuZXJpY0lu aXRpYWxpemUodGhpcywgc3RyZWFtKTsKICAgICB0aGlzLkByZWFkUmVxdWVzdHMgPSBbXTsKLSAg ICB0aGlzLkBvd25lclJlYWRhYmxlU3RyZWFtID0gc3RyZWFtOwotICAgIHN0cmVhbS5AcmVhZGVy ID0gdGhpczsKLSAgICBpZiAoc3RyZWFtLkBzdGF0ZSA9PT0gQHN0cmVhbVJlYWRhYmxlKSB7Ci0g ICAgICAgIHRoaXMuQGNsb3NlZFByb21pc2VDYXBhYmlsaXR5ID0gQG5ld1Byb21pc2VDYXBhYmls aXR5KEBQcm9taXNlKTsKLSAgICAgICAgcmV0dXJuIHRoaXM7Ci0gICAgfQotICAgIGlmIChzdHJl YW0uQHN0YXRlID09PSBAc3RyZWFtQ2xvc2VkKSB7Ci0gICAgICAgIHRoaXMuQGNsb3NlZFByb21p c2VDYXBhYmlsaXR5ID0geyBAcHJvbWlzZTogQFByb21pc2UuQHJlc29sdmUoKSB9OwotICAgICAg ICByZXR1cm4gdGhpczsKLSAgICB9Ci0gICAgQGFzc2VydChzdHJlYW0uQHN0YXRlID09PSBAc3Ry ZWFtRXJyb3JlZCk7Ci0gICAgdGhpcy5AY2xvc2VkUHJvbWlzZUNhcGFiaWxpdHkgPSB7IEBwcm9t aXNlOiBAUHJvbWlzZS5AcmVqZWN0KHN0cmVhbS5Ac3RvcmVkRXJyb3IpIH07CiAKICAgICByZXR1 cm4gdGhpczsKIH0KIAorZnVuY3Rpb24gcmVhZGFibGVTdHJlYW1SZWFkZXJHZW5lcmljSW5pdGlh bGl6ZShyZWFkZXIsIHN0cmVhbSkKK3sKKyAgICAidXNlIHN0cmljdCI7CisKKyAgICByZWFkZXIu QG93bmVyUmVhZGFibGVTdHJlYW0gPSBzdHJlYW07CisgICAgc3RyZWFtLkByZWFkZXIgPSByZWFk ZXI7CisgICAgaWYgKHN0cmVhbS5Ac3RhdGUgPT09IEBzdHJlYW1SZWFkYWJsZSkKKyAgICAgICAg cmVhZGVyLkBjbG9zZWRQcm9taXNlQ2FwYWJpbGl0eSA9IEBuZXdQcm9taXNlQ2FwYWJpbGl0eShA UHJvbWlzZSk7CisgICAgZWxzZSBpZiAoc3RyZWFtLkBzdGF0ZSA9PT0gQHN0cmVhbUNsb3NlZCkK KyAgICAgICAgcmVhZGVyLkBjbG9zZWRQcm9taXNlQ2FwYWJpbGl0eSA9IHsgQHByb21pc2U6IEBQ cm9taXNlLkByZXNvbHZlKCkgfTsKKyAgICBlbHNlIHsKKyAgICAgICAgQGFzc2VydChzdHJlYW0u QHN0YXRlID09PSBAc3RyZWFtRXJyb3JlZCk7CisgICAgICAgIHJlYWRlci5AY2xvc2VkUHJvbWlz ZUNhcGFiaWxpdHkgPSB7IEBwcm9taXNlOiBAUHJvbWlzZS5AcmVqZWN0KHN0cmVhbS5Ac3RvcmVk RXJyb3IpIH07CisgICAgfQorfQorCiBmdW5jdGlvbiBwcml2YXRlSW5pdGlhbGl6ZVJlYWRhYmxl U3RyZWFtRGVmYXVsdENvbnRyb2xsZXIoc3RyZWFtLCB1bmRlcmx5aW5nU291cmNlLCBzaXplLCBo aWdoV2F0ZXJNYXJrKQogewogICAgICJ1c2Ugc3RyaWN0IjsKQEAgLTMyMyw2ICszMjgsMTYgQEAg ZnVuY3Rpb24gcmVhZGFibGVTdHJlYW1EZWZhdWx0Q29udHJvbGxlckdldERlc2lyZWRTaXplKGNv bnRyb2xsZXIpCiAgICByZXR1cm4gY29udHJvbGxlci5Ac3RyYXRlZ3kuaGlnaFdhdGVyTWFyayAt IGNvbnRyb2xsZXIuQHF1ZXVlLnNpemU7CiB9CiAKKworZnVuY3Rpb24gcmVhZGFibGVTdHJlYW1S ZWFkZXJHZW5lcmljQ2FuY2VsKHJlYWRlciwgcmVhc29uKQoreworICAgICJ1c2Ugc3RyaWN0IjsK KworICAgIGNvbnN0IHN0cmVhbSA9IHJlYWRlci5Ab3duZXJSZWFkYWJsZVN0cmVhbTsKKyAgICBA YXNzZXJ0KCEhc3RyZWFtKTsKKyAgICByZXR1cm4gQHJlYWRhYmxlU3RyZWFtQ2FuY2VsKHN0cmVh bSwgcmVhc29uKTsKK30KKwogZnVuY3Rpb24gcmVhZGFibGVTdHJlYW1DYW5jZWwoc3RyZWFtLCBy ZWFzb24pCiB7CiAgICAgInVzZSBzdHJpY3QiOwpAQCAtNDYwLDMgKzQ3NSwxOSBAQCBmdW5jdGlv biBpc1JlYWRhYmxlU3RyZWFtRGlzdHVyYmVkKHN0cmVhbSkKICAgICBAYXNzZXJ0KEBpc1JlYWRh YmxlU3RyZWFtKHN0cmVhbSkpOwogICAgIHJldHVybiBzdHJlYW0uQGRpc3R1cmJlZDsKIH0KKwor ZnVuY3Rpb24gcmVhZGFibGVTdHJlYW1SZWFkZXJHZW5lcmljUmVsZWFzZShyZWFkZXIpCit7Cisg ICAgInVzZSBzdHJpY3QiOworCisgICAgQGFzc2VydCghIXJlYWRlci5Ab3duZXJSZWFkYWJsZVN0 cmVhbSk7CisgICAgQGFzc2VydChyZWFkZXIuQG93bmVyUmVhZGFibGVTdHJlYW0uQHJlYWRlciA9 PT0gcmVhZGVyKTsKKworICAgIGlmIChyZWFkZXIuQG93bmVyUmVhZGFibGVTdHJlYW0uQHN0YXRl ID09PSBAc3RyZWFtUmVhZGFibGUpCisgICAgICAgIHJlYWRlci5AY2xvc2VkUHJvbWlzZUNhcGFi aWxpdHkuQHJlamVjdC5AY2FsbChAdW5kZWZpbmVkLCBuZXcgQFR5cGVFcnJvcigicmVsZWFzaW5n IGxvY2sgb2YgcmVhZGVyIHdob3NlIHN0cmVhbSBpcyBzdGlsbCBpbiByZWFkYWJsZSBzdGF0ZSIp KTsKKyAgICBlbHNlCisgICAgICAgIHJlYWRlci5AY2xvc2VkUHJvbWlzZUNhcGFiaWxpdHkgPSB7 IEBwcm9taXNlOiBAUHJvbWlzZS5AcmVqZWN0KG5ldyBAVHlwZUVycm9yKCJyZWFkZXIgcmVsZWFz ZWQgbG9jayIpKSB9OworCisgICAgcmVhZGVyLkBvd25lclJlYWRhYmxlU3RyZWFtLkByZWFkZXIg PSBAdW5kZWZpbmVkOworICAgIHJlYWRlci5Ab3duZXJSZWFkYWJsZVN0cmVhbSA9IG51bGw7Cit9 Cg== 290913 2016-10-07 01:21:51 -0700 2016-10-07 08:13:17 -0700 Patch bug-163003-20161007101835.patch text/plain 6054 romain.wkt U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2OTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzkyNjEzZTZjYzA4MGY4 MDU5MzkyMzE0NjA4NjhkNmViNjEzMmEzNS4uNTVhNDI2ZDZhZDEwOWM0N2FkZmIyODNmZjBiNzUw ZWEwNjA3ZDhiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE2LTEwLTA3ICBSb21h aW4gQmVsbGVzc29ydCAgPHJvbWFpbi5iZWxsZXNzb3J0QGNyZi5jYW5vbi5mcj4KKworICAgICAg ICBbUmVhZGFibGUgU3RyZWFtcyBBUEldIEltcGxlbWVudCBnZW5lcmljIHJlYWRlciBmdW5jdGlv bnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MzAw MworCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIEltcGxlbWVu dHMgcmVhZGVyIGdlbmVyaWMgZnVuY3Rpb25zIGRlZmluZWQgYnkgc3BlYyBpbiBvcmRlciB0byBw cmVwYXJlIEJZT0JSZWFkZXIgaW50ZWdyYXRpb24uCisgICAgICAgIEdlbmVyaWMgZnVuY3Rpb25z IGZhY3Rvcml6ZSBzb21lIGNvZGUgdGhhdCBpcyB1c2VkIGJ5IGJvdGggRGVmYXVsdFJlYWRlciBh bmQgQllPQlJlYWRlci4KKworICAgICAgICBObyBjaGFuZ2UgaW4gYmVoYXZpb3VyLgorCisgICAg ICAgICogTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtRGVmYXVsdFJlYWRlci5qczoKKyAg ICAgICAgKGNhbmNlbCk6IFJlbHkgb24gcmVhZGFibGVTdHJlYW1SZWFkZXJHZW5lcmljQ2FuY2Vs LgorICAgICAgICAocmVsZWFzZUxvY2spOiBSZWx5IG9uIHJlYWRhYmxlU3RyZWFtUmVhZGVyR2Vu ZXJpY1JlbGVhc2UuCisgICAgICAgICogTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtSW50 ZXJuYWxzLmpzOgorICAgICAgICAocHJpdmF0ZUluaXRpYWxpemVSZWFkYWJsZVN0cmVhbURlZmF1 bHRSZWFkZXIpOiBSZWx5IG9uIHJlYWRhYmxlU3RyZWFtUmVhZGVyR2VuZXJpY0luaXRpYWxpemUu CisgICAgICAgIChyZWFkYWJsZVN0cmVhbVJlYWRlckdlbmVyaWNJbml0aWFsaXplKTogQWRkZWQu CisgICAgICAgIChyZWFkYWJsZVN0cmVhbVJlYWRlckdlbmVyaWNDYW5jZWwpOiBBZGRlZC4KKyAg ICAgICAgKHJlYWRhYmxlU3RyZWFtUmVhZGVyR2VuZXJpY1JlbGVhc2UpOiBBZGRlZC4KKwogMjAx Ni0xMC0wNyAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVm YWN0b3IgQ2FjaGVkUmVzb3VyY2VDbGllbnQ6Om5vdGlmeUZpbmlzaGVkCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW1EZWZhdWx0UmVhZGVy LmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtRGVmYXVs dFJlYWRlci5qcwppbmRleCAwYWUwZDRjNTU2NTU0MTBhNTVlNGIwNjc4NDA0N2M0MGMwODllMjcy Li5kNWE1MWMzYTA1YjZkODUwMjQwNWVlZWQ3MmVlOTY2MDNmZDc0MzM1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW1EZWZhdWx0UmVhZGVy LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbURl ZmF1bHRSZWFkZXIuanMKQEAgLTM1LDcgKzM1LDcgQEAgZnVuY3Rpb24gY2FuY2VsKHJlYXNvbikK ICAgICBpZiAoIXRoaXMuQG93bmVyUmVhZGFibGVTdHJlYW0pCiAgICAgICAgIHJldHVybiBAUHJv bWlzZS5AcmVqZWN0KG5ldyBAVHlwZUVycm9yKCJjYW5jZWwoKSBjYWxsZWQgb24gYSByZWFkZXIg b3duZWQgYnkgbm8gcmVhZGFibGUgc3RyZWFtIikpOwogCi0gICAgcmV0dXJuIEByZWFkYWJsZVN0 cmVhbUNhbmNlbCh0aGlzLkBvd25lclJlYWRhYmxlU3RyZWFtLCByZWFzb24pOworICAgIHJldHVy biBAcmVhZGFibGVTdHJlYW1SZWFkZXJHZW5lcmljQ2FuY2VsKHRoaXMsIHJlYXNvbik7CiB9CiAK IGZ1bmN0aW9uIHJlYWQoKQpAQCAtNTcsMjAgKzU3LDEzIEBAIGZ1bmN0aW9uIHJlbGVhc2VMb2Nr KCkKICAgICBpZiAoIUBpc1JlYWRhYmxlU3RyZWFtRGVmYXVsdFJlYWRlcih0aGlzKSkKICAgICAg ICAgdGhyb3cgQG1ha2VUaGlzVHlwZUVycm9yKCJSZWFkYWJsZVN0cmVhbURlZmF1bHRSZWFkZXIi LCAicmVsZWFzZUxvY2siKTsKIAotICAgIGNvbnN0IHN0cmVhbSA9IHRoaXMuQG93bmVyUmVhZGFi bGVTdHJlYW07Ci0gICAgaWYgKCFzdHJlYW0pCi0gICAgICAgICByZXR1cm47CisgICAgaWYgKCF0 aGlzLkBvd25lclJlYWRhYmxlU3RyZWFtKQorICAgICAgICByZXR1cm47CiAKICAgICBpZiAodGhp cy5AcmVhZFJlcXVlc3RzLmxlbmd0aCkKICAgICAgICAgQHRocm93VHlwZUVycm9yKCJUaGVyZSBh cmUgc3RpbGwgcGVuZGluZyByZWFkIHJlcXVlc3RzLCBjYW5ub3QgcmVsZWFzZSB0aGUgbG9jayIp OwogCi0gICAgaWYgKHN0cmVhbS5Ac3RhdGUgPT09IEBzdHJlYW1SZWFkYWJsZSkKLSAgICAgICAg dGhpcy5AY2xvc2VkUHJvbWlzZUNhcGFiaWxpdHkuQHJlamVjdC5AY2FsbChAdW5kZWZpbmVkLCBu ZXcgQFR5cGVFcnJvcigicmVsZWFzaW5nIGxvY2sgb2YgcmVhZGVyIHdob3NlIHN0cmVhbSBpcyBz dGlsbCBpbiByZWFkYWJsZSBzdGF0ZSIpKTsKLSAgICBlbHNlCi0gICAgICAgIHRoaXMuQGNsb3Nl ZFByb21pc2VDYXBhYmlsaXR5ID0geyBAcHJvbWlzZTogQFByb21pc2UuQHJlamVjdChuZXcgQFR5 cGVFcnJvcigicmVhZGVyIHJlbGVhc2VkIGxvY2siKSkgfTsKLQotICAgIHN0cmVhbS5AcmVhZGVy ID0gQHVuZGVmaW5lZDsKLSAgICB0aGlzLkBvd25lclJlYWRhYmxlU3RyZWFtID0gbnVsbDsKKyAg ICBAcmVhZGFibGVTdHJlYW1SZWFkZXJHZW5lcmljUmVsZWFzZSh0aGlzKTsKIH0KIAogZnVuY3Rp b24gY2xvc2VkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9S ZWFkYWJsZVN0cmVhbUludGVybmFscy5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFt cy9SZWFkYWJsZVN0cmVhbUludGVybmFscy5qcwppbmRleCA2MWZkY2JhNTdkODcxMDhhM2E2NTRm MjdkZjJhMjYzMTAwYjE5ZTRkLi4yOWMzZGQ0MGMyOTM2NGIzNjYyNGE3YTgzMjAzNDA0ZmVhZmRi NTRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVT dHJlYW1JbnRlcm5hbHMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1Jl YWRhYmxlU3RyZWFtSW50ZXJuYWxzLmpzCkBAIC0zNiwyMyArMzYsMjggQEAgZnVuY3Rpb24gcHJp dmF0ZUluaXRpYWxpemVSZWFkYWJsZVN0cmVhbURlZmF1bHRSZWFkZXIoc3RyZWFtKQogICAgIGlm IChAaXNSZWFkYWJsZVN0cmVhbUxvY2tlZChzdHJlYW0pKQogICAgICAgIEB0aHJvd1R5cGVFcnJv cigiUmVhZGFibGVTdHJlYW0gaXMgbG9ja2VkIik7CiAKKyAgICBAcmVhZGFibGVTdHJlYW1SZWFk ZXJHZW5lcmljSW5pdGlhbGl6ZSh0aGlzLCBzdHJlYW0pOwogICAgIHRoaXMuQHJlYWRSZXF1ZXN0 cyA9IFtdOwotICAgIHRoaXMuQG93bmVyUmVhZGFibGVTdHJlYW0gPSBzdHJlYW07Ci0gICAgc3Ry ZWFtLkByZWFkZXIgPSB0aGlzOwotICAgIGlmIChzdHJlYW0uQHN0YXRlID09PSBAc3RyZWFtUmVh ZGFibGUpIHsKLSAgICAgICAgdGhpcy5AY2xvc2VkUHJvbWlzZUNhcGFiaWxpdHkgPSBAbmV3UHJv bWlzZUNhcGFiaWxpdHkoQFByb21pc2UpOwotICAgICAgICByZXR1cm4gdGhpczsKLSAgICB9Ci0g ICAgaWYgKHN0cmVhbS5Ac3RhdGUgPT09IEBzdHJlYW1DbG9zZWQpIHsKLSAgICAgICAgdGhpcy5A Y2xvc2VkUHJvbWlzZUNhcGFiaWxpdHkgPSB7IEBwcm9taXNlOiBAUHJvbWlzZS5AcmVzb2x2ZSgp IH07Ci0gICAgICAgIHJldHVybiB0aGlzOwotICAgIH0KLSAgICBAYXNzZXJ0KHN0cmVhbS5Ac3Rh dGUgPT09IEBzdHJlYW1FcnJvcmVkKTsKLSAgICB0aGlzLkBjbG9zZWRQcm9taXNlQ2FwYWJpbGl0 eSA9IHsgQHByb21pc2U6IEBQcm9taXNlLkByZWplY3Qoc3RyZWFtLkBzdG9yZWRFcnJvcikgfTsK IAogICAgIHJldHVybiB0aGlzOwogfQogCitmdW5jdGlvbiByZWFkYWJsZVN0cmVhbVJlYWRlckdl bmVyaWNJbml0aWFsaXplKHJlYWRlciwgc3RyZWFtKQoreworICAgICJ1c2Ugc3RyaWN0IjsKKwor ICAgIHJlYWRlci5Ab3duZXJSZWFkYWJsZVN0cmVhbSA9IHN0cmVhbTsKKyAgICBzdHJlYW0uQHJl YWRlciA9IHJlYWRlcjsKKyAgICBpZiAoc3RyZWFtLkBzdGF0ZSA9PT0gQHN0cmVhbVJlYWRhYmxl KQorICAgICAgICByZWFkZXIuQGNsb3NlZFByb21pc2VDYXBhYmlsaXR5ID0gQG5ld1Byb21pc2VD YXBhYmlsaXR5KEBQcm9taXNlKTsKKyAgICBlbHNlIGlmIChzdHJlYW0uQHN0YXRlID09PSBAc3Ry ZWFtQ2xvc2VkKQorICAgICAgICByZWFkZXIuQGNsb3NlZFByb21pc2VDYXBhYmlsaXR5ID0geyBA cHJvbWlzZTogQFByb21pc2UuQHJlc29sdmUoKSB9OworICAgIGVsc2UgeworICAgICAgICBAYXNz ZXJ0KHN0cmVhbS5Ac3RhdGUgPT09IEBzdHJlYW1FcnJvcmVkKTsKKyAgICAgICAgcmVhZGVyLkBj bG9zZWRQcm9taXNlQ2FwYWJpbGl0eSA9IHsgQHByb21pc2U6IEBQcm9taXNlLkByZWplY3Qoc3Ry ZWFtLkBzdG9yZWRFcnJvcikgfTsKKyAgICB9Cit9CisKIGZ1bmN0aW9uIHByaXZhdGVJbml0aWFs aXplUmVhZGFibGVTdHJlYW1EZWZhdWx0Q29udHJvbGxlcihzdHJlYW0sIHVuZGVybHlpbmdTb3Vy Y2UsIHNpemUsIGhpZ2hXYXRlck1hcmspCiB7CiAgICAgInVzZSBzdHJpY3QiOwpAQCAtMzIzLDYg KzMyOCwxNiBAQCBmdW5jdGlvbiByZWFkYWJsZVN0cmVhbURlZmF1bHRDb250cm9sbGVyR2V0RGVz aXJlZFNpemUoY29udHJvbGxlcikKICAgIHJldHVybiBjb250cm9sbGVyLkBzdHJhdGVneS5oaWdo V2F0ZXJNYXJrIC0gY29udHJvbGxlci5AcXVldWUuc2l6ZTsKIH0KIAorCitmdW5jdGlvbiByZWFk YWJsZVN0cmVhbVJlYWRlckdlbmVyaWNDYW5jZWwocmVhZGVyLCByZWFzb24pCit7CisgICAgInVz ZSBzdHJpY3QiOworCisgICAgY29uc3Qgc3RyZWFtID0gcmVhZGVyLkBvd25lclJlYWRhYmxlU3Ry ZWFtOworICAgIEBhc3NlcnQoISFzdHJlYW0pOworICAgIHJldHVybiBAcmVhZGFibGVTdHJlYW1D YW5jZWwoc3RyZWFtLCByZWFzb24pOworfQorCiBmdW5jdGlvbiByZWFkYWJsZVN0cmVhbUNhbmNl bChzdHJlYW0sIHJlYXNvbikKIHsKICAgICAidXNlIHN0cmljdCI7CkBAIC00NjAsMyArNDc1LDE5 IEBAIGZ1bmN0aW9uIGlzUmVhZGFibGVTdHJlYW1EaXN0dXJiZWQoc3RyZWFtKQogICAgIEBhc3Nl cnQoQGlzUmVhZGFibGVTdHJlYW0oc3RyZWFtKSk7CiAgICAgcmV0dXJuIHN0cmVhbS5AZGlzdHVy YmVkOwogfQorCitmdW5jdGlvbiByZWFkYWJsZVN0cmVhbVJlYWRlckdlbmVyaWNSZWxlYXNlKHJl YWRlcikKK3sKKyAgICAidXNlIHN0cmljdCI7CisKKyAgICBAYXNzZXJ0KCEhcmVhZGVyLkBvd25l clJlYWRhYmxlU3RyZWFtKTsKKyAgICBAYXNzZXJ0KHJlYWRlci5Ab3duZXJSZWFkYWJsZVN0cmVh bS5AcmVhZGVyID09PSByZWFkZXIpOworCisgICAgaWYgKHJlYWRlci5Ab3duZXJSZWFkYWJsZVN0 cmVhbS5Ac3RhdGUgPT09IEBzdHJlYW1SZWFkYWJsZSkKKyAgICAgICAgcmVhZGVyLkBjbG9zZWRQ cm9taXNlQ2FwYWJpbGl0eS5AcmVqZWN0LkBjYWxsKEB1bmRlZmluZWQsIG5ldyBAVHlwZUVycm9y KCJyZWxlYXNpbmcgbG9jayBvZiByZWFkZXIgd2hvc2Ugc3RyZWFtIGlzIHN0aWxsIGluIHJlYWRh YmxlIHN0YXRlIikpOworICAgIGVsc2UKKyAgICAgICAgcmVhZGVyLkBjbG9zZWRQcm9taXNlQ2Fw YWJpbGl0eSA9IHsgQHByb21pc2U6IEBQcm9taXNlLkByZWplY3QobmV3IEBUeXBlRXJyb3IoInJl YWRlciByZWxlYXNlZCBsb2NrIikpIH07CisKKyAgICByZWFkZXIuQG93bmVyUmVhZGFibGVTdHJl YW0uQHJlYWRlciA9IEB1bmRlZmluZWQ7CisgICAgcmVhZGVyLkBvd25lclJlYWRhYmxlU3RyZWFt ID0gbnVsbDsKK30K