36827 2010-03-30 08:16:23 -0700 [Qt] Patch to amend the Content-Disposition fix [36395] 2010-04-07 07:42:00 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All CLOSED FIXED Qt P2 Enhancement --- 35784 0 adawit webkit-unassigned beidson commit-queue hausmann kenneth webkit.review.bot oldest_to_newest 206013 0 52040 adawit 2010-03-30 08:16:23 -0700 Created attachment 52040 Amendement for the Content-Disposition fix... Based on the discussion in comments #39-42 in bug #36395, this patch amends the factored out function of the Content-Disposition fix to be more generic... 206015 1 webkit.review.bot 2010-03-30 08:21:27 -0700 Attachment 52040 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/ChangeLog:6: Line contains tab character. [whitespace/tab] [5] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 206016 2 52041 adawit 2010-03-30 08:30:34 -0700 Created attachment 52041 Amendment to the Content-Disposition fix II... Fixed style check failures and updated ChangeLog comments. 206048 3 52041 beidson 2010-03-30 09:59:56 -0700 Comment on attachment 52041 Amendment to the Content-Disposition fix II... r+ Thanks! 209496 4 52041 commit-queue 2010-04-07 00:09:10 -0700 Comment on attachment 52041 Amendment to the Content-Disposition fix II... Rejecting patch 52041 from commit-queue. Failed to run "['WebKitTools/Scripts/build-webkit', '--debug']" exit_code: 1 Last 500 characters of output: Users/eseidel/Projects/CommitQueue/WebCore/page/XSSAuditor.cpp -o /Users/eseidel/Projects/CommitQueue/WebKitBuild/WebCore.build/Debug/WebCore.build/Objects-normal/i386/XSSAuditor.o ** BUILD FAILED ** The following build commands failed: WebCore: Distributed-CompileC /Users/eseidel/Projects/CommitQueue/WebKitBuild/WebCore.build/Debug/WebCore.build/Objects-normal/i386/Document.o /Users/eseidel/Projects/CommitQueue/WebCore/dom/Document.cpp normal i386 c++ com.apple.compilers.gcc.4_2 (1 failure) Full output: http://webkit-commit-queue.appspot.com/results/1608274 209540 5 hausmann 2010-04-07 02:03:26 -0700 (In reply to comment #4) > (From update of attachment 52041 [details]) > Rejecting patch 52041 from commit-queue. This is the reason for the build issue: In file included from /Users/eseidel/Projects/CommitQueue/WebCore/dom/Document.cpp:81: /Users/eseidel/Projects/CommitQueue/WebCore/platform/network/HTTPParsers.h:45: error: conflicting declaration ‘None’ /Users/eseidel/Projects/CommitQueue/WebCore/page/SpatialNavigation.h:87: error: ‘WebCore::None’ has a previous declaration as ‘WebCore::RectsAlignment WebCore::None’ The two enum values - None - conflict 209625 6 52735 adawit 2010-04-07 07:07:51 -0700 Created attachment 52735 Amendment to the Content-Disposition fix III... Prefixed all the ContentDispositionType enums with "ContentDisposition" to avoid namespace conflicts which can cause compile errors... 209626 7 52735 hausmann 2010-04-07 07:12:30 -0700 Comment on attachment 52735 Amendment to the Content-Disposition fix III... LGTM :) 209628 8 hausmann 2010-04-07 07:15:02 -0700 Committed r57208: <http://trac.webkit.org/changeset/57208> 209633 9 hausmann 2010-04-07 07:41:51 -0700 Revision r57208 cherry-picked into qtwebkit-2.0 with commit 50d5e029b4a6aa5dc7c39160b275bd7c1d78540c 52040 2010-03-30 08:16:23 -0700 2010-03-30 08:30:34 -0700 Amendement for the Content-Disposition fix... qtwebkit_content_disposition_support_7.patch text/plain 6240 adawit ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg M2M0YTViZi4uMjU5MDJkMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wMy0zMCAgRGF3aXQgQWxlbWF5 ZWh1ICA8YWRhd2l0QGtkZS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUmVwbGFjZWQgdGhlICdzaG91bGRUcmVhdEFzQXR0YWNobWVudCcgZnVu Y3Rpb24gd2l0aCBhIG1vcmUgZ2VuZXJpYyAKKwlmdW5jdGlvbiB0aGF0IHJldHVybnMgdGhlIGNv bnRlbnQgZGlzcG9zaXRpb24gdHlwZS4KKworICAgICAgICBTZWUgY29tbWVudHMgMzktNDIgYXQg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2Mzk1CisKKyAgICAgICAg KiBwbGF0Zm9ybS9uZXR3b3JrL0hUVFBQYXJzZXJzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNv bnRlbnREaXNwb3NpdGlvblR5cGUpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvSFRUUFBh cnNlcnMuaDoKKyAgICAgICAgKFdlYkNvcmU6Oik6CisKIDIwMTAtMDMtMjYgIEtlbm5ldGggUm9o ZGUgQ2hyaXN0aWFuc2VuICA8a2VubmV0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEFudHRpIEtvaXZpc3RvLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L0hUVFBQYXJzZXJzLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9IVFRQUGFyc2Vycy5j cHAKaW5kZXggZmMwYzI0NS4uOTkzYTI5NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL0hUVFBQYXJzZXJzLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvSFRU UFBhcnNlcnMuY3BwCkBAIC03MiwzNiArNzIsMzQgQEAgc3RhdGljIGlubGluZSBib29sIHNraXBU b2tlbihjb25zdCBTdHJpbmcmIHN0ciwgaW50JiBwb3MsIGNvbnN0IGNoYXIqIHRva2VuKQogICAg IHJldHVybiB0cnVlOwogfQogCi1ib29sIHNob3VsZFRyZWF0QXNBdHRhY2htZW50KGNvbnN0IFJl c291cmNlUmVzcG9uc2VCYXNlJiByZXNwb25zZSkKLXsKLSAgICBjb25zdCBTdHJpbmcmIGNvbnRl bnREaXNwb3NpdGlvbiA9IHJlc3BvbnNlLmh0dHBIZWFkZXJGaWVsZCgiQ29udGVudC1EaXNwb3Np dGlvbiIpOwotICAgIAorQ29udGVudERpc3Bvc2l0aW9uVHlwZSBjb250ZW50RGlzcG9zaXRpb25U eXBlKGNvbnN0IFN0cmluZyYgY29udGVudERpc3Bvc2l0aW9uKQoreyAgIAogICAgIGlmIChjb250 ZW50RGlzcG9zaXRpb24uaXNFbXB0eSgpKQotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAg IHJldHVybiBOb25lOwogCiAgICAgLy8gU29tZSBicm9rZW4gc2l0ZXMganVzdCBzZW5kCiAgICAg Ly8gQ29udGVudC1EaXNwb3NpdGlvbjogOyBmaWxlbmFtZT0iZmlsZSIKICAgICAvLyBzY3JlZW4g dGhvc2Ugb3V0IGhlcmUuCiAgICAgaWYgKGNvbnRlbnREaXNwb3NpdGlvbi5zdGFydHNXaXRoKCI7 IikpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgcmV0dXJuIE5vbmU7CiAKICAgICBp ZiAoY29udGVudERpc3Bvc2l0aW9uLnN0YXJ0c1dpdGgoImlubGluZSIsIGZhbHNlKSkKLSAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gSW5saW5lOwogCiAgICAgLy8gU29tZSBi cm9rZW4gc2l0ZXMganVzdCBzZW5kCiAgICAgLy8gQ29udGVudC1EaXNwb3NpdGlvbjogZmlsZW5h bWU9ImZpbGUiCiAgICAgLy8gd2l0aG91dCBhIGRpc3Bvc2l0aW9uIHRva2VuLi4uIHNjcmVlbiB0 aG9zZSBvdXQuCiAgICAgaWYgKGNvbnRlbnREaXNwb3NpdGlvbi5zdGFydHNXaXRoKCJmaWxlbmFt ZSIsIGZhbHNlKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gTm9uZTsK IAogICAgIC8vIEFsc28gaW4gdXNlIGlzIENvbnRlbnQtRGlzcG9zaXRpb246IG5hbWU9ImZpbGUi CiAgICAgaWYgKGNvbnRlbnREaXNwb3NpdGlvbi5zdGFydHNXaXRoKCJuYW1lIiwgZmFsc2UpKQot ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJldHVybiBOb25lOwogCiAgICAgLy8gV2Ug aGF2ZSBhIGNvbnRlbnQtZGlzcG9zaXRpb24gb2YgImF0dGFjaG1lbnQiIG9yIHVua25vd24uCiAg ICAgLy8gUkZDIDIxODMsIHNlY3Rpb24gMi44IHNheXMgdGhhdCBhbiB1bmtub3duIGRpc3Bvc2l0 aW9uCiAgICAgLy8gdmFsdWUgc2hvdWxkIGJlIHRyZWF0ZWQgYXMgImF0dGFjaG1lbnQiCi0gICAg cmV0dXJuIHRydWU7ICAKKyAgICByZXR1cm4gQXR0YWNobWVudDsgIAogfQogCiBib29sIHBhcnNl SFRUUFJlZnJlc2goY29uc3QgU3RyaW5nJiByZWZyZXNoLCBib29sIGZyb21IdHRwRXF1aXZNZXRh LCBkb3VibGUmIGRlbGF5LCBTdHJpbmcmIHVybCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9IVFRQUGFyc2Vycy5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0hUVFBQ YXJzZXJzLmgKaW5kZXggZDU2OGJkNC4uYzFlMzE2NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL0hUVFBQYXJzZXJzLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L0hUVFBQYXJzZXJzLmgKQEAgLTQxLDggKzQxLDE0IEBAIGVudW0gWFNTUHJvdGVjdGlvbkRpc3Bv c2l0aW9uIHsKICAgICBYU1NQcm90ZWN0aW9uQmxvY2tFbmFibGVkCiB9OwogCi0KLWJvb2wgc2hv dWxkVHJlYXRBc0F0dGFjaG1lbnQoY29uc3QgUmVzb3VyY2VSZXNwb25zZUJhc2UmIHJlc3BvbnNl KTsKK3R5cGVkZWYgZW51bSB7CisgICAgTm9uZSwKKyAgICBJbmxpbmUsCisgICAgQXR0YWNobWVu dCwKKyAgICBPdGhlcgorfSBDb250ZW50RGlzcG9zaXRpb25UeXBlOworCitDb250ZW50RGlzcG9z aXRpb25UeXBlIGNvbnRlbnREaXNwb3NpdGlvblR5cGUoY29uc3QgU3RyaW5nJik7CiBib29sIHBh cnNlSFRUUFJlZnJlc2goY29uc3QgU3RyaW5nJiByZWZyZXNoLCBib29sIGZyb21IdHRwRXF1aXZN ZXRhLCBkb3VibGUmIGRlbGF5LCBTdHJpbmcmIHVybCk7CiBkb3VibGUgcGFyc2VEYXRlKGNvbnN0 IFN0cmluZyYpOwogU3RyaW5nIGZpbGVuYW1lRnJvbUhUVFBDb250ZW50RGlzcG9zaXRpb24oY29u c3QgU3RyaW5nJik7IApkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggOWM3NThkZi4uM2E5NzAyYSAxMDA2NDQKLS0t IGEvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTAtMDMtMzAgIERhd2l0IEFsZW1heWVodSAgPGFkYXdp dEBrZGUub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE5lZWQgYSBzaG9ydCBkZXNjcmlwdGlvbiBhbmQgYnVnIFVSTCAoT09QUyEpCisKKyAgICAg ICAgKiBzcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RnJh bWVMb2FkZXJDbGllbnRJbXBsOjpkaXNwYXRjaERlY2lkZVBvbGljeUZvck1JTUVUeXBlKToKKwog MjAxMC0wMy0yOSAgRGF3aXQgQWxlbWF5ZWh1ICA8YWRhd2l0QGtkZS5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4uCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0v c3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1l TG9hZGVyQ2xpZW50SW1wbC5jcHAKaW5kZXggOWQ1OWZkZC4uNzViMWU5ZiAxMDA2NDQKLS0tIGEv V2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3BwCisrKyBiL1dlYktp dC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcApAQCAtODQzLDcgKzg0Myw3 IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRJbXBsOjpkaXNwYXRjaERlY2lkZVBvbGljeUZvck1J TUVUeXBlKAogICAgIGlmIChzdGF0dXNDb2RlID09IDIwNCB8fCBzdGF0dXNDb2RlID09IDIwNSkg ewogICAgICAgICAvLyBUaGUgc2VydmVyIGRvZXMgbm90IHdhbnQgdXMgdG8gcmVwbGFjZSB0aGUg cGFnZSBjb250ZW50cy4KICAgICAgICAgYWN0aW9uID0gUG9saWN5SWdub3JlOwotICAgIH0gZWxz ZSBpZiAoV2ViQ29yZTo6c2hvdWxkVHJlYXRBc0F0dGFjaG1lbnQocmVzcG9uc2UpKSB7CisgICAg fSBlbHNlIGlmIChXZWJDb3JlOjpjb250ZW50RGlzcG9zaXRpb25UeXBlKHJlc3BvbnNlLmh0dHBI ZWFkZXJGaWVsZCgiQ29udGVudC1EaXNwb3NpdGlvbiIpKSA9PSBXZWJDb3JlOjpBdHRhY2htZW50 KSB7CiAgICAgICAgIC8vIFRoZSBzZXJ2ZXIgd2FudHMgdXMgdG8gZG93bmxvYWQgaW5zdGVhZCBv ZiByZXBsYWNpbmcgdGhlIHBhZ2UgY29udGVudHMuCiAgICAgICAgIC8vIERvd25sb2FkaW5nIGlz IGhhbmRsZWQgYnkgdGhlIGVtYmVkZGVyLCBidXQgd2Ugc3RpbGwgZ2V0IHRoZSBpbml0aWFsCiAg ICAgICAgIC8vIHJlc3BvbnNlIHNvIHRoYXQgd2UgY2FuIGlnbm9yZSBpdCBhbmQgY2xlYW4gdXAg cHJvcGVybHkuCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0No YW5nZUxvZwppbmRleCAzYTRiMDk2Li5hZmU3YWU2IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hh bmdlTG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMC0w My0zMCAgRGF3aXQgQWxlbWF5ZWh1ICA8YWRhd2l0QGtkZS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlZCB0aGUgV2ViQ29yZTo6c2hv dWxkVHJlYXRBc0F0dGFjaGVtZW50IGZ1bmN0aW9uIGNhbGwgd2l0aCB0aGUgbmV3IG1vcmUgZ2Vu ZXJpYworICAgICAgICByZXBsYWNlbWVudCBXZWJDb3JlOjpjb250ZW50RGlzcG9zaXRpb25UeXBl LgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0OjpkaXNwYXRjaERlY2lkZVBvbGlj eUZvck1JTUVUeXBlKToKKwogMjAxMC0wMy0yNiAgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4g IDxrZW5uZXRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlz dG8uCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGll bnRRdC5jcHAgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5j cHAKaW5kZXggYzVjNTczOS4uMDAzOGYzNyAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L1dlYkNvcmVT dXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwCisrKyBiL1dlYktpdC9xdC9XZWJDb3JlU3Vw cG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcApAQCAtOTY3LDggKzk2Nyw5IEBAIFdlYkNvcmU6 OkZyYW1lKiBGcmFtZUxvYWRlckNsaWVudFF0OjpkaXNwYXRjaENyZWF0ZVBhZ2UoKQogdm9pZCBG cmFtZUxvYWRlckNsaWVudFF0OjpkaXNwYXRjaERlY2lkZVBvbGljeUZvck1JTUVUeXBlKEZyYW1l UG9saWN5RnVuY3Rpb24gZnVuY3Rpb24sIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgTUlNRVR5cGUs IGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYpCiB7CiAgICAgLy8gd2UgbmVlZCB0byBj YWxsIGRpcmVjdGx5IGhlcmUKLSAgICBpZiAoV2ViQ29yZTo6c2hvdWxkVHJlYXRBc0F0dGFjaG1l bnQobV9mcmFtZS0+bG9hZGVyKCktPmFjdGl2ZURvY3VtZW50TG9hZGVyKCktPnJlc3BvbnNlKCkp KQotICAgICAgICBjYWxsUG9saWN5RnVuY3Rpb24oZnVuY3Rpb24sIFBvbGljeURvd25sb2FkKTsg ICAgCisgICAgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UgPSBtX2ZyYW1lLT5sb2Fk ZXIoKS0+YWN0aXZlRG9jdW1lbnRMb2FkZXIoKS0+cmVzcG9uc2UoKTsKKyAgICBpZiAoV2ViQ29y ZTo6Y29udGVudERpc3Bvc2l0aW9uVHlwZShyZXNwb25zZS5odHRwSGVhZGVyRmllbGQoIkNvbnRl bnQtRGlzcG9zaXRpb24iKSkgPT0gV2ViQ29yZTo6QXR0YWNobWVudCkKKyAgICAgICAgY2FsbFBv bGljeUZ1bmN0aW9uKGZ1bmN0aW9uLCBQb2xpY3lEb3dubG9hZCk7CiAgICAgZWxzZSBpZiAoY2Fu U2hvd01JTUVUeXBlKE1JTUVUeXBlKSkKICAgICAgICAgY2FsbFBvbGljeUZ1bmN0aW9uKGZ1bmN0 aW9uLCBQb2xpY3lVc2UpOwogICAgIGVsc2UK 52041 2010-03-30 08:30:34 -0700 2010-04-07 07:07:51 -0700 Amendment to the Content-Disposition fix II... qtwebkit_content_disposition_support_7.patch text/plain 6496 adawit ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZmNmMTNlMy4uYjFkN2VlYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wMy0zMCAgRGF3aXQgQWxlbWF5 ZWh1ICA8YWRhd2l0QGtkZS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUmVwbGFjZWQgdGhlICdzaG91bGRUcmVhdEFzQXR0YWNobWVudCcgZnVu Y3Rpb24gd2l0aCBhIG1vcmUgZ2VuZXJpYyAKKyAgICAgICAgZnVuY3Rpb24gdGhhdCByZXR1cm5z IHRoZSBjb250ZW50IGRpc3Bvc2l0aW9uIHR5cGUuCisKKyAgICAgICAgU2VlIGNvbW1lbnRzIDM5 LTQyIGluIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjM5NQorCisg ICAgICAgICogcGxhdGZvcm0vbmV0d29yay9IVFRQUGFyc2Vycy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpjb250ZW50RGlzcG9zaXRpb25UeXBlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3Jr L0hUVFBQYXJzZXJzLmg6CisgICAgICAgIChXZWJDb3JlOjopOgorCiAyMDEwLTAzLTI5ICBKYW5u ZSBLb3NraW5lbiAgPGphbm5lLnAua29za2luZW5AZGlnaWEuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL0hUVFBQYXJzZXJzLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9IVFRQUGFyc2Vy cy5jcHAKaW5kZXggZmMwYzI0NS4uOTkzYTI5NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL0hUVFBQYXJzZXJzLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv SFRUUFBhcnNlcnMuY3BwCkBAIC03MiwzNiArNzIsMzQgQEAgc3RhdGljIGlubGluZSBib29sIHNr aXBUb2tlbihjb25zdCBTdHJpbmcmIHN0ciwgaW50JiBwb3MsIGNvbnN0IGNoYXIqIHRva2VuKQog ICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIHNob3VsZFRyZWF0QXNBdHRhY2htZW50KGNvbnN0 IFJlc291cmNlUmVzcG9uc2VCYXNlJiByZXNwb25zZSkKLXsKLSAgICBjb25zdCBTdHJpbmcmIGNv bnRlbnREaXNwb3NpdGlvbiA9IHJlc3BvbnNlLmh0dHBIZWFkZXJGaWVsZCgiQ29udGVudC1EaXNw b3NpdGlvbiIpOwotICAgIAorQ29udGVudERpc3Bvc2l0aW9uVHlwZSBjb250ZW50RGlzcG9zaXRp b25UeXBlKGNvbnN0IFN0cmluZyYgY29udGVudERpc3Bvc2l0aW9uKQoreyAgIAogICAgIGlmIChj b250ZW50RGlzcG9zaXRpb24uaXNFbXB0eSgpKQotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg ICAgIHJldHVybiBOb25lOwogCiAgICAgLy8gU29tZSBicm9rZW4gc2l0ZXMganVzdCBzZW5kCiAg ICAgLy8gQ29udGVudC1EaXNwb3NpdGlvbjogOyBmaWxlbmFtZT0iZmlsZSIKICAgICAvLyBzY3Jl ZW4gdGhvc2Ugb3V0IGhlcmUuCiAgICAgaWYgKGNvbnRlbnREaXNwb3NpdGlvbi5zdGFydHNXaXRo KCI7IikpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgcmV0dXJuIE5vbmU7CiAKICAg ICBpZiAoY29udGVudERpc3Bvc2l0aW9uLnN0YXJ0c1dpdGgoImlubGluZSIsIGZhbHNlKSkKLSAg ICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gSW5saW5lOwogCiAgICAgLy8gU29t ZSBicm9rZW4gc2l0ZXMganVzdCBzZW5kCiAgICAgLy8gQ29udGVudC1EaXNwb3NpdGlvbjogZmls ZW5hbWU9ImZpbGUiCiAgICAgLy8gd2l0aG91dCBhIGRpc3Bvc2l0aW9uIHRva2VuLi4uIHNjcmVl biB0aG9zZSBvdXQuCiAgICAgaWYgKGNvbnRlbnREaXNwb3NpdGlvbi5zdGFydHNXaXRoKCJmaWxl bmFtZSIsIGZhbHNlKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gTm9u ZTsKIAogICAgIC8vIEFsc28gaW4gdXNlIGlzIENvbnRlbnQtRGlzcG9zaXRpb246IG5hbWU9ImZp bGUiCiAgICAgaWYgKGNvbnRlbnREaXNwb3NpdGlvbi5zdGFydHNXaXRoKCJuYW1lIiwgZmFsc2Up KQotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJldHVybiBOb25lOwogCiAgICAgLy8g V2UgaGF2ZSBhIGNvbnRlbnQtZGlzcG9zaXRpb24gb2YgImF0dGFjaG1lbnQiIG9yIHVua25vd24u CiAgICAgLy8gUkZDIDIxODMsIHNlY3Rpb24gMi44IHNheXMgdGhhdCBhbiB1bmtub3duIGRpc3Bv c2l0aW9uCiAgICAgLy8gdmFsdWUgc2hvdWxkIGJlIHRyZWF0ZWQgYXMgImF0dGFjaG1lbnQiCi0g ICAgcmV0dXJuIHRydWU7ICAKKyAgICByZXR1cm4gQXR0YWNobWVudDsgIAogfQogCiBib29sIHBh cnNlSFRUUFJlZnJlc2goY29uc3QgU3RyaW5nJiByZWZyZXNoLCBib29sIGZyb21IdHRwRXF1aXZN ZXRhLCBkb3VibGUmIGRlbGF5LCBTdHJpbmcmIHVybCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9IVFRQUGFyc2Vycy5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0hU VFBQYXJzZXJzLmgKaW5kZXggZDU2OGJkNC4uYzFlMzE2NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL0hUVFBQYXJzZXJzLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL0hUVFBQYXJzZXJzLmgKQEAgLTQxLDggKzQxLDE0IEBAIGVudW0gWFNTUHJvdGVjdGlvbkRp c3Bvc2l0aW9uIHsKICAgICBYU1NQcm90ZWN0aW9uQmxvY2tFbmFibGVkCiB9OwogCi0KLWJvb2wg c2hvdWxkVHJlYXRBc0F0dGFjaG1lbnQoY29uc3QgUmVzb3VyY2VSZXNwb25zZUJhc2UmIHJlc3Bv bnNlKTsKK3R5cGVkZWYgZW51bSB7CisgICAgTm9uZSwKKyAgICBJbmxpbmUsCisgICAgQXR0YWNo bWVudCwKKyAgICBPdGhlcgorfSBDb250ZW50RGlzcG9zaXRpb25UeXBlOworCitDb250ZW50RGlz cG9zaXRpb25UeXBlIGNvbnRlbnREaXNwb3NpdGlvblR5cGUoY29uc3QgU3RyaW5nJik7CiBib29s IHBhcnNlSFRUUFJlZnJlc2goY29uc3QgU3RyaW5nJiByZWZyZXNoLCBib29sIGZyb21IdHRwRXF1 aXZNZXRhLCBkb3VibGUmIGRlbGF5LCBTdHJpbmcmIHVybCk7CiBkb3VibGUgcGFyc2VEYXRlKGNv bnN0IFN0cmluZyYpOwogU3RyaW5nIGZpbGVuYW1lRnJvbUhUVFBDb250ZW50RGlzcG9zaXRpb24o Y29uc3QgU3RyaW5nJik7IApkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBi L1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggOWM3NThkZi4uNGY1ZGQzNyAxMDA2NDQK LS0tIGEvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDMtMzAgIERhd2l0IEFsZW1heWVodSAgPGFk YXdpdEBrZGUub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFVwZGF0ZWQgdGhlIFdlYkNvcmU6OnNob3VsZFRyZWF0QXNBdHRhY2hlbWVudCBmdW5j dGlvbiBjYWxsIHdpdGggdGhlCisgICAgICAgIG5ldyBtb3JlIGdlbmVyaWMgcmVwbGFjZW1lbnQg V2ViQ29yZTo6Y29udGVudERpc3Bvc2l0aW9uVHlwZS4KKworICAgICAgICBTZWUgY29tbWVudHMg MzktNDIgaW4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2Mzk1CisK KyAgICAgICAgKiBzcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktp dDo6RnJhbWVMb2FkZXJDbGllbnRJbXBsOjpkaXNwYXRjaERlY2lkZVBvbGljeUZvck1JTUVUeXBl KToKKwogMjAxMC0wMy0yOSAgRGF3aXQgQWxlbWF5ZWh1ICA8YWRhd2l0QGtkZS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4uCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hy b21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3Jj L0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAKaW5kZXggOWQ1OWZkZC4uNzViMWU5ZiAxMDA2NDQK LS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3BwCisrKyBi L1dlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcApAQCAtODQzLDcg Kzg0Myw3IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRJbXBsOjpkaXNwYXRjaERlY2lkZVBvbGlj eUZvck1JTUVUeXBlKAogICAgIGlmIChzdGF0dXNDb2RlID09IDIwNCB8fCBzdGF0dXNDb2RlID09 IDIwNSkgewogICAgICAgICAvLyBUaGUgc2VydmVyIGRvZXMgbm90IHdhbnQgdXMgdG8gcmVwbGFj ZSB0aGUgcGFnZSBjb250ZW50cy4KICAgICAgICAgYWN0aW9uID0gUG9saWN5SWdub3JlOwotICAg IH0gZWxzZSBpZiAoV2ViQ29yZTo6c2hvdWxkVHJlYXRBc0F0dGFjaG1lbnQocmVzcG9uc2UpKSB7 CisgICAgfSBlbHNlIGlmIChXZWJDb3JlOjpjb250ZW50RGlzcG9zaXRpb25UeXBlKHJlc3BvbnNl Lmh0dHBIZWFkZXJGaWVsZCgiQ29udGVudC1EaXNwb3NpdGlvbiIpKSA9PSBXZWJDb3JlOjpBdHRh Y2htZW50KSB7CiAgICAgICAgIC8vIFRoZSBzZXJ2ZXIgd2FudHMgdXMgdG8gZG93bmxvYWQgaW5z dGVhZCBvZiByZXBsYWNpbmcgdGhlIHBhZ2UgY29udGVudHMuCiAgICAgICAgIC8vIERvd25sb2Fk aW5nIGlzIGhhbmRsZWQgYnkgdGhlIGVtYmVkZGVyLCBidXQgd2Ugc3RpbGwgZ2V0IHRoZSBpbml0 aWFsCiAgICAgICAgIC8vIHJlc3BvbnNlIHNvIHRoYXQgd2UgY2FuIGlnbm9yZSBpdCBhbmQgY2xl YW4gdXAgcHJvcGVybHkuCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0 L3F0L0NoYW5nZUxvZwppbmRleCAzYTRiMDk2Li5hZDMzYjBlIDEwMDY0NAotLS0gYS9XZWJLaXQv cXQvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAor MjAxMC0wMy0zMCAgRGF3aXQgQWxlbWF5ZWh1ICA8YWRhd2l0QGtkZS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlZCB0aGUgV2ViQ29y ZTo6c2hvdWxkVHJlYXRBc0F0dGFjaGVtZW50IGZ1bmN0aW9uIGNhbGwgd2l0aCB0aGUKKyAgICAg ICAgbmV3IG1vcmUgZ2VuZXJpYyByZXBsYWNlbWVudCBXZWJDb3JlOjpjb250ZW50RGlzcG9zaXRp b25UeXBlLgorCisgICAgICAgIFNlZSBjb21tZW50cyAzOS00MiBpbiBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzYzOTUKKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0 L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJD bGllbnRRdDo6ZGlzcGF0Y2hEZWNpZGVQb2xpY3lGb3JNSU1FVHlwZSk6CisKIDIwMTAtMDMtMjYg IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuICA8a2VubmV0aEB3ZWJraXQub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwIGIvV2ViS2l0L3F0L1dlYkNvcmVT dXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwCmluZGV4IGM1YzU3MzkuLjAwMzhmMzcgMTAw NjQ0Ci0tLSBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNw cAorKysgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAK QEAgLTk2Nyw4ICs5NjcsOSBAQCBXZWJDb3JlOjpGcmFtZSogRnJhbWVMb2FkZXJDbGllbnRRdDo6 ZGlzcGF0Y2hDcmVhdGVQYWdlKCkKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRRdDo6ZGlzcGF0Y2hE ZWNpZGVQb2xpY3lGb3JNSU1FVHlwZShGcmFtZVBvbGljeUZ1bmN0aW9uIGZ1bmN0aW9uLCBjb25z dCBXZWJDb3JlOjpTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVl c3QmKQogewogICAgIC8vIHdlIG5lZWQgdG8gY2FsbCBkaXJlY3RseSBoZXJlCi0gICAgaWYgKFdl YkNvcmU6OnNob3VsZFRyZWF0QXNBdHRhY2htZW50KG1fZnJhbWUtPmxvYWRlcigpLT5hY3RpdmVE b2N1bWVudExvYWRlcigpLT5yZXNwb25zZSgpKSkKLSAgICAgICAgY2FsbFBvbGljeUZ1bmN0aW9u KGZ1bmN0aW9uLCBQb2xpY3lEb3dubG9hZCk7ICAgIAorICAgIGNvbnN0IFJlc291cmNlUmVzcG9u c2UmIHJlc3BvbnNlID0gbV9mcmFtZS0+bG9hZGVyKCktPmFjdGl2ZURvY3VtZW50TG9hZGVyKCkt PnJlc3BvbnNlKCk7CisgICAgaWYgKFdlYkNvcmU6OmNvbnRlbnREaXNwb3NpdGlvblR5cGUocmVz cG9uc2UuaHR0cEhlYWRlckZpZWxkKCJDb250ZW50LURpc3Bvc2l0aW9uIikpID09IFdlYkNvcmU6 OkF0dGFjaG1lbnQpCisgICAgICAgIGNhbGxQb2xpY3lGdW5jdGlvbihmdW5jdGlvbiwgUG9saWN5 RG93bmxvYWQpOwogICAgIGVsc2UgaWYgKGNhblNob3dNSU1FVHlwZShNSU1FVHlwZSkpCiAgICAg ICAgIGNhbGxQb2xpY3lGdW5jdGlvbihmdW5jdGlvbiwgUG9saWN5VXNlKTsKICAgICBlbHNlCg== 52735 2010-04-07 07:07:51 -0700 2010-04-07 07:12:30 -0700 Amendment to the Content-Disposition fix III... qtwebkit_content_disposition_support_8.patch text/plain 6712 adawit ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZmNmMTNlMy4uYjFkN2VlYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wMy0zMCAgRGF3aXQgQWxlbWF5 ZWh1ICA8YWRhd2l0QGtkZS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUmVwbGFjZWQgdGhlICdzaG91bGRUcmVhdEFzQXR0YWNobWVudCcgZnVu Y3Rpb24gd2l0aCBhIG1vcmUgZ2VuZXJpYyAKKyAgICAgICAgZnVuY3Rpb24gdGhhdCByZXR1cm5z IHRoZSBjb250ZW50IGRpc3Bvc2l0aW9uIHR5cGUuCisKKyAgICAgICAgU2VlIGNvbW1lbnRzIDM5 LTQyIGluIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjM5NQorCisg ICAgICAgICogcGxhdGZvcm0vbmV0d29yay9IVFRQUGFyc2Vycy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpjb250ZW50RGlzcG9zaXRpb25UeXBlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3Jr L0hUVFBQYXJzZXJzLmg6CisgICAgICAgIChXZWJDb3JlOjopOgorCiAyMDEwLTAzLTI5ICBKYW5u ZSBLb3NraW5lbiAgPGphbm5lLnAua29za2luZW5AZGlnaWEuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL0hUVFBQYXJzZXJzLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9IVFRQUGFyc2Vy cy5jcHAKaW5kZXggZmMwYzI0NS4uOTkzYTI5NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL0hUVFBQYXJzZXJzLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv SFRUUFBhcnNlcnMuY3BwCkBAIC03MiwzNiArNzIsMzQgQEAgc3RhdGljIGlubGluZSBib29sIHNr aXBUb2tlbihjb25zdCBTdHJpbmcmIHN0ciwgaW50JiBwb3MsIGNvbnN0IGNoYXIqIHRva2VuKQog ICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIHNob3VsZFRyZWF0QXNBdHRhY2htZW50KGNvbnN0 IFJlc291cmNlUmVzcG9uc2VCYXNlJiByZXNwb25zZSkKLXsKLSAgICBjb25zdCBTdHJpbmcmIGNv bnRlbnREaXNwb3NpdGlvbiA9IHJlc3BvbnNlLmh0dHBIZWFkZXJGaWVsZCgiQ29udGVudC1EaXNw b3NpdGlvbiIpOwotICAgIAorQ29udGVudERpc3Bvc2l0aW9uVHlwZSBjb250ZW50RGlzcG9zaXRp b25UeXBlKGNvbnN0IFN0cmluZyYgY29udGVudERpc3Bvc2l0aW9uKQoreyAgIAogICAgIGlmIChj b250ZW50RGlzcG9zaXRpb24uaXNFbXB0eSgpKQotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg ICAgIHJldHVybiBDb250ZW50RGlzcG9zaXRpb25Ob25lOwogCiAgICAgLy8gU29tZSBicm9rZW4g c2l0ZXMganVzdCBzZW5kCiAgICAgLy8gQ29udGVudC1EaXNwb3NpdGlvbjogOyBmaWxlbmFtZT0i ZmlsZSIKICAgICAvLyBzY3JlZW4gdGhvc2Ugb3V0IGhlcmUuCiAgICAgaWYgKGNvbnRlbnREaXNw b3NpdGlvbi5zdGFydHNXaXRoKCI7IikpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAg cmV0dXJuIENvbnRlbnREaXNwb3NpdGlvbk5vbmU7CiAKICAgICBpZiAoY29udGVudERpc3Bvc2l0 aW9uLnN0YXJ0c1dpdGgoImlubGluZSIsIGZhbHNlKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgICAgICByZXR1cm4gQ29udGVudERpc3Bvc2l0aW9uSW5saW5lOwogCiAgICAgLy8gU29tZSBi cm9rZW4gc2l0ZXMganVzdCBzZW5kCiAgICAgLy8gQ29udGVudC1EaXNwb3NpdGlvbjogZmlsZW5h bWU9ImZpbGUiCiAgICAgLy8gd2l0aG91dCBhIGRpc3Bvc2l0aW9uIHRva2VuLi4uIHNjcmVlbiB0 aG9zZSBvdXQuCiAgICAgaWYgKGNvbnRlbnREaXNwb3NpdGlvbi5zdGFydHNXaXRoKCJmaWxlbmFt ZSIsIGZhbHNlKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gQ29udGVu dERpc3Bvc2l0aW9uTm9uZTsKIAogICAgIC8vIEFsc28gaW4gdXNlIGlzIENvbnRlbnQtRGlzcG9z aXRpb246IG5hbWU9ImZpbGUiCiAgICAgaWYgKGNvbnRlbnREaXNwb3NpdGlvbi5zdGFydHNXaXRo KCJuYW1lIiwgZmFsc2UpKQotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJldHVybiBD b250ZW50RGlzcG9zaXRpb25Ob25lOwogCiAgICAgLy8gV2UgaGF2ZSBhIGNvbnRlbnQtZGlzcG9z aXRpb24gb2YgImF0dGFjaG1lbnQiIG9yIHVua25vd24uCiAgICAgLy8gUkZDIDIxODMsIHNlY3Rp b24gMi44IHNheXMgdGhhdCBhbiB1bmtub3duIGRpc3Bvc2l0aW9uCiAgICAgLy8gdmFsdWUgc2hv dWxkIGJlIHRyZWF0ZWQgYXMgImF0dGFjaG1lbnQiCi0gICAgcmV0dXJuIHRydWU7ICAKKyAgICBy ZXR1cm4gQ29udGVudERpc3Bvc2l0aW9uQXR0YWNobWVudDsgIAogfQogCiBib29sIHBhcnNlSFRU UFJlZnJlc2goY29uc3QgU3RyaW5nJiByZWZyZXNoLCBib29sIGZyb21IdHRwRXF1aXZNZXRhLCBk b3VibGUmIGRlbGF5LCBTdHJpbmcmIHVybCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9IVFRQUGFyc2Vycy5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0hUVFBQYXJz ZXJzLmgKaW5kZXggZDU2OGJkNC4uYzFlMzE2NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL0hUVFBQYXJzZXJzLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0hU VFBQYXJzZXJzLmgKQEAgLTQxLDggKzQxLDE0IEBAIGVudW0gWFNTUHJvdGVjdGlvbkRpc3Bvc2l0 aW9uIHsKICAgICBYU1NQcm90ZWN0aW9uQmxvY2tFbmFibGVkCiB9OwogCi0KLWJvb2wgc2hvdWxk VHJlYXRBc0F0dGFjaG1lbnQoY29uc3QgUmVzb3VyY2VSZXNwb25zZUJhc2UmIHJlc3BvbnNlKTsK K3R5cGVkZWYgZW51bSB7CisgICAgQ29udGVudERpc3Bvc2l0aW9uTm9uZSwKKyAgICBDb250ZW50 RGlzcG9zaXRpb25JbmxpbmUsCisgICAgQ29udGVudERpc3Bvc2l0aW9uQXR0YWNobWVudCwKKyAg ICBDb250ZW50RGlzcG9zaXRpb25PdGhlcgorfSBDb250ZW50RGlzcG9zaXRpb25UeXBlOworCitD b250ZW50RGlzcG9zaXRpb25UeXBlIGNvbnRlbnREaXNwb3NpdGlvblR5cGUoY29uc3QgU3RyaW5n Jik7CiBib29sIHBhcnNlSFRUUFJlZnJlc2goY29uc3QgU3RyaW5nJiByZWZyZXNoLCBib29sIGZy b21IdHRwRXF1aXZNZXRhLCBkb3VibGUmIGRlbGF5LCBTdHJpbmcmIHVybCk7CiBkb3VibGUgcGFy c2VEYXRlKGNvbnN0IFN0cmluZyYpOwogU3RyaW5nIGZpbGVuYW1lRnJvbUhUVFBDb250ZW50RGlz cG9zaXRpb24oY29uc3QgU3RyaW5nJik7IApkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggOWM3NThkZi4uNGY1ZGQz NyAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDMtMzAgIERhd2l0IEFsZW1h eWVodSAgPGFkYXdpdEBrZGUub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFVwZGF0ZWQgdGhlIFdlYkNvcmU6OnNob3VsZFRyZWF0QXNBdHRhY2hl bWVudCBmdW5jdGlvbiBjYWxsIHdpdGggdGhlCisgICAgICAgIG5ldyBtb3JlIGdlbmVyaWMgcmVw bGFjZW1lbnQgV2ViQ29yZTo6Y29udGVudERpc3Bvc2l0aW9uVHlwZS4KKworICAgICAgICBTZWUg Y29tbWVudHMgMzktNDIgaW4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTM2Mzk1CisKKyAgICAgICAgKiBzcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnRJbXBsOjpkaXNwYXRjaERlY2lkZVBvbGljeUZv ck1JTUVUeXBlKToKKwogMjAxMC0wMy0yOSAgRGF3aXQgQWxlbWF5ZWh1ICA8YWRhd2l0QGtkZS5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4uCmRpZmYgLS1naXQgYS9X ZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAgYi9XZWJLaXQvY2hy b21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAKaW5kZXggOWQ1OWZkZC4uNzViMWU5 ZiAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwu Y3BwCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcApA QCAtODQzLDcgKzg0Myw3IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRJbXBsOjpkaXNwYXRjaERl Y2lkZVBvbGljeUZvck1JTUVUeXBlKAogICAgIGlmIChzdGF0dXNDb2RlID09IDIwNCB8fCBzdGF0 dXNDb2RlID09IDIwNSkgewogICAgICAgICAvLyBUaGUgc2VydmVyIGRvZXMgbm90IHdhbnQgdXMg dG8gcmVwbGFjZSB0aGUgcGFnZSBjb250ZW50cy4KICAgICAgICAgYWN0aW9uID0gUG9saWN5SWdu b3JlOwotICAgIH0gZWxzZSBpZiAoV2ViQ29yZTo6c2hvdWxkVHJlYXRBc0F0dGFjaG1lbnQocmVz cG9uc2UpKSB7CisgICAgfSBlbHNlIGlmIChXZWJDb3JlOjpjb250ZW50RGlzcG9zaXRpb25UeXBl KHJlc3BvbnNlLmh0dHBIZWFkZXJGaWVsZCgiQ29udGVudC1EaXNwb3NpdGlvbiIpKSA9PSBXZWJD b3JlOjpDb250ZW50RGlzcG9zaXRpb25BdHRhY2htZW50KSB7CiAgICAgICAgIC8vIFRoZSBzZXJ2 ZXIgd2FudHMgdXMgdG8gZG93bmxvYWQgaW5zdGVhZCBvZiByZXBsYWNpbmcgdGhlIHBhZ2UgY29u dGVudHMuCiAgICAgICAgIC8vIERvd25sb2FkaW5nIGlzIGhhbmRsZWQgYnkgdGhlIGVtYmVkZGVy LCBidXQgd2Ugc3RpbGwgZ2V0IHRoZSBpbml0aWFsCiAgICAgICAgIC8vIHJlc3BvbnNlIHNvIHRo YXQgd2UgY2FuIGlnbm9yZSBpdCBhbmQgY2xlYW4gdXAgcHJvcGVybHkuCmRpZmYgLS1naXQgYS9X ZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCAzYTRiMDk2Li5h ZDMzYjBlIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9xdC9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0wMy0zMCAgRGF3aXQgQWxlbWF5ZWh1ICA8 YWRhd2l0QGtkZS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVXBkYXRlZCB0aGUgV2ViQ29yZTo6c2hvdWxkVHJlYXRBc0F0dGFjaGVtZW50IGZ1 bmN0aW9uIGNhbGwgd2l0aCB0aGUKKyAgICAgICAgbmV3IG1vcmUgZ2VuZXJpYyByZXBsYWNlbWVu dCBXZWJDb3JlOjpjb250ZW50RGlzcG9zaXRpb25UeXBlLgorCisgICAgICAgIFNlZSBjb21tZW50 cyAzOS00MiBpbiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzYzOTUK KworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRRdDo6ZGlzcGF0Y2hEZWNpZGVQb2xpY3lG b3JNSU1FVHlwZSk6CisKIDIwMTAtMDMtMjYgIEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuICA8 a2VubmV0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3Rv LgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50 UXQuY3BwIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3Bw CmluZGV4IGM1YzU3MzkuLjAwMzhmMzcgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9XZWJDb3JlU3Vw cG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcAorKysgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBv cnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKQEAgLTk2Nyw4ICs5NjcsOSBAQCBXZWJDb3JlOjpG cmFtZSogRnJhbWVMb2FkZXJDbGllbnRRdDo6ZGlzcGF0Y2hDcmVhdGVQYWdlKCkKIHZvaWQgRnJh bWVMb2FkZXJDbGllbnRRdDo6ZGlzcGF0Y2hEZWNpZGVQb2xpY3lGb3JNSU1FVHlwZShGcmFtZVBv bGljeUZ1bmN0aW9uIGZ1bmN0aW9uLCBjb25zdCBXZWJDb3JlOjpTdHJpbmcmIE1JTUVUeXBlLCBj b25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmKQogewogICAgIC8vIHdlIG5lZWQgdG8gY2Fs bCBkaXJlY3RseSBoZXJlCi0gICAgaWYgKFdlYkNvcmU6OnNob3VsZFRyZWF0QXNBdHRhY2htZW50 KG1fZnJhbWUtPmxvYWRlcigpLT5hY3RpdmVEb2N1bWVudExvYWRlcigpLT5yZXNwb25zZSgpKSkK LSAgICAgICAgY2FsbFBvbGljeUZ1bmN0aW9uKGZ1bmN0aW9uLCBQb2xpY3lEb3dubG9hZCk7ICAg IAorICAgIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlID0gbV9mcmFtZS0+bG9hZGVy KCktPmFjdGl2ZURvY3VtZW50TG9hZGVyKCktPnJlc3BvbnNlKCk7CisgICAgaWYgKFdlYkNvcmU6 OmNvbnRlbnREaXNwb3NpdGlvblR5cGUocmVzcG9uc2UuaHR0cEhlYWRlckZpZWxkKCJDb250ZW50 LURpc3Bvc2l0aW9uIikpID09IFdlYkNvcmU6OkNvbnRlbnREaXNwb3NpdGlvbkF0dGFjaG1lbnQp CisgICAgICAgIGNhbGxQb2xpY3lGdW5jdGlvbihmdW5jdGlvbiwgUG9saWN5RG93bmxvYWQpOwog ICAgIGVsc2UgaWYgKGNhblNob3dNSU1FVHlwZShNSU1FVHlwZSkpCiAgICAgICAgIGNhbGxQb2xp Y3lGdW5jdGlvbihmdW5jdGlvbiwgUG9saWN5VXNlKTsKICAgICBlbHNlCg==