101226 2012-11-05 08:39:37 -0800 [Qt] Open link in this window action 2012-11-07 11:52:38 -0800 1 1 1 Unclassified WebKit WebKit Qt 420+ Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 allan.jensen allan.jensen dglazkov jturcotte ossy peter+ews webkit.review.bot oldest_to_newest 758573 0 allan.jensen 2012-11-05 08:39:37 -0800 When right clicking on a link that has a target specifying it should open in a new window we currently show two options that are functionally equivalent (open link (default) and open link in new window). KHTML in this case gives the user another option "open link in this window", which overrides the new window target. This is useful in several poorly designed webpages and a feature I personally miss in QtWebKit. 758575 1 172341 allan.jensen 2012-11-05 08:44:51 -0800 Created attachment 172341 Patch 758578 2 172343 allan.jensen 2012-11-05 08:47:39 -0800 Created attachment 172343 Patch 758579 3 webkit.review.bot 2012-11-05 08:50:43 -0800 Attachment 172343 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebKit/qt/Api/qwebpage.cpp:2373: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/qt/Api/qwebpage.cpp:2374: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] Total errors found: 2 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 758585 4 172343 buildbot 2012-11-05 08:55:10 -0800 Comment on attachment 172343 Patch Attachment 172343 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/14745157 758599 5 172343 webkit.review.bot 2012-11-05 09:07:23 -0800 Comment on attachment 172343 Patch Attachment 172343 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/14748054 758600 6 172343 peter+ews 2012-11-05 09:07:25 -0800 Comment on attachment 172343 Patch Attachment 172343 did not pass cr-android-ews (chromium-android): Output: http://queues.webkit.org/results/14731576 758602 7 172351 allan.jensen 2012-11-05 09:11:31 -0800 Created attachment 172351 Patch 758603 8 webkit.review.bot 2012-11-05 09:14:31 -0800 Attachment 172351 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebKit/qt/Api/qwebpage.cpp:2373: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/qt/Api/qwebpage.cpp:2374: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] Total errors found: 2 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 758605 9 172351 jturcotte 2012-11-05 09:16:21 -0800 Comment on attachment 172351 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172351&action=review > Source/WebCore/page/ContextMenuController.cpp:728 > + ContextMenuItem OpenLinkInThisWindowItem(ActionType, ContextMenuItemTagOpenLinkInThisWindow, > + contextMenuItemTagOpenLinkInThisWindow()); I don't think that this is something that is beneficial for every QtWebKit application. It would be better not to add it to the default context menu and let application add it by overriding QWebView::contextMenuEvent. > Source/WebKit/qt/Api/qwebpage.h:100 > + OpenLinkInThisWindow, Some documentation would be quite helpful given the ambiguity of the name. 758610 10 allan.jensen 2012-11-05 09:25:44 -0800 (In reply to comment #8) > If any of these errors are false positives, please file a bug against check-webkit-style. The style bot discards comments, which makes it miscount the indentation. I could fix it by removing space between comments and arguments, but that does not look very nice. (In reply to comment #9) > (From update of attachment 172351 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=172351&action=review > > > Source/WebCore/page/ContextMenuController.cpp:728 > > + ContextMenuItem OpenLinkInThisWindowItem(ActionType, ContextMenuItemTagOpenLinkInThisWindow, > > + contextMenuItemTagOpenLinkInThisWindow()); > > I don't think that this is something that is beneficial for every QtWebKit application. It would be better not to add it to the default context menu and let application add it by overriding QWebView::contextMenuEvent. > We could do that. That would just mean keeping the code in QtWebKit? The argument for making it more universal is only that OpenLink and OpenLinkInNewWindow are duplicates in this case, though we could also remove one of them by default. > > Source/WebKit/qt/Api/qwebpage.h:100 > > + OpenLinkInThisWindow, > > Some documentation would be quite helpful given the ambiguity of the name. Right, I missed that. 759398 11 jturcotte 2012-11-06 01:41:11 -0800 (In reply to comment #10) > We could do that. That would just mean keeping the code in QtWebKit? The argument for making it more universal is only that OpenLink and OpenLinkInNewWindow are duplicates in this case, though we could also remove one of them by default. I wish we could remove it but it is needed for code out there that implement QWebView::createWindow and expect the menu item to be there already. 759492 12 172545 allan.jensen 2012-11-06 03:43:07 -0800 Created attachment 172545 Patch Do not populate the context-menu by default with the new action, but instead just add it in QtTestBrowser for testing 759496 13 webkit.review.bot 2012-11-06 03:48:09 -0800 Attachment 172545 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebKit/qt/Api/qwebpage.cpp:2374: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/qt/Api/qwebpage.cpp:2375: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] Total errors found: 2 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style. 759562 14 172545 jturcotte 2012-11-06 05:36:26 -0800 Comment on attachment 172545 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172545&action=review I think you also need to update editorCommandWebActions in qwebpage.cpp Overall we usually have a team API review on each release to pass invidual APIs that were added through more eyes, maybe we should do this soon. > Source/WebKit/qt/Api/qwebpage.h:100 > + OpenLinkInThisWindow, I think this needs to go at the end of the list for binary compatibility. 760677 15 172795 allan.jensen 2012-11-07 07:23:57 -0800 Created attachment 172795 Patch Moved new enum to stay ABI compatible 760678 16 webkit.review.bot 2012-11-07 07:26:08 -0800 Attachment 172795 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebKit/qt/Api/qwebpage.cpp:2374: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/qt/Api/qwebpage.cpp:2375: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] Total errors found: 2 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style. 760703 17 allan.jensen 2012-11-07 07:59:25 -0800 (In reply to comment #16) > Attachment 172795 [details] did not pass style-queue: > > Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 > Source/WebKit/qt/Api/qwebpage.cpp:2374: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] > Source/WebKit/qt/Api/qwebpage.cpp:2375: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] > Total errors found: 2 in 10 files > > > If any of these errors are false positives, please file a bug against check-webkit-style. Right, we will get these until the patch for bug #101230 lands. 760704 18 172803 allan.jensen 2012-11-07 08:01:13 -0800 Created attachment 172803 Patch Also updated editorCommentWebActions 760706 19 webkit.review.bot 2012-11-07 08:04:12 -0800 Attachment 172803 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebKit/qt/Api/qwebpage.cpp:2375: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/qt/Api/qwebpage.cpp:2376: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] Total errors found: 2 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style. 760710 20 172803 hausmann 2012-11-07 08:08:35 -0800 Comment on attachment 172803 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172803&action=review > Source/WebKit/qt/Api/qwebpage.cpp:1698 > + \value OpenLinkInThisWindow Open the current link without opening a new window. Used on links that would default to opening a new window. (Added in Qt 5.0) "Used on links that would default to opening a new window" maybe that should also include frames? Like "Used on links that would default to opening in another frame or a new window" ? 760738 21 allan.jensen 2012-11-07 08:38:47 -0800 Committed r133763: <http://trac.webkit.org/changeset/133763> 760860 22 ossy 2012-11-07 10:43:59 -0800 (In reply to comment #21) > Committed r133763: <http://trac.webkit.org/changeset/133763> and it broke 28 tests: http://build.webkit.sed.hu/results/x86-32%20Linux%20Qt%20Release%20NRWT/r133763%20%2823083%29/results.html Please fix the bug. Otherwise I suggest you should run tests before committing ... 760904 23 allan.jensen 2012-11-07 11:19:12 -0800 (In reply to comment #22) > (In reply to comment #21) > > Committed r133763: <http://trac.webkit.org/changeset/133763> > > and it broke 28 tests: http://build.webkit.sed.hu/results/x86-32%20Linux%20Qt%20Release%20NRWT/r133763%20%2823083%29/results.html > > Please fix the bug. Otherwise I suggest you should run tests before committing ... Sorry, it was last minute change. The addition to editorCommandWebAction is in the wrong place, and all the tests were run before that addition. 760946 24 ossy 2012-11-07 11:52:38 -0800 Fix landed in http://trac.webkit.org/changeset/133789. 172341 2012-11-05 08:44:51 -0800 2012-11-05 08:47:36 -0800 Patch bug-101226-20121105174242.patch text/plain 8917 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzNDUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDc5YmRlYmEzMWY1NTc3 NDQ5OTIyNDIxMTVlMGM0MmYwMjI2ODJjZi4uMGNjYjA5N2JhMjliMGQ2ZDgxNjEwZjc3ZWRiOGNk ZWRmYTkxM2EwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTExLTA1ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gT3BlbiBsaW5rIGluIHRoaXMgd2luZG93IGFjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxMjI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkcyB0aGUgYWN0aW9uIGFuZCBwb3B1bGF0ZXMg dGhlIGNvbnRleHQtbWVudSB3aXRoIGl0IHdoZW4gdGhlIHVzZXIgaGl0cyBsaW5rIHRvIGEgbmV3 IGZyYW1lLgorCisgICAgICAgICogcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Q29udGV4dE1lbnVDb250cm9sbGVyOjpjb250ZXh0TWVudUl0ZW1TZWxl Y3RlZCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZXh0TWVudUNvbnRyb2xsZXI6OnBvcHVsYXRl KToKKyAgICAgICAgKiBwbGF0Zm9ybS9Db250ZXh0TWVudUl0ZW0uaDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmg6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBw bGF0Zm9ybS9xdC9Mb2NhbGl6ZWRTdHJpbmdzUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29u dGV4dE1lbnVJdGVtVGFnT3BlbkxpbmtJblRoaXNXaW5kb3cpOgorICAgICAgICAoV2ViQ29yZSk6 CisKIDIwMTItMTEtMDUgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29t PgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMzMyODYsIHIxMzMzODUsIGFu ZCByMTMzMzk0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCA0M2I5OWIzZDMyZjY2NDBiM2MxZjRiYzZkNzY3 ZjUxZDkwNzliYzMxLi5kN2RkOTM3ZGZhYzI0MzMyOTg0MDg4YWZlMDM5MmM0YTM5YjVhYzFhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTExLTA1ICBBbGxhbiBTYW5kZmVs ZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtRdF0gT3BlbiBs aW5rIGluIHRoaXMgd2luZG93IGFjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTAxMjI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkcyB0aGUgZ2x1ZSB0byBleGVjdXRlIGFuZCBleHBvcnQgdGhl IG5ldyBjb250ZXh0IG1lbnUgYWN0aW9uLgorCisgICAgICAgICogQXBpL3F3ZWJwYWdlLmNwcDoK KyAgICAgICAgKHdlYkFjdGlvbkZvckNvbnRleHRNZW51QWN0aW9uKToKKyAgICAgICAgKFFXZWJQ YWdlOjp0cmlnZ2VyQWN0aW9uKToKKyAgICAgICAgKFFXZWJQYWdlOjphY3Rpb24pOgorICAgICAg ICAqIEFwaS9xd2VicGFnZS5oOgorCiAyMDEyLTExLTAxICBTdGVwaGVuIFdoaXRlICA8c2Vub3Ji bGFuY29AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIx MzMxNDMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29udHJv bGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5jcHAK aW5kZXggZWFlNGJmZjQzMzkzNGYxNDZlYTU1NWQ1OTEwOGNjMGEyYjVhYTYyYy4uYmIyNzJiNzNl MjAzOTU3MWY0NGIyNDQ3MTc0Njc3OWNkZjdiODZlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvQ29udGV4dE1lbnVDb250cm9sbGVyLmNwcApAQCAtMzY4LDYgKzM2OCw5IEBAIHZvaWQgQ29u dGV4dE1lbnVDb250cm9sbGVyOjpjb250ZXh0TWVudUl0ZW1TZWxlY3RlZChDb250ZXh0TWVudUl0 ZW0qIGl0ZW0pCiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIG9wZW5OZXdXaW5kb3cobV9oaXRU ZXN0UmVzdWx0LmFic29sdXRlTGlua1VSTCgpLCBmcmFtZSk7CiAgICAgICAgIGJyZWFrOworICAg IGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnT3BlbkxpbmtJblRoaXNXaW5kb3c6CisgICAgICAgIGZy YW1lLT5sb2FkZXIoKS0+bG9hZEZyYW1lUmVxdWVzdChGcmFtZUxvYWRSZXF1ZXN0KGZyYW1lLT5k b2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLCBSZXNvdXJjZVJlcXVlc3QobV9oaXRUZXN0UmVz dWx0LmFic29sdXRlTGlua1VSTCgpLCBmcmFtZS0+bG9hZGVyKCktPm91dGdvaW5nUmVmZXJyZXIo KSkpLCBmYWxzZSwgZmFsc2UsIDAsIDAsIE1heWJlU2VuZFJlZmVycmVyKTsKKyAgICAgICAgYnJl YWs7CiAgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdCb2xkOgogICAgICAgICBmcmFtZS0+ZWRp dG9yKCktPmNvbW1hbmQoIlRvZ2dsZUJvbGQiKS5leGVjdXRlKCk7CiAgICAgICAgIGJyZWFrOwpA QCAtNzIwLDcgKzcyMyw5IEBAIHZvaWQgQ29udGV4dE1lbnVDb250cm9sbGVyOjpwb3B1bGF0ZSgp CiAgICAgQ29udGV4dE1lbnVJdGVtIE9wZW5MaW5rSXRlbShBY3Rpb25UeXBlLCBDb250ZXh0TWVu dUl0ZW1UYWdPcGVuTGluaywgY29udGV4dE1lbnVJdGVtVGFnT3BlbkxpbmsoKSk7CiAgICAgQ29u dGV4dE1lbnVJdGVtIE9wZW5MaW5rSW5OZXdXaW5kb3dJdGVtKEFjdGlvblR5cGUsIENvbnRleHRN ZW51SXRlbVRhZ09wZW5MaW5rSW5OZXdXaW5kb3csIAogICAgICAgICBjb250ZXh0TWVudUl0ZW1U YWdPcGVuTGlua0luTmV3V2luZG93KCkpOwotICAgIENvbnRleHRNZW51SXRlbSBEb3dubG9hZEZp bGVJdGVtKEFjdGlvblR5cGUsIENvbnRleHRNZW51SXRlbVRhZ0Rvd25sb2FkTGlua1RvRGlzaywg CisgICAgQ29udGV4dE1lbnVJdGVtIE9wZW5MaW5rSW5UaGlzV2luZG93SXRlbShBY3Rpb25UeXBl LCBDb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlua0luVGhpc1dpbmRvdywKKyAgICAgICAgY29udGV4 dE1lbnVJdGVtVGFnT3BlbkxpbmtJblRoaXNXaW5kb3coKSk7CisgICAgQ29udGV4dE1lbnVJdGVt IERvd25sb2FkRmlsZUl0ZW0oQWN0aW9uVHlwZSwgQ29udGV4dE1lbnVJdGVtVGFnRG93bmxvYWRM aW5rVG9EaXNrLAogICAgICAgICBjb250ZXh0TWVudUl0ZW1UYWdEb3dubG9hZExpbmtUb0Rpc2so KSk7CiAgICAgQ29udGV4dE1lbnVJdGVtIENvcHlMaW5rSXRlbShBY3Rpb25UeXBlLCBDb250ZXh0 TWVudUl0ZW1UYWdDb3B5TGlua1RvQ2xpcGJvYXJkLCAKICAgICAgICAgY29udGV4dE1lbnVJdGVt VGFnQ29weUxpbmtUb0NsaXBib2FyZCgpKTsKQEAgLTc5NCw3ICs3OTksMTUgQEAgdm9pZCBDb250 ZXh0TWVudUNvbnRyb2xsZXI6OnBvcHVsYXRlKCkKICAgICAgICAgS1VSTCBsaW5rVVJMID0gbV9o aXRUZXN0UmVzdWx0LmFic29sdXRlTGlua1VSTCgpOwogICAgICAgICBpZiAoIWxpbmtVUkwuaXNF bXB0eSgpKSB7CiAgICAgICAgICAgICBpZiAobG9hZGVyLT5jbGllbnQoKS0+Y2FuSGFuZGxlUmVx dWVzdChSZXNvdXJjZVJlcXVlc3QobGlua1VSTCkpKSB7CisjaWYgUExBVEZPUk0oUVQpCisgICAg ICAgICAgICAgICAgaWYgKG1faGl0VGVzdFJlc3VsdC50YXJnZXRGcmFtZSgpID09IGZyYW1lKQor ICAgICAgICAgICAgICAgICAgICBhcHBlbmRJdGVtKE9wZW5MaW5rSXRlbSwgbV9jb250ZXh0TWVu dS5nZXQoKSk7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICBhcHBl bmRJdGVtKE9wZW5MaW5rSW5UaGlzV2luZG93SXRlbSwgbV9jb250ZXh0TWVudS5nZXQoKSk7Cisj ZWxzZQorCiAgICAgICAgICAgICAgICAgYXBwZW5kSXRlbShPcGVuTGlua0l0ZW0sIG1fY29udGV4 dE1lbnUuZ2V0KCkpOworI2VuZGlmCiAgICAgICAgICAgICAgICAgYXBwZW5kSXRlbShPcGVuTGlu a0luTmV3V2luZG93SXRlbSwgbV9jb250ZXh0TWVudS5nZXQoKSk7CiAgICAgICAgICAgICAgICAg YXBwZW5kSXRlbShEb3dubG9hZEZpbGVJdGVtLCBtX2NvbnRleHRNZW51LmdldCgpKTsKICAgICAg ICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0NvbnRleHRNZW51 SXRlbS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29udGV4dE1lbnVJdGVtLmgKaW5kZXgg ZjVkOTM1YTVhMmU0NGU4YzZiODliM2NhYTFlOTI0MjEzYjg3NTA0Yi4uOGQxOTcxZjdlYmEzMjcy OWM0MjlmMzZmNzcxZjQ0YWYxMzA1MmVkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vQ29udGV4dE1lbnVJdGVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29u dGV4dE1lbnVJdGVtLmgKQEAgLTE2NCw2ICsxNjQsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAg ICAgICAgIENvbnRleHRNZW51SXRlbVRhZ01lZGlhUGxheVBhdXNlLAogICAgICAgICBDb250ZXh0 TWVudUl0ZW1UYWdNZWRpYU11dGUsCiAgICAgICAgIENvbnRleHRNZW51SXRlbVRhZ0RpY3RhdGlv bkFsdGVybmF0aXZlLAorICAgICAgICBDb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlua0luVGhpc1dp bmRvdywKICAgICAgICAgQ29udGV4dE1lbnVJdGVtQmFzZUN1c3RvbVRhZyA9IDUwMDAsCiAgICAg ICAgIENvbnRleHRNZW51SXRlbUN1c3RvbVRhZ05vQWN0aW9uID0gNTk5OCwKICAgICAgICAgQ29u dGV4dE1lbnVJdGVtTGFzdEN1c3RvbVRhZyA9IDU5OTksCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9Mb2NhbGl6ZWRTdHJpbmdzLmgKaW5kZXggOTYwMmUxZjkwYzA2ZTEzMjM5ZDg1NzRjYTI3MzI0 M2Q4ZTA3NmVkNi4uYmNkMjJjNDZjMzFlNWM3YWFhZGY4M2U5MjcyYTZlNDdmMzJkNDdhYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9jYWxpemVkU3RyaW5ncy5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuaApAQCAtNDksNiArNDks OSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICNpZiBFTkFCTEUoQ09OVEVYVF9NRU5VUykKICAg ICBTdHJpbmcgY29udGV4dE1lbnVJdGVtVGFnT3BlbkxpbmtJbk5ld1dpbmRvdygpOworI2lmIFBM QVRGT1JNKFFUKQorICAgIFN0cmluZyBjb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlua0luVGhpc1dp bmRvdygpOworI2VuZGlmCiAgICAgU3RyaW5nIGNvbnRleHRNZW51SXRlbVRhZ0Rvd25sb2FkTGlu a1RvRGlzaygpOwogICAgIFN0cmluZyBjb250ZXh0TWVudUl0ZW1UYWdDb3B5TGlua1RvQ2xpcGJv YXJkKCk7CiAgICAgU3RyaW5nIGNvbnRleHRNZW51SXRlbVRhZ09wZW5JbWFnZUluTmV3V2luZG93 KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9Mb2NhbGl6ZWRTdHJp bmdzUXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvTG9jYWxpemVkU3RyaW5nc1F0 LmNwcAppbmRleCAwY2RjZTNhODUzNDE0NTFjODIxODMzYzllNmRlY2NkZDg5NTBjOTNiLi43ZGZm ZjFmZTk4ZjhkNThmNGNlNmI2ODc2NzBhYmQ3MzFjNjVjMWNhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9xdC9Mb2NhbGl6ZWRTdHJpbmdzUXQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL3F0L0xvY2FsaXplZFN0cmluZ3NRdC5jcHAKQEAgLTg4LDYgKzg4LDEx IEBAIFN0cmluZyBjb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlua0luTmV3V2luZG93KCkKICAgICBy ZXR1cm4gUUNvcmVBcHBsaWNhdGlvbjo6dHJhbnNsYXRlKCJRV2ViUGFnZSIsICJPcGVuIGluIE5l dyBXaW5kb3ciLCAiT3BlbiBpbiBOZXcgV2luZG93IGNvbnRleHQgbWVudSBpdGVtIik7CiB9CiAK K1N0cmluZyBjb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlua0luVGhpc1dpbmRvdygpCit7CisgICAg cmV0dXJuIFFDb3JlQXBwbGljYXRpb246OnRyYW5zbGF0ZSgiUVdlYlBhZ2UiLCAiT3BlbiBpbiBU aGlzIFdpbmRvdyIsICJPcGVuIGluIFRoaXMgV2luZG93IGNvbnRleHQgbWVudSBpdGVtIik7Cit9 CisKIFN0cmluZyBjb250ZXh0TWVudUl0ZW1UYWdEb3dubG9hZExpbmtUb0Rpc2soKQogewogICAg IHJldHVybiBRQ29yZUFwcGxpY2F0aW9uOjp0cmFuc2xhdGUoIlFXZWJQYWdlIiwgIlNhdmUgTGlu ay4uLiIsICJEb3dubG9hZCBMaW5rZWQgRmlsZSBjb250ZXh0IG1lbnUgaXRlbSIpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9x dC9BcGkvcXdlYnBhZ2UuY3BwCmluZGV4IGMyYzk4MjNmOTljYmNlNzJiMDNkN2JjOGViNWQ2YWQz Mjg4NTI4OTIuLjAzZGZhZTYzODc2OTMwMGI3OTU1MDhjMjQwNDhiZDkyMmQ5NTI0OTggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKQEAgLTQzNiw2ICs0MzYsNyBAQCBzdGF0aWMgUVdlYlBh Z2U6OldlYkFjdGlvbiB3ZWJBY3Rpb25Gb3JDb250ZXh0TWVudUFjdGlvbihXZWJDb3JlOjpDb250 ZXh0TWVudUFjdAogICAgIHN3aXRjaCAoYWN0aW9uKSB7CiAgICAgICAgIGNhc2UgV2ViQ29yZTo6 Q29udGV4dE1lbnVJdGVtVGFnT3Blbkxpbms6IHJldHVybiBRV2ViUGFnZTo6T3Blbkxpbms7CiAg ICAgICAgIGNhc2UgV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVtVGFnT3BlbkxpbmtJbk5ld1dpbmRv dzogcmV0dXJuIFFXZWJQYWdlOjpPcGVuTGlua0luTmV3V2luZG93OworICAgICAgICBjYXNlIFdl YkNvcmU6OkNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rSW5UaGlzV2luZG93OiByZXR1cm4gUVdl YlBhZ2U6Ok9wZW5MaW5rSW5UaGlzV2luZG93OwogICAgICAgICBjYXNlIFdlYkNvcmU6OkNvbnRl eHRNZW51SXRlbVRhZ0Rvd25sb2FkTGlua1RvRGlzazogcmV0dXJuIFFXZWJQYWdlOjpEb3dubG9h ZExpbmtUb0Rpc2s7CiAgICAgICAgIGNhc2UgV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVtVGFnQ29w eUxpbmtUb0NsaXBib2FyZDogcmV0dXJuIFFXZWJQYWdlOjpDb3B5TGlua1RvQ2xpcGJvYXJkOwog ICAgICAgICBjYXNlIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbVRhZ09wZW5JbWFnZUluTmV3V2lu ZG93OiByZXR1cm4gUVdlYlBhZ2U6Ok9wZW5JbWFnZUluTmV3V2luZG93OwpAQCAtMjM2Nyw2ICsy MzY4LDEwIEBAIHZvaWQgUVdlYlBhZ2U6OnRyaWdnZXJBY3Rpb24oV2ViQWN0aW9uIGFjdGlvbiwg Ym9vbCkKICAgICAgICAgY2FzZSBPcGVuTGlua0luTmV3V2luZG93OgogICAgICAgICAgICAgb3Bl bk5ld1dpbmRvdyhkLT5oaXRUZXN0UmVzdWx0LmxpbmtVcmwoKSwgZnJhbWUpOwogICAgICAgICAg ICAgYnJlYWs7CisgICAgICAgIGNhc2UgT3BlbkxpbmtJblRoaXNXaW5kb3c6CisgICAgICAgICAg ICBmcmFtZS0+bG9hZGVyKCktPmxvYWRGcmFtZVJlcXVlc3QoZnJhbWVMb2FkUmVxdWVzdChkLT5o aXRUZXN0UmVzdWx0LmxpbmtVcmwoKSwgZnJhbWUpLAorICAgICAgICAgICAgICAgIC8qbG9ja0hp c3RvcnkqLyBmYWxzZSwgLypsb2NrQmFja0ZvcndhcmRMaXN0Ki8gZmFsc2UsIC8qZXZlbnQqLyAw LCAvKkZvcm1TdGF0ZSovIDAsIE1heWJlU2VuZFJlZmVycmVyKTsKKyAgICAgICAgICAgIGJyZWFr OwogICAgICAgICBjYXNlIE9wZW5GcmFtZUluTmV3V2luZG93OiB7CiAgICAgICAgICAgICBLVVJM IHVybCA9IGZyYW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+dW5yZWFjaGFibGVVUkwo KTsKICAgICAgICAgICAgIGlmICh1cmwuaXNFbXB0eSgpKQpAQCAtMjc4OCw3ICsyNzkzLDkgQEAg UUFjdGlvbiAqUVdlYlBhZ2U6OmFjdGlvbihXZWJBY3Rpb24gYWN0aW9uKSBjb25zdAogICAgICAg ICBjYXNlIE9wZW5GcmFtZUluTmV3V2luZG93OgogICAgICAgICAgICAgdGV4dCA9IGNvbnRleHRN ZW51SXRlbVRhZ09wZW5GcmFtZUluTmV3V2luZG93KCk7CiAgICAgICAgICAgICBicmVhazsKLQor ICAgICAgICBjYXNlIE9wZW5MaW5rSW5UaGlzV2luZG93OgorICAgICAgICAgICAgdGV4dCA9IGNv bnRleHRNZW51SXRlbVRhZ09wZW5MaW5rSW5UaGlzV2luZG93KCk7CisgICAgICAgICAgICBicmVh azsKICAgICAgICAgY2FzZSBEb3dubG9hZExpbmtUb0Rpc2s6CiAgICAgICAgICAgICB0ZXh0ID0g Y29udGV4dE1lbnVJdGVtVGFnRG93bmxvYWRMaW5rVG9EaXNrKCk7CiAgICAgICAgICAgICBicmVh azsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmggYi9Tb3VyY2Uv V2ViS2l0L3F0L0FwaS9xd2VicGFnZS5oCmluZGV4IDY2Zjg5NjA5YjAwMzg0Y2JhZjlhOTBlMTYw ZDlkN2IxNzBkMGQwNTIuLjY3MjgxOTdlZDYxNWNjYjQ4MjBmOGUxODk5YjZjZTU2NTMwY2UzOTMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmgKKysrIGIvU291cmNl L1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuaApAQCAtOTcsNiArOTcsNyBAQCBwdWJsaWM6CiAgICAg ICAgIE9wZW5MaW5rLAogCiAgICAgICAgIE9wZW5MaW5rSW5OZXdXaW5kb3csCisgICAgICAgIE9w ZW5MaW5rSW5UaGlzV2luZG93LAogICAgICAgICBPcGVuRnJhbWVJbk5ld1dpbmRvdywKIAogICAg ICAgICBEb3dubG9hZExpbmtUb0Rpc2ssCg== 172343 2012-11-05 08:47:39 -0800 2012-11-05 09:11:27 -0800 Patch bug-101226-20121105174530.patch text/plain 8942 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzNDUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDc5YmRlYmEzMWY1NTc3 NDQ5OTIyNDIxMTVlMGM0MmYwMjI2ODJjZi4uMGNjYjA5N2JhMjliMGQ2ZDgxNjEwZjc3ZWRiOGNk ZWRmYTkxM2EwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTExLTA1ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gT3BlbiBsaW5rIGluIHRoaXMgd2luZG93IGFjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxMjI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkcyB0aGUgYWN0aW9uIGFuZCBwb3B1bGF0ZXMg dGhlIGNvbnRleHQtbWVudSB3aXRoIGl0IHdoZW4gdGhlIHVzZXIgaGl0cyBsaW5rIHRvIGEgbmV3 IGZyYW1lLgorCisgICAgICAgICogcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Q29udGV4dE1lbnVDb250cm9sbGVyOjpjb250ZXh0TWVudUl0ZW1TZWxl Y3RlZCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZXh0TWVudUNvbnRyb2xsZXI6OnBvcHVsYXRl KToKKyAgICAgICAgKiBwbGF0Zm9ybS9Db250ZXh0TWVudUl0ZW0uaDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmg6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBw bGF0Zm9ybS9xdC9Mb2NhbGl6ZWRTdHJpbmdzUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29u dGV4dE1lbnVJdGVtVGFnT3BlbkxpbmtJblRoaXNXaW5kb3cpOgorICAgICAgICAoV2ViQ29yZSk6 CisKIDIwMTItMTEtMDUgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29t PgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMzMyODYsIHIxMzMzODUsIGFu ZCByMTMzMzk0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCA0M2I5OWIzZDMyZjY2NDBiM2MxZjRiYzZkNzY3 ZjUxZDkwNzliYzMxLi5kN2RkOTM3ZGZhYzI0MzMyOTg0MDg4YWZlMDM5MmM0YTM5YjVhYzFhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTExLTA1ICBBbGxhbiBTYW5kZmVs ZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtRdF0gT3BlbiBs aW5rIGluIHRoaXMgd2luZG93IGFjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTAxMjI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkcyB0aGUgZ2x1ZSB0byBleGVjdXRlIGFuZCBleHBvcnQgdGhl IG5ldyBjb250ZXh0IG1lbnUgYWN0aW9uLgorCisgICAgICAgICogQXBpL3F3ZWJwYWdlLmNwcDoK KyAgICAgICAgKHdlYkFjdGlvbkZvckNvbnRleHRNZW51QWN0aW9uKToKKyAgICAgICAgKFFXZWJQ YWdlOjp0cmlnZ2VyQWN0aW9uKToKKyAgICAgICAgKFFXZWJQYWdlOjphY3Rpb24pOgorICAgICAg ICAqIEFwaS9xd2VicGFnZS5oOgorCiAyMDEyLTExLTAxICBTdGVwaGVuIFdoaXRlICA8c2Vub3Ji bGFuY29AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIx MzMxNDMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29udHJv bGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5jcHAK aW5kZXggZWFlNGJmZjQzMzkzNGYxNDZlYTU1NWQ1OTEwOGNjMGEyYjVhYTYyYy4uMTc5OGYwNzNm NTA2NDNhMzYyNTUzZWU4NjVmYWQxMDBlZWI4YmY1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvQ29udGV4dE1lbnVDb250cm9sbGVyLmNwcApAQCAtMzY4LDYgKzM2OCw5IEBAIHZvaWQgQ29u dGV4dE1lbnVDb250cm9sbGVyOjpjb250ZXh0TWVudUl0ZW1TZWxlY3RlZChDb250ZXh0TWVudUl0 ZW0qIGl0ZW0pCiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIG9wZW5OZXdXaW5kb3cobV9oaXRU ZXN0UmVzdWx0LmFic29sdXRlTGlua1VSTCgpLCBmcmFtZSk7CiAgICAgICAgIGJyZWFrOworICAg IGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnT3BlbkxpbmtJblRoaXNXaW5kb3c6CisgICAgICAgIGZy YW1lLT5sb2FkZXIoKS0+bG9hZEZyYW1lUmVxdWVzdChGcmFtZUxvYWRSZXF1ZXN0KGZyYW1lLT5k b2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLCBSZXNvdXJjZVJlcXVlc3QobV9oaXRUZXN0UmVz dWx0LmFic29sdXRlTGlua1VSTCgpLCBmcmFtZS0+bG9hZGVyKCktPm91dGdvaW5nUmVmZXJyZXIo KSkpLCBmYWxzZSwgZmFsc2UsIDAsIDAsIE1heWJlU2VuZFJlZmVycmVyKTsKKyAgICAgICAgYnJl YWs7CiAgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdCb2xkOgogICAgICAgICBmcmFtZS0+ZWRp dG9yKCktPmNvbW1hbmQoIlRvZ2dsZUJvbGQiKS5leGVjdXRlKCk7CiAgICAgICAgIGJyZWFrOwpA QCAtNzIwLDcgKzcyMywxMSBAQCB2b2lkIENvbnRleHRNZW51Q29udHJvbGxlcjo6cG9wdWxhdGUo KQogICAgIENvbnRleHRNZW51SXRlbSBPcGVuTGlua0l0ZW0oQWN0aW9uVHlwZSwgQ29udGV4dE1l bnVJdGVtVGFnT3BlbkxpbmssIGNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rKCkpOwogICAgIENv bnRleHRNZW51SXRlbSBPcGVuTGlua0luTmV3V2luZG93SXRlbShBY3Rpb25UeXBlLCBDb250ZXh0 TWVudUl0ZW1UYWdPcGVuTGlua0luTmV3V2luZG93LCAKICAgICAgICAgY29udGV4dE1lbnVJdGVt VGFnT3BlbkxpbmtJbk5ld1dpbmRvdygpKTsKLSAgICBDb250ZXh0TWVudUl0ZW0gRG93bmxvYWRG aWxlSXRlbShBY3Rpb25UeXBlLCBDb250ZXh0TWVudUl0ZW1UYWdEb3dubG9hZExpbmtUb0Rpc2ss IAorI2lmIFBMQVRGT1JNKFFUKQorICAgIENvbnRleHRNZW51SXRlbSBPcGVuTGlua0luVGhpc1dp bmRvd0l0ZW0oQWN0aW9uVHlwZSwgQ29udGV4dE1lbnVJdGVtVGFnT3BlbkxpbmtJblRoaXNXaW5k b3csCisgICAgICAgIGNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rSW5UaGlzV2luZG93KCkpOwor I2VuZGlmCisgICAgQ29udGV4dE1lbnVJdGVtIERvd25sb2FkRmlsZUl0ZW0oQWN0aW9uVHlwZSwg Q29udGV4dE1lbnVJdGVtVGFnRG93bmxvYWRMaW5rVG9EaXNrLAogICAgICAgICBjb250ZXh0TWVu dUl0ZW1UYWdEb3dubG9hZExpbmtUb0Rpc2soKSk7CiAgICAgQ29udGV4dE1lbnVJdGVtIENvcHlM aW5rSXRlbShBY3Rpb25UeXBlLCBDb250ZXh0TWVudUl0ZW1UYWdDb3B5TGlua1RvQ2xpcGJvYXJk LCAKICAgICAgICAgY29udGV4dE1lbnVJdGVtVGFnQ29weUxpbmtUb0NsaXBib2FyZCgpKTsKQEAg LTc5NCw3ICs4MDEsMTQgQEAgdm9pZCBDb250ZXh0TWVudUNvbnRyb2xsZXI6OnBvcHVsYXRlKCkK ICAgICAgICAgS1VSTCBsaW5rVVJMID0gbV9oaXRUZXN0UmVzdWx0LmFic29sdXRlTGlua1VSTCgp OwogICAgICAgICBpZiAoIWxpbmtVUkwuaXNFbXB0eSgpKSB7CiAgICAgICAgICAgICBpZiAobG9h ZGVyLT5jbGllbnQoKS0+Y2FuSGFuZGxlUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QobGlua1VSTCkp KSB7CisjaWYgUExBVEZPUk0oUVQpCisgICAgICAgICAgICAgICAgaWYgKG1faGl0VGVzdFJlc3Vs dC50YXJnZXRGcmFtZSgpID09IGZyYW1lKQorICAgICAgICAgICAgICAgICAgICBhcHBlbmRJdGVt KE9wZW5MaW5rSXRlbSwgbV9jb250ZXh0TWVudS5nZXQoKSk7CisgICAgICAgICAgICAgICAgZWxz ZQorICAgICAgICAgICAgICAgICAgICBhcHBlbmRJdGVtKE9wZW5MaW5rSW5UaGlzV2luZG93SXRl bSwgbV9jb250ZXh0TWVudS5nZXQoKSk7CisjZWxzZQogICAgICAgICAgICAgICAgIGFwcGVuZEl0 ZW0oT3BlbkxpbmtJdGVtLCBtX2NvbnRleHRNZW51LmdldCgpKTsKKyNlbmRpZgogICAgICAgICAg ICAgICAgIGFwcGVuZEl0ZW0oT3BlbkxpbmtJbk5ld1dpbmRvd0l0ZW0sIG1fY29udGV4dE1lbnUu Z2V0KCkpOwogICAgICAgICAgICAgICAgIGFwcGVuZEl0ZW0oRG93bmxvYWRGaWxlSXRlbSwgbV9j b250ZXh0TWVudS5nZXQoKSk7CiAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9Db250ZXh0TWVudUl0ZW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L0NvbnRleHRNZW51SXRlbS5oCmluZGV4IGY1ZDkzNWE1YTJlNDRlOGM2Yjg5YjNjYWExZTkyNDIx M2I4NzUwNGIuLjhkMTk3MWY3ZWJhMzI3MjljNDI5ZjM2Zjc3MWY0NGFmMTMwNTJlZDQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0NvbnRleHRNZW51SXRlbS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL0NvbnRleHRNZW51SXRlbS5oCkBAIC0xNjQsNiArMTY0LDcg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBDb250ZXh0TWVudUl0ZW1UYWdNZWRpYVBs YXlQYXVzZSwKICAgICAgICAgQ29udGV4dE1lbnVJdGVtVGFnTWVkaWFNdXRlLAogICAgICAgICBD b250ZXh0TWVudUl0ZW1UYWdEaWN0YXRpb25BbHRlcm5hdGl2ZSwKKyAgICAgICAgQ29udGV4dE1l bnVJdGVtVGFnT3BlbkxpbmtJblRoaXNXaW5kb3csCiAgICAgICAgIENvbnRleHRNZW51SXRlbUJh c2VDdXN0b21UYWcgPSA1MDAwLAogICAgICAgICBDb250ZXh0TWVudUl0ZW1DdXN0b21UYWdOb0Fj dGlvbiA9IDU5OTgsCiAgICAgICAgIENvbnRleHRNZW51SXRlbUxhc3RDdXN0b21UYWcgPSA1OTk5 LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9jYWxpemVkU3RyaW5ncy5o IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9jYWxpemVkU3RyaW5ncy5oCmluZGV4IDk2MDJl MWY5MGMwNmUxMzIzOWQ4NTc0Y2EyNzMyNDNkOGUwNzZlZDYuLmJjZDIyYzQ2YzMxZTVjN2FhYWRm ODNlOTI3MmE2ZTQ3ZjMyZDQ3YWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L0xvY2FsaXplZFN0cmluZ3MuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2NhbGl6 ZWRTdHJpbmdzLmgKQEAgLTQ5LDYgKzQ5LDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAjaWYg RU5BQkxFKENPTlRFWFRfTUVOVVMpCiAgICAgU3RyaW5nIGNvbnRleHRNZW51SXRlbVRhZ09wZW5M aW5rSW5OZXdXaW5kb3coKTsKKyNpZiBQTEFURk9STShRVCkKKyAgICBTdHJpbmcgY29udGV4dE1l bnVJdGVtVGFnT3BlbkxpbmtJblRoaXNXaW5kb3coKTsKKyNlbmRpZgogICAgIFN0cmluZyBjb250 ZXh0TWVudUl0ZW1UYWdEb3dubG9hZExpbmtUb0Rpc2soKTsKICAgICBTdHJpbmcgY29udGV4dE1l bnVJdGVtVGFnQ29weUxpbmtUb0NsaXBib2FyZCgpOwogICAgIFN0cmluZyBjb250ZXh0TWVudUl0 ZW1UYWdPcGVuSW1hZ2VJbk5ld1dpbmRvdygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vcXQvTG9jYWxpemVkU3RyaW5nc1F0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3F0L0xvY2FsaXplZFN0cmluZ3NRdC5jcHAKaW5kZXggMGNkY2UzYTg1MzQxNDUxYzgyMTgz M2M5ZTZkZWNjZGQ4OTUwYzkzYi4uN2RmZmYxZmU5OGY4ZDU4ZjRjZTZiNjg3NjcwYWJkNzMxYzY1 YzFjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvTG9jYWxpemVkU3Ry aW5nc1F0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9Mb2NhbGl6ZWRTdHJp bmdzUXQuY3BwCkBAIC04OCw2ICs4OCwxMSBAQCBTdHJpbmcgY29udGV4dE1lbnVJdGVtVGFnT3Bl bkxpbmtJbk5ld1dpbmRvdygpCiAgICAgcmV0dXJuIFFDb3JlQXBwbGljYXRpb246OnRyYW5zbGF0 ZSgiUVdlYlBhZ2UiLCAiT3BlbiBpbiBOZXcgV2luZG93IiwgIk9wZW4gaW4gTmV3IFdpbmRvdyBj b250ZXh0IG1lbnUgaXRlbSIpOwogfQogCitTdHJpbmcgY29udGV4dE1lbnVJdGVtVGFnT3Blbkxp bmtJblRoaXNXaW5kb3coKQoreworICAgIHJldHVybiBRQ29yZUFwcGxpY2F0aW9uOjp0cmFuc2xh dGUoIlFXZWJQYWdlIiwgIk9wZW4gaW4gVGhpcyBXaW5kb3ciLCAiT3BlbiBpbiBUaGlzIFdpbmRv dyBjb250ZXh0IG1lbnUgaXRlbSIpOworfQorCiBTdHJpbmcgY29udGV4dE1lbnVJdGVtVGFnRG93 bmxvYWRMaW5rVG9EaXNrKCkKIHsKICAgICByZXR1cm4gUUNvcmVBcHBsaWNhdGlvbjo6dHJhbnNs YXRlKCJRV2ViUGFnZSIsICJTYXZlIExpbmsuLi4iLCAiRG93bmxvYWQgTGlua2VkIEZpbGUgY29u dGV4dCBtZW51IGl0ZW0iKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJw YWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAppbmRleCBjMmM5ODIz Zjk5Y2JjZTcyYjAzZDdiYzhlYjVkNmFkMzI4ODUyODkyLi4wM2RmYWU2Mzg3NjkzMDBiNzk1NTA4 YzI0MDQ4YmQ5MjJkOTUyNDk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2Vi cGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCkBAIC00MzYs NiArNDM2LDcgQEAgc3RhdGljIFFXZWJQYWdlOjpXZWJBY3Rpb24gd2ViQWN0aW9uRm9yQ29udGV4 dE1lbnVBY3Rpb24oV2ViQ29yZTo6Q29udGV4dE1lbnVBY3QKICAgICBzd2l0Y2ggKGFjdGlvbikg ewogICAgICAgICBjYXNlIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rOiByZXR1 cm4gUVdlYlBhZ2U6Ok9wZW5MaW5rOwogICAgICAgICBjYXNlIFdlYkNvcmU6OkNvbnRleHRNZW51 SXRlbVRhZ09wZW5MaW5rSW5OZXdXaW5kb3c6IHJldHVybiBRV2ViUGFnZTo6T3BlbkxpbmtJbk5l d1dpbmRvdzsKKyAgICAgICAgY2FzZSBXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlu a0luVGhpc1dpbmRvdzogcmV0dXJuIFFXZWJQYWdlOjpPcGVuTGlua0luVGhpc1dpbmRvdzsKICAg ICAgICAgY2FzZSBXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW1UYWdEb3dubG9hZExpbmtUb0Rpc2s6 IHJldHVybiBRV2ViUGFnZTo6RG93bmxvYWRMaW5rVG9EaXNrOwogICAgICAgICBjYXNlIFdlYkNv cmU6OkNvbnRleHRNZW51SXRlbVRhZ0NvcHlMaW5rVG9DbGlwYm9hcmQ6IHJldHVybiBRV2ViUGFn ZTo6Q29weUxpbmtUb0NsaXBib2FyZDsKICAgICAgICAgY2FzZSBXZWJDb3JlOjpDb250ZXh0TWVu dUl0ZW1UYWdPcGVuSW1hZ2VJbk5ld1dpbmRvdzogcmV0dXJuIFFXZWJQYWdlOjpPcGVuSW1hZ2VJ bk5ld1dpbmRvdzsKQEAgLTIzNjcsNiArMjM2OCwxMCBAQCB2b2lkIFFXZWJQYWdlOjp0cmlnZ2Vy QWN0aW9uKFdlYkFjdGlvbiBhY3Rpb24sIGJvb2wpCiAgICAgICAgIGNhc2UgT3BlbkxpbmtJbk5l d1dpbmRvdzoKICAgICAgICAgICAgIG9wZW5OZXdXaW5kb3coZC0+aGl0VGVzdFJlc3VsdC5saW5r VXJsKCksIGZyYW1lKTsKICAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIE9wZW5MaW5r SW5UaGlzV2luZG93OgorICAgICAgICAgICAgZnJhbWUtPmxvYWRlcigpLT5sb2FkRnJhbWVSZXF1 ZXN0KGZyYW1lTG9hZFJlcXVlc3QoZC0+aGl0VGVzdFJlc3VsdC5saW5rVXJsKCksIGZyYW1lKSwK KyAgICAgICAgICAgICAgICAvKmxvY2tIaXN0b3J5Ki8gZmFsc2UsIC8qbG9ja0JhY2tGb3J3YXJk TGlzdCovIGZhbHNlLCAvKmV2ZW50Ki8gMCwgLypGb3JtU3RhdGUqLyAwLCBNYXliZVNlbmRSZWZl cnJlcik7CisgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBPcGVuRnJhbWVJbk5ld1dp bmRvdzogewogICAgICAgICAgICAgS1VSTCB1cmwgPSBmcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50 TG9hZGVyKCktPnVucmVhY2hhYmxlVVJMKCk7CiAgICAgICAgICAgICBpZiAodXJsLmlzRW1wdHko KSkKQEAgLTI3ODgsNyArMjc5Myw5IEBAIFFBY3Rpb24gKlFXZWJQYWdlOjphY3Rpb24oV2ViQWN0 aW9uIGFjdGlvbikgY29uc3QKICAgICAgICAgY2FzZSBPcGVuRnJhbWVJbk5ld1dpbmRvdzoKICAg ICAgICAgICAgIHRleHQgPSBjb250ZXh0TWVudUl0ZW1UYWdPcGVuRnJhbWVJbk5ld1dpbmRvdygp OwogICAgICAgICAgICAgYnJlYWs7Ci0KKyAgICAgICAgY2FzZSBPcGVuTGlua0luVGhpc1dpbmRv dzoKKyAgICAgICAgICAgIHRleHQgPSBjb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlua0luVGhpc1dp bmRvdygpOworICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgRG93bmxvYWRMaW5rVG9E aXNrOgogICAgICAgICAgICAgdGV4dCA9IGNvbnRleHRNZW51SXRlbVRhZ0Rvd25sb2FkTGlua1Rv RGlzaygpOwogICAgICAgICAgICAgYnJlYWs7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0FwaS9xd2VicGFnZS5oIGIvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuaAppbmRleCA2 NmY4OTYwOWIwMDM4NGNiYWY5YTkwZTE2MGQ5ZDdiMTcwZDBkMDUyLi42NzI4MTk3ZWQ2MTVjY2I0 ODIwZjhlMTg5OWI2Y2U1NjUzMGNlMzkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0Fw aS9xd2VicGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmgKQEAgLTk3 LDYgKzk3LDcgQEAgcHVibGljOgogICAgICAgICBPcGVuTGluaywKIAogICAgICAgICBPcGVuTGlu a0luTmV3V2luZG93LAorICAgICAgICBPcGVuTGlua0luVGhpc1dpbmRvdywKICAgICAgICAgT3Bl bkZyYW1lSW5OZXdXaW5kb3csCiAKICAgICAgICAgRG93bmxvYWRMaW5rVG9EaXNrLAo= 172351 2012-11-05 09:11:31 -0800 2012-11-06 03:43:02 -0800 Patch bug-101226-20121105180922.patch text/plain 9385 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzNDUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDc5YmRlYmEzMWY1NTc3 NDQ5OTIyNDIxMTVlMGM0MmYwMjI2ODJjZi4uZTA1YWFjOTg2ODc4ODFmZjZiMmY0NTMwNDM0MWE0 MjNjNmEyY2ZmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTExLTA1ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gT3BlbiBsaW5rIGluIHRoaXMgd2luZG93IGFjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxMjI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkcyB0aGUgYWN0aW9uIGFuZCBwb3B1bGF0ZXMg dGhlIGNvbnRleHQtbWVudSB3aXRoIGl0IHdoZW4gdGhlIHVzZXIgaGl0cyBsaW5rIHRvIGEgbmV3 IGZyYW1lLgorCisgICAgICAgICogcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Q29udGV4dE1lbnVDb250cm9sbGVyOjpjb250ZXh0TWVudUl0ZW1TZWxl Y3RlZCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZXh0TWVudUNvbnRyb2xsZXI6OnBvcHVsYXRl KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRleHRNZW51Q29udHJvbGxlcjo6Y2hlY2tPckVuYWJs ZUlmTmVlZGVkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9Db250ZXh0TWVudUl0ZW0uaDoKKyAgICAg ICAgKiBwbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmg6CisgICAgICAgICogcGxhdGZvcm0vcXQv TG9jYWxpemVkU3RyaW5nc1F0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNvbnRleHRNZW51SXRl bVRhZ09wZW5MaW5rSW5UaGlzV2luZG93KToKKwogMjAxMi0xMS0wNSAgU2hlcmlmZiBCb3QgIDx3 ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGlu ZyBvdXQgcjEzMzI4NiwgcjEzMzM4NSwgYW5kIHIxMzMzOTQuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L3F0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDQz Yjk5YjNkMzJmNjY0MGIzYzFmNGJjNmQ3NjdmNTFkOTA3OWJjMzEuLmQ3ZGQ5MzdkZmFjMjQzMzI5 ODQwODhhZmUwMzkyYzRhMzliNWFjMWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAK KzIwMTItMTEtMDUgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFsbGFuLmplbnNlbkBkaWdpYS5j b20+CisKKyAgICAgICAgW1F0XSBPcGVuIGxpbmsgaW4gdGhpcyB3aW5kb3cgYWN0aW9uCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDEyMjYKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRzIHRoZSBnbHVl IHRvIGV4ZWN1dGUgYW5kIGV4cG9ydCB0aGUgbmV3IGNvbnRleHQgbWVudSBhY3Rpb24uCisKKyAg ICAgICAgKiBBcGkvcXdlYnBhZ2UuY3BwOgorICAgICAgICAod2ViQWN0aW9uRm9yQ29udGV4dE1l bnVBY3Rpb24pOgorICAgICAgICAoUVdlYlBhZ2U6OnRyaWdnZXJBY3Rpb24pOgorICAgICAgICAo UVdlYlBhZ2U6OmFjdGlvbik6CisgICAgICAgICogQXBpL3F3ZWJwYWdlLmg6CisKIDIwMTItMTEt MDEgIFN0ZXBoZW4gV2hpdGUgIDxzZW5vcmJsYW5jb0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg VW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEzMzE0My4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvQ29udGV4dE1lbnVDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv Q29udGV4dE1lbnVDb250cm9sbGVyLmNwcAppbmRleCBlYWU0YmZmNDMzOTM0ZjE0NmVhNTU1ZDU5 MTA4Y2MwYTJiNWFhNjJjLi5iMjllYjYzYjYxYTNmZGQ3YTM4Nzc5NTZlYzZiODMzMmI0MjFjYmYy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwCkBA IC0zNjgsNiArMzY4LDkgQEAgdm9pZCBDb250ZXh0TWVudUNvbnRyb2xsZXI6OmNvbnRleHRNZW51 SXRlbVNlbGVjdGVkKENvbnRleHRNZW51SXRlbSogaXRlbSkKICAgICAgICAgZWxzZQogICAgICAg ICAgICAgb3Blbk5ld1dpbmRvdyhtX2hpdFRlc3RSZXN1bHQuYWJzb2x1dGVMaW5rVVJMKCksIGZy YW1lKTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlu a0luVGhpc1dpbmRvdzoKKyAgICAgICAgZnJhbWUtPmxvYWRlcigpLT5sb2FkRnJhbWVSZXF1ZXN0 KEZyYW1lTG9hZFJlcXVlc3QoZnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCksIFJl c291cmNlUmVxdWVzdChtX2hpdFRlc3RSZXN1bHQuYWJzb2x1dGVMaW5rVVJMKCksIGZyYW1lLT5s b2FkZXIoKS0+b3V0Z29pbmdSZWZlcnJlcigpKSksIGZhbHNlLCBmYWxzZSwgMCwgMCwgTWF5YmVT ZW5kUmVmZXJyZXIpOworICAgICAgICBicmVhazsKICAgICBjYXNlIENvbnRleHRNZW51SXRlbVRh Z0JvbGQ6CiAgICAgICAgIGZyYW1lLT5lZGl0b3IoKS0+Y29tbWFuZCgiVG9nZ2xlQm9sZCIpLmV4 ZWN1dGUoKTsKICAgICAgICAgYnJlYWs7CkBAIC03MjAsNyArNzIzLDExIEBAIHZvaWQgQ29udGV4 dE1lbnVDb250cm9sbGVyOjpwb3B1bGF0ZSgpCiAgICAgQ29udGV4dE1lbnVJdGVtIE9wZW5MaW5r SXRlbShBY3Rpb25UeXBlLCBDb250ZXh0TWVudUl0ZW1UYWdPcGVuTGluaywgY29udGV4dE1lbnVJ dGVtVGFnT3BlbkxpbmsoKSk7CiAgICAgQ29udGV4dE1lbnVJdGVtIE9wZW5MaW5rSW5OZXdXaW5k b3dJdGVtKEFjdGlvblR5cGUsIENvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rSW5OZXdXaW5kb3cs IAogICAgICAgICBjb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlua0luTmV3V2luZG93KCkpOwotICAg IENvbnRleHRNZW51SXRlbSBEb3dubG9hZEZpbGVJdGVtKEFjdGlvblR5cGUsIENvbnRleHRNZW51 SXRlbVRhZ0Rvd25sb2FkTGlua1RvRGlzaywgCisjaWYgUExBVEZPUk0oUVQpCisgICAgQ29udGV4 dE1lbnVJdGVtIE9wZW5MaW5rSW5UaGlzV2luZG93SXRlbShBY3Rpb25UeXBlLCBDb250ZXh0TWVu dUl0ZW1UYWdPcGVuTGlua0luVGhpc1dpbmRvdywKKyAgICAgICAgY29udGV4dE1lbnVJdGVtVGFn T3BlbkxpbmtJblRoaXNXaW5kb3coKSk7CisjZW5kaWYKKyAgICBDb250ZXh0TWVudUl0ZW0gRG93 bmxvYWRGaWxlSXRlbShBY3Rpb25UeXBlLCBDb250ZXh0TWVudUl0ZW1UYWdEb3dubG9hZExpbmtU b0Rpc2ssCiAgICAgICAgIGNvbnRleHRNZW51SXRlbVRhZ0Rvd25sb2FkTGlua1RvRGlzaygpKTsK ICAgICBDb250ZXh0TWVudUl0ZW0gQ29weUxpbmtJdGVtKEFjdGlvblR5cGUsIENvbnRleHRNZW51 SXRlbVRhZ0NvcHlMaW5rVG9DbGlwYm9hcmQsIAogICAgICAgICBjb250ZXh0TWVudUl0ZW1UYWdD b3B5TGlua1RvQ2xpcGJvYXJkKCkpOwpAQCAtNzk0LDcgKzgwMSwxNCBAQCB2b2lkIENvbnRleHRN ZW51Q29udHJvbGxlcjo6cG9wdWxhdGUoKQogICAgICAgICBLVVJMIGxpbmtVUkwgPSBtX2hpdFRl c3RSZXN1bHQuYWJzb2x1dGVMaW5rVVJMKCk7CiAgICAgICAgIGlmICghbGlua1VSTC5pc0VtcHR5 KCkpIHsKICAgICAgICAgICAgIGlmIChsb2FkZXItPmNsaWVudCgpLT5jYW5IYW5kbGVSZXF1ZXN0 KFJlc291cmNlUmVxdWVzdChsaW5rVVJMKSkpIHsKKyNpZiBQTEFURk9STShRVCkKKyAgICAgICAg ICAgICAgICBpZiAobV9oaXRUZXN0UmVzdWx0LnRhcmdldEZyYW1lKCkgPT0gZnJhbWUpCisgICAg ICAgICAgICAgICAgICAgIGFwcGVuZEl0ZW0oT3BlbkxpbmtJdGVtLCBtX2NvbnRleHRNZW51Lmdl dCgpKTsKKyAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgIGFwcGVuZEl0 ZW0oT3BlbkxpbmtJblRoaXNXaW5kb3dJdGVtLCBtX2NvbnRleHRNZW51LmdldCgpKTsKKyNlbHNl CiAgICAgICAgICAgICAgICAgYXBwZW5kSXRlbShPcGVuTGlua0l0ZW0sIG1fY29udGV4dE1lbnUu Z2V0KCkpOworI2VuZGlmCiAgICAgICAgICAgICAgICAgYXBwZW5kSXRlbShPcGVuTGlua0luTmV3 V2luZG93SXRlbSwgbV9jb250ZXh0TWVudS5nZXQoKSk7CiAgICAgICAgICAgICAgICAgYXBwZW5k SXRlbShEb3dubG9hZEZpbGVJdGVtLCBtX2NvbnRleHRNZW51LmdldCgpKTsKICAgICAgICAgICAg IH0KQEAgLTEyOTcsNiArMTMxMSw3IEBAIHZvaWQgQ29udGV4dE1lbnVDb250cm9sbGVyOjpjaGVj a09yRW5hYmxlSWZOZWVkZWQoQ29udGV4dE1lbnVJdGVtJiBpdGVtKSBjb25zdAogI2VuZGlmCiAg ICAgICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnTm9BY3Rpb246CiAgICAgICAgIGNhc2UgQ29u dGV4dE1lbnVJdGVtVGFnT3BlbkxpbmtJbk5ld1dpbmRvdzoKKyAgICAgICAgY2FzZSBDb250ZXh0 TWVudUl0ZW1UYWdPcGVuTGlua0luVGhpc1dpbmRvdzoKICAgICAgICAgY2FzZSBDb250ZXh0TWVu dUl0ZW1UYWdEb3dubG9hZExpbmtUb0Rpc2s6CiAgICAgICAgIGNhc2UgQ29udGV4dE1lbnVJdGVt VGFnQ29weUxpbmtUb0NsaXBib2FyZDoKICAgICAgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdP cGVuSW1hZ2VJbk5ld1dpbmRvdzoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L0NvbnRleHRNZW51SXRlbS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29udGV4dE1lbnVJ dGVtLmgKaW5kZXggZjVkOTM1YTVhMmU0NGU4YzZiODliM2NhYTFlOTI0MjEzYjg3NTA0Yi4uOGQx OTcxZjdlYmEzMjcyOWM0MjlmMzZmNzcxZjQ0YWYxMzA1MmVkNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vQ29udGV4dE1lbnVJdGVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vQ29udGV4dE1lbnVJdGVtLmgKQEAgLTE2NCw2ICsxNjQsNyBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAgICAgICAgIENvbnRleHRNZW51SXRlbVRhZ01lZGlhUGxheVBhdXNlLAogICAg ICAgICBDb250ZXh0TWVudUl0ZW1UYWdNZWRpYU11dGUsCiAgICAgICAgIENvbnRleHRNZW51SXRl bVRhZ0RpY3RhdGlvbkFsdGVybmF0aXZlLAorICAgICAgICBDb250ZXh0TWVudUl0ZW1UYWdPcGVu TGlua0luVGhpc1dpbmRvdywKICAgICAgICAgQ29udGV4dE1lbnVJdGVtQmFzZUN1c3RvbVRhZyA9 IDUwMDAsCiAgICAgICAgIENvbnRleHRNZW51SXRlbUN1c3RvbVRhZ05vQWN0aW9uID0gNTk5OCwK ICAgICAgICAgQ29udGV4dE1lbnVJdGVtTGFzdEN1c3RvbVRhZyA9IDU5OTksCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmgKaW5kZXggOTYwMmUxZjkwYzA2ZTEzMjM5 ZDg1NzRjYTI3MzI0M2Q4ZTA3NmVkNi4uYmNkMjJjNDZjMzFlNWM3YWFhZGY4M2U5MjcyYTZlNDdm MzJkNDdhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9jYWxpemVkU3Ry aW5ncy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuaApA QCAtNDksNiArNDksOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICNpZiBFTkFCTEUoQ09OVEVY VF9NRU5VUykKICAgICBTdHJpbmcgY29udGV4dE1lbnVJdGVtVGFnT3BlbkxpbmtJbk5ld1dpbmRv dygpOworI2lmIFBMQVRGT1JNKFFUKQorICAgIFN0cmluZyBjb250ZXh0TWVudUl0ZW1UYWdPcGVu TGlua0luVGhpc1dpbmRvdygpOworI2VuZGlmCiAgICAgU3RyaW5nIGNvbnRleHRNZW51SXRlbVRh Z0Rvd25sb2FkTGlua1RvRGlzaygpOwogICAgIFN0cmluZyBjb250ZXh0TWVudUl0ZW1UYWdDb3B5 TGlua1RvQ2xpcGJvYXJkKCk7CiAgICAgU3RyaW5nIGNvbnRleHRNZW51SXRlbVRhZ09wZW5JbWFn ZUluTmV3V2luZG93KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9M b2NhbGl6ZWRTdHJpbmdzUXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvTG9jYWxp emVkU3RyaW5nc1F0LmNwcAppbmRleCAwY2RjZTNhODUzNDE0NTFjODIxODMzYzllNmRlY2NkZDg5 NTBjOTNiLi43ZGZmZjFmZTk4ZjhkNThmNGNlNmI2ODc2NzBhYmQ3MzFjNjVjMWNhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9Mb2NhbGl6ZWRTdHJpbmdzUXQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L0xvY2FsaXplZFN0cmluZ3NRdC5jcHAKQEAg LTg4LDYgKzg4LDExIEBAIFN0cmluZyBjb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlua0luTmV3V2lu ZG93KCkKICAgICByZXR1cm4gUUNvcmVBcHBsaWNhdGlvbjo6dHJhbnNsYXRlKCJRV2ViUGFnZSIs ICJPcGVuIGluIE5ldyBXaW5kb3ciLCAiT3BlbiBpbiBOZXcgV2luZG93IGNvbnRleHQgbWVudSBp dGVtIik7CiB9CiAKK1N0cmluZyBjb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlua0luVGhpc1dpbmRv dygpCit7CisgICAgcmV0dXJuIFFDb3JlQXBwbGljYXRpb246OnRyYW5zbGF0ZSgiUVdlYlBhZ2Ui LCAiT3BlbiBpbiBUaGlzIFdpbmRvdyIsICJPcGVuIGluIFRoaXMgV2luZG93IGNvbnRleHQgbWVu dSBpdGVtIik7Cit9CisKIFN0cmluZyBjb250ZXh0TWVudUl0ZW1UYWdEb3dubG9hZExpbmtUb0Rp c2soKQogewogICAgIHJldHVybiBRQ29yZUFwcGxpY2F0aW9uOjp0cmFuc2xhdGUoIlFXZWJQYWdl IiwgIlNhdmUgTGluay4uLiIsICJEb3dubG9hZCBMaW5rZWQgRmlsZSBjb250ZXh0IG1lbnUgaXRl bSIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwIGIvU291 cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCmluZGV4IGMyYzk4MjNmOTljYmNlNzJiMDNk N2JjOGViNWQ2YWQzMjg4NTI4OTIuLjAzZGZhZTYzODc2OTMwMGI3OTU1MDhjMjQwNDhiZDkyMmQ5 NTI0OTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKQEAgLTQzNiw2ICs0MzYsNyBAQCBz dGF0aWMgUVdlYlBhZ2U6OldlYkFjdGlvbiB3ZWJBY3Rpb25Gb3JDb250ZXh0TWVudUFjdGlvbihX ZWJDb3JlOjpDb250ZXh0TWVudUFjdAogICAgIHN3aXRjaCAoYWN0aW9uKSB7CiAgICAgICAgIGNh c2UgV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVtVGFnT3Blbkxpbms6IHJldHVybiBRV2ViUGFnZTo6 T3Blbkxpbms7CiAgICAgICAgIGNhc2UgV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVtVGFnT3Blbkxp bmtJbk5ld1dpbmRvdzogcmV0dXJuIFFXZWJQYWdlOjpPcGVuTGlua0luTmV3V2luZG93OworICAg ICAgICBjYXNlIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rSW5UaGlzV2luZG93 OiByZXR1cm4gUVdlYlBhZ2U6Ok9wZW5MaW5rSW5UaGlzV2luZG93OwogICAgICAgICBjYXNlIFdl YkNvcmU6OkNvbnRleHRNZW51SXRlbVRhZ0Rvd25sb2FkTGlua1RvRGlzazogcmV0dXJuIFFXZWJQ YWdlOjpEb3dubG9hZExpbmtUb0Rpc2s7CiAgICAgICAgIGNhc2UgV2ViQ29yZTo6Q29udGV4dE1l bnVJdGVtVGFnQ29weUxpbmtUb0NsaXBib2FyZDogcmV0dXJuIFFXZWJQYWdlOjpDb3B5TGlua1Rv Q2xpcGJvYXJkOwogICAgICAgICBjYXNlIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbVRhZ09wZW5J bWFnZUluTmV3V2luZG93OiByZXR1cm4gUVdlYlBhZ2U6Ok9wZW5JbWFnZUluTmV3V2luZG93OwpA QCAtMjM2Nyw2ICsyMzY4LDEwIEBAIHZvaWQgUVdlYlBhZ2U6OnRyaWdnZXJBY3Rpb24oV2ViQWN0 aW9uIGFjdGlvbiwgYm9vbCkKICAgICAgICAgY2FzZSBPcGVuTGlua0luTmV3V2luZG93OgogICAg ICAgICAgICAgb3Blbk5ld1dpbmRvdyhkLT5oaXRUZXN0UmVzdWx0LmxpbmtVcmwoKSwgZnJhbWUp OwogICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgT3BlbkxpbmtJblRoaXNXaW5kb3c6 CisgICAgICAgICAgICBmcmFtZS0+bG9hZGVyKCktPmxvYWRGcmFtZVJlcXVlc3QoZnJhbWVMb2Fk UmVxdWVzdChkLT5oaXRUZXN0UmVzdWx0LmxpbmtVcmwoKSwgZnJhbWUpLAorICAgICAgICAgICAg ICAgIC8qbG9ja0hpc3RvcnkqLyBmYWxzZSwgLypsb2NrQmFja0ZvcndhcmRMaXN0Ki8gZmFsc2Us IC8qZXZlbnQqLyAwLCAvKkZvcm1TdGF0ZSovIDAsIE1heWJlU2VuZFJlZmVycmVyKTsKKyAgICAg ICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIE9wZW5GcmFtZUluTmV3V2luZG93OiB7CiAgICAg ICAgICAgICBLVVJMIHVybCA9IGZyYW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+dW5y ZWFjaGFibGVVUkwoKTsKICAgICAgICAgICAgIGlmICh1cmwuaXNFbXB0eSgpKQpAQCAtMjc4OCw3 ICsyNzkzLDkgQEAgUUFjdGlvbiAqUVdlYlBhZ2U6OmFjdGlvbihXZWJBY3Rpb24gYWN0aW9uKSBj b25zdAogICAgICAgICBjYXNlIE9wZW5GcmFtZUluTmV3V2luZG93OgogICAgICAgICAgICAgdGV4 dCA9IGNvbnRleHRNZW51SXRlbVRhZ09wZW5GcmFtZUluTmV3V2luZG93KCk7CiAgICAgICAgICAg ICBicmVhazsKLQorICAgICAgICBjYXNlIE9wZW5MaW5rSW5UaGlzV2luZG93OgorICAgICAgICAg ICAgdGV4dCA9IGNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rSW5UaGlzV2luZG93KCk7CisgICAg ICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBEb3dubG9hZExpbmtUb0Rpc2s6CiAgICAgICAg ICAgICB0ZXh0ID0gY29udGV4dE1lbnVJdGVtVGFnRG93bmxvYWRMaW5rVG9EaXNrKCk7CiAgICAg ICAgICAgICBicmVhazsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdl LmggYi9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5oCmluZGV4IDY2Zjg5NjA5YjAwMzg0 Y2JhZjlhOTBlMTYwZDlkN2IxNzBkMGQwNTIuLjY3MjgxOTdlZDYxNWNjYjQ4MjBmOGUxODk5YjZj ZTU2NTMwY2UzOTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmgK KysrIGIvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuaApAQCAtOTcsNiArOTcsNyBAQCBw dWJsaWM6CiAgICAgICAgIE9wZW5MaW5rLAogCiAgICAgICAgIE9wZW5MaW5rSW5OZXdXaW5kb3cs CisgICAgICAgIE9wZW5MaW5rSW5UaGlzV2luZG93LAogICAgICAgICBPcGVuRnJhbWVJbk5ld1dp bmRvdywKIAogICAgICAgICBEb3dubG9hZExpbmtUb0Rpc2ssCg== 172545 2012-11-06 03:43:07 -0800 2012-11-07 07:23:53 -0800 Patch bug-101226-20121106124056.patch text/plain 9959 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzNDUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDc5YmRlYmEzMWY1NTc3 NDQ5OTIyNDIxMTVlMGM0MmYwMjI2ODJjZi4uYWEwOWZjMTZiMDdlODRlMDM4MTYxODQ1ZjY3MjRk OWJiZjY1OGUyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTExLTA2ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gT3BlbiBsaW5rIGluIHRoaXMgd2luZG93IGFjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxMjI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkcyB0aGUgYWN0aW9uIHRvIHRoZSBXZWJDb3Jl IGNvbnRleHQtbWVudSBjb250cm9sbGVyLgorCisgICAgICAgICogcGFnZS9Db250ZXh0TWVudUNv bnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGV4dE1lbnVDb250cm9sbGVyOjpj b250ZXh0TWVudUl0ZW1TZWxlY3RlZCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZXh0TWVudUNv bnRyb2xsZXI6OmNoZWNrT3JFbmFibGVJZk5lZWRlZCk6CisgICAgICAgICogcGxhdGZvcm0vQ29u dGV4dE1lbnVJdGVtLmg6CisgICAgICAgICogcGxhdGZvcm0vTG9jYWxpemVkU3RyaW5ncy5oOgor ICAgICAgICAqIHBsYXRmb3JtL3F0L0xvY2FsaXplZFN0cmluZ3NRdC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpjb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlua0luVGhpc1dpbmRvdyk6CisKIDIwMTIt MTEtMDUgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMzMyODYsIHIxMzMzODUsIGFuZCByMTMzMzk0 LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 L3F0L0NoYW5nZUxvZwppbmRleCA0M2I5OWIzZDMyZjY2NDBiM2MxZjRiYzZkNzY3ZjUxZDkwNzli YzMxLi4wOThkNzgwMzAwNzQyZTRjYjQyNDNmNmNmZGQ4YzM0YjM5Yzk5ZTQxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTExLTA2ICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4g IDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtRdF0gT3BlbiBsaW5rIGluIHRo aXMgd2luZG93IGFjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTAxMjI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkcyB0aGUgYWN0aW9uIHRvIFF0V2ViS2l0LgorCisgICAgICAgICogQXBpL3F3 ZWJwYWdlLmNwcDoKKyAgICAgICAgKHdlYkFjdGlvbkZvckNvbnRleHRNZW51QWN0aW9uKToKKyAg ICAgICAgKFFXZWJQYWdlOjp0cmlnZ2VyQWN0aW9uKToKKyAgICAgICAgKFFXZWJQYWdlOjphY3Rp b24pOgorICAgICAgICAqIEFwaS9xd2VicGFnZS5oOgorCiAyMDEyLTExLTAxICBTdGVwaGVuIFdo aXRlICA8c2Vub3JibGFuY29AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJv bGxpbmcgb3V0IHIxMzMxNDMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRl eHRNZW51Q29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29u dHJvbGxlci5jcHAKaW5kZXggZWFlNGJmZjQzMzkzNGYxNDZlYTU1NWQ1OTEwOGNjMGEyYjVhYTYy Yy4uNzRjODU4MzVmYmUwZDk3ZDNiYTJkN2ZlNDdkNDhkYzcwOWNhNzM1MiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvQ29udGV4dE1lbnVDb250cm9sbGVyLmNwcApAQCAtMzY4LDYgKzM2OCw5 IEBAIHZvaWQgQ29udGV4dE1lbnVDb250cm9sbGVyOjpjb250ZXh0TWVudUl0ZW1TZWxlY3RlZChD b250ZXh0TWVudUl0ZW0qIGl0ZW0pCiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIG9wZW5OZXdX aW5kb3cobV9oaXRUZXN0UmVzdWx0LmFic29sdXRlTGlua1VSTCgpLCBmcmFtZSk7CiAgICAgICAg IGJyZWFrOworICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnT3BlbkxpbmtJblRoaXNXaW5kb3c6 CisgICAgICAgIGZyYW1lLT5sb2FkZXIoKS0+bG9hZEZyYW1lUmVxdWVzdChGcmFtZUxvYWRSZXF1 ZXN0KGZyYW1lLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLCBSZXNvdXJjZVJlcXVlc3Qo bV9oaXRUZXN0UmVzdWx0LmFic29sdXRlTGlua1VSTCgpLCBmcmFtZS0+bG9hZGVyKCktPm91dGdv aW5nUmVmZXJyZXIoKSkpLCBmYWxzZSwgZmFsc2UsIDAsIDAsIE1heWJlU2VuZFJlZmVycmVyKTsK KyAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdCb2xkOgogICAgICAg ICBmcmFtZS0+ZWRpdG9yKCktPmNvbW1hbmQoIlRvZ2dsZUJvbGQiKS5leGVjdXRlKCk7CiAgICAg ICAgIGJyZWFrOwpAQCAtMTI5Nyw2ICsxMzAwLDcgQEAgdm9pZCBDb250ZXh0TWVudUNvbnRyb2xs ZXI6OmNoZWNrT3JFbmFibGVJZk5lZWRlZChDb250ZXh0TWVudUl0ZW0mIGl0ZW0pIGNvbnN0CiAj ZW5kaWYKICAgICAgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdOb0FjdGlvbjoKICAgICAgICAg Y2FzZSBDb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlua0luTmV3V2luZG93OgorICAgICAgICBjYXNl IENvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rSW5UaGlzV2luZG93OgogICAgICAgICBjYXNlIENv bnRleHRNZW51SXRlbVRhZ0Rvd25sb2FkTGlua1RvRGlzazoKICAgICAgICAgY2FzZSBDb250ZXh0 TWVudUl0ZW1UYWdDb3B5TGlua1RvQ2xpcGJvYXJkOgogICAgICAgICBjYXNlIENvbnRleHRNZW51 SXRlbVRhZ09wZW5JbWFnZUluTmV3V2luZG93OgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vQ29udGV4dE1lbnVJdGVtLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db250 ZXh0TWVudUl0ZW0uaAppbmRleCBmNWQ5MzVhNWEyZTQ0ZThjNmI4OWIzY2FhMWU5MjQyMTNiODc1 MDRiLi44ZDE5NzFmN2ViYTMyNzI5YzQyOWYzNmY3NzFmNDRhZjEzMDUyZWQ0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db250ZXh0TWVudUl0ZW0uaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9Db250ZXh0TWVudUl0ZW0uaApAQCAtMTY0LDYgKzE2NCw3IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgQ29udGV4dE1lbnVJdGVtVGFnTWVkaWFQbGF5UGF1 c2UsCiAgICAgICAgIENvbnRleHRNZW51SXRlbVRhZ01lZGlhTXV0ZSwKICAgICAgICAgQ29udGV4 dE1lbnVJdGVtVGFnRGljdGF0aW9uQWx0ZXJuYXRpdmUsCisgICAgICAgIENvbnRleHRNZW51SXRl bVRhZ09wZW5MaW5rSW5UaGlzV2luZG93LAogICAgICAgICBDb250ZXh0TWVudUl0ZW1CYXNlQ3Vz dG9tVGFnID0gNTAwMCwKICAgICAgICAgQ29udGV4dE1lbnVJdGVtQ3VzdG9tVGFnTm9BY3Rpb24g PSA1OTk4LAogICAgICAgICBDb250ZXh0TWVudUl0ZW1MYXN0Q3VzdG9tVGFnID0gNTk5OSwKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuaAppbmRleCA5NjAyZTFmOTBj MDZlMTMyMzlkODU3NGNhMjczMjQzZDhlMDc2ZWQ2Li5iY2QyMmM0NmMzMWU1YzdhYWFkZjgzZTky NzJhNmU0N2YzMmQ0N2FiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2Nh bGl6ZWRTdHJpbmdzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9jYWxpemVkU3Ry aW5ncy5oCkBAIC00OSw2ICs0OSw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogI2lmIEVOQUJM RShDT05URVhUX01FTlVTKQogICAgIFN0cmluZyBjb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlua0lu TmV3V2luZG93KCk7CisjaWYgUExBVEZPUk0oUVQpCisgICAgU3RyaW5nIGNvbnRleHRNZW51SXRl bVRhZ09wZW5MaW5rSW5UaGlzV2luZG93KCk7CisjZW5kaWYKICAgICBTdHJpbmcgY29udGV4dE1l bnVJdGVtVGFnRG93bmxvYWRMaW5rVG9EaXNrKCk7CiAgICAgU3RyaW5nIGNvbnRleHRNZW51SXRl bVRhZ0NvcHlMaW5rVG9DbGlwYm9hcmQoKTsKICAgICBTdHJpbmcgY29udGV4dE1lbnVJdGVtVGFn T3BlbkltYWdlSW5OZXdXaW5kb3coKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3F0L0xvY2FsaXplZFN0cmluZ3NRdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9x dC9Mb2NhbGl6ZWRTdHJpbmdzUXQuY3BwCmluZGV4IDBjZGNlM2E4NTM0MTQ1MWM4MjE4MzNjOWU2 ZGVjY2RkODk1MGM5M2IuLjdkZmZmMWZlOThmOGQ1OGY0Y2U2YjY4NzY3MGFiZDczMWM2NWMxY2Eg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L0xvY2FsaXplZFN0cmluZ3NR dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvTG9jYWxpemVkU3RyaW5nc1F0 LmNwcApAQCAtODgsNiArODgsMTEgQEAgU3RyaW5nIGNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5r SW5OZXdXaW5kb3coKQogICAgIHJldHVybiBRQ29yZUFwcGxpY2F0aW9uOjp0cmFuc2xhdGUoIlFX ZWJQYWdlIiwgIk9wZW4gaW4gTmV3IFdpbmRvdyIsICJPcGVuIGluIE5ldyBXaW5kb3cgY29udGV4 dCBtZW51IGl0ZW0iKTsKIH0KIAorU3RyaW5nIGNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rSW5U aGlzV2luZG93KCkKK3sKKyAgICByZXR1cm4gUUNvcmVBcHBsaWNhdGlvbjo6dHJhbnNsYXRlKCJR V2ViUGFnZSIsICJPcGVuIGluIFRoaXMgV2luZG93IiwgIk9wZW4gaW4gVGhpcyBXaW5kb3cgY29u dGV4dCBtZW51IGl0ZW0iKTsKK30KKwogU3RyaW5nIGNvbnRleHRNZW51SXRlbVRhZ0Rvd25sb2Fk TGlua1RvRGlzaygpCiB7CiAgICAgcmV0dXJuIFFDb3JlQXBwbGljYXRpb246OnRyYW5zbGF0ZSgi UVdlYlBhZ2UiLCAiU2F2ZSBMaW5rLi4uIiwgIkRvd25sb2FkIExpbmtlZCBGaWxlIGNvbnRleHQg bWVudSBpdGVtIik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5j cHAgYi9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKaW5kZXggYzJjOTgyM2Y5OWNi Y2U3MmIwM2Q3YmM4ZWI1ZDZhZDMyODg1Mjg5Mi4uYjYwNWQ2ZjA3NTJiNmVjNWM0Yzc1YzgzM2Nl YTI5M2FjYTNjMzg3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcApAQCAtNDM2LDYgKzQz Niw3IEBAIHN0YXRpYyBRV2ViUGFnZTo6V2ViQWN0aW9uIHdlYkFjdGlvbkZvckNvbnRleHRNZW51 QWN0aW9uKFdlYkNvcmU6OkNvbnRleHRNZW51QWN0CiAgICAgc3dpdGNoIChhY3Rpb24pIHsKICAg ICAgICAgY2FzZSBXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW1UYWdPcGVuTGluazogcmV0dXJuIFFX ZWJQYWdlOjpPcGVuTGluazsKICAgICAgICAgY2FzZSBXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW1U YWdPcGVuTGlua0luTmV3V2luZG93OiByZXR1cm4gUVdlYlBhZ2U6Ok9wZW5MaW5rSW5OZXdXaW5k b3c7CisgICAgICAgIGNhc2UgV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVtVGFnT3BlbkxpbmtJblRo aXNXaW5kb3c6IHJldHVybiBRV2ViUGFnZTo6T3BlbkxpbmtJblRoaXNXaW5kb3c7CiAgICAgICAg IGNhc2UgV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVtVGFnRG93bmxvYWRMaW5rVG9EaXNrOiByZXR1 cm4gUVdlYlBhZ2U6OkRvd25sb2FkTGlua1RvRGlzazsKICAgICAgICAgY2FzZSBXZWJDb3JlOjpD b250ZXh0TWVudUl0ZW1UYWdDb3B5TGlua1RvQ2xpcGJvYXJkOiByZXR1cm4gUVdlYlBhZ2U6OkNv cHlMaW5rVG9DbGlwYm9hcmQ7CiAgICAgICAgIGNhc2UgV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVt VGFnT3BlbkltYWdlSW5OZXdXaW5kb3c6IHJldHVybiBRV2ViUGFnZTo6T3BlbkltYWdlSW5OZXdX aW5kb3c7CkBAIC0xNjkzLDYgKzE2OTQsNyBAQCBJbnRQb2ludCBRV2ViUGFnZVByaXZhdGU6OlRv dWNoQWRqdXN0ZXI6OmZpbmRDYW5kaWRhdGVQb2ludEZvclRvdWNoKGNvbnN0IEludFBvaQogICAg IFx2YWx1ZSBOb1dlYkFjdGlvbiBObyBhY3Rpb24gaXMgdHJpZ2dlcmVkLgogICAgIFx2YWx1ZSBP cGVuTGluayBPcGVuIHRoZSBjdXJyZW50IGxpbmsuCiAgICAgXHZhbHVlIE9wZW5MaW5rSW5OZXdX aW5kb3cgT3BlbiB0aGUgY3VycmVudCBsaW5rIGluIGEgbmV3IHdpbmRvdy4KKyAgICBcdmFsdWUg T3BlbkxpbmtJblRoaXNXaW5kb3cgT3BlbiB0aGUgY3VycmVudCBsaW5rIHdpdGhvdXQgb3Blbmlu ZyBhIG5ldyB3aW5kb3cuIFVzZWQgb24gbGlua3MgdGhhdCB3b3VsZCBkZWZhdWx0IHRvIG9wZW5p bmcgYSBuZXcgd2luZG93LiAoQWRkZWQgaW4gUXQgNS4wKQogICAgIFx2YWx1ZSBPcGVuRnJhbWVJ bk5ld1dpbmRvdyBSZXBsaWNhdGUgdGhlIGN1cnJlbnQgZnJhbWUgaW4gYSBuZXcgd2luZG93Lgog ICAgIFx2YWx1ZSBEb3dubG9hZExpbmtUb0Rpc2sgRG93bmxvYWQgdGhlIGN1cnJlbnQgbGluayB0 byB0aGUgZGlzay4KICAgICBcdmFsdWUgQ29weUxpbmtUb0NsaXBib2FyZCBDb3B5IHRoZSBjdXJy ZW50IGxpbmsgdG8gdGhlIGNsaXBib2FyZC4KQEAgLTIzNjcsNiArMjM2OSwxMCBAQCB2b2lkIFFX ZWJQYWdlOjp0cmlnZ2VyQWN0aW9uKFdlYkFjdGlvbiBhY3Rpb24sIGJvb2wpCiAgICAgICAgIGNh c2UgT3BlbkxpbmtJbk5ld1dpbmRvdzoKICAgICAgICAgICAgIG9wZW5OZXdXaW5kb3coZC0+aGl0 VGVzdFJlc3VsdC5saW5rVXJsKCksIGZyYW1lKTsKICAgICAgICAgICAgIGJyZWFrOworICAgICAg ICBjYXNlIE9wZW5MaW5rSW5UaGlzV2luZG93OgorICAgICAgICAgICAgZnJhbWUtPmxvYWRlcigp LT5sb2FkRnJhbWVSZXF1ZXN0KGZyYW1lTG9hZFJlcXVlc3QoZC0+aGl0VGVzdFJlc3VsdC5saW5r VXJsKCksIGZyYW1lKSwKKyAgICAgICAgICAgICAgICAvKmxvY2tIaXN0b3J5Ki8gZmFsc2UsIC8q bG9ja0JhY2tGb3J3YXJkTGlzdCovIGZhbHNlLCAvKmV2ZW50Ki8gMCwgLypGb3JtU3RhdGUqLyAw LCBNYXliZVNlbmRSZWZlcnJlcik7CisgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBP cGVuRnJhbWVJbk5ld1dpbmRvdzogewogICAgICAgICAgICAgS1VSTCB1cmwgPSBmcmFtZS0+bG9h ZGVyKCktPmRvY3VtZW50TG9hZGVyKCktPnVucmVhY2hhYmxlVVJMKCk7CiAgICAgICAgICAgICBp ZiAodXJsLmlzRW1wdHkoKSkKQEAgLTI3ODgsNiArMjc5NCw5IEBAIFFBY3Rpb24gKlFXZWJQYWdl OjphY3Rpb24oV2ViQWN0aW9uIGFjdGlvbikgY29uc3QKICAgICAgICAgY2FzZSBPcGVuRnJhbWVJ bk5ld1dpbmRvdzoKICAgICAgICAgICAgIHRleHQgPSBjb250ZXh0TWVudUl0ZW1UYWdPcGVuRnJh bWVJbk5ld1dpbmRvdygpOwogICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgT3Blbkxp bmtJblRoaXNXaW5kb3c6CisgICAgICAgICAgICB0ZXh0ID0gY29udGV4dE1lbnVJdGVtVGFnT3Bl bkxpbmtJblRoaXNXaW5kb3coKTsKKyAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIGNhc2Ug RG93bmxvYWRMaW5rVG9EaXNrOgogICAgICAgICAgICAgdGV4dCA9IGNvbnRleHRNZW51SXRlbVRh Z0Rvd25sb2FkTGlua1RvRGlzaygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9BcGkv cXdlYnBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmgKaW5kZXggNjZmODk2 MDliMDAzODRjYmFmOWE5MGUxNjBkOWQ3YjE3MGQwZDA1Mi4uNjcyODE5N2VkNjE1Y2NiNDgyMGY4 ZTE4OTliNmNlNTY1MzBjZTM5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdl YnBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5oCkBAIC05Nyw2ICs5 Nyw3IEBAIHB1YmxpYzoKICAgICAgICAgT3BlbkxpbmssCiAKICAgICAgICAgT3BlbkxpbmtJbk5l d1dpbmRvdywKKyAgICAgICAgT3BlbkxpbmtJblRoaXNXaW5kb3csCiAgICAgICAgIE9wZW5GcmFt ZUluTmV3V2luZG93LAogCiAgICAgICAgIERvd25sb2FkTGlua1RvRGlzaywKZGlmZiAtLWdpdCBh L1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3MjFhMjFhOWMzYWU4NGMx MTM5NjZlZGU1NTJjZmNhZWU1NDFmZDQ1Li42MjA1NWNlYTEyZjhlZGY5OTBkYjE3MWIwYjVlOGYy OWI3YzMzODNhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMTEtMDYgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAg PGFsbGFuLmplbnNlbkBkaWdpYS5jb20+CisKKyAgICAgICAgW1F0XSBPcGVuIGxpbmsgaW4gdGhp cyB3aW5kb3cgYWN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMDEyMjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBQb3B1bGF0ZXMgdGhlIGNvbnRleHQtbWVudSB3aXRoIHRoZSBuZXcgYWN0aW9uIHdo ZW4gdGhlIGRlZmF1bHQgYWN0aW9uIGlzIHRvIG9wZW4gaW4gYSBuZXcgd2luZG93LgorCisgICAg ICAgICogUXRUZXN0QnJvd3Nlci93ZWJ2aWV3LmNwcDoKKyAgICAgICAgKGNyZWF0ZUNvbnRleHRN ZW51KToKKwogMjAxMi0xMS0wNSAgS3l1bmdUYWUgS2ltICA8a3RmLmtpbUBzYW1zdW5nLmNvbT4K IAogICAgICAgICBbRUZMXSBGaXggYnVpbGQgd2FybmluZyBpbiBFV2ViTGF1bmNoZXIvbWFpbi5j CmRpZmYgLS1naXQgYS9Ub29scy9RdFRlc3RCcm93c2VyL3dlYnZpZXcuY3BwIGIvVG9vbHMvUXRU ZXN0QnJvd3Nlci93ZWJ2aWV3LmNwcAppbmRleCAzZWE5OGY5MGI1MTU2YWQzMmM4ODhhYWQzNDI2 ZjM2NjIyM2JlODg3Li40ZmFjY2JkNTgzNDlhNDlkNTgzY2RkM2MyMDViNjFmZDhlMTljNTAwIDEw MDY0NAotLS0gYS9Ub29scy9RdFRlc3RCcm93c2VyL3dlYnZpZXcuY3BwCisrKyBiL1Rvb2xzL1F0 VGVzdEJyb3dzZXIvd2Vidmlldy5jcHAKQEAgLTI1MSwxMCArMjUxLDE0IEBAIHN0YXRpYyBRTWVu dSogY3JlYXRlQ29udGV4dE1lbnUoUVdlYlBhZ2UqIHBhZ2UsIFFQb2ludCBwb3NpdGlvbikKICAg ICBRV2ViSGl0VGVzdFJlc3VsdCByID0gcGFnZS0+bWFpbkZyYW1lKCktPmhpdFRlc3RDb250ZW50 KHBvc2l0aW9uKTsKIAogICAgIGlmICghci5saW5rVXJsKCkuaXNFbXB0eSgpKSB7CisjaWZuZGVm IFFUX05PX0RFU0tUT1BTRVJWSUNFUwogICAgICAgICBXZWJQYWdlKiB3ZWJQYWdlID0gcW9iamVj dF9jYXN0PFdlYlBhZ2UqPihwYWdlKTsKICAgICAgICAgUUFjdGlvbiogbmV3VGFiQWN0aW9uID0g bWVudS0+YWRkQWN0aW9uKCJPcGVuIGluIERlZmF1bHQgJkJyb3dzZXIiLCB3ZWJQYWdlLCBTTE9U KG9wZW5VcmxJbkRlZmF1bHRCcm93c2VyKCkpKTsKICAgICAgICAgbmV3VGFiQWN0aW9uLT5zZXRE YXRhKHIubGlua1VybCgpKTsKICAgICAgICAgbWVudS0+aW5zZXJ0QWN0aW9uKG1lbnUtPmFjdGlv bnMoKS5hdCgyKSwgbmV3VGFiQWN0aW9uKTsKKyNlbmRpZgorICAgICAgICBpZiAoci5saW5rVGFy Z2V0RnJhbWUoKSAhPSByLmZyYW1lKCkpCisgICAgICAgICAgICBtZW51LT5pbnNlcnRBY3Rpb24o bWVudS0+YWN0aW9ucygpLmF0KDApLCBwYWdlLT5hY3Rpb24oUVdlYlBhZ2U6Ok9wZW5MaW5rSW5U aGlzV2luZG93KSk7CiAgICAgfQogICAgIHJldHVybiBtZW51OwogfQo= 172795 2012-11-07 07:23:57 -0800 2012-11-07 08:01:07 -0800 Patch bug-101226-20121107162144.patch text/plain 9910 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzNzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTdiZjEzZjY0Yjk3OWM5 NGRiNjdhMTE3OWRkMWRjMzJhNmZhNGFjZS4uMzJhZjljY2NjM2E1OWE1ZjVlMjEwOTE5NDczNjM4 OGM3ZTUxNDNiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTExLTA3ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gT3BlbiBsaW5rIGluIHRoaXMgd2luZG93IGFjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxMjI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkcyB0aGUgYWN0aW9uIHRvIHRoZSBXZWJDb3Jl IGNvbnRleHQtbWVudSBjb250cm9sbGVyLgorCisgICAgICAgICogcGFnZS9Db250ZXh0TWVudUNv bnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGV4dE1lbnVDb250cm9sbGVyOjpj b250ZXh0TWVudUl0ZW1TZWxlY3RlZCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZXh0TWVudUNv bnRyb2xsZXI6OmNoZWNrT3JFbmFibGVJZk5lZWRlZCk6CisgICAgICAgICogcGxhdGZvcm0vQ29u dGV4dE1lbnVJdGVtLmg6CisgICAgICAgICogcGxhdGZvcm0vTG9jYWxpemVkU3RyaW5ncy5oOgor ICAgICAgICAqIHBsYXRmb3JtL3F0L0xvY2FsaXplZFN0cmluZ3NRdC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpjb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlua0luVGhpc1dpbmRvdyk6CisKIDIwMTIt MTEtMDcgIEFuZHJleSBBZGFpa2luICA8YWFuZHJleUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg V2ViIEluc3BlY3RvcjogW0NhbnZhc10gY2xvc3VyZSBjb21waWxlciBmaXhlcwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxv ZwppbmRleCA0M2I5OWIzZDMyZjY2NDBiM2MxZjRiYzZkNzY3ZjUxZDkwNzliYzMxLi40NWMzZjUz NjBiNjc1NTVkZTBkNmE3YzkxMzFhNDljODJhZTEzNTc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L3F0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE4IEBACisyMDEyLTExLTA3ICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5z ZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtRdF0gT3BlbiBsaW5rIGluIHRoaXMgd2luZG93IGFj dGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAx MjI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk cyB0aGUgYWN0aW9uIHRvIFF0V2ViS2l0LgorCisgICAgICAgICogQXBpL3F3ZWJwYWdlLmNwcDoK KyAgICAgICAgKHdlYkFjdGlvbkZvckNvbnRleHRNZW51QWN0aW9uKToKKyAgICAgICAgKFFXZWJQ YWdlOjp0cmlnZ2VyQWN0aW9uKToKKyAgICAgICAgKFFXZWJQYWdlOjphY3Rpb24pOgorICAgICAg ICAqIEFwaS9xd2VicGFnZS5oOgorCiAyMDEyLTExLTAxICBTdGVwaGVuIFdoaXRlICA8c2Vub3Ji bGFuY29AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIx MzMxNDMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29udHJv bGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5jcHAK aW5kZXggZWFlNGJmZjQzMzkzNGYxNDZlYTU1NWQ1OTEwOGNjMGEyYjVhYTYyYy4uNzRjODU4MzVm YmUwZDk3ZDNiYTJkN2ZlNDdkNDhkYzcwOWNhNzM1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvQ29udGV4dE1lbnVDb250cm9sbGVyLmNwcApAQCAtMzY4LDYgKzM2OCw5IEBAIHZvaWQgQ29u dGV4dE1lbnVDb250cm9sbGVyOjpjb250ZXh0TWVudUl0ZW1TZWxlY3RlZChDb250ZXh0TWVudUl0 ZW0qIGl0ZW0pCiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIG9wZW5OZXdXaW5kb3cobV9oaXRU ZXN0UmVzdWx0LmFic29sdXRlTGlua1VSTCgpLCBmcmFtZSk7CiAgICAgICAgIGJyZWFrOworICAg IGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnT3BlbkxpbmtJblRoaXNXaW5kb3c6CisgICAgICAgIGZy YW1lLT5sb2FkZXIoKS0+bG9hZEZyYW1lUmVxdWVzdChGcmFtZUxvYWRSZXF1ZXN0KGZyYW1lLT5k b2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLCBSZXNvdXJjZVJlcXVlc3QobV9oaXRUZXN0UmVz dWx0LmFic29sdXRlTGlua1VSTCgpLCBmcmFtZS0+bG9hZGVyKCktPm91dGdvaW5nUmVmZXJyZXIo KSkpLCBmYWxzZSwgZmFsc2UsIDAsIDAsIE1heWJlU2VuZFJlZmVycmVyKTsKKyAgICAgICAgYnJl YWs7CiAgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdCb2xkOgogICAgICAgICBmcmFtZS0+ZWRp dG9yKCktPmNvbW1hbmQoIlRvZ2dsZUJvbGQiKS5leGVjdXRlKCk7CiAgICAgICAgIGJyZWFrOwpA QCAtMTI5Nyw2ICsxMzAwLDcgQEAgdm9pZCBDb250ZXh0TWVudUNvbnRyb2xsZXI6OmNoZWNrT3JF bmFibGVJZk5lZWRlZChDb250ZXh0TWVudUl0ZW0mIGl0ZW0pIGNvbnN0CiAjZW5kaWYKICAgICAg ICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdOb0FjdGlvbjoKICAgICAgICAgY2FzZSBDb250ZXh0 TWVudUl0ZW1UYWdPcGVuTGlua0luTmV3V2luZG93OgorICAgICAgICBjYXNlIENvbnRleHRNZW51 SXRlbVRhZ09wZW5MaW5rSW5UaGlzV2luZG93OgogICAgICAgICBjYXNlIENvbnRleHRNZW51SXRl bVRhZ0Rvd25sb2FkTGlua1RvRGlzazoKICAgICAgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdD b3B5TGlua1RvQ2xpcGJvYXJkOgogICAgICAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ09wZW5J bWFnZUluTmV3V2luZG93OgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29u dGV4dE1lbnVJdGVtLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db250ZXh0TWVudUl0ZW0u aAppbmRleCBmNWQ5MzVhNWEyZTQ0ZThjNmI4OWIzY2FhMWU5MjQyMTNiODc1MDRiLi44ZDE5NzFm N2ViYTMyNzI5YzQyOWYzNmY3NzFmNDRhZjEzMDUyZWQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9Db250ZXh0TWVudUl0ZW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9Db250ZXh0TWVudUl0ZW0uaApAQCAtMTY0LDYgKzE2NCw3IEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKICAgICAgICAgQ29udGV4dE1lbnVJdGVtVGFnTWVkaWFQbGF5UGF1c2UsCiAgICAgICAg IENvbnRleHRNZW51SXRlbVRhZ01lZGlhTXV0ZSwKICAgICAgICAgQ29udGV4dE1lbnVJdGVtVGFn RGljdGF0aW9uQWx0ZXJuYXRpdmUsCisgICAgICAgIENvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5r SW5UaGlzV2luZG93LAogICAgICAgICBDb250ZXh0TWVudUl0ZW1CYXNlQ3VzdG9tVGFnID0gNTAw MCwKICAgICAgICAgQ29udGV4dE1lbnVJdGVtQ3VzdG9tVGFnTm9BY3Rpb24gPSA1OTk4LAogICAg ICAgICBDb250ZXh0TWVudUl0ZW1MYXN0Q3VzdG9tVGFnID0gNTk5OSwKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuaCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuaAppbmRleCA5NjAyZTFmOTBjMDZlMTMyMzlkODU3 NGNhMjczMjQzZDhlMDc2ZWQ2Li5iY2QyMmM0NmMzMWU1YzdhYWFkZjgzZTkyNzJhNmU0N2YzMmQ0 N2FiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdz LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9jYWxpemVkU3RyaW5ncy5oCkBAIC00 OSw2ICs0OSw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogI2lmIEVOQUJMRShDT05URVhUX01F TlVTKQogICAgIFN0cmluZyBjb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlua0luTmV3V2luZG93KCk7 CisjaWYgUExBVEZPUk0oUVQpCisgICAgU3RyaW5nIGNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5r SW5UaGlzV2luZG93KCk7CisjZW5kaWYKICAgICBTdHJpbmcgY29udGV4dE1lbnVJdGVtVGFnRG93 bmxvYWRMaW5rVG9EaXNrKCk7CiAgICAgU3RyaW5nIGNvbnRleHRNZW51SXRlbVRhZ0NvcHlMaW5r VG9DbGlwYm9hcmQoKTsKICAgICBTdHJpbmcgY29udGV4dE1lbnVJdGVtVGFnT3BlbkltYWdlSW5O ZXdXaW5kb3coKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L0xvY2Fs aXplZFN0cmluZ3NRdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9Mb2NhbGl6ZWRT dHJpbmdzUXQuY3BwCmluZGV4IDBjZGNlM2E4NTM0MTQ1MWM4MjE4MzNjOWU2ZGVjY2RkODk1MGM5 M2IuLjdkZmZmMWZlOThmOGQ1OGY0Y2U2YjY4NzY3MGFiZDczMWM2NWMxY2EgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L0xvY2FsaXplZFN0cmluZ3NRdC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvTG9jYWxpemVkU3RyaW5nc1F0LmNwcApAQCAtODgs NiArODgsMTEgQEAgU3RyaW5nIGNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rSW5OZXdXaW5kb3co KQogICAgIHJldHVybiBRQ29yZUFwcGxpY2F0aW9uOjp0cmFuc2xhdGUoIlFXZWJQYWdlIiwgIk9w ZW4gaW4gTmV3IFdpbmRvdyIsICJPcGVuIGluIE5ldyBXaW5kb3cgY29udGV4dCBtZW51IGl0ZW0i KTsKIH0KIAorU3RyaW5nIGNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rSW5UaGlzV2luZG93KCkK K3sKKyAgICByZXR1cm4gUUNvcmVBcHBsaWNhdGlvbjo6dHJhbnNsYXRlKCJRV2ViUGFnZSIsICJP cGVuIGluIFRoaXMgV2luZG93IiwgIk9wZW4gaW4gVGhpcyBXaW5kb3cgY29udGV4dCBtZW51IGl0 ZW0iKTsKK30KKwogU3RyaW5nIGNvbnRleHRNZW51SXRlbVRhZ0Rvd25sb2FkTGlua1RvRGlzaygp CiB7CiAgICAgcmV0dXJuIFFDb3JlQXBwbGljYXRpb246OnRyYW5zbGF0ZSgiUVdlYlBhZ2UiLCAi U2F2ZSBMaW5rLi4uIiwgIkRvd25sb2FkIExpbmtlZCBGaWxlIGNvbnRleHQgbWVudSBpdGVtIik7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKaW5kZXggYzJjOTgyM2Y5OWNiY2U3MmIwM2Q3YmM4 ZWI1ZDZhZDMyODg1Mjg5Mi4uYjYwNWQ2ZjA3NTJiNmVjNWM0Yzc1YzgzM2NlYTI5M2FjYTNjMzg3 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcApAQCAtNDM2LDYgKzQzNiw3IEBAIHN0YXRp YyBRV2ViUGFnZTo6V2ViQWN0aW9uIHdlYkFjdGlvbkZvckNvbnRleHRNZW51QWN0aW9uKFdlYkNv cmU6OkNvbnRleHRNZW51QWN0CiAgICAgc3dpdGNoIChhY3Rpb24pIHsKICAgICAgICAgY2FzZSBX ZWJDb3JlOjpDb250ZXh0TWVudUl0ZW1UYWdPcGVuTGluazogcmV0dXJuIFFXZWJQYWdlOjpPcGVu TGluazsKICAgICAgICAgY2FzZSBXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlua0lu TmV3V2luZG93OiByZXR1cm4gUVdlYlBhZ2U6Ok9wZW5MaW5rSW5OZXdXaW5kb3c7CisgICAgICAg IGNhc2UgV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVtVGFnT3BlbkxpbmtJblRoaXNXaW5kb3c6IHJl dHVybiBRV2ViUGFnZTo6T3BlbkxpbmtJblRoaXNXaW5kb3c7CiAgICAgICAgIGNhc2UgV2ViQ29y ZTo6Q29udGV4dE1lbnVJdGVtVGFnRG93bmxvYWRMaW5rVG9EaXNrOiByZXR1cm4gUVdlYlBhZ2U6 OkRvd25sb2FkTGlua1RvRGlzazsKICAgICAgICAgY2FzZSBXZWJDb3JlOjpDb250ZXh0TWVudUl0 ZW1UYWdDb3B5TGlua1RvQ2xpcGJvYXJkOiByZXR1cm4gUVdlYlBhZ2U6OkNvcHlMaW5rVG9DbGlw Ym9hcmQ7CiAgICAgICAgIGNhc2UgV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVtVGFnT3BlbkltYWdl SW5OZXdXaW5kb3c6IHJldHVybiBRV2ViUGFnZTo6T3BlbkltYWdlSW5OZXdXaW5kb3c7CkBAIC0x NjkzLDYgKzE2OTQsNyBAQCBJbnRQb2ludCBRV2ViUGFnZVByaXZhdGU6OlRvdWNoQWRqdXN0ZXI6 OmZpbmRDYW5kaWRhdGVQb2ludEZvclRvdWNoKGNvbnN0IEludFBvaQogICAgIFx2YWx1ZSBOb1dl YkFjdGlvbiBObyBhY3Rpb24gaXMgdHJpZ2dlcmVkLgogICAgIFx2YWx1ZSBPcGVuTGluayBPcGVu IHRoZSBjdXJyZW50IGxpbmsuCiAgICAgXHZhbHVlIE9wZW5MaW5rSW5OZXdXaW5kb3cgT3BlbiB0 aGUgY3VycmVudCBsaW5rIGluIGEgbmV3IHdpbmRvdy4KKyAgICBcdmFsdWUgT3BlbkxpbmtJblRo aXNXaW5kb3cgT3BlbiB0aGUgY3VycmVudCBsaW5rIHdpdGhvdXQgb3BlbmluZyBhIG5ldyB3aW5k b3cuIFVzZWQgb24gbGlua3MgdGhhdCB3b3VsZCBkZWZhdWx0IHRvIG9wZW5pbmcgYSBuZXcgd2lu ZG93LiAoQWRkZWQgaW4gUXQgNS4wKQogICAgIFx2YWx1ZSBPcGVuRnJhbWVJbk5ld1dpbmRvdyBS ZXBsaWNhdGUgdGhlIGN1cnJlbnQgZnJhbWUgaW4gYSBuZXcgd2luZG93LgogICAgIFx2YWx1ZSBE b3dubG9hZExpbmtUb0Rpc2sgRG93bmxvYWQgdGhlIGN1cnJlbnQgbGluayB0byB0aGUgZGlzay4K ICAgICBcdmFsdWUgQ29weUxpbmtUb0NsaXBib2FyZCBDb3B5IHRoZSBjdXJyZW50IGxpbmsgdG8g dGhlIGNsaXBib2FyZC4KQEAgLTIzNjcsNiArMjM2OSwxMCBAQCB2b2lkIFFXZWJQYWdlOjp0cmln Z2VyQWN0aW9uKFdlYkFjdGlvbiBhY3Rpb24sIGJvb2wpCiAgICAgICAgIGNhc2UgT3BlbkxpbmtJ bk5ld1dpbmRvdzoKICAgICAgICAgICAgIG9wZW5OZXdXaW5kb3coZC0+aGl0VGVzdFJlc3VsdC5s aW5rVXJsKCksIGZyYW1lKTsKICAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIE9wZW5M aW5rSW5UaGlzV2luZG93OgorICAgICAgICAgICAgZnJhbWUtPmxvYWRlcigpLT5sb2FkRnJhbWVS ZXF1ZXN0KGZyYW1lTG9hZFJlcXVlc3QoZC0+aGl0VGVzdFJlc3VsdC5saW5rVXJsKCksIGZyYW1l KSwKKyAgICAgICAgICAgICAgICAvKmxvY2tIaXN0b3J5Ki8gZmFsc2UsIC8qbG9ja0JhY2tGb3J3 YXJkTGlzdCovIGZhbHNlLCAvKmV2ZW50Ki8gMCwgLypGb3JtU3RhdGUqLyAwLCBNYXliZVNlbmRS ZWZlcnJlcik7CisgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBPcGVuRnJhbWVJbk5l d1dpbmRvdzogewogICAgICAgICAgICAgS1VSTCB1cmwgPSBmcmFtZS0+bG9hZGVyKCktPmRvY3Vt ZW50TG9hZGVyKCktPnVucmVhY2hhYmxlVVJMKCk7CiAgICAgICAgICAgICBpZiAodXJsLmlzRW1w dHkoKSkKQEAgLTI3ODgsNiArMjc5NCw5IEBAIFFBY3Rpb24gKlFXZWJQYWdlOjphY3Rpb24oV2Vi QWN0aW9uIGFjdGlvbikgY29uc3QKICAgICAgICAgY2FzZSBPcGVuRnJhbWVJbk5ld1dpbmRvdzoK ICAgICAgICAgICAgIHRleHQgPSBjb250ZXh0TWVudUl0ZW1UYWdPcGVuRnJhbWVJbk5ld1dpbmRv dygpOwogICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgT3BlbkxpbmtJblRoaXNXaW5k b3c6CisgICAgICAgICAgICB0ZXh0ID0gY29udGV4dE1lbnVJdGVtVGFnT3BlbkxpbmtJblRoaXNX aW5kb3coKTsKKyAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIGNhc2UgRG93bmxvYWRMaW5r VG9EaXNrOgogICAgICAgICAgICAgdGV4dCA9IGNvbnRleHRNZW51SXRlbVRhZ0Rvd25sb2FkTGlu a1RvRGlzaygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuaCBi L1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmgKaW5kZXggNjZmODk2MDliMDAzODRjYmFm OWE5MGUxNjBkOWQ3YjE3MGQwZDA1Mi4uYjJjYWExMzFkZWE2NTA1ZTVmMGFiNDdkY2Q0OTE3NWMy NWUxODE3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5oCkBAIC0xODAsNiArMTgwLDggQEAgcHVi bGljOgogCiAgICAgICAgIENvcHlJbWFnZVVybFRvQ2xpcGJvYXJkLAogCisgICAgICAgIE9wZW5M aW5rSW5UaGlzV2luZG93LAorCiAgICAgICAgIFdlYkFjdGlvbkNvdW50CiAgICAgfTsKIApkaWZm IC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDM0NTBiNDY5 YTNjNjA1YzNjNzJhYjI5YjllN2NlNDVkZWI3NWQ2MDYuLmQ3OGNjMzU2ZGZhNGNhNjA4NmEwZTRm ODdkMmYzNDVkZTk4MDZiZmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29s cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMi0xMS0wNyAgQWxsYW4gU2FuZGZlbGQg SmVuc2VuICA8YWxsYW4uamVuc2VuQGRpZ2lhLmNvbT4KKworICAgICAgICBbUXRdIE9wZW4gbGlu ayBpbiB0aGlzIHdpbmRvdyBhY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEwMTIyNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFBvcHVsYXRlcyB0aGUgY29udGV4dC1tZW51IHdpdGggdGhlIG5ldyBh Y3Rpb24gd2hlbiB0aGUgZGVmYXVsdCBhY3Rpb24gaXMgdG8gb3BlbiBpbiBhIG5ldyB3aW5kb3cu CisKKyAgICAgICAgKiBRdFRlc3RCcm93c2VyL3dlYnZpZXcuY3BwOgorICAgICAgICAoY3JlYXRl Q29udGV4dE1lbnUpOgorCiAyMDEyLTExLTA3ICBUaGlhZ28gTWFyY29zIFAuIFNhbnRvcyAgPHRo aWFnby5zYW50b3NAaW50ZWwuY29tPgogCiAgICAgICAgIFtFRkxdIEFkZCBFRkwgdG8gZ2FyZGVu LW8tbWF0aWMKZGlmZiAtLWdpdCBhL1Rvb2xzL1F0VGVzdEJyb3dzZXIvd2Vidmlldy5jcHAgYi9U b29scy9RdFRlc3RCcm93c2VyL3dlYnZpZXcuY3BwCmluZGV4IDNlYTk4ZjkwYjUxNTZhZDMyYzg4 OGFhZDM0MjZmMzY2MjIzYmU4ODcuLjRmYWNjYmQ1ODM0OWE0OWQ1ODNjZGQzYzIwNWI2MWZkOGUx OWM1MDAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1F0VGVzdEJyb3dzZXIvd2Vidmlldy5jcHAKKysrIGIv VG9vbHMvUXRUZXN0QnJvd3Nlci93ZWJ2aWV3LmNwcApAQCAtMjUxLDEwICsyNTEsMTQgQEAgc3Rh dGljIFFNZW51KiBjcmVhdGVDb250ZXh0TWVudShRV2ViUGFnZSogcGFnZSwgUVBvaW50IHBvc2l0 aW9uKQogICAgIFFXZWJIaXRUZXN0UmVzdWx0IHIgPSBwYWdlLT5tYWluRnJhbWUoKS0+aGl0VGVz dENvbnRlbnQocG9zaXRpb24pOwogCiAgICAgaWYgKCFyLmxpbmtVcmwoKS5pc0VtcHR5KCkpIHsK KyNpZm5kZWYgUVRfTk9fREVTS1RPUFNFUlZJQ0VTCiAgICAgICAgIFdlYlBhZ2UqIHdlYlBhZ2Ug PSBxb2JqZWN0X2Nhc3Q8V2ViUGFnZSo+KHBhZ2UpOwogICAgICAgICBRQWN0aW9uKiBuZXdUYWJB Y3Rpb24gPSBtZW51LT5hZGRBY3Rpb24oIk9wZW4gaW4gRGVmYXVsdCAmQnJvd3NlciIsIHdlYlBh Z2UsIFNMT1Qob3BlblVybEluRGVmYXVsdEJyb3dzZXIoKSkpOwogICAgICAgICBuZXdUYWJBY3Rp b24tPnNldERhdGEoci5saW5rVXJsKCkpOwogICAgICAgICBtZW51LT5pbnNlcnRBY3Rpb24obWVu dS0+YWN0aW9ucygpLmF0KDIpLCBuZXdUYWJBY3Rpb24pOworI2VuZGlmCisgICAgICAgIGlmIChy LmxpbmtUYXJnZXRGcmFtZSgpICE9IHIuZnJhbWUoKSkKKyAgICAgICAgICAgIG1lbnUtPmluc2Vy dEFjdGlvbihtZW51LT5hY3Rpb25zKCkuYXQoMCksIHBhZ2UtPmFjdGlvbihRV2ViUGFnZTo6T3Bl bkxpbmtJblRoaXNXaW5kb3cpKTsKICAgICB9CiAgICAgcmV0dXJuIG1lbnU7CiB9Cg== 172803 2012-11-07 08:01:13 -0800 2012-11-07 08:08:34 -0800 Patch bug-101226-20121107165900.patch text/plain 10131 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzNzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTdiZjEzZjY0Yjk3OWM5 NGRiNjdhMTE3OWRkMWRjMzJhNmZhNGFjZS4uMzJhZjljY2NjM2E1OWE1ZjVlMjEwOTE5NDczNjM4 OGM3ZTUxNDNiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTExLTA3ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gT3BlbiBsaW5rIGluIHRoaXMgd2luZG93IGFjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxMjI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkcyB0aGUgYWN0aW9uIHRvIHRoZSBXZWJDb3Jl IGNvbnRleHQtbWVudSBjb250cm9sbGVyLgorCisgICAgICAgICogcGFnZS9Db250ZXh0TWVudUNv bnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGV4dE1lbnVDb250cm9sbGVyOjpj b250ZXh0TWVudUl0ZW1TZWxlY3RlZCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZXh0TWVudUNv bnRyb2xsZXI6OmNoZWNrT3JFbmFibGVJZk5lZWRlZCk6CisgICAgICAgICogcGxhdGZvcm0vQ29u dGV4dE1lbnVJdGVtLmg6CisgICAgICAgICogcGxhdGZvcm0vTG9jYWxpemVkU3RyaW5ncy5oOgor ICAgICAgICAqIHBsYXRmb3JtL3F0L0xvY2FsaXplZFN0cmluZ3NRdC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpjb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlua0luVGhpc1dpbmRvdyk6CisKIDIwMTIt MTEtMDcgIEFuZHJleSBBZGFpa2luICA8YWFuZHJleUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg V2ViIEluc3BlY3RvcjogW0NhbnZhc10gY2xvc3VyZSBjb21waWxlciBmaXhlcwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxv ZwppbmRleCA0M2I5OWIzZDMyZjY2NDBiM2MxZjRiYzZkNzY3ZjUxZDkwNzliYzMxLi40NWMzZjUz NjBiNjc1NTVkZTBkNmE3YzkxMzFhNDljODJhZTEzNTc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L3F0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE4IEBACisyMDEyLTExLTA3ICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5z ZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtRdF0gT3BlbiBsaW5rIGluIHRoaXMgd2luZG93IGFj dGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAx MjI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk cyB0aGUgYWN0aW9uIHRvIFF0V2ViS2l0LgorCisgICAgICAgICogQXBpL3F3ZWJwYWdlLmNwcDoK KyAgICAgICAgKHdlYkFjdGlvbkZvckNvbnRleHRNZW51QWN0aW9uKToKKyAgICAgICAgKFFXZWJQ YWdlOjp0cmlnZ2VyQWN0aW9uKToKKyAgICAgICAgKFFXZWJQYWdlOjphY3Rpb24pOgorICAgICAg ICAqIEFwaS9xd2VicGFnZS5oOgorCiAyMDEyLTExLTAxICBTdGVwaGVuIFdoaXRlICA8c2Vub3Ji bGFuY29AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIx MzMxNDMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29udHJv bGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5jcHAK aW5kZXggZWFlNGJmZjQzMzkzNGYxNDZlYTU1NWQ1OTEwOGNjMGEyYjVhYTYyYy4uNzRjODU4MzVm YmUwZDk3ZDNiYTJkN2ZlNDdkNDhkYzcwOWNhNzM1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvQ29udGV4dE1lbnVDb250cm9sbGVyLmNwcApAQCAtMzY4LDYgKzM2OCw5IEBAIHZvaWQgQ29u dGV4dE1lbnVDb250cm9sbGVyOjpjb250ZXh0TWVudUl0ZW1TZWxlY3RlZChDb250ZXh0TWVudUl0 ZW0qIGl0ZW0pCiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIG9wZW5OZXdXaW5kb3cobV9oaXRU ZXN0UmVzdWx0LmFic29sdXRlTGlua1VSTCgpLCBmcmFtZSk7CiAgICAgICAgIGJyZWFrOworICAg IGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnT3BlbkxpbmtJblRoaXNXaW5kb3c6CisgICAgICAgIGZy YW1lLT5sb2FkZXIoKS0+bG9hZEZyYW1lUmVxdWVzdChGcmFtZUxvYWRSZXF1ZXN0KGZyYW1lLT5k b2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLCBSZXNvdXJjZVJlcXVlc3QobV9oaXRUZXN0UmVz dWx0LmFic29sdXRlTGlua1VSTCgpLCBmcmFtZS0+bG9hZGVyKCktPm91dGdvaW5nUmVmZXJyZXIo KSkpLCBmYWxzZSwgZmFsc2UsIDAsIDAsIE1heWJlU2VuZFJlZmVycmVyKTsKKyAgICAgICAgYnJl YWs7CiAgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdCb2xkOgogICAgICAgICBmcmFtZS0+ZWRp dG9yKCktPmNvbW1hbmQoIlRvZ2dsZUJvbGQiKS5leGVjdXRlKCk7CiAgICAgICAgIGJyZWFrOwpA QCAtMTI5Nyw2ICsxMzAwLDcgQEAgdm9pZCBDb250ZXh0TWVudUNvbnRyb2xsZXI6OmNoZWNrT3JF bmFibGVJZk5lZWRlZChDb250ZXh0TWVudUl0ZW0mIGl0ZW0pIGNvbnN0CiAjZW5kaWYKICAgICAg ICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdOb0FjdGlvbjoKICAgICAgICAgY2FzZSBDb250ZXh0 TWVudUl0ZW1UYWdPcGVuTGlua0luTmV3V2luZG93OgorICAgICAgICBjYXNlIENvbnRleHRNZW51 SXRlbVRhZ09wZW5MaW5rSW5UaGlzV2luZG93OgogICAgICAgICBjYXNlIENvbnRleHRNZW51SXRl bVRhZ0Rvd25sb2FkTGlua1RvRGlzazoKICAgICAgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdD b3B5TGlua1RvQ2xpcGJvYXJkOgogICAgICAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ09wZW5J bWFnZUluTmV3V2luZG93OgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29u dGV4dE1lbnVJdGVtLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db250ZXh0TWVudUl0ZW0u aAppbmRleCBmNWQ5MzVhNWEyZTQ0ZThjNmI4OWIzY2FhMWU5MjQyMTNiODc1MDRiLi44ZDE5NzFm N2ViYTMyNzI5YzQyOWYzNmY3NzFmNDRhZjEzMDUyZWQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9Db250ZXh0TWVudUl0ZW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9Db250ZXh0TWVudUl0ZW0uaApAQCAtMTY0LDYgKzE2NCw3IEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKICAgICAgICAgQ29udGV4dE1lbnVJdGVtVGFnTWVkaWFQbGF5UGF1c2UsCiAgICAgICAg IENvbnRleHRNZW51SXRlbVRhZ01lZGlhTXV0ZSwKICAgICAgICAgQ29udGV4dE1lbnVJdGVtVGFn RGljdGF0aW9uQWx0ZXJuYXRpdmUsCisgICAgICAgIENvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5r SW5UaGlzV2luZG93LAogICAgICAgICBDb250ZXh0TWVudUl0ZW1CYXNlQ3VzdG9tVGFnID0gNTAw MCwKICAgICAgICAgQ29udGV4dE1lbnVJdGVtQ3VzdG9tVGFnTm9BY3Rpb24gPSA1OTk4LAogICAg ICAgICBDb250ZXh0TWVudUl0ZW1MYXN0Q3VzdG9tVGFnID0gNTk5OSwKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuaCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuaAppbmRleCA5NjAyZTFmOTBjMDZlMTMyMzlkODU3 NGNhMjczMjQzZDhlMDc2ZWQ2Li5iY2QyMmM0NmMzMWU1YzdhYWFkZjgzZTkyNzJhNmU0N2YzMmQ0 N2FiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdz LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9jYWxpemVkU3RyaW5ncy5oCkBAIC00 OSw2ICs0OSw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogI2lmIEVOQUJMRShDT05URVhUX01F TlVTKQogICAgIFN0cmluZyBjb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlua0luTmV3V2luZG93KCk7 CisjaWYgUExBVEZPUk0oUVQpCisgICAgU3RyaW5nIGNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5r SW5UaGlzV2luZG93KCk7CisjZW5kaWYKICAgICBTdHJpbmcgY29udGV4dE1lbnVJdGVtVGFnRG93 bmxvYWRMaW5rVG9EaXNrKCk7CiAgICAgU3RyaW5nIGNvbnRleHRNZW51SXRlbVRhZ0NvcHlMaW5r VG9DbGlwYm9hcmQoKTsKICAgICBTdHJpbmcgY29udGV4dE1lbnVJdGVtVGFnT3BlbkltYWdlSW5O ZXdXaW5kb3coKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L0xvY2Fs aXplZFN0cmluZ3NRdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9Mb2NhbGl6ZWRT dHJpbmdzUXQuY3BwCmluZGV4IDBjZGNlM2E4NTM0MTQ1MWM4MjE4MzNjOWU2ZGVjY2RkODk1MGM5 M2IuLjdkZmZmMWZlOThmOGQ1OGY0Y2U2YjY4NzY3MGFiZDczMWM2NWMxY2EgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L0xvY2FsaXplZFN0cmluZ3NRdC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvTG9jYWxpemVkU3RyaW5nc1F0LmNwcApAQCAtODgs NiArODgsMTEgQEAgU3RyaW5nIGNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rSW5OZXdXaW5kb3co KQogICAgIHJldHVybiBRQ29yZUFwcGxpY2F0aW9uOjp0cmFuc2xhdGUoIlFXZWJQYWdlIiwgIk9w ZW4gaW4gTmV3IFdpbmRvdyIsICJPcGVuIGluIE5ldyBXaW5kb3cgY29udGV4dCBtZW51IGl0ZW0i KTsKIH0KIAorU3RyaW5nIGNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rSW5UaGlzV2luZG93KCkK K3sKKyAgICByZXR1cm4gUUNvcmVBcHBsaWNhdGlvbjo6dHJhbnNsYXRlKCJRV2ViUGFnZSIsICJP cGVuIGluIFRoaXMgV2luZG93IiwgIk9wZW4gaW4gVGhpcyBXaW5kb3cgY29udGV4dCBtZW51IGl0 ZW0iKTsKK30KKwogU3RyaW5nIGNvbnRleHRNZW51SXRlbVRhZ0Rvd25sb2FkTGlua1RvRGlzaygp CiB7CiAgICAgcmV0dXJuIFFDb3JlQXBwbGljYXRpb246OnRyYW5zbGF0ZSgiUVdlYlBhZ2UiLCAi U2F2ZSBMaW5rLi4uIiwgIkRvd25sb2FkIExpbmtlZCBGaWxlIGNvbnRleHQgbWVudSBpdGVtIik7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKaW5kZXggYzJjOTgyM2Y5OWNiY2U3MmIwM2Q3YmM4 ZWI1ZDZhZDMyODg1Mjg5Mi4uZTE3NmY3ODBjODk5ZWMwOWUyNDc2NDZlZTE0ZTE0ZTI1Y2U1YmUy MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcApAQCAtMTcxLDYgKzE3MSw3IEBAIHN0YXRp YyBjb25zdCBjaGFyKiBlZGl0b3JDb21tYW5kV2ViQWN0aW9uc1tdID0KICAgICAwLCAvLyBPcGVu TGluaywKIAogICAgIDAsIC8vIE9wZW5MaW5rSW5OZXdXaW5kb3csCisgICAgMCwgLy8gT3Blbkxp bmtJblRoaXNXaW5kb3csCiAgICAgMCwgLy8gT3BlbkZyYW1lSW5OZXdXaW5kb3csCiAKICAgICAw LCAvLyBEb3dubG9hZExpbmtUb0Rpc2ssCkBAIC00MzYsNiArNDM3LDcgQEAgc3RhdGljIFFXZWJQ YWdlOjpXZWJBY3Rpb24gd2ViQWN0aW9uRm9yQ29udGV4dE1lbnVBY3Rpb24oV2ViQ29yZTo6Q29u dGV4dE1lbnVBY3QKICAgICBzd2l0Y2ggKGFjdGlvbikgewogICAgICAgICBjYXNlIFdlYkNvcmU6 OkNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rOiByZXR1cm4gUVdlYlBhZ2U6Ok9wZW5MaW5rOwog ICAgICAgICBjYXNlIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rSW5OZXdXaW5k b3c6IHJldHVybiBRV2ViUGFnZTo6T3BlbkxpbmtJbk5ld1dpbmRvdzsKKyAgICAgICAgY2FzZSBX ZWJDb3JlOjpDb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlua0luVGhpc1dpbmRvdzogcmV0dXJuIFFX ZWJQYWdlOjpPcGVuTGlua0luVGhpc1dpbmRvdzsKICAgICAgICAgY2FzZSBXZWJDb3JlOjpDb250 ZXh0TWVudUl0ZW1UYWdEb3dubG9hZExpbmtUb0Rpc2s6IHJldHVybiBRV2ViUGFnZTo6RG93bmxv YWRMaW5rVG9EaXNrOwogICAgICAgICBjYXNlIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbVRhZ0Nv cHlMaW5rVG9DbGlwYm9hcmQ6IHJldHVybiBRV2ViUGFnZTo6Q29weUxpbmtUb0NsaXBib2FyZDsK ICAgICAgICAgY2FzZSBXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW1UYWdPcGVuSW1hZ2VJbk5ld1dp bmRvdzogcmV0dXJuIFFXZWJQYWdlOjpPcGVuSW1hZ2VJbk5ld1dpbmRvdzsKQEAgLTE2OTMsNiAr MTY5NSw3IEBAIEludFBvaW50IFFXZWJQYWdlUHJpdmF0ZTo6VG91Y2hBZGp1c3Rlcjo6ZmluZENh bmRpZGF0ZVBvaW50Rm9yVG91Y2goY29uc3QgSW50UG9pCiAgICAgXHZhbHVlIE5vV2ViQWN0aW9u IE5vIGFjdGlvbiBpcyB0cmlnZ2VyZWQuCiAgICAgXHZhbHVlIE9wZW5MaW5rIE9wZW4gdGhlIGN1 cnJlbnQgbGluay4KICAgICBcdmFsdWUgT3BlbkxpbmtJbk5ld1dpbmRvdyBPcGVuIHRoZSBjdXJy ZW50IGxpbmsgaW4gYSBuZXcgd2luZG93LgorICAgIFx2YWx1ZSBPcGVuTGlua0luVGhpc1dpbmRv dyBPcGVuIHRoZSBjdXJyZW50IGxpbmsgd2l0aG91dCBvcGVuaW5nIGEgbmV3IHdpbmRvdy4gVXNl ZCBvbiBsaW5rcyB0aGF0IHdvdWxkIGRlZmF1bHQgdG8gb3BlbmluZyBhIG5ldyB3aW5kb3cuIChB ZGRlZCBpbiBRdCA1LjApCiAgICAgXHZhbHVlIE9wZW5GcmFtZUluTmV3V2luZG93IFJlcGxpY2F0 ZSB0aGUgY3VycmVudCBmcmFtZSBpbiBhIG5ldyB3aW5kb3cuCiAgICAgXHZhbHVlIERvd25sb2Fk TGlua1RvRGlzayBEb3dubG9hZCB0aGUgY3VycmVudCBsaW5rIHRvIHRoZSBkaXNrLgogICAgIFx2 YWx1ZSBDb3B5TGlua1RvQ2xpcGJvYXJkIENvcHkgdGhlIGN1cnJlbnQgbGluayB0byB0aGUgY2xp cGJvYXJkLgpAQCAtMjM2Nyw2ICsyMzcwLDEwIEBAIHZvaWQgUVdlYlBhZ2U6OnRyaWdnZXJBY3Rp b24oV2ViQWN0aW9uIGFjdGlvbiwgYm9vbCkKICAgICAgICAgY2FzZSBPcGVuTGlua0luTmV3V2lu ZG93OgogICAgICAgICAgICAgb3Blbk5ld1dpbmRvdyhkLT5oaXRUZXN0UmVzdWx0LmxpbmtVcmwo KSwgZnJhbWUpOwogICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgT3BlbkxpbmtJblRo aXNXaW5kb3c6CisgICAgICAgICAgICBmcmFtZS0+bG9hZGVyKCktPmxvYWRGcmFtZVJlcXVlc3Qo ZnJhbWVMb2FkUmVxdWVzdChkLT5oaXRUZXN0UmVzdWx0LmxpbmtVcmwoKSwgZnJhbWUpLAorICAg ICAgICAgICAgICAgIC8qbG9ja0hpc3RvcnkqLyBmYWxzZSwgLypsb2NrQmFja0ZvcndhcmRMaXN0 Ki8gZmFsc2UsIC8qZXZlbnQqLyAwLCAvKkZvcm1TdGF0ZSovIDAsIE1heWJlU2VuZFJlZmVycmVy KTsKKyAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIE9wZW5GcmFtZUluTmV3V2luZG93 OiB7CiAgICAgICAgICAgICBLVVJMIHVybCA9IGZyYW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2Fk ZXIoKS0+dW5yZWFjaGFibGVVUkwoKTsKICAgICAgICAgICAgIGlmICh1cmwuaXNFbXB0eSgpKQpA QCAtMjc4OCw2ICsyNzk1LDkgQEAgUUFjdGlvbiAqUVdlYlBhZ2U6OmFjdGlvbihXZWJBY3Rpb24g YWN0aW9uKSBjb25zdAogICAgICAgICBjYXNlIE9wZW5GcmFtZUluTmV3V2luZG93OgogICAgICAg ICAgICAgdGV4dCA9IGNvbnRleHRNZW51SXRlbVRhZ09wZW5GcmFtZUluTmV3V2luZG93KCk7CiAg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBPcGVuTGlua0luVGhpc1dpbmRvdzoKKyAg ICAgICAgICAgIHRleHQgPSBjb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlua0luVGhpc1dpbmRvdygp OworICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgY2FzZSBEb3dubG9hZExpbmtUb0Rpc2s6 CiAgICAgICAgICAgICB0ZXh0ID0gY29udGV4dE1lbnVJdGVtVGFnRG93bmxvYWRMaW5rVG9EaXNr KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5oIGIvU291cmNl L1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuaAppbmRleCA2NmY4OTYwOWIwMDM4NGNiYWY5YTkwZTE2 MGQ5ZDdiMTcwZDBkMDUyLi5iMmNhYTEzMWRlYTY1MDVlNWYwYWI0N2RjZDQ5MTc1YzI1ZTE4MTdj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmgKQEAgLTE4MCw2ICsxODAsOCBAQCBwdWJsaWM6CiAK ICAgICAgICAgQ29weUltYWdlVXJsVG9DbGlwYm9hcmQsCiAKKyAgICAgICAgT3BlbkxpbmtJblRo aXNXaW5kb3csCisKICAgICAgICAgV2ViQWN0aW9uQ291bnQKICAgICB9OwogCmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzQ1MGI0NjlhM2M2MDVj M2M3MmFiMjliOWU3Y2U0NWRlYjc1ZDYwNi4uZDc4Y2MzNTZkZmE0Y2E2MDg2YTBlNGY4N2QyZjM0 NWRlOTgwNmJmYiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTExLTA3ICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4g IDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtRdF0gT3BlbiBsaW5rIGluIHRo aXMgd2luZG93IGFjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTAxMjI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgUG9wdWxhdGVzIHRoZSBjb250ZXh0LW1lbnUgd2l0aCB0aGUgbmV3IGFjdGlvbiB3 aGVuIHRoZSBkZWZhdWx0IGFjdGlvbiBpcyB0byBvcGVuIGluIGEgbmV3IHdpbmRvdy4KKworICAg ICAgICAqIFF0VGVzdEJyb3dzZXIvd2Vidmlldy5jcHA6CisgICAgICAgIChjcmVhdGVDb250ZXh0 TWVudSk6CisKIDIwMTItMTEtMDcgIFRoaWFnbyBNYXJjb3MgUC4gU2FudG9zICA8dGhpYWdvLnNh bnRvc0BpbnRlbC5jb20+CiAKICAgICAgICAgW0VGTF0gQWRkIEVGTCB0byBnYXJkZW4tby1tYXRp YwpkaWZmIC0tZ2l0IGEvVG9vbHMvUXRUZXN0QnJvd3Nlci93ZWJ2aWV3LmNwcCBiL1Rvb2xzL1F0 VGVzdEJyb3dzZXIvd2Vidmlldy5jcHAKaW5kZXggM2VhOThmOTBiNTE1NmFkMzJjODg4YWFkMzQy NmYzNjYyMjNiZTg4Ny4uNGZhY2NiZDU4MzQ5YTQ5ZDU4M2NkZDNjMjA1YjYxZmQ4ZTE5YzUwMCAx MDA2NDQKLS0tIGEvVG9vbHMvUXRUZXN0QnJvd3Nlci93ZWJ2aWV3LmNwcAorKysgYi9Ub29scy9R dFRlc3RCcm93c2VyL3dlYnZpZXcuY3BwCkBAIC0yNTEsMTAgKzI1MSwxNCBAQCBzdGF0aWMgUU1l bnUqIGNyZWF0ZUNvbnRleHRNZW51KFFXZWJQYWdlKiBwYWdlLCBRUG9pbnQgcG9zaXRpb24pCiAg ICAgUVdlYkhpdFRlc3RSZXN1bHQgciA9IHBhZ2UtPm1haW5GcmFtZSgpLT5oaXRUZXN0Q29udGVu dChwb3NpdGlvbik7CiAKICAgICBpZiAoIXIubGlua1VybCgpLmlzRW1wdHkoKSkgeworI2lmbmRl ZiBRVF9OT19ERVNLVE9QU0VSVklDRVMKICAgICAgICAgV2ViUGFnZSogd2ViUGFnZSA9IHFvYmpl Y3RfY2FzdDxXZWJQYWdlKj4ocGFnZSk7CiAgICAgICAgIFFBY3Rpb24qIG5ld1RhYkFjdGlvbiA9 IG1lbnUtPmFkZEFjdGlvbigiT3BlbiBpbiBEZWZhdWx0ICZCcm93c2VyIiwgd2ViUGFnZSwgU0xP VChvcGVuVXJsSW5EZWZhdWx0QnJvd3NlcigpKSk7CiAgICAgICAgIG5ld1RhYkFjdGlvbi0+c2V0 RGF0YShyLmxpbmtVcmwoKSk7CiAgICAgICAgIG1lbnUtPmluc2VydEFjdGlvbihtZW51LT5hY3Rp b25zKCkuYXQoMiksIG5ld1RhYkFjdGlvbik7CisjZW5kaWYKKyAgICAgICAgaWYgKHIubGlua1Rh cmdldEZyYW1lKCkgIT0gci5mcmFtZSgpKQorICAgICAgICAgICAgbWVudS0+aW5zZXJ0QWN0aW9u KG1lbnUtPmFjdGlvbnMoKS5hdCgwKSwgcGFnZS0+YWN0aW9uKFFXZWJQYWdlOjpPcGVuTGlua0lu VGhpc1dpbmRvdykpOwogICAgIH0KICAgICByZXR1cm4gbWVudTsKIH0K