193313 2019-01-10 05:38:29 -0800 [css-grid] Line names are resolved incorrectly for grid-aligned abs.pos. child 2019-01-10 09:33:34 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.chromium.org/p/chromium/issues/detail?id=915551 InRadar P2 Normal --- 1 obrufau obrufau commit-queue rego webkit-bug-importer oldest_to_newest 1493260 0 obrufau 2019-01-10 05:38:29 -0800 Grid placement properties of absolutely positioned items can't reference implicit grid lines and behave as 'auto' instead. https://github.com/w3c/csswg-drafts/commit/511bb63 clarified that this is wrong. Has been fixed in Blink: https://bugs.chromium.org/p/chromium/issues/detail?id=915551' 1493264 1 358787 obrufau 2019-01-10 05:56:12 -0800 Created attachment 358787 Patch 1493274 2 358787 commit-queue 2019-01-10 06:24:54 -0800 Comment on attachment 358787 Patch Rejecting attachment 358787 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'build', '--no-clean', '--no-update', '--build-style=release', '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 5000 characters of output: /Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/System.framework/PrivateHeaders -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/Carbon.framework/Frameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/ApplicationServices.framework/Frameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/CoreServices.framework/Frameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/Quartz.framework/Frameworks -include /Volumes/Data/EWS/WebKit/WebKitBuild/PrecompiledHeaders/WebCorePrefix-efwoslpaqzemvkasiszcdwwyopli/WebCorePrefix.h -MMD -MT dependencies -MF /Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/Objects-normal/x86_64/UnifiedSource404.d --serialize-diagnostics /Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/Objects-normal/x86_64/UnifiedSource404.dia -c /Volumes/Data/EWS/WebKit/WebKitBuild/Release/DerivedSources/WebCore/unified-sources/UnifiedSource404.cpp -o /Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/Objects-normal/x86_64/UnifiedSource404.o ** BUILD FAILED ** The following build commands failed: CompileC /Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/Objects-normal/x86_64/UnifiedSource398.o /Volumes/Data/EWS/WebKit/WebKitBuild/Release/DerivedSources/WebCore/unified-sources/UnifiedSource398.cpp normal x86_64 c++ com.apple.compilers.llvm.clang.1_0.compiler (1 failure) Failed to run "['Tools/Scripts/build-webkit', '--release']" exit_code: 65 umes/Data/EWS/WebKit/WebKitBuild/Release/usr/local/include/webrtc -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/local/include/webrtc -I/Volumes/Data/EWS/WebKit/WebKitBuild/Release/usr/local/include/webrtc/sdk/objc/Framework/Headers -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/local/include/webrtc/sdk/objc/Framework/Headers -I/Volumes/Data/EWS/WebKit/Source/WebCore -I/Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/DerivedSources/x86_64 -I/Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/DerivedSources -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wno-unknown-warning-option -F/Volumes/Data/EWS/WebKit/WebKitBuild/Release -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/PrivateFrameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks -isystem /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/System.framework/PrivateHeaders -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/Carbon.framework/Frameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/ApplicationServices.framework/Frameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/CoreServices.framework/Frameworks -iframework /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/Quartz.framework/Frameworks -include /Volumes/Data/EWS/WebKit/WebKitBuild/PrecompiledHeaders/WebCorePrefix-efwoslpaqzemvkasiszcdwwyopli/WebCorePrefix.h -MMD -MT dependencies -MF /Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/Objects-normal/x86_64/UnifiedSource404.d --serialize-diagnostics /Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/Objects-normal/x86_64/UnifiedSource404.dia -c /Volumes/Data/EWS/WebKit/WebKitBuild/Release/DerivedSources/WebCore/unified-sources/UnifiedSource404.cpp -o /Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/Objects-normal/x86_64/UnifiedSource404.o ** BUILD FAILED ** The following build commands failed: CompileC /Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/Objects-normal/x86_64/UnifiedSource398.o /Volumes/Data/EWS/WebKit/WebKitBuild/Release/DerivedSources/WebCore/unified-sources/UnifiedSource398.cpp normal x86_64 c++ com.apple.compilers.llvm.clang.1_0.compiler (1 failure) Full output: https://webkit-queues.webkit.org/results/10696728 1493295 3 358792 obrufau 2019-01-10 07:42:55 -0800 Created attachment 358792 Patch 1493321 4 358792 commit-queue 2019-01-10 09:32:32 -0800 Comment on attachment 358792 Patch Clearing flags on attachment: 358792 Committed r239831: <https://trac.webkit.org/changeset/239831> 1493322 5 commit-queue 2019-01-10 09:32:34 -0800 All reviewed patches have been landed. Closing bug. 1493323 6 webkit-bug-importer 2019-01-10 09:33:34 -0800 <rdar://problem/47180221> 358787 2019-01-10 05:56:12 -0800 2019-01-10 07:42:52 -0800 Patch bug-193313-20190110145611.patch text/plain 13641 obrufau U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5NjA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTM5MjA1OTJiOWJmYzcx NjIxNTU4ODZhOGNiOTQxM2I0MzcxODY1OS4uNWFiNjVhNDhjZjhkZDdkM2Y1NzlmZjAzMjQ1Njdh Y2IxNjE2YmI4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE5LTAxLTEwICBPcmlv bCBCcnVmYXUgIDxvYnJ1ZmF1QGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1ncmlkXSBMZXQg YWJzcG9zIGl0ZW1zIHJlZmVyZW5jZSBpbXBsaWNpdCBncmlkIGxpbmVzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTMzMTMKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGlsZSB0aGV5IGNhbid0IGNyZWF0 ZSBuZXcgaW1wbGljaXQgZ3JpZCBsaW5lcywgYWJzcG9zIGl0ZW1zCisgICAgICAgIGNhbiByZWZl cmVuY2UgZXhpc3Rpbmcgb25lcyBhcyBjbGFyaWZpZWQgaW4KKyAgICAgICAgaHR0cHM6Ly9naXRo dWIuY29tL3czYy9jc3N3Zy1kcmFmdHMvY29tbWl0LzUxMWJiNjMKKworICAgICAgICBUaGlzIHBh dGNoIG1ha2VzIFdlYktpdCBtYXRjaCBCbGluaywgRmlyZWZveCBhbmQgRWRnZS4KKworICAgICAg ICBUZXN0czogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hYnNwb3MvZ3JpZC1wb3Np dGlvbmVkLWl0ZW1zLXBhZGRpbmctMDAxLmh0bWwKKyAgICAgICAgICAgICAgIHdlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLWdyaWQvYWJzcG9zL2dyaWQtcG9zaXRpb25lZC1pdGVtcy11bmtub3du LW5hbWVkLWdyaWQtbGluZS0wMDEuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdy aWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6Z3JpZEFyZWFCcmVhZHRoRm9y T3V0T2ZGbG93Q2hpbGQpOgorICAgICAgICBEb24ndCB0cmVhdCBpbXBsaWNpdCBncmlkIGxpbmVz IGFzICdhdXRvJy4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6OmdyaWRQb3NpdGlvbklz QXV0b0Zvck91dE9mRmxvdyBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckdyaWQuaDoKKyAgICAgICAgRGVsZXRlIGdyaWRQb3NpdGlvbklzQXV0b0Zvck91dE9mRmxv dy4KKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvR3JpZFBvc2l0aW9uc1Jlc29sdmVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OmFkanVzdEdyaWRQb3NpdGlvbnNGcm9tU3R5bGUpOgorICAgICAg ICBEb24ndCB0cmVhdCBpbXBsaWNpdCBncmlkIGxpbmVzIGFzICdhdXRvJy4KKyAgICAgICAgKFdl YkNvcmU6OnJlc29sdmVHcmlkUG9zaXRpb25Gcm9tU3R5bGUpOgorICAgICAgICBSZW1vdmUgdW5u ZWNlc3NhcnkgYXNzZXJ0IHRoYXQgdXNlcyBpc1ZhbGlkTmFtZWRMaW5lT3JBcmVhLgorICAgICAg ICAoV2ViQ29yZTo6TmFtZWRMaW5lQ29sbGVjdGlvbjo6aXNWYWxpZE5hbWVkTGluZU9yQXJlYSk6 IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL0dyaWRQb3NpdGlvbnNSZXNvbHZl ci5oOgorICAgICAgICBEZWxldGUgaXNWYWxpZE5hbWVkTGluZU9yQXJlYS4KKwogMjAxOS0wMS0w MyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT046 IC13ZWJraXQtYXBwZWFyYW5jZSB0ZXN0IGNhc2UgY3Jhc2hlcwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckdyaWQuY3BwCmluZGV4IDM1YTYxMGIyOTk3M2NjZDllNjhjNjU0YzhhNDViZWQw Y2MzYTVhNmYuLmJmNWZiOTBkZTBiYzI0Y2ZiMjMyYTYxNWMwM2Y1YjAwZmVlYmEwNmIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKQEAgLTE0NzAsMTEgKzE0NzAsNiBA QCBMYXlvdXRVbml0IFJlbmRlckdyaWQ6OnJvd0F4aXNPZmZzZXRGb3JDaGlsZChjb25zdCBSZW5k ZXJCb3gmIGNoaWxkKSBjb25zdAogICAgIHJldHVybiAwOwogfQogCi1ib29sIFJlbmRlckdyaWQ6 OmdyaWRQb3NpdGlvbklzQXV0b0Zvck91dE9mRmxvdyhHcmlkUG9zaXRpb24gcG9zaXRpb24sIEdy aWRUcmFja1NpemluZ0RpcmVjdGlvbiBkaXJlY3Rpb24pIGNvbnN0Ci17Ci0gICAgcmV0dXJuIHBv c2l0aW9uLmlzQXV0bygpIHx8IChwb3NpdGlvbi5pc05hbWVkR3JpZEFyZWEoKSAmJiAhTmFtZWRM aW5lQ29sbGVjdGlvbjo6aXNWYWxpZE5hbWVkTGluZU9yQXJlYShwb3NpdGlvbi5uYW1lZEdyaWRM aW5lKCksIHN0eWxlKCksIEdyaWRQb3NpdGlvbnNSZXNvbHZlcjo6aW5pdGlhbFBvc2l0aW9uU2lk ZShkaXJlY3Rpb24pKSk7Ci19Ci0KIExheW91dFVuaXQgUmVuZGVyR3JpZDo6cmVzb2x2ZUF1dG9T dGFydEdyaWRQb3NpdGlvbihHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9uKSBjb25z dAogewogICAgIGlmIChkaXJlY3Rpb24gPT0gRm9yUm93cyB8fCBzdHlsZSgpLmlzTGVmdFRvUmln aHREaXJlY3Rpb24oKSkKQEAgLTE1MjAsOCArMTUxNSw4IEBAIExheW91dFVuaXQgUmVuZGVyR3Jp ZDo6Z3JpZEFyZWFCcmVhZHRoRm9yT3V0T2ZGbG93Q2hpbGQoY29uc3QgUmVuZGVyQm94JiBjaGls ZCwKICAgICBHcmlkUG9zaXRpb24gc3RhcnRQb3NpdGlvbiA9IGRpcmVjdGlvbiA9PSBGb3JDb2x1 bW5zID8gY2hpbGQuc3R5bGUoKS5ncmlkSXRlbUNvbHVtblN0YXJ0KCkgOiBjaGlsZC5zdHlsZSgp LmdyaWRJdGVtUm93U3RhcnQoKTsKICAgICBHcmlkUG9zaXRpb24gZW5kUG9zaXRpb24gPSBkaXJl Y3Rpb24gPT0gRm9yQ29sdW1ucyA/IGNoaWxkLnN0eWxlKCkuZ3JpZEl0ZW1Db2x1bW5FbmQoKSA6 IGNoaWxkLnN0eWxlKCkuZ3JpZEl0ZW1Sb3dFbmQoKTsKIAotICAgIGJvb2wgc3RhcnRJc0F1dG8g PSBncmlkUG9zaXRpb25Jc0F1dG9Gb3JPdXRPZkZsb3coc3RhcnRQb3NpdGlvbiwgZGlyZWN0aW9u KSB8fCBzdGFydExpbmUgPCAwIHx8IHN0YXJ0TGluZSA+IGxhc3RMaW5lOwotICAgIGJvb2wgZW5k SXNBdXRvID0gZ3JpZFBvc2l0aW9uSXNBdXRvRm9yT3V0T2ZGbG93KGVuZFBvc2l0aW9uLCBkaXJl Y3Rpb24pIHx8IGVuZExpbmUgPCAwIHx8IGVuZExpbmUgPiBsYXN0TGluZTsKKyAgICBib29sIHN0 YXJ0SXNBdXRvID0gc3RhcnRQb3NpdGlvbi5pc0F1dG8oKSB8fCBzdGFydExpbmUgPCAwIHx8IHN0 YXJ0TGluZSA+IGxhc3RMaW5lOworICAgIGJvb2wgZW5kSXNBdXRvID0gZW5kUG9zaXRpb24uaXNB dXRvKCkgfHwgZW5kTGluZSA8IDAgfHwgZW5kTGluZSA+IGxhc3RMaW5lOwogCiAgICAgaWYgKHN0 YXJ0SXNBdXRvICYmIGVuZElzQXV0bykKICAgICAgICAgcmV0dXJuIGlzUm93QXhpcyA/IGNsaWVu dExvZ2ljYWxXaWR0aCgpIDogY2xpZW50TG9naWNhbEhlaWdodCgpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJHcmlkLmgKaW5kZXggMTMxYTAwODQxYWNlYjI0M2JkNTBmZWRhZGU0YTUwNzc5 NTVjZTM1Zi4uZGUzYzIzNDgzYTBjYzFmMDc2ZjRlMWJkNGZjOTI2MTc1Y2NiZmI3ZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oCkBAIC0xMzMsNyArMTMzLDYgQEAgcHJpdmF0 ZToKICAgICB2b2lkIGxheW91dEdyaWRJdGVtcygpOwogICAgIHZvaWQgcG9wdWxhdGVHcmlkUG9z aXRpb25zRm9yRGlyZWN0aW9uKEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbik7CiAKLSAgICBib29s IGdyaWRQb3NpdGlvbklzQXV0b0Zvck91dE9mRmxvdyhHcmlkUG9zaXRpb24sIEdyaWRUcmFja1Np emluZ0RpcmVjdGlvbikgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCByZXNvbHZlQXV0b1N0YXJ0R3Jp ZFBvc2l0aW9uKEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbikgY29uc3Q7CiAgICAgTGF5b3V0VW5p dCByZXNvbHZlQXV0b0VuZEdyaWRQb3NpdGlvbihHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24pIGNv bnN0OwogICAgIExheW91dFVuaXQgZ3JpZEFyZWFCcmVhZHRoRm9yT3V0T2ZGbG93Q2hpbGQoY29u c3QgUmVuZGVyQm94JiwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9HcmlkUG9zaXRpb25zUmVzb2x2ZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0dyaWRQb3NpdGlvbnNSZXNvbHZlci5jcHAK aW5kZXggMjRjOWQzODAxZTBlOGNlOGEwYzk2OWVkNWIyNTRjNTc3YTgwOTI1Ny4uYTM1MTQ0ODUx NjVlMzI2MGViOTM5ZjUyMDgyZGZhYWYxNDc0MTAxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N0eWxlL0dyaWRQb3NpdGlvbnNSZXNvbHZlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0dyaWRQb3NpdGlvbnNSZXNvbHZlci5jcHAKQEAgLTc2 LDE5ICs3Niw2IEBAIE5hbWVkTGluZUNvbGxlY3Rpb246Ok5hbWVkTGluZUNvbGxlY3Rpb24oY29u c3QgUmVuZGVyU3R5bGUmIGdyaWRDb250YWluZXJTdHlsZSwKICAgICBtX2F1dG9SZXBlYXRUcmFj a0xpc3RMZW5ndGggPSBpc1Jvd0F4aXMgPyBncmlkQ29udGFpbmVyU3R5bGUuZ3JpZEF1dG9SZXBl YXRDb2x1bW5zKCkuc2l6ZSgpIDogZ3JpZENvbnRhaW5lclN0eWxlLmdyaWRBdXRvUmVwZWF0Um93 cygpLnNpemUoKTsKIH0KIAotYm9vbCBOYW1lZExpbmVDb2xsZWN0aW9uOjppc1ZhbGlkTmFtZWRM aW5lT3JBcmVhKGNvbnN0IFN0cmluZyYgbmFtZWRMaW5lLCBjb25zdCBSZW5kZXJTdHlsZSYgZ3Jp ZENvbnRhaW5lclN0eWxlLCBHcmlkUG9zaXRpb25TaWRlIHNpZGUpCi17Ci0gICAgYm9vbCBpc1Jv d0F4aXMgPSBkaXJlY3Rpb25Gcm9tU2lkZShzaWRlKSA9PSBGb3JDb2x1bW5zOwotICAgIGF1dG8m IGdyaWRMaW5lTmFtZXMgPSBpc1Jvd0F4aXMgPyBncmlkQ29udGFpbmVyU3R5bGUubmFtZWRHcmlk Q29sdW1uTGluZXMoKSA6IGdyaWRDb250YWluZXJTdHlsZS5uYW1lZEdyaWRSb3dMaW5lcygpOwot ICAgIGF1dG8mIGF1dG9SZXBlYXRHcmlkTGluZU5hbWVzID0gaXNSb3dBeGlzID8gZ3JpZENvbnRh aW5lclN0eWxlLmF1dG9SZXBlYXROYW1lZEdyaWRDb2x1bW5MaW5lcygpIDogZ3JpZENvbnRhaW5l clN0eWxlLmF1dG9SZXBlYXROYW1lZEdyaWRSb3dMaW5lcygpOwotCi0gICAgaWYgKGdyaWRMaW5l TmFtZXMuY29udGFpbnMobmFtZWRMaW5lKSB8fCBhdXRvUmVwZWF0R3JpZExpbmVOYW1lcy5jb250 YWlucyhuYW1lZExpbmUpKQotICAgICAgICByZXR1cm4gdHJ1ZTsKLQotICAgIFN0cmluZyBpbXBs aWNpdE5hbWUgPSBpbXBsaWNpdE5hbWVkR3JpZExpbmVGb3JTaWRlKG5hbWVkTGluZSwgc2lkZSk7 Ci0gICAgcmV0dXJuIGdyaWRMaW5lTmFtZXMuY29udGFpbnMoaW1wbGljaXROYW1lKSB8fCBhdXRv UmVwZWF0R3JpZExpbmVOYW1lcy5jb250YWlucyhpbXBsaWNpdE5hbWUpOwotfQotCiBib29sIE5h bWVkTGluZUNvbGxlY3Rpb246Omhhc05hbWVkTGluZXMoKSBjb25zdAogewogICAgIHJldHVybiBt X25hbWVkTGluZXNJbmRleGVzIHx8IG1fYXV0b1JlcGVhdE5hbWVkTGluZXNJbmRleGVzOwpAQCAt MTU5LDE1ICsxNDYsNiBAQCBzdGF0aWMgdm9pZCBhZGp1c3RHcmlkUG9zaXRpb25zRnJvbVN0eWxl KGNvbnN0IFJlbmRlclN0eWxlJiBncmlkQ29udGFpbmVyU3R5bGUsCiAgICAgaWYgKGluaXRpYWxQ b3NpdGlvbi5pc1NwYW4oKSAmJiBmaW5hbFBvc2l0aW9uLmlzU3BhbigpKQogICAgICAgICBmaW5h bFBvc2l0aW9uLnNldEF1dG9Qb3NpdGlvbigpOwogCi0gICAgaWYgKGdyaWRJdGVtLmlzT3V0T2ZG bG93UG9zaXRpb25lZCgpKSB7Ci0gICAgICAgIC8vIEVhcmx5IGRldGVjdCB0aGUgY2FzZSBvZiBu b24gZXhpc3RpbmcgbmFtZWQgZ3JpZCBsaW5lcyBmb3IgcG9zaXRpb25lZCBpdGVtcy4KLSAgICAg ICAgaWYgKGluaXRpYWxQb3NpdGlvbi5pc05hbWVkR3JpZEFyZWEoKSAmJiAhTmFtZWRMaW5lQ29s bGVjdGlvbjo6aXNWYWxpZE5hbWVkTGluZU9yQXJlYShpbml0aWFsUG9zaXRpb24ubmFtZWRHcmlk TGluZSgpLCBncmlkQ29udGFpbmVyU3R5bGUsIEdyaWRQb3NpdGlvbnNSZXNvbHZlcjo6aW5pdGlh bFBvc2l0aW9uU2lkZShkaXJlY3Rpb24pKSkKLSAgICAgICAgICAgIGluaXRpYWxQb3NpdGlvbi5z ZXRBdXRvUG9zaXRpb24oKTsKLQotICAgICAgICBpZiAoZmluYWxQb3NpdGlvbi5pc05hbWVkR3Jp ZEFyZWEoKSAmJiAhTmFtZWRMaW5lQ29sbGVjdGlvbjo6aXNWYWxpZE5hbWVkTGluZU9yQXJlYShm aW5hbFBvc2l0aW9uLm5hbWVkR3JpZExpbmUoKSwgZ3JpZENvbnRhaW5lclN0eWxlLCBHcmlkUG9z aXRpb25zUmVzb2x2ZXI6OmZpbmFsUG9zaXRpb25TaWRlKGRpcmVjdGlvbikpKQotICAgICAgICAg ICAgZmluYWxQb3NpdGlvbi5zZXRBdXRvUG9zaXRpb24oKTsKLSAgICB9Ci0KICAgICAvLyBJZiB0 aGUgZ3JpZCBpdGVtIGhhcyBhbiBhdXRvbWF0aWMgcG9zaXRpb24gYW5kIGEgZ3JpZCBzcGFuIGZv ciBhIG5hbWVkIGxpbmUgaW4gYSBnaXZlbiBkaW1lbnNpb24sIGluc3RlYWQgdHJlYXQgdGhlIGdy aWQgc3BhbiBhcyBvbmUuCiAgICAgaWYgKGluaXRpYWxQb3NpdGlvbi5pc0F1dG8oKSAmJiBmaW5h bFBvc2l0aW9uLmlzU3BhbigpICYmICFmaW5hbFBvc2l0aW9uLm5hbWVkR3JpZExpbmUoKS5pc051 bGwoKSkKICAgICAgICAgZmluYWxQb3NpdGlvbi5zZXRTcGFuUG9zaXRpb24oMSwgU3RyaW5nKCkp OwpAQCAtMzU3LDcgKzMzNSw2IEBAIHN0YXRpYyBpbnQgcmVzb2x2ZUdyaWRQb3NpdGlvbkZyb21T dHlsZShjb25zdCBSZW5kZXJTdHlsZSYgZ3JpZENvbnRhaW5lclN0eWxlLCBjCiAgICAgICAgIGlm IChleHBsaWNpdExpbmVzLmhhc05hbWVkTGluZXMoKSkKICAgICAgICAgICAgIHJldHVybiBleHBs aWNpdExpbmVzLmZpcnN0UG9zaXRpb24oKTsKIAotICAgICAgICBBU1NFUlQoIU5hbWVkTGluZUNv bGxlY3Rpb246OmlzVmFsaWROYW1lZExpbmVPckFyZWEobmFtZWRHcmlkTGluZSwgZ3JpZENvbnRh aW5lclN0eWxlLCBzaWRlKSk7CiAgICAgICAgIC8vIElmIG5vbmUgb2YgdGhlIGFib3ZlIHdvcmtz IHNwZWNzIG1hbmRhdGUgdG8gYXNzdW1lIHRoYXQgYWxsIHRoZSBsaW5lcyBpbiB0aGUgaW1wbGlj aXQgZ3JpZCBoYXZlIHRoaXMgbmFtZS4KICAgICAgICAgcmV0dXJuIGxhc3RMaW5lICsgMTsKICAg ICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvR3JpZFBvc2l0 aW9uc1Jlc29sdmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvR3JpZFBvc2l0 aW9uc1Jlc29sdmVyLmgKaW5kZXggZmIzMzExYTg1YjM2ZTdmZjAxMTQ5ZTQ0MWYwMGRhM2E1OGJm OWQxNy4uM2EzNjE5NWI5OTUzZjczZjAxYzQ4MjY4MTAzMWUzYjE3MGU0NjIwNyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0dyaWRQb3NpdGlvbnNSZXNvbHZlci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9HcmlkUG9zaXRpb25zUmVzb2x2 ZXIuaApAQCAtNDgsOCArNDgsNiBAQCBjbGFzcyBOYW1lZExpbmVDb2xsZWN0aW9uIHsKIHB1Ymxp YzoKICAgICBOYW1lZExpbmVDb2xsZWN0aW9uKGNvbnN0IFJlbmRlclN0eWxlJiwgY29uc3QgU3Ry aW5nJiBuYW1lZExpbmUsIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiwgdW5zaWduZWQgbGFzdExp bmUsIHVuc2lnbmVkIGF1dG9SZXBlYXRUcmFja3NDb3VudCk7CiAKLSAgICBzdGF0aWMgYm9vbCBp c1ZhbGlkTmFtZWRMaW5lT3JBcmVhKGNvbnN0IFN0cmluZyYgbmFtZWRMaW5lLCBjb25zdCBSZW5k ZXJTdHlsZSYsIEdyaWRQb3NpdGlvblNpZGUpOwotCiAgICAgYm9vbCBoYXNOYW1lZExpbmVzKCkg Y29uc3Q7CiAgICAgdW5zaWduZWQgZmlyc3RQb3NpdGlvbigpIGNvbnN0OwogCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL0NoYW5nZUxvZwppbmRleCA2YTQzZWY2M2EzOGMwMWZmOTU2YWE1MDcxM2FkNjU0ODRl MDVlZmY1Li4xYWEyZGUwNTdjOWI2YTc2OGFjOTFiMGMyYmE5NzlhNTI0YzczYTQ1IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxOS0wMS0xMCAgT3Jp b2wgQnJ1ZmF1ICA8b2JydWZhdUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZ3JpZF0gTGV0 IGFic3BvcyBpdGVtcyByZWZlcmVuY2UgaW1wbGljaXQgZ3JpZCBsaW5lcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzMzEzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wb3J0IHRlc3QgY2hhbmdlcyBm cm9tIFdQVC4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWJz cG9zL2dyaWQtcG9zaXRpb25lZC1pdGVtcy1wYWRkaW5nLTAwMS5odG1sOgorICAgICAgICAqIHdl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWJzcG9zL2dyaWQtcG9zaXRpb25lZC1pdGVt cy11bmtub3duLW5hbWVkLWdyaWQtbGluZS0wMDEuaHRtbDoKKwogMjAxOS0wMS0wMiAgU2ltb24g RnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBTdXBwb3J0IGNzcy1j b2xvci00IHJnYiBmdW5jdGlvbnMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2Fic3Bvcy9ncmlkLXBvc2l0aW9uZWQt aXRlbXMtcGFkZGluZy0wMDEuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2Fic3Bvcy9ncmlkLXBvc2l0aW9uZWQtaXRlbXMtcGFk ZGluZy0wMDEuaHRtbAppbmRleCA0OTQxZDc3YTcxYWY3M2M1ZWIyYzcwYTE0NjI5NTk2YWFjZGNm NzY3Li42NDNhNjg4MzBkNGFlY2RhZDE4MmY0MGQ4Yjc0ZmI4NDcwZGE4YjU0IDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3Jp ZC9hYnNwb3MvZ3JpZC1wb3NpdGlvbmVkLWl0ZW1zLXBhZGRpbmctMDAxLmh0bWwKKysrIGIvTGF5 b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWJz cG9zL2dyaWQtcG9zaXRpb25lZC1pdGVtcy1wYWRkaW5nLTAwMS5odG1sCkBAIC0xMDksMTMgKzEw OSwxMyBAQAogCiA8ZGl2IGNsYXNzPSJncmlkIj4KICAgPGRpdiBjbGFzcz0iYWJzb2x1dGUiIHN0 eWxlPSJncmlkLWNvbHVtbjogZm9vIC8gMTsgZ3JpZC1yb3c6IGZvbyAvIDE7IgotICAgIGRhdGEt b2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjE1IiBk YXRhLWV4cGVjdGVkLWhlaWdodD0iMTUiPgorICAgIGRhdGEtb2Zmc2V0LXg9IjE1IiBkYXRhLW9m ZnNldC15PSIxNSIgZGF0YS1leHBlY3RlZC13aWR0aD0iNTE1IiBkYXRhLWV4cGVjdGVkLWhlaWdo dD0iMzE1Ij4KICAgPC9kaXY+CiAgIDxkaXYgY2xhc3M9ImFic29sdXRlIiBzdHlsZT0iZ3JpZC1j b2x1bW46IDEgLyAyOyBncmlkLXJvdzogZm9vIC8gMTsiCi0gICAgZGF0YS1vZmZzZXQteD0iMTUi IGRhdGEtb2Zmc2V0LXk9IjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjEwMCIgZGF0YS1leHBlY3Rl ZC1oZWlnaHQ9IjE1Ij4KKyAgICBkYXRhLW9mZnNldC14PSIxNSIgZGF0YS1vZmZzZXQteT0iMTUi IGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjEwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMxNSI+CiAg IDwvZGl2PgogICA8ZGl2IGNsYXNzPSJhYnNvbHV0ZSIgc3R5bGU9ImdyaWQtY29sdW1uOiBmb28g LyAxOyBncmlkLXJvdzogMSAvIDI7IgotICAgIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0 LXk9IjE1IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIxNSIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjUw Ij4KKyAgICBkYXRhLW9mZnNldC14PSIxNSIgZGF0YS1vZmZzZXQteT0iMTUiIGRhdGEtZXhwZWN0 ZWQtd2lkdGg9IjUxNSIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjUwIj4KICAgPC9kaXY+CiAgIDxk aXYgY2xhc3M9ImFic29sdXRlIiBzdHlsZT0iZ3JpZC1jb2x1bW46IDMgLyBmb287IGdyaWQtcm93 OiAzIC8gZm9vOyIKICAgICBkYXRhLW9mZnNldC14PSIzMTUiIGRhdGEtb2Zmc2V0LXk9IjIxNSIg ZGF0YS1leHBlY3RlZC13aWR0aD0iMjE1IiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMTE1Ij4KQEAg LTE5MywxMyArMTkzLDEzIEBACiAKIDxkaXYgY2xhc3M9ImdyaWQgZGlyZWN0aW9uUlRMIj4KICAg PGRpdiBjbGFzcz0iYWJzb2x1dGUiIHN0eWxlPSJncmlkLWNvbHVtbjogZm9vIC8gMTsgZ3JpZC1y b3c6IGZvbyAvIDE7IgotICAgIGRhdGEtb2Zmc2V0LXg9IjUxNSIgZGF0YS1vZmZzZXQteT0iMCIg ZGF0YS1leHBlY3RlZC13aWR0aD0iMTUiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIxNSI+CisgICAg ZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMTUiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9 IjUxNSIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMxNSI+CiAgIDwvZGl2PgogICA8ZGl2IGNsYXNz PSJhYnNvbHV0ZSIgc3R5bGU9ImdyaWQtY29sdW1uOiAxIC8gMjsgZ3JpZC1yb3c6IGZvbyAvIDE7 IgotICAgIGRhdGEtb2Zmc2V0LXg9IjQxNSIgZGF0YS1vZmZzZXQteT0iMCIgZGF0YS1leHBlY3Rl ZC13aWR0aD0iMTAwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMTUiPgorICAgIGRhdGEtb2Zmc2V0 LXg9IjQxNSIgZGF0YS1vZmZzZXQteT0iMTUiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjEwMCIgZGF0 YS1leHBlY3RlZC1oZWlnaHQ9IjMxNSI+CiAgIDwvZGl2PgogICA8ZGl2IGNsYXNzPSJhYnNvbHV0 ZSIgc3R5bGU9ImdyaWQtY29sdW1uOiBmb28gLyAxOyBncmlkLXJvdzogMSAvIDI7IgotICAgIGRh dGEtb2Zmc2V0LXg9IjUxNSIgZGF0YS1vZmZzZXQteT0iMTUiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9 IjE1IiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iNTAiPgorICAgIGRhdGEtb2Zmc2V0LXg9IjAiIGRh dGEtb2Zmc2V0LXk9IjE1IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI1MTUiIGRhdGEtZXhwZWN0ZWQt aGVpZ2h0PSI1MCI+CiAgIDwvZGl2PgogICA8ZGl2IGNsYXNzPSJhYnNvbHV0ZSIgc3R5bGU9Imdy aWQtY29sdW1uOiAzIC8gZm9vOyBncmlkLXJvdzogMyAvIGZvbzsiCiAgICAgZGF0YS1vZmZzZXQt eD0iMCIgZGF0YS1vZmZzZXQteT0iMjE1IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIyMTUiIGRhdGEt ZXhwZWN0ZWQtaGVpZ2h0PSIxMTUiPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWJzcG9zL2dyaWQtcG9zaXRpb25l ZC1pdGVtcy11bmtub3duLW5hbWVkLWdyaWQtbGluZS0wMDEuaHRtbCBiL0xheW91dFRlc3RzL2lt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2Fic3Bvcy9ncmlkLXBv c2l0aW9uZWQtaXRlbXMtdW5rbm93bi1uYW1lZC1ncmlkLWxpbmUtMDAxLmh0bWwKaW5kZXggMjRk OWQ3NjlmOTkwNzlkMTk1MTlkMDVmODJlOGZkNjM3OTA2ZmU4YS4uNmU2MWY3YzJkZTM2YTFkNzk5 YWJhMGRlNmQxMGM1MjE0N2Q0MDZkNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWJzcG9zL2dyaWQtcG9zaXRpb25l ZC1pdGVtcy11bmtub3duLW5hbWVkLWdyaWQtbGluZS0wMDEuaHRtbAorKysgYi9MYXlvdXRUZXN0 cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hYnNwb3MvZ3Jp ZC1wb3NpdGlvbmVkLWl0ZW1zLXVua25vd24tbmFtZWQtZ3JpZC1saW5lLTAwMS5odG1sCkBAIC0z LDcgKzMsNyBAQAogPHRpdGxlPkNTUyBHcmlkIExheW91dCBUZXN0OiBHcmlkIHBvc2l0aW9uZWQg aXRlbXMgdW5rbm93biBuYW1lZCBncmlkIGxpbmU8L3RpdGxlPgogPGxpbmsgcmVsPSJhdXRob3Ii IHRpdGxlPSJNYW51ZWwgUmVnbyBDYXNhc25vdmFzIiBocmVmPSJtYWlsdG86cmVnb0BpZ2FsaWEu Y29tIj4KIDxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nz cy1ncmlkLTEvI2Fic3BvcyIgdGl0bGU9IjkuIEFic29sdXRlIFBvc2l0aW9uaW5nIj4KLTxtZXRh IG5hbWU9ImFzc2VydCIgY29udGVudD0iVGhpcyB0ZXN0IGNoZWNrcyB0aGF0IGdyaWQgcGxhY2Vt ZW50IHByb3BlcnRpZXMgb2YgYWJzb2x1dGVseSBwb3NpdGlvbmVkIGl0ZW1zIHVzaW5nIHVua25v d24gbmFtZWQgZ3JpZCBsaW5lcyBhcmUgdHJlYXRlZCBhcyAnYXV0bycuIj4KKzxtZXRhIG5hbWU9 ImFzc2VydCIgY29udGVudD0iVGhpcyB0ZXN0IGNoZWNrcyB0aGF0IGdyaWQgcGxhY2VtZW50IHBy b3BlcnRpZXMgb2YgYWJzb2x1dGVseSBwb3NpdGlvbmVkIGl0ZW1zIGNhbiByZWZlcmVuY2UgaW1w bGljaXQgZ3JpZCBsaW5lcy4iPgogPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJzdXBwb3J0 L2dyaWQuY3NzIj4KIDxzdHlsZT4KIApAQCAtNTgsNyArNTgsNyBAQAogICAgIGRhdGEtb2Zmc2V0 LXg9IjE1IiBkYXRhLW9mZnNldC15PSIxNSIgZGF0YS1leHBlY3RlZC13aWR0aD0iNTE1IiBkYXRh LWV4cGVjdGVkLWhlaWdodD0iMzE1Ij4KICAgPC9kaXY+CiAgIDxkaXYgY2xhc3M9ImFic29sdXRl IHNpemVkVG9HcmlkQXJlYSBzdGFydFVua25vd25MaW5lIgotICAgIGRhdGEtb2Zmc2V0LXg9IjAi IGRhdGEtb2Zmc2V0LXk9IjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjMxNSIgZGF0YS1leHBlY3Rl ZC1oZWlnaHQ9IjIxNSI+CisgICAgZGF0YS1vZmZzZXQteD0iMzE1IiBkYXRhLW9mZnNldC15PSIy MTUiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjIxNSIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjExNSI+ CiAgIDwvZGl2PgogPC9kaXY+CiAKQEAgLTcwLDcgKzcwLDcgQEAKICAgICBkYXRhLW9mZnNldC14 PSIwIiBkYXRhLW9mZnNldC15PSIxNSIgZGF0YS1leHBlY3RlZC13aWR0aD0iNTE1IiBkYXRhLWV4 cGVjdGVkLWhlaWdodD0iMzE1Ij4KICAgPC9kaXY+CiAgIDxkaXYgY2xhc3M9ImFic29sdXRlIHNp emVkVG9HcmlkQXJlYSBzdGFydFVua25vd25MaW5lIgotICAgIGRhdGEtb2Zmc2V0LXg9IjIxNSIg ZGF0YS1vZmZzZXQteT0iMCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMzE1IiBkYXRhLWV4cGVjdGVk LWhlaWdodD0iMjE1Ij4KKyAgICBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIyMTUi IGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjIxNSIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjExNSI+CiAg IDwvZGl2PgogPC9kaXY+CiAK 358792 2019-01-10 07:42:55 -0800 2019-01-10 09:32:32 -0800 Patch bug-193313-20190110164254.patch text/plain 22267 obrufau U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5NjA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTM5MjA1OTJiOWJmYzcx NjIxNTU4ODZhOGNiOTQxM2I0MzcxODY1OS4uNjQxNjBlZGZmNWU4NzA3ODRjZDI1N2Y5NzQ4MDYx MmY3NjQ3NTlhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ3IEBACisyMDE5LTAxLTEwICBPcmlv bCBCcnVmYXUgIDxvYnJ1ZmF1QGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1ncmlkXSBMZXQg YWJzcG9zIGl0ZW1zIHJlZmVyZW5jZSBpbXBsaWNpdCBncmlkIGxpbmVzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTMzMTMKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGlsZSB0aGV5IGNhbid0IGNyZWF0 ZSBuZXcgaW1wbGljaXQgZ3JpZCBsaW5lcywgYWJzcG9zIGl0ZW1zCisgICAgICAgIGNhbiByZWZl cmVuY2UgZXhpc3Rpbmcgb25lcyBhcyBjbGFyaWZpZWQgaW4KKyAgICAgICAgaHR0cHM6Ly9naXRo dWIuY29tL3czYy9jc3N3Zy1kcmFmdHMvY29tbWl0LzUxMWJiNjMKKworICAgICAgICBUaGlzIHBh dGNoIG1ha2VzIFdlYktpdCBtYXRjaCBCbGluaywgRmlyZWZveCBhbmQgRWRnZS4KKworICAgICAg ICBUZXN0czogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hYnNwb3MvZ3JpZC1wb3Np dGlvbmVkLWl0ZW1zLXBhZGRpbmctMDAxLmh0bWwKKyAgICAgICAgICAgICAgIHdlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLWdyaWQvYWJzcG9zL2dyaWQtcG9zaXRpb25lZC1pdGVtcy11bmtub3du LW5hbWVkLWdyaWQtbGluZS0wMDEuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdy aWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6cG9wdWxhdGVFeHBsaWNpdEdy aWRBbmRPcmRlckl0ZXJhdG9yIGNvbnN0KToKKyAgICAgICAgUmVtb3ZlIGFyZ3VtZW50IGZyb20g c3BhblNpemVGb3JBdXRvUGxhY2VkSXRlbSBjYWxsLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy R3JpZDo6Y3JlYXRlRW1wdHlHcmlkQXJlYUF0U3BlY2lmaWVkUG9zaXRpb25zT3V0c2lkZUdyaWQg Y29uc3QpOgorICAgICAgICBSZW1vdmUgYXJndW1lbnQgZnJvbSBzcGFuU2l6ZUZvckF1dG9QbGFj ZWRJdGVtIGNhbGwuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpwbGFjZVNwZWNpZmll ZE1ham9yQXhpc0l0ZW1zT25HcmlkIGNvbnN0KToKKyAgICAgICAgUmVtb3ZlIGFyZ3VtZW50IGZy b20gc3BhblNpemVGb3JBdXRvUGxhY2VkSXRlbSBjYWxsLgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyR3JpZDo6cGxhY2VBdXRvTWFqb3JBeGlzSXRlbU9uR3JpZCBjb25zdCk6CisgICAgICAgIFJl bW92ZSBhcmd1bWVudCBmcm9tIHNwYW5TaXplRm9yQXV0b1BsYWNlZEl0ZW0gY2FsbC4KKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6OmdyaWRBcmVhQnJlYWR0aEZvck91dE9mRmxvd0NoaWxk KToKKyAgICAgICAgRG9uJ3QgdHJlYXQgaW1wbGljaXQgZ3JpZCBsaW5lcyBhcyAnYXV0bycuCisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdyaWQuaDoKKyAgICAgICAgUmVtb3ZlIHVudXNlZCBn cmlkUG9zaXRpb25Jc0F1dG9Gb3JPdXRPZkZsb3cuCisgICAgICAgICogcmVuZGVyaW5nL3N0eWxl L0dyaWRQb3NpdGlvbnNSZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjphZGp1c3RHcmlk UG9zaXRpb25zRnJvbVN0eWxlKToKKyAgICAgICAgRG9uJ3QgdHJlYXQgaW1wbGljaXQgZ3JpZCBs aW5lcyBhcyAnYXV0bycuCisgICAgICAgIFJlbW92ZSB1bnVzZWQgZ3JpZENvbnRhaW5lclN0eWxl IHBhcmFtZXRlci4KKyAgICAgICAgKFdlYkNvcmU6OkdyaWRQb3NpdGlvbnNSZXNvbHZlcjo6c3Bh blNpemVGb3JBdXRvUGxhY2VkSXRlbSk6CisgICAgICAgIFJlbW92ZSBhcmd1bWVudCBmcm9tIGFk anVzdEdyaWRQb3NpdGlvbnNGcm9tU3R5bGUgY2FsbC4KKyAgICAgICAgUmVtb3ZlIHVudXNlZCBn cmlkQ29udGFpbmVyU3R5bGUgcGFyYW1ldGVyLgorICAgICAgICAoV2ViQ29yZTo6cmVzb2x2ZUdy aWRQb3NpdGlvbkZyb21TdHlsZSk6CisgICAgICAgIFJlbW92ZSB1bm5lY2Vzc2FyeSBhc3NlcnQg dGhhdCB1c2VzIGlzVmFsaWROYW1lZExpbmVPckFyZWEuCisgICAgICAgIChXZWJDb3JlOjpHcmlk UG9zaXRpb25zUmVzb2x2ZXI6OnJlc29sdmVHcmlkUG9zaXRpb25zRnJvbVN0eWxlKToKKyAgICAg ICAgUmVtb3ZlIGFyZ3VtZW50IGZyb20gYWRqdXN0R3JpZFBvc2l0aW9uc0Zyb21TdHlsZSBjYWxs LgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9HcmlkUG9zaXRpb25zUmVzb2x2ZXIuaDoKKyAg ICAgICAgUmVtb3ZlIHVudXNlZCBpc1ZhbGlkTmFtZWRMaW5lT3JBcmVhLgorICAgICAgICBSZW1v dmUgdW51c2VkIHBhcmFtZXRlciBmcm9tIHNwYW5TaXplRm9yQXV0b1BsYWNlZEl0ZW0uCisKIDIw MTktMDEtMDMgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdS RVNTSU9OOiAtd2Via2l0LWFwcGVhcmFuY2UgdGVzdCBjYXNlIGNyYXNoZXMKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAppbmRleCAzNWE2MTBiMjk5NzNjY2Q5ZTY4YzY1NGM4 YTQ1YmVkMGNjM2E1YTZmLi4zNTdiMzI0MTY4MzRhNDcwOTE2YzU4Yzk0MTkwNGMxNmU2NWE5ZDc2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCkBAIC02OTMsNyArNjkz LDcgQEAgdm9pZCBSZW5kZXJHcmlkOjpwb3B1bGF0ZUV4cGxpY2l0R3JpZEFuZE9yZGVySXRlcmF0 b3IoR3JpZCYgZ3JpZCkgY29uc3QKICAgICAgICAgICAgIG1heGltdW1Sb3dJbmRleCA9IHN0ZDo6 bWF4PGludD4obWF4aW11bVJvd0luZGV4LCByb3dQb3NpdGlvbnMudW50cmFuc2xhdGVkRW5kTGlu ZSgpKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIC8vIEdyb3cgdGhlIGdyaWQgZm9y IGl0ZW1zIHdpdGggYSBkZWZpbml0ZSByb3cgc3BhbiwgZ2V0dGluZyB0aGUgbGFyZ2VzdCBzdWNo IHNwYW4uCi0gICAgICAgICAgICB1bnNpZ25lZCBzcGFuU2l6ZSA9IEdyaWRQb3NpdGlvbnNSZXNv bHZlcjo6c3BhblNpemVGb3JBdXRvUGxhY2VkSXRlbShzdHlsZSgpLCAqY2hpbGQsIEZvclJvd3Mp OworICAgICAgICAgICAgdW5zaWduZWQgc3BhblNpemUgPSBHcmlkUG9zaXRpb25zUmVzb2x2ZXI6 OnNwYW5TaXplRm9yQXV0b1BsYWNlZEl0ZW0oKmNoaWxkLCBGb3JSb3dzKTsKICAgICAgICAgICAg IG1heGltdW1Sb3dJbmRleCA9IHN0ZDo6bWF4KG1heGltdW1Sb3dJbmRleCwgc3BhblNpemUpOwog ICAgICAgICB9CiAKQEAgLTcwMyw3ICs3MDMsNyBAQCB2b2lkIFJlbmRlckdyaWQ6OnBvcHVsYXRl RXhwbGljaXRHcmlkQW5kT3JkZXJJdGVyYXRvcihHcmlkJiBncmlkKSBjb25zdAogICAgICAgICAg ICAgbWF4aW11bUNvbHVtbkluZGV4ID0gc3RkOjptYXg8aW50PihtYXhpbXVtQ29sdW1uSW5kZXgs IGNvbHVtblBvc2l0aW9ucy51bnRyYW5zbGF0ZWRFbmRMaW5lKCkpOwogICAgICAgICB9IGVsc2Ug ewogICAgICAgICAgICAgLy8gR3JvdyB0aGUgZ3JpZCBmb3IgaXRlbXMgd2l0aCBhIGRlZmluaXRl IGNvbHVtbiBzcGFuLCBnZXR0aW5nIHRoZSBsYXJnZXN0IHN1Y2ggc3Bhbi4KLSAgICAgICAgICAg IHVuc2lnbmVkIHNwYW5TaXplID0gR3JpZFBvc2l0aW9uc1Jlc29sdmVyOjpzcGFuU2l6ZUZvckF1 dG9QbGFjZWRJdGVtKHN0eWxlKCksICpjaGlsZCwgRm9yQ29sdW1ucyk7CisgICAgICAgICAgICB1 bnNpZ25lZCBzcGFuU2l6ZSA9IEdyaWRQb3NpdGlvbnNSZXNvbHZlcjo6c3BhblNpemVGb3JBdXRv UGxhY2VkSXRlbSgqY2hpbGQsIEZvckNvbHVtbnMpOwogICAgICAgICAgICAgbWF4aW11bUNvbHVt bkluZGV4ID0gc3RkOjptYXgobWF4aW11bUNvbHVtbkluZGV4LCBzcGFuU2l6ZSk7CiAgICAgICAg IH0KIApAQCAtNzE4LDcgKzcxOCw3IEBAIHN0ZDo6dW5pcXVlX3B0cjxHcmlkQXJlYT4gUmVuZGVy R3JpZDo6Y3JlYXRlRW1wdHlHcmlkQXJlYUF0U3BlY2lmaWVkUG9zaXRpb25zT3V0CiB7CiAgICAg R3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGNyb3NzRGlyZWN0aW9uID0gc3BlY2lmaWVkRGlyZWN0 aW9uID09IEZvckNvbHVtbnMgPyBGb3JSb3dzIDogRm9yQ29sdW1uczsKICAgICBjb25zdCB1bnNp Z25lZCBlbmRPZkNyb3NzRGlyZWN0aW9uID0gZ3JpZC5udW1UcmFja3MoY3Jvc3NEaXJlY3Rpb24p OwotICAgIHVuc2lnbmVkIGNyb3NzRGlyZWN0aW9uU3BhblNpemUgPSBHcmlkUG9zaXRpb25zUmVz b2x2ZXI6OnNwYW5TaXplRm9yQXV0b1BsYWNlZEl0ZW0oc3R5bGUoKSwgZ3JpZEl0ZW0sIGNyb3Nz RGlyZWN0aW9uKTsKKyAgICB1bnNpZ25lZCBjcm9zc0RpcmVjdGlvblNwYW5TaXplID0gR3JpZFBv c2l0aW9uc1Jlc29sdmVyOjpzcGFuU2l6ZUZvckF1dG9QbGFjZWRJdGVtKGdyaWRJdGVtLCBjcm9z c0RpcmVjdGlvbik7CiAgICAgR3JpZFNwYW4gY3Jvc3NEaXJlY3Rpb25Qb3NpdGlvbnMgPSBHcmlk U3Bhbjo6dHJhbnNsYXRlZERlZmluaXRlR3JpZFNwYW4oZW5kT2ZDcm9zc0RpcmVjdGlvbiwgZW5k T2ZDcm9zc0RpcmVjdGlvbiArIGNyb3NzRGlyZWN0aW9uU3BhblNpemUpOwogICAgIHJldHVybiBz dGQ6Om1ha2VfdW5pcXVlPEdyaWRBcmVhPihzcGVjaWZpZWREaXJlY3Rpb24gPT0gRm9yQ29sdW1u cyA/IGNyb3NzRGlyZWN0aW9uUG9zaXRpb25zIDogc3BlY2lmaWVkUG9zaXRpb25zLCBzcGVjaWZp ZWREaXJlY3Rpb24gPT0gRm9yQ29sdW1ucyA/IHNwZWNpZmllZFBvc2l0aW9ucyA6IGNyb3NzRGly ZWN0aW9uUG9zaXRpb25zKTsKIH0KQEAgLTczNyw3ICs3MzcsNyBAQCB2b2lkIFJlbmRlckdyaWQ6 OnBsYWNlU3BlY2lmaWVkTWFqb3JBeGlzSXRlbXNPbkdyaWQoR3JpZCYgZ3JpZCwgY29uc3QgVmVj dG9yPFJlbgogICAgICAgICBHcmlkU3BhbiBtYWpvckF4aXNQb3NpdGlvbnMgPSBncmlkLmdyaWRJ dGVtU3BhbigqYXV0b0dyaWRJdGVtLCBhdXRvUGxhY2VtZW50TWFqb3JBeGlzRGlyZWN0aW9uKCkp OwogICAgICAgICBBU1NFUlQobWFqb3JBeGlzUG9zaXRpb25zLmlzVHJhbnNsYXRlZERlZmluaXRl KCkpOwogICAgICAgICBBU1NFUlQoZ3JpZC5ncmlkSXRlbVNwYW4oKmF1dG9HcmlkSXRlbSwgYXV0 b1BsYWNlbWVudE1pbm9yQXhpc0RpcmVjdGlvbigpKS5pc0luZGVmaW5pdGUoKSk7Ci0gICAgICAg IHVuc2lnbmVkIG1pbm9yQXhpc1NwYW5TaXplID0gR3JpZFBvc2l0aW9uc1Jlc29sdmVyOjpzcGFu U2l6ZUZvckF1dG9QbGFjZWRJdGVtKHN0eWxlKCksICphdXRvR3JpZEl0ZW0sIGF1dG9QbGFjZW1l bnRNaW5vckF4aXNEaXJlY3Rpb24oKSk7CisgICAgICAgIHVuc2lnbmVkIG1pbm9yQXhpc1NwYW5T aXplID0gR3JpZFBvc2l0aW9uc1Jlc29sdmVyOjpzcGFuU2l6ZUZvckF1dG9QbGFjZWRJdGVtKCph dXRvR3JpZEl0ZW0sIGF1dG9QbGFjZW1lbnRNaW5vckF4aXNEaXJlY3Rpb24oKSk7CiAgICAgICAg IHVuc2lnbmVkIG1ham9yQXhpc0luaXRpYWxQb3NpdGlvbiA9IG1ham9yQXhpc1Bvc2l0aW9ucy5z dGFydExpbmUoKTsKIAogICAgICAgICBHcmlkSXRlcmF0b3IgaXRlcmF0b3IoZ3JpZCwgYXV0b1Bs YWNlbWVudE1ham9yQXhpc0RpcmVjdGlvbigpLCBtYWpvckF4aXNQb3NpdGlvbnMuc3RhcnRMaW5l KCksIGlzR3JpZEF1dG9GbG93RGVuc2UgPyAwIDogbWlub3JBeGlzQ3Vyc29ycy5nZXQobWFqb3JB eGlzSW5pdGlhbFBvc2l0aW9uKSk7CkBAIC03NzAsNyArNzcwLDcgQEAgdm9pZCBSZW5kZXJHcmlk OjpwbGFjZUF1dG9NYWpvckF4aXNJdGVtc09uR3JpZChHcmlkJiBncmlkLCBjb25zdCBWZWN0b3I8 UmVuZGVyQm8KIHZvaWQgUmVuZGVyR3JpZDo6cGxhY2VBdXRvTWFqb3JBeGlzSXRlbU9uR3JpZChH cmlkJiBncmlkLCBSZW5kZXJCb3gmIGdyaWRJdGVtLCBBdXRvUGxhY2VtZW50Q3Vyc29yJiBhdXRv UGxhY2VtZW50Q3Vyc29yKSBjb25zdAogewogICAgIEFTU0VSVChncmlkLmdyaWRJdGVtU3Bhbihn cmlkSXRlbSwgYXV0b1BsYWNlbWVudE1ham9yQXhpc0RpcmVjdGlvbigpKS5pc0luZGVmaW5pdGUo KSk7Ci0gICAgdW5zaWduZWQgbWFqb3JBeGlzU3BhblNpemUgPSBHcmlkUG9zaXRpb25zUmVzb2x2 ZXI6OnNwYW5TaXplRm9yQXV0b1BsYWNlZEl0ZW0oc3R5bGUoKSwgZ3JpZEl0ZW0sIGF1dG9QbGFj ZW1lbnRNYWpvckF4aXNEaXJlY3Rpb24oKSk7CisgICAgdW5zaWduZWQgbWFqb3JBeGlzU3BhblNp emUgPSBHcmlkUG9zaXRpb25zUmVzb2x2ZXI6OnNwYW5TaXplRm9yQXV0b1BsYWNlZEl0ZW0oZ3Jp ZEl0ZW0sIGF1dG9QbGFjZW1lbnRNYWpvckF4aXNEaXJlY3Rpb24oKSk7CiAKICAgICBjb25zdCB1 bnNpZ25lZCBlbmRPZk1ham9yQXhpcyA9IGdyaWQubnVtVHJhY2tzKGF1dG9QbGFjZW1lbnRNYWpv ckF4aXNEaXJlY3Rpb24oKSk7CiAgICAgdW5zaWduZWQgbWFqb3JBeGlzQXV0b1BsYWNlbWVudEN1 cnNvciA9IGF1dG9QbGFjZW1lbnRNYWpvckF4aXNEaXJlY3Rpb24oKSA9PSBGb3JDb2x1bW5zID8g YXV0b1BsYWNlbWVudEN1cnNvci5zZWNvbmQgOiBhdXRvUGxhY2VtZW50Q3Vyc29yLmZpcnN0OwpA QCAtNzkxLDcgKzc5MSw3IEBAIHZvaWQgUmVuZGVyR3JpZDo6cGxhY2VBdXRvTWFqb3JBeGlzSXRl bU9uR3JpZChHcmlkJiBncmlkLCBSZW5kZXJCb3gmIGdyaWRJdGVtLCBBCiAgICAgICAgIGlmICgh ZW1wdHlHcmlkQXJlYSkKICAgICAgICAgICAgIGVtcHR5R3JpZEFyZWEgPSBjcmVhdGVFbXB0eUdy aWRBcmVhQXRTcGVjaWZpZWRQb3NpdGlvbnNPdXRzaWRlR3JpZChncmlkLCBncmlkSXRlbSwgYXV0 b1BsYWNlbWVudE1pbm9yQXhpc0RpcmVjdGlvbigpLCBtaW5vckF4aXNQb3NpdGlvbnMpOwogICAg IH0gZWxzZSB7Ci0gICAgICAgIHVuc2lnbmVkIG1pbm9yQXhpc1NwYW5TaXplID0gR3JpZFBvc2l0 aW9uc1Jlc29sdmVyOjpzcGFuU2l6ZUZvckF1dG9QbGFjZWRJdGVtKHN0eWxlKCksIGdyaWRJdGVt LCBhdXRvUGxhY2VtZW50TWlub3JBeGlzRGlyZWN0aW9uKCkpOworICAgICAgICB1bnNpZ25lZCBt aW5vckF4aXNTcGFuU2l6ZSA9IEdyaWRQb3NpdGlvbnNSZXNvbHZlcjo6c3BhblNpemVGb3JBdXRv UGxhY2VkSXRlbShncmlkSXRlbSwgYXV0b1BsYWNlbWVudE1pbm9yQXhpc0RpcmVjdGlvbigpKTsK IAogICAgICAgICBmb3IgKHVuc2lnbmVkIG1ham9yQXhpc0luZGV4ID0gbWFqb3JBeGlzQXV0b1Bs YWNlbWVudEN1cnNvcjsgbWFqb3JBeGlzSW5kZXggPCBlbmRPZk1ham9yQXhpczsgKyttYWpvckF4 aXNJbmRleCkgewogICAgICAgICAgICAgR3JpZEl0ZXJhdG9yIGl0ZXJhdG9yKGdyaWQsIGF1dG9Q bGFjZW1lbnRNYWpvckF4aXNEaXJlY3Rpb24oKSwgbWFqb3JBeGlzSW5kZXgsIG1pbm9yQXhpc0F1 dG9QbGFjZW1lbnRDdXJzb3IpOwpAQCAtMTQ3MCwxMSArMTQ3MCw2IEBAIExheW91dFVuaXQgUmVu ZGVyR3JpZDo6cm93QXhpc09mZnNldEZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNv bnN0CiAgICAgcmV0dXJuIDA7CiB9CiAKLWJvb2wgUmVuZGVyR3JpZDo6Z3JpZFBvc2l0aW9uSXNB dXRvRm9yT3V0T2ZGbG93KEdyaWRQb3NpdGlvbiBwb3NpdGlvbiwgR3JpZFRyYWNrU2l6aW5nRGly ZWN0aW9uIGRpcmVjdGlvbikgY29uc3QKLXsKLSAgICByZXR1cm4gcG9zaXRpb24uaXNBdXRvKCkg fHwgKHBvc2l0aW9uLmlzTmFtZWRHcmlkQXJlYSgpICYmICFOYW1lZExpbmVDb2xsZWN0aW9uOjpp c1ZhbGlkTmFtZWRMaW5lT3JBcmVhKHBvc2l0aW9uLm5hbWVkR3JpZExpbmUoKSwgc3R5bGUoKSwg R3JpZFBvc2l0aW9uc1Jlc29sdmVyOjppbml0aWFsUG9zaXRpb25TaWRlKGRpcmVjdGlvbikpKTsK LX0KLQogTGF5b3V0VW5pdCBSZW5kZXJHcmlkOjpyZXNvbHZlQXV0b1N0YXJ0R3JpZFBvc2l0aW9u KEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBkaXJlY3Rpb24pIGNvbnN0CiB7CiAgICAgaWYgKGRp cmVjdGlvbiA9PSBGb3JSb3dzIHx8IHN0eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpKQpA QCAtMTUyMCw4ICsxNTE1LDggQEAgTGF5b3V0VW5pdCBSZW5kZXJHcmlkOjpncmlkQXJlYUJyZWFk dGhGb3JPdXRPZkZsb3dDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNoaWxkLAogICAgIEdyaWRQb3Np dGlvbiBzdGFydFBvc2l0aW9uID0gZGlyZWN0aW9uID09IEZvckNvbHVtbnMgPyBjaGlsZC5zdHls ZSgpLmdyaWRJdGVtQ29sdW1uU3RhcnQoKSA6IGNoaWxkLnN0eWxlKCkuZ3JpZEl0ZW1Sb3dTdGFy dCgpOwogICAgIEdyaWRQb3NpdGlvbiBlbmRQb3NpdGlvbiA9IGRpcmVjdGlvbiA9PSBGb3JDb2x1 bW5zID8gY2hpbGQuc3R5bGUoKS5ncmlkSXRlbUNvbHVtbkVuZCgpIDogY2hpbGQuc3R5bGUoKS5n cmlkSXRlbVJvd0VuZCgpOwogCi0gICAgYm9vbCBzdGFydElzQXV0byA9IGdyaWRQb3NpdGlvbklz QXV0b0Zvck91dE9mRmxvdyhzdGFydFBvc2l0aW9uLCBkaXJlY3Rpb24pIHx8IHN0YXJ0TGluZSA8 IDAgfHwgc3RhcnRMaW5lID4gbGFzdExpbmU7Ci0gICAgYm9vbCBlbmRJc0F1dG8gPSBncmlkUG9z aXRpb25Jc0F1dG9Gb3JPdXRPZkZsb3coZW5kUG9zaXRpb24sIGRpcmVjdGlvbikgfHwgZW5kTGlu ZSA8IDAgfHwgZW5kTGluZSA+IGxhc3RMaW5lOworICAgIGJvb2wgc3RhcnRJc0F1dG8gPSBzdGFy dFBvc2l0aW9uLmlzQXV0bygpIHx8IHN0YXJ0TGluZSA8IDAgfHwgc3RhcnRMaW5lID4gbGFzdExp bmU7CisgICAgYm9vbCBlbmRJc0F1dG8gPSBlbmRQb3NpdGlvbi5pc0F1dG8oKSB8fCBlbmRMaW5l IDwgMCB8fCBlbmRMaW5lID4gbGFzdExpbmU7CiAKICAgICBpZiAoc3RhcnRJc0F1dG8gJiYgZW5k SXNBdXRvKQogICAgICAgICByZXR1cm4gaXNSb3dBeGlzID8gY2xpZW50TG9naWNhbFdpZHRoKCkg OiBjbGllbnRMb2dpY2FsSGVpZ2h0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyR3JpZC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQu aAppbmRleCAxMzFhMDA4NDFhY2ViMjQzYmQ1MGZlZGFkZTRhNTA3Nzk1NWNlMzVmLi5kZTNjMjM0 ODNhMGNjMWYwNzZmNGUxYmQ0ZmM5MjYxNzVjY2JmYjdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJHcmlkLmgKQEAgLTEzMyw3ICsxMzMsNiBAQCBwcml2YXRlOgogICAgIHZvaWQgbGF5 b3V0R3JpZEl0ZW1zKCk7CiAgICAgdm9pZCBwb3B1bGF0ZUdyaWRQb3NpdGlvbnNGb3JEaXJlY3Rp b24oR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uKTsKIAotICAgIGJvb2wgZ3JpZFBvc2l0aW9uSXNB dXRvRm9yT3V0T2ZGbG93KEdyaWRQb3NpdGlvbiwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uKSBj b25zdDsKICAgICBMYXlvdXRVbml0IHJlc29sdmVBdXRvU3RhcnRHcmlkUG9zaXRpb24oR3JpZFRy YWNrU2l6aW5nRGlyZWN0aW9uKSBjb25zdDsKICAgICBMYXlvdXRVbml0IHJlc29sdmVBdXRvRW5k R3JpZFBvc2l0aW9uKEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbikgY29uc3Q7CiAgICAgTGF5b3V0 VW5pdCBncmlkQXJlYUJyZWFkdGhGb3JPdXRPZkZsb3dDaGlsZChjb25zdCBSZW5kZXJCb3gmLCBH cmlkVHJhY2tTaXppbmdEaXJlY3Rpb24pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL0dyaWRQb3NpdGlvbnNSZXNvbHZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3R5bGUvR3JpZFBvc2l0aW9uc1Jlc29sdmVyLmNwcAppbmRleCAyNGM5ZDM4MDFl MGU4Y2U4YTBjOTY5ZWQ1YjI1NGM1NzdhODA5MjU3Li4zZDk5ODEzMTYyNTRmZWM3MmEzMDdhNzdi ZmYwN2ZjZjQzZDZjYzU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5 bGUvR3JpZFBvc2l0aW9uc1Jlc29sdmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc3R5bGUvR3JpZFBvc2l0aW9uc1Jlc29sdmVyLmNwcApAQCAtNzYsMTkgKzc2LDYgQEAgTmFt ZWRMaW5lQ29sbGVjdGlvbjo6TmFtZWRMaW5lQ29sbGVjdGlvbihjb25zdCBSZW5kZXJTdHlsZSYg Z3JpZENvbnRhaW5lclN0eWxlLAogICAgIG1fYXV0b1JlcGVhdFRyYWNrTGlzdExlbmd0aCA9IGlz Um93QXhpcyA/IGdyaWRDb250YWluZXJTdHlsZS5ncmlkQXV0b1JlcGVhdENvbHVtbnMoKS5zaXpl KCkgOiBncmlkQ29udGFpbmVyU3R5bGUuZ3JpZEF1dG9SZXBlYXRSb3dzKCkuc2l6ZSgpOwogfQog Ci1ib29sIE5hbWVkTGluZUNvbGxlY3Rpb246OmlzVmFsaWROYW1lZExpbmVPckFyZWEoY29uc3Qg U3RyaW5nJiBuYW1lZExpbmUsIGNvbnN0IFJlbmRlclN0eWxlJiBncmlkQ29udGFpbmVyU3R5bGUs IEdyaWRQb3NpdGlvblNpZGUgc2lkZSkKLXsKLSAgICBib29sIGlzUm93QXhpcyA9IGRpcmVjdGlv bkZyb21TaWRlKHNpZGUpID09IEZvckNvbHVtbnM7Ci0gICAgYXV0byYgZ3JpZExpbmVOYW1lcyA9 IGlzUm93QXhpcyA/IGdyaWRDb250YWluZXJTdHlsZS5uYW1lZEdyaWRDb2x1bW5MaW5lcygpIDog Z3JpZENvbnRhaW5lclN0eWxlLm5hbWVkR3JpZFJvd0xpbmVzKCk7Ci0gICAgYXV0byYgYXV0b1Jl cGVhdEdyaWRMaW5lTmFtZXMgPSBpc1Jvd0F4aXMgPyBncmlkQ29udGFpbmVyU3R5bGUuYXV0b1Jl cGVhdE5hbWVkR3JpZENvbHVtbkxpbmVzKCkgOiBncmlkQ29udGFpbmVyU3R5bGUuYXV0b1JlcGVh dE5hbWVkR3JpZFJvd0xpbmVzKCk7Ci0KLSAgICBpZiAoZ3JpZExpbmVOYW1lcy5jb250YWlucyhu YW1lZExpbmUpIHx8IGF1dG9SZXBlYXRHcmlkTGluZU5hbWVzLmNvbnRhaW5zKG5hbWVkTGluZSkp Ci0gICAgICAgIHJldHVybiB0cnVlOwotCi0gICAgU3RyaW5nIGltcGxpY2l0TmFtZSA9IGltcGxp Y2l0TmFtZWRHcmlkTGluZUZvclNpZGUobmFtZWRMaW5lLCBzaWRlKTsKLSAgICByZXR1cm4gZ3Jp ZExpbmVOYW1lcy5jb250YWlucyhpbXBsaWNpdE5hbWUpIHx8IGF1dG9SZXBlYXRHcmlkTGluZU5h bWVzLmNvbnRhaW5zKGltcGxpY2l0TmFtZSk7Ci19Ci0KIGJvb2wgTmFtZWRMaW5lQ29sbGVjdGlv bjo6aGFzTmFtZWRMaW5lcygpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fbmFtZWRMaW5lc0luZGV4 ZXMgfHwgbV9hdXRvUmVwZWF0TmFtZWRMaW5lc0luZGV4ZXM7CkBAIC0xNDgsNyArMTM1LDcgQEAg dW5zaWduZWQgTmFtZWRMaW5lQ29sbGVjdGlvbjo6Zmlyc3RQb3NpdGlvbigpIGNvbnN0CiAgICAg cmV0dXJuIHN0ZDo6bWluKG1fbmFtZWRMaW5lc0luZGV4ZXMtPmF0KGZpcnN0TGluZSksIG1fYXV0 b1JlcGVhdE5hbWVkTGluZXNJbmRleGVzLT5hdChmaXJzdExpbmUpICsgbV9pbnNlcnRpb25Qb2lu dCk7CiB9CiAKLXN0YXRpYyB2b2lkIGFkanVzdEdyaWRQb3NpdGlvbnNGcm9tU3R5bGUoY29uc3Qg UmVuZGVyU3R5bGUmIGdyaWRDb250YWluZXJTdHlsZSwgY29uc3QgUmVuZGVyQm94JiBncmlkSXRl bSwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGRpcmVjdGlvbiwgR3JpZFBvc2l0aW9uJiBpbml0 aWFsUG9zaXRpb24sIEdyaWRQb3NpdGlvbiYgZmluYWxQb3NpdGlvbikKK3N0YXRpYyB2b2lkIGFk anVzdEdyaWRQb3NpdGlvbnNGcm9tU3R5bGUoY29uc3QgUmVuZGVyQm94JiBncmlkSXRlbSwgR3Jp ZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGRpcmVjdGlvbiwgR3JpZFBvc2l0aW9uJiBpbml0aWFsUG9z aXRpb24sIEdyaWRQb3NpdGlvbiYgZmluYWxQb3NpdGlvbikKIHsKICAgICBib29sIGlzRm9yQ29s dW1ucyA9IGRpcmVjdGlvbiA9PSBGb3JDb2x1bW5zOwogICAgIGluaXRpYWxQb3NpdGlvbiA9IGlz Rm9yQ29sdW1ucyA/IGdyaWRJdGVtLnN0eWxlKCkuZ3JpZEl0ZW1Db2x1bW5TdGFydCgpIDogZ3Jp ZEl0ZW0uc3R5bGUoKS5ncmlkSXRlbVJvd1N0YXJ0KCk7CkBAIC0xNTksMTUgKzE0Niw2IEBAIHN0 YXRpYyB2b2lkIGFkanVzdEdyaWRQb3NpdGlvbnNGcm9tU3R5bGUoY29uc3QgUmVuZGVyU3R5bGUm IGdyaWRDb250YWluZXJTdHlsZSwKICAgICBpZiAoaW5pdGlhbFBvc2l0aW9uLmlzU3BhbigpICYm IGZpbmFsUG9zaXRpb24uaXNTcGFuKCkpCiAgICAgICAgIGZpbmFsUG9zaXRpb24uc2V0QXV0b1Bv c2l0aW9uKCk7CiAKLSAgICBpZiAoZ3JpZEl0ZW0uaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpIHsK LSAgICAgICAgLy8gRWFybHkgZGV0ZWN0IHRoZSBjYXNlIG9mIG5vbiBleGlzdGluZyBuYW1lZCBn cmlkIGxpbmVzIGZvciBwb3NpdGlvbmVkIGl0ZW1zLgotICAgICAgICBpZiAoaW5pdGlhbFBvc2l0 aW9uLmlzTmFtZWRHcmlkQXJlYSgpICYmICFOYW1lZExpbmVDb2xsZWN0aW9uOjppc1ZhbGlkTmFt ZWRMaW5lT3JBcmVhKGluaXRpYWxQb3NpdGlvbi5uYW1lZEdyaWRMaW5lKCksIGdyaWRDb250YWlu ZXJTdHlsZSwgR3JpZFBvc2l0aW9uc1Jlc29sdmVyOjppbml0aWFsUG9zaXRpb25TaWRlKGRpcmVj dGlvbikpKQotICAgICAgICAgICAgaW5pdGlhbFBvc2l0aW9uLnNldEF1dG9Qb3NpdGlvbigpOwot Ci0gICAgICAgIGlmIChmaW5hbFBvc2l0aW9uLmlzTmFtZWRHcmlkQXJlYSgpICYmICFOYW1lZExp bmVDb2xsZWN0aW9uOjppc1ZhbGlkTmFtZWRMaW5lT3JBcmVhKGZpbmFsUG9zaXRpb24ubmFtZWRH cmlkTGluZSgpLCBncmlkQ29udGFpbmVyU3R5bGUsIEdyaWRQb3NpdGlvbnNSZXNvbHZlcjo6Zmlu YWxQb3NpdGlvblNpZGUoZGlyZWN0aW9uKSkpCi0gICAgICAgICAgICBmaW5hbFBvc2l0aW9uLnNl dEF1dG9Qb3NpdGlvbigpOwotICAgIH0KLQogICAgIC8vIElmIHRoZSBncmlkIGl0ZW0gaGFzIGFu IGF1dG9tYXRpYyBwb3NpdGlvbiBhbmQgYSBncmlkIHNwYW4gZm9yIGEgbmFtZWQgbGluZSBpbiBh IGdpdmVuIGRpbWVuc2lvbiwgaW5zdGVhZCB0cmVhdCB0aGUgZ3JpZCBzcGFuIGFzIG9uZS4KICAg ICBpZiAoaW5pdGlhbFBvc2l0aW9uLmlzQXV0bygpICYmIGZpbmFsUG9zaXRpb24uaXNTcGFuKCkg JiYgIWZpbmFsUG9zaXRpb24ubmFtZWRHcmlkTGluZSgpLmlzTnVsbCgpKQogICAgICAgICBmaW5h bFBvc2l0aW9uLnNldFNwYW5Qb3NpdGlvbigxLCBTdHJpbmcoKSk7CkBAIC0zMDIsMTAgKzI4MCwx MCBAQCBHcmlkUG9zaXRpb25TaWRlIEdyaWRQb3NpdGlvbnNSZXNvbHZlcjo6ZmluYWxQb3NpdGlv blNpZGUoR3JpZFRyYWNrU2l6aW5nRGlyZWN0aQogICAgIHJldHVybiBkaXJlY3Rpb24gPT0gRm9y Q29sdW1ucyA/IENvbHVtbkVuZFNpZGUgOiBSb3dFbmRTaWRlOwogfQogCi11bnNpZ25lZCBHcmlk UG9zaXRpb25zUmVzb2x2ZXI6OnNwYW5TaXplRm9yQXV0b1BsYWNlZEl0ZW0oY29uc3QgUmVuZGVy U3R5bGUmIGdyaWRDb250YWluZXJTdHlsZSwgY29uc3QgUmVuZGVyQm94JiBncmlkSXRlbSwgR3Jp ZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGRpcmVjdGlvbikKK3Vuc2lnbmVkIEdyaWRQb3NpdGlvbnNS ZXNvbHZlcjo6c3BhblNpemVGb3JBdXRvUGxhY2VkSXRlbShjb25zdCBSZW5kZXJCb3gmIGdyaWRJ dGVtLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9uKQogewogICAgIEdyaWRQb3Np dGlvbiBpbml0aWFsUG9zaXRpb24sIGZpbmFsUG9zaXRpb247Ci0gICAgYWRqdXN0R3JpZFBvc2l0 aW9uc0Zyb21TdHlsZShncmlkQ29udGFpbmVyU3R5bGUsIGdyaWRJdGVtLCBkaXJlY3Rpb24sIGlu aXRpYWxQb3NpdGlvbiwgZmluYWxQb3NpdGlvbik7CisgICAgYWRqdXN0R3JpZFBvc2l0aW9uc0Zy b21TdHlsZShncmlkSXRlbSwgZGlyZWN0aW9uLCBpbml0aWFsUG9zaXRpb24sIGZpbmFsUG9zaXRp b24pOwogCiAgICAgLy8gVGhpcyBtZXRob2Qgd2lsbCBvbmx5IGJlIHVzZWQgd2hlbiBib3RoIHBv c2l0aW9ucyBuZWVkIHRvIGJlIHJlc29sdmVkIGFnYWluc3QgdGhlIG9wcG9zaXRlIG9uZS4KICAg ICBBU1NFUlQoaW5pdGlhbFBvc2l0aW9uLnNob3VsZEJlUmVzb2x2ZWRBZ2FpbnN0T3Bwb3NpdGVQ b3NpdGlvbigpICYmIGZpbmFsUG9zaXRpb24uc2hvdWxkQmVSZXNvbHZlZEFnYWluc3RPcHBvc2l0 ZVBvc2l0aW9uKCkpOwpAQCAtMzU3LDcgKzMzNSw2IEBAIHN0YXRpYyBpbnQgcmVzb2x2ZUdyaWRQ b3NpdGlvbkZyb21TdHlsZShjb25zdCBSZW5kZXJTdHlsZSYgZ3JpZENvbnRhaW5lclN0eWxlLCBj CiAgICAgICAgIGlmIChleHBsaWNpdExpbmVzLmhhc05hbWVkTGluZXMoKSkKICAgICAgICAgICAg IHJldHVybiBleHBsaWNpdExpbmVzLmZpcnN0UG9zaXRpb24oKTsKIAotICAgICAgICBBU1NFUlQo IU5hbWVkTGluZUNvbGxlY3Rpb246OmlzVmFsaWROYW1lZExpbmVPckFyZWEobmFtZWRHcmlkTGlu ZSwgZ3JpZENvbnRhaW5lclN0eWxlLCBzaWRlKSk7CiAgICAgICAgIC8vIElmIG5vbmUgb2YgdGhl IGFib3ZlIHdvcmtzIHNwZWNzIG1hbmRhdGUgdG8gYXNzdW1lIHRoYXQgYWxsIHRoZSBsaW5lcyBp biB0aGUgaW1wbGljaXQgZ3JpZCBoYXZlIHRoaXMgbmFtZS4KICAgICAgICAgcmV0dXJuIGxhc3RM aW5lICsgMTsKICAgICB9CkBAIC0zNzQsNyArMzUxLDcgQEAgc3RhdGljIGludCByZXNvbHZlR3Jp ZFBvc2l0aW9uRnJvbVN0eWxlKGNvbnN0IFJlbmRlclN0eWxlJiBncmlkQ29udGFpbmVyU3R5bGUs IGMKIEdyaWRTcGFuIEdyaWRQb3NpdGlvbnNSZXNvbHZlcjo6cmVzb2x2ZUdyaWRQb3NpdGlvbnNG cm9tU3R5bGUoY29uc3QgUmVuZGVyU3R5bGUmIGdyaWRDb250YWluZXJTdHlsZSwgY29uc3QgUmVu ZGVyQm94JiBncmlkSXRlbSwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGRpcmVjdGlvbiwgdW5z aWduZWQgYXV0b1JlcGVhdFRyYWNrc0NvdW50KQogewogICAgIEdyaWRQb3NpdGlvbiBpbml0aWFs UG9zaXRpb24sIGZpbmFsUG9zaXRpb247Ci0gICAgYWRqdXN0R3JpZFBvc2l0aW9uc0Zyb21TdHls ZShncmlkQ29udGFpbmVyU3R5bGUsIGdyaWRJdGVtLCBkaXJlY3Rpb24sIGluaXRpYWxQb3NpdGlv biwgZmluYWxQb3NpdGlvbik7CisgICAgYWRqdXN0R3JpZFBvc2l0aW9uc0Zyb21TdHlsZShncmlk SXRlbSwgZGlyZWN0aW9uLCBpbml0aWFsUG9zaXRpb24sIGZpbmFsUG9zaXRpb24pOwogCiAgICAg R3JpZFBvc2l0aW9uU2lkZSBpbml0aWFsU2lkZSA9IGluaXRpYWxQb3NpdGlvblNpZGUoZGlyZWN0 aW9uKTsKICAgICBHcmlkUG9zaXRpb25TaWRlIGZpbmFsU2lkZSA9IGZpbmFsUG9zaXRpb25TaWRl KGRpcmVjdGlvbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv R3JpZFBvc2l0aW9uc1Jlc29sdmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv R3JpZFBvc2l0aW9uc1Jlc29sdmVyLmgKaW5kZXggZmIzMzExYTg1YjM2ZTdmZjAxMTQ5ZTQ0MWYw MGRhM2E1OGJmOWQxNy4uOGNhMjA5YjZhYzNhMTdiNzk0Njg5OTJkMDE0Y2FkNDliOWMwYjQ4NCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0dyaWRQb3NpdGlvbnNS ZXNvbHZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9HcmlkUG9zaXRp b25zUmVzb2x2ZXIuaApAQCAtNDgsOCArNDgsNiBAQCBjbGFzcyBOYW1lZExpbmVDb2xsZWN0aW9u IHsKIHB1YmxpYzoKICAgICBOYW1lZExpbmVDb2xsZWN0aW9uKGNvbnN0IFJlbmRlclN0eWxlJiwg Y29uc3QgU3RyaW5nJiBuYW1lZExpbmUsIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiwgdW5zaWdu ZWQgbGFzdExpbmUsIHVuc2lnbmVkIGF1dG9SZXBlYXRUcmFja3NDb3VudCk7CiAKLSAgICBzdGF0 aWMgYm9vbCBpc1ZhbGlkTmFtZWRMaW5lT3JBcmVhKGNvbnN0IFN0cmluZyYgbmFtZWRMaW5lLCBj b25zdCBSZW5kZXJTdHlsZSYsIEdyaWRQb3NpdGlvblNpZGUpOwotCiAgICAgYm9vbCBoYXNOYW1l ZExpbmVzKCkgY29uc3Q7CiAgICAgdW5zaWduZWQgZmlyc3RQb3NpdGlvbigpIGNvbnN0OwogCkBA IC03Miw3ICs3MCw3IEBAIGNsYXNzIEdyaWRQb3NpdGlvbnNSZXNvbHZlciB7CiBwdWJsaWM6CiAg ICAgc3RhdGljIEdyaWRQb3NpdGlvblNpZGUgaW5pdGlhbFBvc2l0aW9uU2lkZShHcmlkVHJhY2tT aXppbmdEaXJlY3Rpb24pOwogICAgIHN0YXRpYyBHcmlkUG9zaXRpb25TaWRlIGZpbmFsUG9zaXRp b25TaWRlKEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbik7Ci0gICAgc3RhdGljIHVuc2lnbmVkIHNw YW5TaXplRm9yQXV0b1BsYWNlZEl0ZW0oY29uc3QgUmVuZGVyU3R5bGUmLCBjb25zdCBSZW5kZXJC b3gmLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24pOworICAgIHN0YXRpYyB1bnNpZ25lZCBzcGFu U2l6ZUZvckF1dG9QbGFjZWRJdGVtKGNvbnN0IFJlbmRlckJveCYsIEdyaWRUcmFja1NpemluZ0Rp cmVjdGlvbik7CiAgICAgc3RhdGljIEdyaWRTcGFuIHJlc29sdmVHcmlkUG9zaXRpb25zRnJvbVN0 eWxlKGNvbnN0IFJlbmRlclN0eWxlJiwgY29uc3QgUmVuZGVyQm94JiwgR3JpZFRyYWNrU2l6aW5n RGlyZWN0aW9uLCB1bnNpZ25lZCBhdXRvUmVwZWF0VHJhY2tzQ291bnQpOwogICAgIHN0YXRpYyB1 bnNpZ25lZCBleHBsaWNpdEdyaWRDb2x1bW5Db3VudChjb25zdCBSZW5kZXJTdHlsZSYsIHVuc2ln bmVkIGF1dG9SZXBlYXRDb2x1bW5zQ291bnQpOwogICAgIHN0YXRpYyB1bnNpZ25lZCBleHBsaWNp dEdyaWRSb3dDb3VudChjb25zdCBSZW5kZXJTdHlsZSYsIHVuc2lnbmVkIGF1dG9SZXBlYXRSb3dz Q291bnQpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBi L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggNmE0M2VmNjNhMzhjMDFm Zjk1NmFhNTA3MTNhZDY1NDg0ZTA1ZWZmNS4uMWFhMmRlMDU3YzliNmE3NjhhYzkxYjBjMmJhOTc5 YTUyNGM3M2E0NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxv ZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTktMDEtMTAgIE9yaW9sIEJydWZhdSAgPG9icnVmYXVAaWdhbGlhLmNvbT4KKworICAg ICAgICBbY3NzLWdyaWRdIExldCBhYnNwb3MgaXRlbXMgcmVmZXJlbmNlIGltcGxpY2l0IGdyaWQg bGluZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 MzMxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElt cG9ydCB0ZXN0IGNoYW5nZXMgZnJvbSBXUFQuCisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy1ncmlkL2Fic3Bvcy9ncmlkLXBvc2l0aW9uZWQtaXRlbXMtcGFkZGluZy0wMDEu aHRtbDoKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2Fic3Bvcy9n cmlkLXBvc2l0aW9uZWQtaXRlbXMtdW5rbm93bi1uYW1lZC1ncmlkLWxpbmUtMDAxLmh0bWw6CisK IDIwMTktMDEtMDIgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAg ICAgICAgU3VwcG9ydCBjc3MtY29sb3ItNCByZ2IgZnVuY3Rpb25zCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hYnNw b3MvZ3JpZC1wb3NpdGlvbmVkLWl0ZW1zLXBhZGRpbmctMDAxLmh0bWwgYi9MYXlvdXRUZXN0cy9p bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hYnNwb3MvZ3JpZC1w b3NpdGlvbmVkLWl0ZW1zLXBhZGRpbmctMDAxLmh0bWwKaW5kZXggNDk0MWQ3N2E3MWFmNzNjNWVi MmM3MGExNDYyOTU5NmFhY2RjZjc2Ny4uNjQzYTY4ODMwZDRhZWNkYWQxODJmNDBkOGI3NGZiODQ3 MGRhOGI1NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLWdyaWQvYWJzcG9zL2dyaWQtcG9zaXRpb25lZC1pdGVtcy1wYWRkaW5n LTAwMS5odG1sCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy1ncmlkL2Fic3Bvcy9ncmlkLXBvc2l0aW9uZWQtaXRlbXMtcGFkZGluZy0wMDEu aHRtbApAQCAtMTA5LDEzICsxMDksMTMgQEAKIAogPGRpdiBjbGFzcz0iZ3JpZCI+CiAgIDxkaXYg Y2xhc3M9ImFic29sdXRlIiBzdHlsZT0iZ3JpZC1jb2x1bW46IGZvbyAvIDE7IGdyaWQtcm93OiBm b28gLyAxOyIKLSAgICBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIwIiBkYXRhLWV4 cGVjdGVkLXdpZHRoPSIxNSIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjE1Ij4KKyAgICBkYXRhLW9m ZnNldC14PSIxNSIgZGF0YS1vZmZzZXQteT0iMTUiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjUxNSIg ZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMxNSI+CiAgIDwvZGl2PgogICA8ZGl2IGNsYXNzPSJhYnNv bHV0ZSIgc3R5bGU9ImdyaWQtY29sdW1uOiAxIC8gMjsgZ3JpZC1yb3c6IGZvbyAvIDE7IgotICAg IGRhdGEtb2Zmc2V0LXg9IjE1IiBkYXRhLW9mZnNldC15PSIwIiBkYXRhLWV4cGVjdGVkLXdpZHRo PSIxMDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIxNSI+CisgICAgZGF0YS1vZmZzZXQteD0iMTUi IGRhdGEtb2Zmc2V0LXk9IjE1IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIxMDAiIGRhdGEtZXhwZWN0 ZWQtaGVpZ2h0PSIzMTUiPgogICA8L2Rpdj4KICAgPGRpdiBjbGFzcz0iYWJzb2x1dGUiIHN0eWxl PSJncmlkLWNvbHVtbjogZm9vIC8gMTsgZ3JpZC1yb3c6IDEgLyAyOyIKLSAgICBkYXRhLW9mZnNl dC14PSIwIiBkYXRhLW9mZnNldC15PSIxNSIgZGF0YS1leHBlY3RlZC13aWR0aD0iMTUiIGRhdGEt ZXhwZWN0ZWQtaGVpZ2h0PSI1MCI+CisgICAgZGF0YS1vZmZzZXQteD0iMTUiIGRhdGEtb2Zmc2V0 LXk9IjE1IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI1MTUiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI1 MCI+CiAgIDwvZGl2PgogICA8ZGl2IGNsYXNzPSJhYnNvbHV0ZSIgc3R5bGU9ImdyaWQtY29sdW1u OiAzIC8gZm9vOyBncmlkLXJvdzogMyAvIGZvbzsiCiAgICAgZGF0YS1vZmZzZXQteD0iMzE1IiBk YXRhLW9mZnNldC15PSIyMTUiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjIxNSIgZGF0YS1leHBlY3Rl ZC1oZWlnaHQ9IjExNSI+CkBAIC0xOTMsMTMgKzE5MywxMyBAQAogCiA8ZGl2IGNsYXNzPSJncmlk IGRpcmVjdGlvblJUTCI+CiAgIDxkaXYgY2xhc3M9ImFic29sdXRlIiBzdHlsZT0iZ3JpZC1jb2x1 bW46IGZvbyAvIDE7IGdyaWQtcm93OiBmb28gLyAxOyIKLSAgICBkYXRhLW9mZnNldC14PSI1MTUi IGRhdGEtb2Zmc2V0LXk9IjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjE1IiBkYXRhLWV4cGVjdGVk LWhlaWdodD0iMTUiPgorICAgIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjE1IiBk YXRhLWV4cGVjdGVkLXdpZHRoPSI1MTUiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMTUiPgogICA8 L2Rpdj4KICAgPGRpdiBjbGFzcz0iYWJzb2x1dGUiIHN0eWxlPSJncmlkLWNvbHVtbjogMSAvIDI7 IGdyaWQtcm93OiBmb28gLyAxOyIKLSAgICBkYXRhLW9mZnNldC14PSI0MTUiIGRhdGEtb2Zmc2V0 LXk9IjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjEwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjE1 Ij4KKyAgICBkYXRhLW9mZnNldC14PSI0MTUiIGRhdGEtb2Zmc2V0LXk9IjE1IiBkYXRhLWV4cGVj dGVkLXdpZHRoPSIxMDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMTUiPgogICA8L2Rpdj4KICAg PGRpdiBjbGFzcz0iYWJzb2x1dGUiIHN0eWxlPSJncmlkLWNvbHVtbjogZm9vIC8gMTsgZ3JpZC1y b3c6IDEgLyAyOyIKLSAgICBkYXRhLW9mZnNldC14PSI1MTUiIGRhdGEtb2Zmc2V0LXk9IjE1IiBk YXRhLWV4cGVjdGVkLXdpZHRoPSIxNSIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjUwIj4KKyAgICBk YXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIxNSIgZGF0YS1leHBlY3RlZC13aWR0aD0i NTE1IiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iNTAiPgogICA8L2Rpdj4KICAgPGRpdiBjbGFzcz0i YWJzb2x1dGUiIHN0eWxlPSJncmlkLWNvbHVtbjogMyAvIGZvbzsgZ3JpZC1yb3c6IDMgLyBmb287 IgogICAgIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjIxNSIgZGF0YS1leHBlY3Rl ZC13aWR0aD0iMjE1IiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMTE1Ij4KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2Fi c3Bvcy9ncmlkLXBvc2l0aW9uZWQtaXRlbXMtdW5rbm93bi1uYW1lZC1ncmlkLWxpbmUtMDAxLmh0 bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt Z3JpZC9hYnNwb3MvZ3JpZC1wb3NpdGlvbmVkLWl0ZW1zLXVua25vd24tbmFtZWQtZ3JpZC1saW5l LTAwMS5odG1sCmluZGV4IDI0ZDlkNzY5Zjk5MDc5ZDE5NTE5ZDA1ZjgyZThmZDYzNzkwNmZlOGEu LjZlNjFmN2MyZGUzNmExZDc5OWFiYTBkZTZkMTBjNTIxNDdkNDA2ZDYgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2Fi c3Bvcy9ncmlkLXBvc2l0aW9uZWQtaXRlbXMtdW5rbm93bi1uYW1lZC1ncmlkLWxpbmUtMDAxLmh0 bWwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLWdyaWQvYWJzcG9zL2dyaWQtcG9zaXRpb25lZC1pdGVtcy11bmtub3duLW5hbWVkLWdyaWQt bGluZS0wMDEuaHRtbApAQCAtMyw3ICszLDcgQEAKIDx0aXRsZT5DU1MgR3JpZCBMYXlvdXQgVGVz dDogR3JpZCBwb3NpdGlvbmVkIGl0ZW1zIHVua25vd24gbmFtZWQgZ3JpZCBsaW5lPC90aXRsZT4K IDxsaW5rIHJlbD0iYXV0aG9yIiB0aXRsZT0iTWFudWVsIFJlZ28gQ2FzYXNub3ZhcyIgaHJlZj0i bWFpbHRvOnJlZ29AaWdhbGlhLmNvbSI+CiA8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8v ZHJhZnRzLmNzc3dnLm9yZy9jc3MtZ3JpZC0xLyNhYnNwb3MiIHRpdGxlPSI5LiBBYnNvbHV0ZSBQ b3NpdGlvbmluZyI+Ci08bWV0YSBuYW1lPSJhc3NlcnQiIGNvbnRlbnQ9IlRoaXMgdGVzdCBjaGVj a3MgdGhhdCBncmlkIHBsYWNlbWVudCBwcm9wZXJ0aWVzIG9mIGFic29sdXRlbHkgcG9zaXRpb25l ZCBpdGVtcyB1c2luZyB1bmtub3duIG5hbWVkIGdyaWQgbGluZXMgYXJlIHRyZWF0ZWQgYXMgJ2F1 dG8nLiI+Cis8bWV0YSBuYW1lPSJhc3NlcnQiIGNvbnRlbnQ9IlRoaXMgdGVzdCBjaGVja3MgdGhh dCBncmlkIHBsYWNlbWVudCBwcm9wZXJ0aWVzIG9mIGFic29sdXRlbHkgcG9zaXRpb25lZCBpdGVt cyBjYW4gcmVmZXJlbmNlIGltcGxpY2l0IGdyaWQgbGluZXMuIj4KIDxsaW5rIHJlbD0ic3R5bGVz aGVldCIgaHJlZj0ic3VwcG9ydC9ncmlkLmNzcyI+CiA8c3R5bGU+CiAKQEAgLTU4LDcgKzU4LDcg QEAKICAgICBkYXRhLW9mZnNldC14PSIxNSIgZGF0YS1vZmZzZXQteT0iMTUiIGRhdGEtZXhwZWN0 ZWQtd2lkdGg9IjUxNSIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMxNSI+CiAgIDwvZGl2PgogICA8 ZGl2IGNsYXNzPSJhYnNvbHV0ZSBzaXplZFRvR3JpZEFyZWEgc3RhcnRVbmtub3duTGluZSIKLSAg ICBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIwIiBkYXRhLWV4cGVjdGVkLXdpZHRo PSIzMTUiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIyMTUiPgorICAgIGRhdGEtb2Zmc2V0LXg9IjMx NSIgZGF0YS1vZmZzZXQteT0iMjE1IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIyMTUiIGRhdGEtZXhw ZWN0ZWQtaGVpZ2h0PSIxMTUiPgogICA8L2Rpdj4KIDwvZGl2PgogCkBAIC03MCw3ICs3MCw3IEBA CiAgICAgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMTUiIGRhdGEtZXhwZWN0ZWQt d2lkdGg9IjUxNSIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMxNSI+CiAgIDwvZGl2PgogICA8ZGl2 IGNsYXNzPSJhYnNvbHV0ZSBzaXplZFRvR3JpZEFyZWEgc3RhcnRVbmtub3duTGluZSIKLSAgICBk YXRhLW9mZnNldC14PSIyMTUiIGRhdGEtb2Zmc2V0LXk9IjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9 IjMxNSIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjIxNSI+CisgICAgZGF0YS1vZmZzZXQteD0iMCIg ZGF0YS1vZmZzZXQteT0iMjE1IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIyMTUiIGRhdGEtZXhwZWN0 ZWQtaGVpZ2h0PSIxMTUiPgogICA8L2Rpdj4KIDwvZGl2PgogCg==