73033 2011-11-23 11:20:44 -0800 [Chromium] WebGL active texture state corrupted upon WebGL contents present 2011-12-01 12:02:53 -0800 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 twiz twiz cc-bugs dglazkov eric gustavo.noronha gustavo jamesr kbr rniwa senorblanco twiz webkit.review.bot xan.lopez oldest_to_newest 508250 0 twiz 2011-11-23 11:20:44 -0800 DrawingBuffer::publishToPlatformLayer is corrupting the WebGL active texture state. The bound texture must be restored after the texture copy. Webkit issue tracking crbug.com/105045. 508258 1 116387 twiz 2011-11-23 11:33:50 -0800 Created attachment 116387 Patch 508263 2 116387 senorblanco 2011-11-23 11:53:03 -0800 Comment on attachment 116387 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116387&action=review > Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:66 > + , m_activeTextureUnit(0) The default value for m_activeTextureUnit should probably be GraphicsContext3D::GL_TEXTURE0, not 0, just in case the WebGL app doesn't call glActiveTexture() before DrawingBuffer::publishToPlatformLayer() gets called. > Source/WebCore/platform/graphics/gpu/mac/DrawingBufferMac.mm:47 > + , m_activeTextureUnit(0) Same as above. > Source/WebCore/platform/graphics/gpu/qt/DrawingBufferQt.cpp:42 > + , m_activeTextureUnit(0) Same as above. > Source/WebCore/platform/graphics/gtk/DrawingBufferGtk.cpp:44 > + , m_activeTextureUnit(0) Same as above. 508266 3 116387 kbr 2011-11-23 11:54:40 -0800 Comment on attachment 116387 Patch Nice work tracking this down. Looks like it needs to be merged to top of tree, but r=me with that addressed. 508268 4 kbr 2011-11-23 11:55:14 -0800 BTW, possible to write a layout test for this? 508304 5 116400 twiz 2011-11-23 12:37:25 -0800 Created attachment 116400 Patch 508318 6 116400 webkit-ews 2011-11-23 12:51:21 -0800 Comment on attachment 116400 Patch Attachment 116400 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/10635041 508320 7 116400 gustavo.noronha 2011-11-23 12:52:40 -0800 Comment on attachment 116400 Patch Attachment 116400 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/10636045 508321 8 116400 webkit.review.bot 2011-11-23 12:53:31 -0800 Comment on attachment 116400 Patch Attachment 116400 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/10632048 508375 9 116422 twiz 2011-11-23 14:02:24 -0800 Created attachment 116422 Patch 508566 10 116467 twiz 2011-11-23 19:11:38 -0800 Created attachment 116467 Patch 508596 11 116467 kbr 2011-11-23 20:46:25 -0800 Comment on attachment 116467 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116467&action=review Looks good; nice job on the test case. A few minor nits in the test that can be cleaned up later. r=me > LayoutTests/fast/canvas/webgl/webgl-texture-binding-preserved.html:22 > +var requestAnimationFrame; nit: this variable is no longer needed. > LayoutTests/fast/canvas/webgl/webgl-texture-binding-preserved.html:26 > + // before reaching this point. If the texture state was corruted, then nit: corruted -> corrupted > LayoutTests/fast/canvas/webgl/webgl-texture-binding-preserved.html:42 > + canvas.width = 50; canvas.height = 50; nit: not needed > LayoutTests/fast/canvas/webgl/webgl-texture-binding-preserved.html:63 > + setTimeout(draw, 100); nit: add comment that requestAnimationFrame was tried for this purpose and it didn't work. Also that the 100 ms timeout seemed to reproduce the problem 100% of the time even during fast page reloads. 508622 12 116467 webkit.review.bot 2011-11-23 22:06:46 -0800 Comment on attachment 116467 Patch Clearing flags on attachment: 116467 Committed r101120: <http://trac.webkit.org/changeset/101120> 508623 13 webkit.review.bot 2011-11-23 22:06:52 -0800 All reviewed patches have been landed. Closing bug. 509248 14 rniwa 2011-11-25 12:30:46 -0800 The test added by this patch is failing on Mac: http://build.webkit.org/results/SnowLeopard%20Intel%20Release%20(Tests)/r101177%20(34952)/fast/canvas/webgl/webgl-texture-binding-preserved-pretty-diff.html 509260 15 116638 twiz 2011-11-25 13:53:30 -0800 Created attachment 116638 Patch 509261 16 twiz 2011-11-25 13:58:13 -0800 (In reply to comment #14) > The test added by this patch is failing on Mac: > http://build.webkit.org/results/SnowLeopard%20Intel%20Release%20(Tests)/r101177%20(34952)/fast/canvas/webgl/webgl-texture-binding-preserved-pretty-diff.html Investigating the failure. This test should pass on all browsers, and does not rely on Chrome-specific behaviour. 509802 17 116638 senorblanco 2011-11-28 06:48:55 -0800 Comment on attachment 116638 Patch OK. r=me 509838 18 twiz 2011-11-28 08:05:28 -0800 (In reply to comment #14) > The test added by this patch is failing on Mac: > http://build.webkit.org/results/SnowLeopard%20Intel%20Release%20(Tests)/r101177%20(34952)/fast/canvas/webgl/webgl-texture-binding-preserved-pretty-diff.html The test is failing because safari is failing to construct the shaders used by the test. Added a suppression, and a new bug here: https://bugs.webkit.org/show_bug.cgi?id=73148 512894 19 twiz 2011-12-01 10:49:30 -0800 Re-opening the bug, to allow the CQ to process pending patch #5. 512969 20 116638 webkit.review.bot 2011-12-01 12:02:46 -0800 Comment on attachment 116638 Patch Clearing flags on attachment: 116638 Committed r101696: <http://trac.webkit.org/changeset/101696> 512970 21 webkit.review.bot 2011-12-01 12:02:53 -0800 All reviewed patches have been landed. Closing bug. 116387 2011-11-23 11:33:50 -0800 2011-11-23 12:37:19 -0800 Patch bug-73033-20111123143029.patch text/plain 7845 twiz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMTA5NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDExLTExLTIzICBKZWZmIFRp bWFudXMgIDx0d2l6QGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dICBQcmV2ZW50 IERyYXdpbmdCdWZmZXIgaW5zdGFuY2VzIGZyb20gY29ycnVwdGluZyB0aGUgYWN0aXZlCisgICAg ICAgIHRleHR1cmUgc3RhdGUgb2YgdGhlIFdlYkdMIGNvbnRleHRzLiBUaGUgRHJhd2luZ0J1ZmZl ciBub3cgdHJhY2tzIHRoZQorICAgICAgICBzdGF0ZSBvZiB0ZXh0dXJlIHVuaXQgMCwgYW5kIHRo ZSBhY3RpdmUgdGV4dHVyZSB1bml0LCBzbyB0aGF0IHN0YXRlIGNhbgorICAgICAgICBiZSByZXN0 b3JlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcz MDMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBo dG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 V2ViR0xSZW5kZXJpbmdDb250ZXh0OjphY3RpdmVUZXh0dXJlKToKKyAgICAgICAgKFdlYkNvcmU6 OldlYkdMUmVuZGVyaW5nQ29udGV4dDo6YmluZFRleHR1cmUpOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjpEcmF3aW5nQnVmZmVyKToKKyAgICAgICAgKFdlYkNvcmU6 OkRyYXdpbmdCdWZmZXI6OnB1Ymxpc2hUb1BsYXRmb3JtTGF5ZXIpOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmg6CisgICAgICAgIChXZWJDb3JlOjpEcmF3 aW5nQnVmZmVyOjpzZXRUZXh0dXJlMkRCaW5kaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkRyYXdp bmdCdWZmZXI6OnNldEFjdGl2ZVRleHR1cmVVbml0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9ncHUvbWFjL0RyYXdpbmdCdWZmZXJNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpEcmF3 aW5nQnVmZmVyOjpEcmF3aW5nQnVmZmVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9n cHUvcXQvRHJhd2luZ0J1ZmZlclF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRyYXdpbmdCdWZm ZXI6OkRyYXdpbmdCdWZmZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2d0ay9EcmF3 aW5nQnVmZmVyR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRyYXdpbmdCdWZmZXI6OkRyYXdp bmdCdWZmZXIpOgorCiAyMDExLTExLTIzICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90 QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTAxMDY5LgpJ bmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmlu Z0NvbnRleHQuY3BwCShyZXZpc2lvbiAxMDA5NzgpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL2Nh bnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03NTgsNiAr NzU4LDEwIEBAIHZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0OjphY3RpdmVUZXh0dXIKICAgICB9 CiAgICAgbV9hY3RpdmVUZXh0dXJlVW5pdCA9IHRleHR1cmUgLSBHcmFwaGljc0NvbnRleHQzRDo6 VEVYVFVSRTA7CiAgICAgbV9jb250ZXh0LT5hY3RpdmVUZXh0dXJlKHRleHR1cmUpOworCisgICAg aWYgKG1fZHJhd2luZ0J1ZmZlcikKKyAgICAgICAgbV9kcmF3aW5nQnVmZmVyLT5zZXRBY3RpdmVU ZXh0dXJlVW5pdCh0ZXh0dXJlKTsKKwogICAgIGNsZWFudXBBZnRlckdyYXBoaWNzQ2FsbChmYWxz ZSk7CiB9CiAKQEAgLTg4OCw2ICs4OTIsMTAgQEAgdm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6 OmJpbmRUZXh0dXJlKAogICAgIGlmICh0YXJnZXQgPT0gR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRV UkVfMkQpIHsKICAgICAgICAgbV90ZXh0dXJlVW5pdHNbbV9hY3RpdmVUZXh0dXJlVW5pdF0ubV90 ZXh0dXJlMkRCaW5kaW5nID0gdGV4dHVyZTsKICAgICAgICAgbWF4TGV2ZWwgPSBtX21heFRleHR1 cmVMZXZlbDsKKworICAgICAgICBpZiAobV9kcmF3aW5nQnVmZmVyICYmICFtX2FjdGl2ZVRleHR1 cmVVbml0KQorICAgICAgICAgICAgbV9kcmF3aW5nQnVmZmVyLT5zZXRUZXh0dXJlQmluZGluZyhv YmplY3RPclplcm8odGV4dHVyZSkpOworCiAgICAgfSBlbHNlIGlmICh0YXJnZXQgPT0gR3JhcGhp Y3NDb250ZXh0M0Q6OlRFWFRVUkVfQ1VCRV9NQVApIHsKICAgICAgICAgbV90ZXh0dXJlVW5pdHNb bV9hY3RpdmVUZXh0dXJlVW5pdF0ubV90ZXh0dXJlQ3ViZU1hcEJpbmRpbmcgPSB0ZXh0dXJlOwog ICAgICAgICBtYXhMZXZlbCA9IG1fbWF4Q3ViZU1hcFRleHR1cmVMZXZlbDsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1 bS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vRHJhd2luZ0J1ZmZlckNocm9taXVtLmNwcAkocmV2aXNpb24gMTAwOTc4KQorKysgU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJhd2luZ0J1ZmZlckNocm9t aXVtLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjIsNiArNjIsOCBAQCBEcmF3aW5nQnVmZmVyOjpE cmF3aW5nQnVmZmVyKEdyYXBoaWNzQ29uCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJv b2wgc2VwYXJhdGVCYWNraW5nVGV4dHVyZSkKICAgICA6IG1fc2VwYXJhdGVCYWNraW5nVGV4dHVy ZShzZXBhcmF0ZUJhY2tpbmdUZXh0dXJlKQogICAgICwgbV9zY2lzc29yRW5hYmxlZChmYWxzZSkK KyAgICAsIG1fdGV4dHVyZTJEQmluZGluZygwKQorICAgICwgbV9hY3RpdmVUZXh0dXJlVW5pdCgw KQogICAgICwgbV9jb250ZXh0KGNvbnRleHQpCiAgICAgLCBtX3NpemUoLTEsIC0xKQogICAgICwg bV9tdWx0aXNhbXBsZUV4dGVuc2lvblN1cHBvcnRlZChtdWx0aXNhbXBsZUV4dGVuc2lvblN1cHBv cnRlZCkKQEAgLTExOCw5ICsxMjAsMTYgQEAgdm9pZCBEcmF3aW5nQnVmZmVyOjpwdWJsaXNoVG9Q bGF0Zm9ybUxheQogCiAgICAgaWYgKG1fc2VwYXJhdGVCYWNraW5nVGV4dHVyZSkgewogICAgICAg ICBtX2NvbnRleHQtPmJpbmRGcmFtZWJ1ZmZlcihHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZG RVIsIG1fZmJvKTsKKworICAgICAgICAvLyBUaGlzIHBhdGggYWx3YXlzIHVzZXMgVEVYVFVSRTAs IGFuZCByZXN0b3JlcyBpdHMgc3RhdGUgYmVsb3cuCisgICAgICAgIG1fY29udGV4dC0+YWN0aXZl VGV4dHVyZShHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRTApOwogICAgICAgICBtX2NvbnRleHQt PmJpbmRUZXh0dXJlKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCBtX2JhY2tpbmdDb2xv ckJ1ZmZlcik7CisKICAgICAgICAgdW5zaWduZWQgY29sb3JGb3JtYXQgPSBtX2NvbnRleHQtPmdl dENvbnRleHRBdHRyaWJ1dGVzKCkuYWxwaGEgPyBHcmFwaGljc0NvbnRleHQzRDo6UkdCQSA6IEdy YXBoaWNzQ29udGV4dDNEOjpSR0I7CiAgICAgICAgIG1fY29udGV4dC0+Y29weVRleEltYWdlMkQo R3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIDAsIGNvbG9yRm9ybWF0LCAwLCAwLCBzaXpl KCkud2lkdGgoKSwgc2l6ZSgpLmhlaWdodCgpLCAwKTsKKworICAgICAgICBtX2NvbnRleHQtPmJp bmRUZXh0dXJlKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCBtX3RleHR1cmUyREJpbmRp bmcpOworICAgICAgICBtX2NvbnRleHQtPmFjdGl2ZVRleHR1cmUobV9hY3RpdmVUZXh0dXJlVW5p dCk7CiAgICAgfQogCiAgICAgaWYgKG11bHRpc2FtcGxlKCkpCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmgJKHJldmlz aW9uIDEwMDk3OCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3 aW5nQnVmZmVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTg1LDYgKzg1LDE0IEBAIHB1YmxpYzoKICAg ICAvLyBjYW4gYmUgZGlzYWJsZWQgZHVyaW5nIGNhbGxzIHRvIGNvbW1pdC4KICAgICB2b2lkIHNl dFNjaXNzb3JFbmFibGVkKGJvb2wgc2Npc3NvckVuYWJsZWQpIHsgbV9zY2lzc29yRW5hYmxlZCA9 IHNjaXNzb3JFbmFibGVkOyB9CiAKKyAgICAvLyBUaGUgRHJhd2luZ0J1ZmZlciBuZWVkcyB0byB0 cmFjayB0aGUgdGV4dHVyZSBib3VuZCB0byB0ZXh0dXJlIHVuaXQgMC4KKyAgICAvLyBUaGUgYm91 bmQgdGV4dHVyZSBpcyB0cmFja2VkIHRvIGF2b2lkIGNvc3RseSBxdWVyaWVzIGR1cmluZyByZW5k ZXJpbmcuCisgICAgdm9pZCBzZXRUZXh0dXJlMkRCaW5kaW5nKEdDM0RpbnQgdGV4dHVyZSkgeyBt X3RleHR1cmUyREJpbmRpbmcgPSB0ZXh0dXJlOyB9CisKKyAgICAvLyBUcmFjayB0aGUgY3VycmVu dGx5IGFjdGl2ZSB0ZXh0dXJlIHVuaXQuIFRleHR1cmUgdW5pdCAwIGlzIHVzZWQgYXMgaG9zdCBm b3IgYSBzY3JhdGNoCisgICAgLy8gdGV4dHVyZS4KKyAgICB2b2lkIHNldEFjdGl2ZVRleHR1cmVV bml0KEdDM0RpbnQgdGV4dHVyZVVuaXQpIHsgbV9hY3RpdmVUZXh0dXJlVW5pdCA9IHRleHR1cmVV bml0OyB9CisKICAgICBib29sIG11bHRpc2FtcGxlKCkgY29uc3Q7CiAKICAgICBQbGF0Zm9ybTNE T2JqZWN0IHBsYXRmb3JtQ29sb3JCdWZmZXIoKSBjb25zdDsKQEAgLTExMiw2ICsxMjAsOCBAQCBw cml2YXRlOgogCiAgICAgYm9vbCBtX3NlcGFyYXRlQmFja2luZ1RleHR1cmU7CiAgICAgYm9vbCBt X3NjaXNzb3JFbmFibGVkOworICAgIFBsYXRmb3JtM0RPYmplY3QgbV90ZXh0dXJlMkRCaW5kaW5n OworICAgIEdDM0RlbnVtIG1fYWN0aXZlVGV4dHVyZVVuaXQ7CiAKICAgICBSZWZQdHI8R3JhcGhp Y3NDb250ZXh0M0Q+IG1fY29udGV4dDsKICAgICBJbnRTaXplIG1fc2l6ZTsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9tYWMvRHJhd2luZ0J1ZmZlck1hYy5tbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvbWFjL0Ry YXdpbmdCdWZmZXJNYWMubW0JKHJldmlzaW9uIDEwMDk3OCkKKysrIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2dwdS9tYWMvRHJhd2luZ0J1ZmZlck1hYy5tbQkod29ya2luZyBjb3B5 KQpAQCAtNDMsNiArNDMsOCBAQCBEcmF3aW5nQnVmZmVyOjpEcmF3aW5nQnVmZmVyKEdyYXBoaWNz Q29uCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgc2VwYXJhdGVCYWNraW5nVGV4 dHVyZSkKICAgICA6IG1fc2VwYXJhdGVCYWNraW5nVGV4dHVyZShzZXBhcmF0ZUJhY2tpbmdUZXh0 dXJlKQogICAgICwgbV9zY2lzc29yRW5hYmxlZChmYWxzZSkKKyAgICAsIG1fdGV4dHVyZTJEQmlu ZGluZygwKQorICAgICwgbV9hY3RpdmVUZXh0dXJlVW5pdCgwKQogICAgICwgbV9jb250ZXh0KGNv bnRleHQpCiAgICAgLCBtX3NpemUoLTEsIC0xKQogICAgICwgbV9tdWx0aXNhbXBsZUV4dGVuc2lv blN1cHBvcnRlZChtdWx0aXNhbXBsZUV4dGVuc2lvblN1cHBvcnRlZCkKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9xdC9EcmF3aW5nQnVmZmVyUXQuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9xdC9EcmF3aW5n QnVmZmVyUXQuY3BwCShyZXZpc2lvbiAxMDA5NzgpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9ncHUvcXQvRHJhd2luZ0J1ZmZlclF0LmNwcAkod29ya2luZyBjb3B5KQpAQCAt MzgsNiArMzgsOCBAQCBEcmF3aW5nQnVmZmVyOjpEcmF3aW5nQnVmZmVyKEdyYXBoaWNzQ29uCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgc2VwYXJhdGVCYWNraW5nVGV4dHVyZSkK ICAgICA6IG1fc2VwYXJhdGVCYWNraW5nVGV4dHVyZShzZXBhcmF0ZUJhY2tpbmdUZXh0dXJlKQog ICAgICwgbV9zY2lzc29yRW5hYmxlZChmYWxzZSkKKyAgICAsIG1fdGV4dHVyZTJEQmluZGluZygw KQorICAgICwgbV9hY3RpdmVUZXh0dXJlVW5pdCgwKQogICAgICwgbV9jb250ZXh0KGNvbnRleHQp CiAgICAgLCBtX3NpemUoLTEsIC0xKQogICAgICwgbV9tdWx0aXNhbXBsZUV4dGVuc2lvblN1cHBv cnRlZChtdWx0aXNhbXBsZUV4dGVuc2lvblN1cHBvcnRlZCkKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9EcmF3aW5nQnVmZmVyR3RrLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvRHJhd2luZ0J1ZmZlckd0ay5j cHAJKHJldmlzaW9uIDEwMDk3OCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2d0ay9EcmF3aW5nQnVmZmVyR3RrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzYsOCArMzYsMTMg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogRHJhd2luZ0J1ZmZlcjo6RHJhd2luZ0J1ZmZlcihHcmFw aGljc0NvbnRleHQzRCogY29udGV4dCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3QgSW50U2l6ZSYgc2l6ZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBtdWx0 aXNhbXBsZUV4dGVuc2lvblN1cHBvcnRlZCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Ym9vbCBwYWNrZWREZXB0aFN0ZW5jaWxFeHRlbnNpb25TdXBwb3J0ZWQpCi0gICAgOiBtX2NvbnRl eHQoY29udGV4dCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBwYWNrZWREZXB0 aFN0ZW5jaWxFeHRlbnNpb25TdXBwb3J0ZWQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGJvb2wgc2VwYXJhdGVCYWNraW5nVGV4dHVyZSkKKyAgICA6IG1fc2VwYXJhdGVCYWNraW5nVGV4 dHVyZShzZXBhcmF0ZUJhY2tpbmdUZXh0dXJlKQorICAgICwgbV9zY2lzc29yRW5hYmxlZChmYWxz ZSkKKyAgICAsIG1fdGV4dHVyZTJEQmluZGluZygwKQorICAgICwgbV9hY3RpdmVUZXh0dXJlVW5p dCgwKQorICAgICwgbV9jb250ZXh0KGNvbnRleHQpCiAgICAgLCBtX3NpemUoLTEsIC0xKQogICAg ICwgbV9tdWx0aXNhbXBsZUV4dGVuc2lvblN1cHBvcnRlZChtdWx0aXNhbXBsZUV4dGVuc2lvblN1 cHBvcnRlZCkKICAgICAsIG1fcGFja2VkRGVwdGhTdGVuY2lsRXh0ZW5zaW9uU3VwcG9ydGVkKHBh Y2tlZERlcHRoU3RlbmNpbEV4dGVuc2lvblN1cHBvcnRlZCkK 116400 2011-11-23 12:37:25 -0800 2011-11-23 14:02:12 -0800 Patch bug-73033-20111123153404.patch text/plain 6883 twiz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMTA5OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDExLTExLTIzICBKZWZmIFRp bWFudXMgIDx0d2l6QGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dICBQcmV2ZW50 IERyYXdpbmdCdWZmZXIgaW5zdGFuY2VzIGZyb20gY29ycnVwdGluZyB0aGUgYWN0aXZlCisgICAg ICAgIHRleHR1cmUgc3RhdGUgb2YgdGhlIFdlYkdMIGNvbnRleHRzLiBUaGUgRHJhd2luZ0J1ZmZl ciBub3cgdHJhY2tzIHRoZQorICAgICAgICBzdGF0ZSBvZiB0ZXh0dXJlIHVuaXQgMCwgYW5kIHRo ZSBhY3RpdmUgdGV4dHVyZSB1bml0LCBzbyB0aGF0IHN0YXRlIGNhbgorICAgICAgICBiZSByZXN0 b3JlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcz MDMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBo dG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 V2ViR0xSZW5kZXJpbmdDb250ZXh0OjphY3RpdmVUZXh0dXJlKToKKyAgICAgICAgKFdlYkNvcmU6 OldlYkdMUmVuZGVyaW5nQ29udGV4dDo6YmluZFRleHR1cmUpOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjpEcmF3aW5nQnVmZmVyKToKKyAgICAgICAgKFdlYkNvcmU6 OkRyYXdpbmdCdWZmZXI6OnB1Ymxpc2hUb1BsYXRmb3JtTGF5ZXIpOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmg6CisgICAgICAgIChXZWJDb3JlOjpEcmF3 aW5nQnVmZmVyOjpzZXRUZXh0dXJlMkRCaW5kaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkRyYXdp bmdCdWZmZXI6OnNldEFjdGl2ZVRleHR1cmVVbml0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9ncHUvbWFjL0RyYXdpbmdCdWZmZXJNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpEcmF3 aW5nQnVmZmVyOjpEcmF3aW5nQnVmZmVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9n cHUvcXQvRHJhd2luZ0J1ZmZlclF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRyYXdpbmdCdWZm ZXI6OkRyYXdpbmdCdWZmZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2d0ay9EcmF3 aW5nQnVmZmVyR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRyYXdpbmdCdWZmZXI6OkRyYXdp bmdCdWZmZXIpOgorCiAyMDExLTExLTIzICBEbWl0cnkgTG9tb3YgIDxkc2xvbW92QGdvb2dsZS5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmViYXNlbGluZSBiaW5kaW5nIHRlc3RzIGFmdGVy IGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzEwMTA2NC4KSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcAko cmV2aXNpb24gMTAxMDk5KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5k ZXJpbmdDb250ZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzU4LDYgKzc1OCwxMCBAQCB2b2lk IFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6YWN0aXZlVGV4dHVyCiAgICAgfQogICAgIG1fYWN0aXZl VGV4dHVyZVVuaXQgPSB0ZXh0dXJlIC0gR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkUwOwogICAg IG1fY29udGV4dC0+YWN0aXZlVGV4dHVyZSh0ZXh0dXJlKTsKKworICAgIGlmIChtX2RyYXdpbmdC dWZmZXIpCisgICAgICAgIG1fZHJhd2luZ0J1ZmZlci0+c2V0QWN0aXZlVGV4dHVyZVVuaXQodGV4 dHVyZSk7CisKICAgICBjbGVhbnVwQWZ0ZXJHcmFwaGljc0NhbGwoZmFsc2UpOwogfQogCkBAIC04 ODgsNiArODkyLDEwIEBAIHZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0OjpiaW5kVGV4dHVyZSgK ICAgICBpZiAodGFyZ2V0ID09IEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJEKSB7CiAgICAg ICAgIG1fdGV4dHVyZVVuaXRzW21fYWN0aXZlVGV4dHVyZVVuaXRdLm1fdGV4dHVyZTJEQmluZGlu ZyA9IHRleHR1cmU7CiAgICAgICAgIG1heExldmVsID0gbV9tYXhUZXh0dXJlTGV2ZWw7CisKKyAg ICAgICAgaWYgKG1fZHJhd2luZ0J1ZmZlciAmJiAhbV9hY3RpdmVUZXh0dXJlVW5pdCkKKyAgICAg ICAgICAgIG1fZHJhd2luZ0J1ZmZlci0+c2V0VGV4dHVyZUJpbmRpbmcob2JqZWN0T3JaZXJvKHRl eHR1cmUpKTsKKwogICAgIH0gZWxzZSBpZiAodGFyZ2V0ID09IEdyYXBoaWNzQ29udGV4dDNEOjpU RVhUVVJFX0NVQkVfTUFQKSB7CiAgICAgICAgIG1fdGV4dHVyZVVuaXRzW21fYWN0aXZlVGV4dHVy ZVVuaXRdLm1fdGV4dHVyZUN1YmVNYXBCaW5kaW5nID0gdGV4dHVyZTsKICAgICAgICAgbWF4TGV2 ZWwgPSBtX21heEN1YmVNYXBUZXh0dXJlTGV2ZWw7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9EcmF3aW5nQnVmZmVyQ2hyb21pdW0uY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdC dWZmZXJDaHJvbWl1bS5jcHAJKHJldmlzaW9uIDEwMTA5OSkKKysrIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTYyLDYgKzYyLDggQEAgRHJhd2luZ0J1ZmZlcjo6RHJhd2luZ0J1ZmZlcihH cmFwaGljc0NvbgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sIHNlcGFyYXRlQmFj a2luZ1RleHR1cmUpCiAgICAgOiBtX3NlcGFyYXRlQmFja2luZ1RleHR1cmUoc2VwYXJhdGVCYWNr aW5nVGV4dHVyZSkKICAgICAsIG1fc2Npc3NvckVuYWJsZWQoZmFsc2UpCisgICAgLCBtX3RleHR1 cmUyREJpbmRpbmcoMCkKKyAgICAsIG1fYWN0aXZlVGV4dHVyZVVuaXQoR3JhcGhpY3NDb250ZXh0 M0Q6OlRFWFRVUkUwKQogICAgICwgbV9jb250ZXh0KGNvbnRleHQpCiAgICAgLCBtX3NpemUoLTEs IC0xKQogICAgICwgbV9tdWx0aXNhbXBsZUV4dGVuc2lvblN1cHBvcnRlZChtdWx0aXNhbXBsZUV4 dGVuc2lvblN1cHBvcnRlZCkKQEAgLTExOCw5ICsxMjAsMTYgQEAgdm9pZCBEcmF3aW5nQnVmZmVy OjpwdWJsaXNoVG9QbGF0Zm9ybUxheQogCiAgICAgaWYgKG1fc2VwYXJhdGVCYWNraW5nVGV4dHVy ZSkgewogICAgICAgICBtX2NvbnRleHQtPmJpbmRGcmFtZWJ1ZmZlcihHcmFwaGljc0NvbnRleHQz RDo6RlJBTUVCVUZGRVIsIG1fZmJvKTsKKworICAgICAgICAvLyBUaGlzIHBhdGggYWx3YXlzIHVz ZXMgVEVYVFVSRTAsIGFuZCByZXN0b3JlcyBpdHMgc3RhdGUgYmVsb3cuCisgICAgICAgIG1fY29u dGV4dC0+YWN0aXZlVGV4dHVyZShHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRTApOwogICAgICAg ICBtX2NvbnRleHQtPmJpbmRUZXh0dXJlKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCBt X2JhY2tpbmdDb2xvckJ1ZmZlcik7CisKICAgICAgICAgdW5zaWduZWQgY29sb3JGb3JtYXQgPSBt X2NvbnRleHQtPmdldENvbnRleHRBdHRyaWJ1dGVzKCkuYWxwaGEgPyBHcmFwaGljc0NvbnRleHQz RDo6UkdCQSA6IEdyYXBoaWNzQ29udGV4dDNEOjpSR0I7CiAgICAgICAgIG1fY29udGV4dC0+Y29w eVRleEltYWdlMkQoR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIDAsIGNvbG9yRm9ybWF0 LCAwLCAwLCBzaXplKCkud2lkdGgoKSwgc2l6ZSgpLmhlaWdodCgpLCAwKTsKKworICAgICAgICBt X2NvbnRleHQtPmJpbmRUZXh0dXJlKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCBtX3Rl eHR1cmUyREJpbmRpbmcpOworICAgICAgICBtX2NvbnRleHQtPmFjdGl2ZVRleHR1cmUobV9hY3Rp dmVUZXh0dXJlVW5pdCk7CiAgICAgfQogCiAgICAgaWYgKG11bHRpc2FtcGxlKCkpCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVm ZmVyLmgJKHJldmlzaW9uIDEwMTA5OSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dwdS9EcmF3aW5nQnVmZmVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTg1LDYgKzg1LDE0IEBA IHB1YmxpYzoKICAgICAvLyBjYW4gYmUgZGlzYWJsZWQgZHVyaW5nIGNhbGxzIHRvIGNvbW1pdC4K ICAgICB2b2lkIHNldFNjaXNzb3JFbmFibGVkKGJvb2wgc2Npc3NvckVuYWJsZWQpIHsgbV9zY2lz c29yRW5hYmxlZCA9IHNjaXNzb3JFbmFibGVkOyB9CiAKKyAgICAvLyBUaGUgRHJhd2luZ0J1ZmZl ciBuZWVkcyB0byB0cmFjayB0aGUgdGV4dHVyZSBib3VuZCB0byB0ZXh0dXJlIHVuaXQgMC4KKyAg ICAvLyBUaGUgYm91bmQgdGV4dHVyZSBpcyB0cmFja2VkIHRvIGF2b2lkIGNvc3RseSBxdWVyaWVz IGR1cmluZyByZW5kZXJpbmcuCisgICAgdm9pZCBzZXRUZXh0dXJlMkRCaW5kaW5nKEdDM0RpbnQg dGV4dHVyZSkgeyBtX3RleHR1cmUyREJpbmRpbmcgPSB0ZXh0dXJlOyB9CisKKyAgICAvLyBUcmFj ayB0aGUgY3VycmVudGx5IGFjdGl2ZSB0ZXh0dXJlIHVuaXQuIFRleHR1cmUgdW5pdCAwIGlzIHVz ZWQgYXMgaG9zdCBmb3IgYSBzY3JhdGNoCisgICAgLy8gdGV4dHVyZS4KKyAgICB2b2lkIHNldEFj dGl2ZVRleHR1cmVVbml0KEdDM0RpbnQgdGV4dHVyZVVuaXQpIHsgbV9hY3RpdmVUZXh0dXJlVW5p dCA9IHRleHR1cmVVbml0OyB9CisKICAgICBib29sIG11bHRpc2FtcGxlKCkgY29uc3Q7CiAKICAg ICBQbGF0Zm9ybTNET2JqZWN0IHBsYXRmb3JtQ29sb3JCdWZmZXIoKSBjb25zdDsKQEAgLTExMiw2 ICsxMjAsOCBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBtX3NlcGFyYXRlQmFja2luZ1RleHR1cmU7 CiAgICAgYm9vbCBtX3NjaXNzb3JFbmFibGVkOworICAgIFBsYXRmb3JtM0RPYmplY3QgbV90ZXh0 dXJlMkRCaW5kaW5nOworICAgIEdDM0RlbnVtIG1fYWN0aXZlVGV4dHVyZVVuaXQ7CiAKICAgICBS ZWZQdHI8R3JhcGhpY3NDb250ZXh0M0Q+IG1fY29udGV4dDsKICAgICBJbnRTaXplIG1fc2l6ZTsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9tYWMvRHJhd2luZ0J1 ZmZlck1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9ncHUvbWFjL0RyYXdpbmdCdWZmZXJNYWMubW0JKHJldmlzaW9uIDEwMTA5OSkKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9tYWMvRHJhd2luZ0J1ZmZlck1hYy5tbQko d29ya2luZyBjb3B5KQpAQCAtNDMsNiArNDMsOCBAQCBEcmF3aW5nQnVmZmVyOjpEcmF3aW5nQnVm ZmVyKEdyYXBoaWNzQ29uCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgc2VwYXJh dGVCYWNraW5nVGV4dHVyZSkKICAgICA6IG1fc2VwYXJhdGVCYWNraW5nVGV4dHVyZShzZXBhcmF0 ZUJhY2tpbmdUZXh0dXJlKQogICAgICwgbV9zY2lzc29yRW5hYmxlZChmYWxzZSkKKyAgICAsIG1f dGV4dHVyZTJEQmluZGluZygwKQorICAgICwgbV9hY3RpdmVUZXh0dXJlVW5pdChHcmFwaGljc0Nv bnRleHQzRDo6VEVYVFVSRTApCiAgICAgLCBtX2NvbnRleHQoY29udGV4dCkKICAgICAsIG1fc2l6 ZSgtMSwgLTEpCiAgICAgLCBtX211bHRpc2FtcGxlRXh0ZW5zaW9uU3VwcG9ydGVkKG11bHRpc2Ft cGxlRXh0ZW5zaW9uU3VwcG9ydGVkKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3B1L3F0L0RyYXdpbmdCdWZmZXJRdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L3F0L0RyYXdpbmdCdWZmZXJRdC5jcHAJKHJldmlz aW9uIDEwMTA5OSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9xdC9E cmF3aW5nQnVmZmVyUXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOCw2ICszOCw4IEBAIERyYXdp bmdCdWZmZXI6OkRyYXdpbmdCdWZmZXIoR3JhcGhpY3NDb24KICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgYm9vbCBzZXBhcmF0ZUJhY2tpbmdUZXh0dXJlKQogICAgIDogbV9zZXBhcmF0ZUJh Y2tpbmdUZXh0dXJlKHNlcGFyYXRlQmFja2luZ1RleHR1cmUpCiAgICAgLCBtX3NjaXNzb3JFbmFi bGVkKGZhbHNlKQorICAgICwgbV90ZXh0dXJlMkRCaW5kaW5nKDApCisgICAgLCBtX2FjdGl2ZVRl eHR1cmVVbml0KEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFMCkKICAgICAsIG1fY29udGV4dChj b250ZXh0KQogICAgICwgbV9zaXplKC0xLCAtMSkKICAgICAsIG1fbXVsdGlzYW1wbGVFeHRlbnNp b25TdXBwb3J0ZWQobXVsdGlzYW1wbGVFeHRlbnNpb25TdXBwb3J0ZWQpCg== 116422 2011-11-23 14:02:24 -0800 2011-11-23 19:11:26 -0800 Patch bug-73033-20111123165903.patch text/plain 7583 twiz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMTA5OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDExLTExLTIzICBKZWZmIFRp bWFudXMgIDx0d2l6QGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dICBQcmV2ZW50 IERyYXdpbmdCdWZmZXIgaW5zdGFuY2VzIGZyb20gY29ycnVwdGluZyB0aGUgYWN0aXZlCisgICAg ICAgIHRleHR1cmUgc3RhdGUgb2YgdGhlIFdlYkdMIGNvbnRleHRzLiBUaGUgRHJhd2luZ0J1ZmZl ciBub3cgdHJhY2tzIHRoZQorICAgICAgICBzdGF0ZSBvZiB0ZXh0dXJlIHVuaXQgMCwgYW5kIHRo ZSBhY3RpdmUgdGV4dHVyZSB1bml0LCBzbyB0aGF0IHN0YXRlIGNhbgorICAgICAgICBiZSByZXN0 b3JlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcz MDMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBo dG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 V2ViR0xSZW5kZXJpbmdDb250ZXh0OjphY3RpdmVUZXh0dXJlKToKKyAgICAgICAgKFdlYkNvcmU6 OldlYkdMUmVuZGVyaW5nQ29udGV4dDo6YmluZFRleHR1cmUpOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjpEcmF3aW5nQnVmZmVyKToKKyAgICAgICAgKFdlYkNvcmU6 OkRyYXdpbmdCdWZmZXI6OnB1Ymxpc2hUb1BsYXRmb3JtTGF5ZXIpOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmg6CisgICAgICAgIChXZWJDb3JlOjpEcmF3 aW5nQnVmZmVyOjpzZXRUZXh0dXJlMkRCaW5kaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkRyYXdp bmdCdWZmZXI6OnNldEFjdGl2ZVRleHR1cmVVbml0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9ncHUvbWFjL0RyYXdpbmdCdWZmZXJNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpEcmF3 aW5nQnVmZmVyOjpEcmF3aW5nQnVmZmVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9n cHUvcXQvRHJhd2luZ0J1ZmZlclF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRyYXdpbmdCdWZm ZXI6OkRyYXdpbmdCdWZmZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2d0ay9EcmF3 aW5nQnVmZmVyR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRyYXdpbmdCdWZmZXI6OkRyYXdp bmdCdWZmZXIpOgorCiAyMDExLTExLTIzICBEbWl0cnkgTG9tb3YgIDxkc2xvbW92QGdvb2dsZS5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmViYXNlbGluZSBiaW5kaW5nIHRlc3RzIGFmdGVy IGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzEwMTA2NC4KSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcAko cmV2aXNpb24gMTAxMDk5KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5k ZXJpbmdDb250ZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzU4LDYgKzc1OCwxMCBAQCB2b2lk IFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6YWN0aXZlVGV4dHVyCiAgICAgfQogICAgIG1fYWN0aXZl VGV4dHVyZVVuaXQgPSB0ZXh0dXJlIC0gR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkUwOwogICAg IG1fY29udGV4dC0+YWN0aXZlVGV4dHVyZSh0ZXh0dXJlKTsKKworICAgIGlmIChtX2RyYXdpbmdC dWZmZXIpCisgICAgICAgIG1fZHJhd2luZ0J1ZmZlci0+c2V0QWN0aXZlVGV4dHVyZVVuaXQodGV4 dHVyZSk7CisKICAgICBjbGVhbnVwQWZ0ZXJHcmFwaGljc0NhbGwoZmFsc2UpOwogfQogCkBAIC04 ODgsNiArODkyLDEwIEBAIHZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0OjpiaW5kVGV4dHVyZSgK ICAgICBpZiAodGFyZ2V0ID09IEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJEKSB7CiAgICAg ICAgIG1fdGV4dHVyZVVuaXRzW21fYWN0aXZlVGV4dHVyZVVuaXRdLm1fdGV4dHVyZTJEQmluZGlu ZyA9IHRleHR1cmU7CiAgICAgICAgIG1heExldmVsID0gbV9tYXhUZXh0dXJlTGV2ZWw7CisKKyAg ICAgICAgaWYgKG1fZHJhd2luZ0J1ZmZlciAmJiAhbV9hY3RpdmVUZXh0dXJlVW5pdCkKKyAgICAg ICAgICAgIG1fZHJhd2luZ0J1ZmZlci0+c2V0VGV4dHVyZTJEQmluZGluZyhvYmplY3RPclplcm8o dGV4dHVyZSkpOworCiAgICAgfSBlbHNlIGlmICh0YXJnZXQgPT0gR3JhcGhpY3NDb250ZXh0M0Q6 OlRFWFRVUkVfQ1VCRV9NQVApIHsKICAgICAgICAgbV90ZXh0dXJlVW5pdHNbbV9hY3RpdmVUZXh0 dXJlVW5pdF0ubV90ZXh0dXJlQ3ViZU1hcEJpbmRpbmcgPSB0ZXh0dXJlOwogICAgICAgICBtYXhM ZXZlbCA9IG1fbWF4Q3ViZU1hcFRleHR1cmVMZXZlbDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJhd2lu Z0J1ZmZlckNocm9taXVtLmNwcAkocmV2aXNpb24gMTAxMDk5KQorKysgU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJhd2luZ0J1ZmZlckNocm9taXVtLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNjIsNiArNjIsOCBAQCBEcmF3aW5nQnVmZmVyOjpEcmF3aW5nQnVmZmVy KEdyYXBoaWNzQ29uCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgc2VwYXJhdGVC YWNraW5nVGV4dHVyZSkKICAgICA6IG1fc2VwYXJhdGVCYWNraW5nVGV4dHVyZShzZXBhcmF0ZUJh Y2tpbmdUZXh0dXJlKQogICAgICwgbV9zY2lzc29yRW5hYmxlZChmYWxzZSkKKyAgICAsIG1fdGV4 dHVyZTJEQmluZGluZygwKQorICAgICwgbV9hY3RpdmVUZXh0dXJlVW5pdChHcmFwaGljc0NvbnRl eHQzRDo6VEVYVFVSRTApCiAgICAgLCBtX2NvbnRleHQoY29udGV4dCkKICAgICAsIG1fc2l6ZSgt MSwgLTEpCiAgICAgLCBtX211bHRpc2FtcGxlRXh0ZW5zaW9uU3VwcG9ydGVkKG11bHRpc2FtcGxl RXh0ZW5zaW9uU3VwcG9ydGVkKQpAQCAtMTE4LDkgKzEyMCwxNiBAQCB2b2lkIERyYXdpbmdCdWZm ZXI6OnB1Ymxpc2hUb1BsYXRmb3JtTGF5CiAKICAgICBpZiAobV9zZXBhcmF0ZUJhY2tpbmdUZXh0 dXJlKSB7CiAgICAgICAgIG1fY29udGV4dC0+YmluZEZyYW1lYnVmZmVyKEdyYXBoaWNzQ29udGV4 dDNEOjpGUkFNRUJVRkZFUiwgbV9mYm8pOworCisgICAgICAgIC8vIFRoaXMgcGF0aCBhbHdheXMg dXNlcyBURVhUVVJFMCwgYW5kIHJlc3RvcmVzIGl0cyBzdGF0ZSBiZWxvdy4KKyAgICAgICAgbV9j b250ZXh0LT5hY3RpdmVUZXh0dXJlKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFMCk7CiAgICAg ICAgIG1fY29udGV4dC0+YmluZFRleHR1cmUoR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQs IG1fYmFja2luZ0NvbG9yQnVmZmVyKTsKKwogICAgICAgICB1bnNpZ25lZCBjb2xvckZvcm1hdCA9 IG1fY29udGV4dC0+Z2V0Q29udGV4dEF0dHJpYnV0ZXMoKS5hbHBoYSA/IEdyYXBoaWNzQ29udGV4 dDNEOjpSR0JBIDogR3JhcGhpY3NDb250ZXh0M0Q6OlJHQjsKICAgICAgICAgbV9jb250ZXh0LT5j b3B5VGV4SW1hZ2UyRChHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV8yRCwgMCwgY29sb3JGb3Jt YXQsIDAsIDAsIHNpemUoKS53aWR0aCgpLCBzaXplKCkuaGVpZ2h0KCksIDApOworCisgICAgICAg IG1fY29udGV4dC0+YmluZFRleHR1cmUoR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIG1f dGV4dHVyZTJEQmluZGluZyk7CisgICAgICAgIG1fY29udGV4dC0+YWN0aXZlVGV4dHVyZShtX2Fj dGl2ZVRleHR1cmVVbml0KTsKICAgICB9CiAKICAgICBpZiAobXVsdGlzYW1wbGUoKSkKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdC dWZmZXIuaAkocmV2aXNpb24gMTAxMDk5KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIuaAkod29ya2luZyBjb3B5KQpAQCAtODUsNiArODUsMTQg QEAgcHVibGljOgogICAgIC8vIGNhbiBiZSBkaXNhYmxlZCBkdXJpbmcgY2FsbHMgdG8gY29tbWl0 LgogICAgIHZvaWQgc2V0U2Npc3NvckVuYWJsZWQoYm9vbCBzY2lzc29yRW5hYmxlZCkgeyBtX3Nj aXNzb3JFbmFibGVkID0gc2Npc3NvckVuYWJsZWQ7IH0KIAorICAgIC8vIFRoZSBEcmF3aW5nQnVm ZmVyIG5lZWRzIHRvIHRyYWNrIHRoZSB0ZXh0dXJlIGJvdW5kIHRvIHRleHR1cmUgdW5pdCAwLgor ICAgIC8vIFRoZSBib3VuZCB0ZXh0dXJlIGlzIHRyYWNrZWQgdG8gYXZvaWQgY29zdGx5IHF1ZXJp ZXMgZHVyaW5nIHJlbmRlcmluZy4KKyAgICB2b2lkIHNldFRleHR1cmUyREJpbmRpbmcoR0MzRGlu dCB0ZXh0dXJlKSB7IG1fdGV4dHVyZTJEQmluZGluZyA9IHRleHR1cmU7IH0KKworICAgIC8vIFRy YWNrIHRoZSBjdXJyZW50bHkgYWN0aXZlIHRleHR1cmUgdW5pdC4gVGV4dHVyZSB1bml0IDAgaXMg dXNlZCBhcyBob3N0IGZvciBhIHNjcmF0Y2gKKyAgICAvLyB0ZXh0dXJlLgorICAgIHZvaWQgc2V0 QWN0aXZlVGV4dHVyZVVuaXQoR0MzRGludCB0ZXh0dXJlVW5pdCkgeyBtX2FjdGl2ZVRleHR1cmVV bml0ID0gdGV4dHVyZVVuaXQ7IH0KKwogICAgIGJvb2wgbXVsdGlzYW1wbGUoKSBjb25zdDsKIAog ICAgIFBsYXRmb3JtM0RPYmplY3QgcGxhdGZvcm1Db2xvckJ1ZmZlcigpIGNvbnN0OwpAQCAtMTEy LDYgKzEyMCw4IEBAIHByaXZhdGU6CiAKICAgICBib29sIG1fc2VwYXJhdGVCYWNraW5nVGV4dHVy ZTsKICAgICBib29sIG1fc2Npc3NvckVuYWJsZWQ7CisgICAgUGxhdGZvcm0zRE9iamVjdCBtX3Rl eHR1cmUyREJpbmRpbmc7CisgICAgR0MzRGVudW0gbV9hY3RpdmVUZXh0dXJlVW5pdDsKIAogICAg IFJlZlB0cjxHcmFwaGljc0NvbnRleHQzRD4gbV9jb250ZXh0OwogICAgIEludFNpemUgbV9zaXpl OwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L21hYy9EcmF3aW5n QnVmZmVyTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dwdS9tYWMvRHJhd2luZ0J1ZmZlck1hYy5tbQkocmV2aXNpb24gMTAxMDk5KQorKysgU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L21hYy9EcmF3aW5nQnVmZmVyTWFjLm1t CSh3b3JraW5nIGNvcHkpCkBAIC00Myw2ICs0Myw4IEBAIERyYXdpbmdCdWZmZXI6OkRyYXdpbmdC dWZmZXIoR3JhcGhpY3NDb24KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBzZXBh cmF0ZUJhY2tpbmdUZXh0dXJlKQogICAgIDogbV9zZXBhcmF0ZUJhY2tpbmdUZXh0dXJlKHNlcGFy YXRlQmFja2luZ1RleHR1cmUpCiAgICAgLCBtX3NjaXNzb3JFbmFibGVkKGZhbHNlKQorICAgICwg bV90ZXh0dXJlMkRCaW5kaW5nKDApCisgICAgLCBtX2FjdGl2ZVRleHR1cmVVbml0KEdyYXBoaWNz Q29udGV4dDNEOjpURVhUVVJFMCkKICAgICAsIG1fY29udGV4dChjb250ZXh0KQogICAgICwgbV9z aXplKC0xLCAtMSkKICAgICAsIG1fbXVsdGlzYW1wbGVFeHRlbnNpb25TdXBwb3J0ZWQobXVsdGlz YW1wbGVFeHRlbnNpb25TdXBwb3J0ZWQpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9ncHUvcXQvRHJhd2luZ0J1ZmZlclF0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvcXQvRHJhd2luZ0J1ZmZlclF0LmNwcAkocmV2 aXNpb24gMTAxMDk5KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L3F0 L0RyYXdpbmdCdWZmZXJRdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM4LDYgKzM4LDggQEAgRHJh d2luZ0J1ZmZlcjo6RHJhd2luZ0J1ZmZlcihHcmFwaGljc0NvbgogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBib29sIHNlcGFyYXRlQmFja2luZ1RleHR1cmUpCiAgICAgOiBtX3NlcGFyYXRl QmFja2luZ1RleHR1cmUoc2VwYXJhdGVCYWNraW5nVGV4dHVyZSkKICAgICAsIG1fc2Npc3NvckVu YWJsZWQoZmFsc2UpCisgICAgLCBtX3RleHR1cmUyREJpbmRpbmcoMCkKKyAgICAsIG1fYWN0aXZl VGV4dHVyZVVuaXQoR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkUwKQogICAgICwgbV9jb250ZXh0 KGNvbnRleHQpCiAgICAgLCBtX3NpemUoLTEsIC0xKQogICAgICwgbV9tdWx0aXNhbXBsZUV4dGVu c2lvblN1cHBvcnRlZChtdWx0aXNhbXBsZUV4dGVuc2lvblN1cHBvcnRlZCkKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9EcmF3aW5nQnVmZmVyR3RrLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvRHJhd2luZ0J1 ZmZlckd0ay5jcHAJKHJldmlzaW9uIDEwMTA5OSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2d0ay9EcmF3aW5nQnVmZmVyR3RrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDAs NiArNDAsOCBAQCBEcmF3aW5nQnVmZmVyOjpEcmF3aW5nQnVmZmVyKEdyYXBoaWNzQ29uCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgc2VwYXJhdGVCYWNraW5nVGV4dHVyZSkKICAg ICA6IG1fc2VwYXJhdGVCYWNraW5nVGV4dHVyZShzZXBhcmF0ZUJhY2tpbmdUZXh0dXJlKQogICAg ICwgbV9zY2lzc29yRW5hYmxlZChmYWxzZSkKKyAgICAsIG1fdGV4dHVyZTJEQmluZGluZygwKQor ICAgICwgbV9hY3RpdmVUZXh0dXJlVW5pdChHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRTApCiAg ICAgLCBtX2NvbnRleHQoY29udGV4dCkKICAgICAsIG1fc2l6ZSgtMSwgLTEpCiAgICAgLCBtX211 bHRpc2FtcGxlRXh0ZW5zaW9uU3VwcG9ydGVkKG11bHRpc2FtcGxlRXh0ZW5zaW9uU3VwcG9ydGVk KQo= 116467 2011-11-23 19:11:38 -0800 2011-11-25 13:53:23 -0800 Patch bug-73033-20111123220815.patch text/plain 12022 twiz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMTExNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDExLTExLTIzICBKZWZmIFRp bWFudXMgIDx0d2l6QGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dICBQcmV2ZW50 IERyYXdpbmdCdWZmZXIgaW5zdGFuY2VzIGZyb20gY29ycnVwdGluZyB0aGUgYWN0aXZlCisgICAg ICAgIHRleHR1cmUgc3RhdGUgb2YgdGhlIFdlYkdMIGNvbnRleHRzLiBUaGUgRHJhd2luZ0J1ZmZl ciBub3cgdHJhY2tzIHRoZQorICAgICAgICBzdGF0ZSBvZiB0ZXh0dXJlIHVuaXQgMCwgYW5kIHRo ZSBhY3RpdmUgdGV4dHVyZSB1bml0LCBzbyB0aGF0IHN0YXRlIGNhbgorICAgICAgICBiZSByZXN0 b3JlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcz MDMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVz dDogZmFzdC9jYW52YXMvd2ViZ2wvd2ViZ2wtdGV4dHVyZS1iaW5kaW5nLXByZXNlcnZlZC5odG1s CisKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6V2ViR0xSZW5kZXJpbmdDb250ZXh0OjphY3RpdmVUZXh0dXJlKToKKyAg ICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5nQ29udGV4dDo6YmluZFRleHR1cmUpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjpEcmF3aW5nQnVmZmVyKToKKyAg ICAgICAgKFdlYkNvcmU6OkRyYXdpbmdCdWZmZXI6OnB1Ymxpc2hUb1BsYXRmb3JtTGF5ZXIpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmg6CisgICAgICAg IChXZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjpzZXRUZXh0dXJlMkRCaW5kaW5nKToKKyAgICAgICAg KFdlYkNvcmU6OkRyYXdpbmdCdWZmZXI6OnNldEFjdGl2ZVRleHR1cmVVbml0KToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9ncHUvbWFjL0RyYXdpbmdCdWZmZXJNYWMubW06CisgICAgICAg IChXZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjpEcmF3aW5nQnVmZmVyKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9ncHUvcXQvRHJhd2luZ0J1ZmZlclF0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkRyYXdpbmdCdWZmZXI6OkRyYXdpbmdCdWZmZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2d0ay9EcmF3aW5nQnVmZmVyR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRyYXdp bmdCdWZmZXI6OkRyYXdpbmdCdWZmZXIpOgorCiAyMDExLTExLTIzICBBbWkgRmlzY2htYW4gIDxm aXNjaG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVGVhY2ggVmlkZW9MYXllckNocm9taXVt IGhvdyB0byByZW5kZXIgbmF0aXZlIHRleHR1cmUgKHRvIHN1cHBvcnQgSFcgdmlkZW8gZGVjb2Rl KS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4 dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5k ZXJpbmdDb250ZXh0LmNwcAkocmV2aXNpb24gMTAxMTAzKQorKysgU291cmNlL1dlYkNvcmUvaHRt bC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzU4 LDYgKzc1OCwxMCBAQCB2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6YWN0aXZlVGV4dHVyCiAg ICAgfQogICAgIG1fYWN0aXZlVGV4dHVyZVVuaXQgPSB0ZXh0dXJlIC0gR3JhcGhpY3NDb250ZXh0 M0Q6OlRFWFRVUkUwOwogICAgIG1fY29udGV4dC0+YWN0aXZlVGV4dHVyZSh0ZXh0dXJlKTsKKwor ICAgIGlmIChtX2RyYXdpbmdCdWZmZXIpCisgICAgICAgIG1fZHJhd2luZ0J1ZmZlci0+c2V0QWN0 aXZlVGV4dHVyZVVuaXQodGV4dHVyZSk7CisKICAgICBjbGVhbnVwQWZ0ZXJHcmFwaGljc0NhbGwo ZmFsc2UpOwogfQogCkBAIC04ODgsNiArODkyLDEwIEBAIHZvaWQgV2ViR0xSZW5kZXJpbmdDb250 ZXh0OjpiaW5kVGV4dHVyZSgKICAgICBpZiAodGFyZ2V0ID09IEdyYXBoaWNzQ29udGV4dDNEOjpU RVhUVVJFXzJEKSB7CiAgICAgICAgIG1fdGV4dHVyZVVuaXRzW21fYWN0aXZlVGV4dHVyZVVuaXRd Lm1fdGV4dHVyZTJEQmluZGluZyA9IHRleHR1cmU7CiAgICAgICAgIG1heExldmVsID0gbV9tYXhU ZXh0dXJlTGV2ZWw7CisKKyAgICAgICAgaWYgKG1fZHJhd2luZ0J1ZmZlciAmJiAhbV9hY3RpdmVU ZXh0dXJlVW5pdCkKKyAgICAgICAgICAgIG1fZHJhd2luZ0J1ZmZlci0+c2V0VGV4dHVyZTJEQmlu ZGluZyhvYmplY3RPclplcm8odGV4dHVyZSkpOworCiAgICAgfSBlbHNlIGlmICh0YXJnZXQgPT0g R3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfQ1VCRV9NQVApIHsKICAgICAgICAgbV90ZXh0dXJl VW5pdHNbbV9hY3RpdmVUZXh0dXJlVW5pdF0ubV90ZXh0dXJlQ3ViZU1hcEJpbmRpbmcgPSB0ZXh0 dXJlOwogICAgICAgICBtYXhMZXZlbCA9IG1fbWF4Q3ViZU1hcFRleHR1cmVMZXZlbDsKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJD aHJvbWl1bS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vRHJhd2luZ0J1ZmZlckNocm9taXVtLmNwcAkocmV2aXNpb24gMTAxMTAzKQor KysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJhd2luZ0J1ZmZl ckNocm9taXVtLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjIsNiArNjIsOCBAQCBEcmF3aW5nQnVm ZmVyOjpEcmF3aW5nQnVmZmVyKEdyYXBoaWNzQ29uCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGJvb2wgc2VwYXJhdGVCYWNraW5nVGV4dHVyZSkKICAgICA6IG1fc2VwYXJhdGVCYWNraW5n VGV4dHVyZShzZXBhcmF0ZUJhY2tpbmdUZXh0dXJlKQogICAgICwgbV9zY2lzc29yRW5hYmxlZChm YWxzZSkKKyAgICAsIG1fdGV4dHVyZTJEQmluZGluZygwKQorICAgICwgbV9hY3RpdmVUZXh0dXJl VW5pdChHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRTApCiAgICAgLCBtX2NvbnRleHQoY29udGV4 dCkKICAgICAsIG1fc2l6ZSgtMSwgLTEpCiAgICAgLCBtX211bHRpc2FtcGxlRXh0ZW5zaW9uU3Vw cG9ydGVkKG11bHRpc2FtcGxlRXh0ZW5zaW9uU3VwcG9ydGVkKQpAQCAtMTE4LDkgKzEyMCwxNiBA QCB2b2lkIERyYXdpbmdCdWZmZXI6OnB1Ymxpc2hUb1BsYXRmb3JtTGF5CiAKICAgICBpZiAobV9z ZXBhcmF0ZUJhY2tpbmdUZXh0dXJlKSB7CiAgICAgICAgIG1fY29udGV4dC0+YmluZEZyYW1lYnVm ZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUiwgbV9mYm8pOworCisgICAgICAgIC8v IFRoaXMgcGF0aCBhbHdheXMgdXNlcyBURVhUVVJFMCwgYW5kIHJlc3RvcmVzIGl0cyBzdGF0ZSBi ZWxvdy4KKyAgICAgICAgbV9jb250ZXh0LT5hY3RpdmVUZXh0dXJlKEdyYXBoaWNzQ29udGV4dDNE OjpURVhUVVJFMCk7CiAgICAgICAgIG1fY29udGV4dC0+YmluZFRleHR1cmUoR3JhcGhpY3NDb250 ZXh0M0Q6OlRFWFRVUkVfMkQsIG1fYmFja2luZ0NvbG9yQnVmZmVyKTsKKwogICAgICAgICB1bnNp Z25lZCBjb2xvckZvcm1hdCA9IG1fY29udGV4dC0+Z2V0Q29udGV4dEF0dHJpYnV0ZXMoKS5hbHBo YSA/IEdyYXBoaWNzQ29udGV4dDNEOjpSR0JBIDogR3JhcGhpY3NDb250ZXh0M0Q6OlJHQjsKICAg ICAgICAgbV9jb250ZXh0LT5jb3B5VGV4SW1hZ2UyRChHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVS RV8yRCwgMCwgY29sb3JGb3JtYXQsIDAsIDAsIHNpemUoKS53aWR0aCgpLCBzaXplKCkuaGVpZ2h0 KCksIDApOworCisgICAgICAgIG1fY29udGV4dC0+YmluZFRleHR1cmUoR3JhcGhpY3NDb250ZXh0 M0Q6OlRFWFRVUkVfMkQsIG1fdGV4dHVyZTJEQmluZGluZyk7CisgICAgICAgIG1fY29udGV4dC0+ YWN0aXZlVGV4dHVyZShtX2FjdGl2ZVRleHR1cmVVbml0KTsKICAgICB9CiAKICAgICBpZiAobXVs dGlzYW1wbGUoKSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9E cmF3aW5nQnVmZmVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIuaAkocmV2aXNpb24gMTAxMTAzKQorKysgU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIuaAkod29ya2luZyBjb3B5 KQpAQCAtODUsNiArODUsMTQgQEAgcHVibGljOgogICAgIC8vIGNhbiBiZSBkaXNhYmxlZCBkdXJp bmcgY2FsbHMgdG8gY29tbWl0LgogICAgIHZvaWQgc2V0U2Npc3NvckVuYWJsZWQoYm9vbCBzY2lz c29yRW5hYmxlZCkgeyBtX3NjaXNzb3JFbmFibGVkID0gc2Npc3NvckVuYWJsZWQ7IH0KIAorICAg IC8vIFRoZSBEcmF3aW5nQnVmZmVyIG5lZWRzIHRvIHRyYWNrIHRoZSB0ZXh0dXJlIGJvdW5kIHRv IHRleHR1cmUgdW5pdCAwLgorICAgIC8vIFRoZSBib3VuZCB0ZXh0dXJlIGlzIHRyYWNrZWQgdG8g YXZvaWQgY29zdGx5IHF1ZXJpZXMgZHVyaW5nIHJlbmRlcmluZy4KKyAgICB2b2lkIHNldFRleHR1 cmUyREJpbmRpbmcoR0MzRGludCB0ZXh0dXJlKSB7IG1fdGV4dHVyZTJEQmluZGluZyA9IHRleHR1 cmU7IH0KKworICAgIC8vIFRyYWNrIHRoZSBjdXJyZW50bHkgYWN0aXZlIHRleHR1cmUgdW5pdC4g VGV4dHVyZSB1bml0IDAgaXMgdXNlZCBhcyBob3N0IGZvciBhIHNjcmF0Y2gKKyAgICAvLyB0ZXh0 dXJlLgorICAgIHZvaWQgc2V0QWN0aXZlVGV4dHVyZVVuaXQoR0MzRGludCB0ZXh0dXJlVW5pdCkg eyBtX2FjdGl2ZVRleHR1cmVVbml0ID0gdGV4dHVyZVVuaXQ7IH0KKwogICAgIGJvb2wgbXVsdGlz YW1wbGUoKSBjb25zdDsKIAogICAgIFBsYXRmb3JtM0RPYmplY3QgcGxhdGZvcm1Db2xvckJ1ZmZl cigpIGNvbnN0OwpAQCAtMTEyLDYgKzEyMCw4IEBAIHByaXZhdGU6CiAKICAgICBib29sIG1fc2Vw YXJhdGVCYWNraW5nVGV4dHVyZTsKICAgICBib29sIG1fc2Npc3NvckVuYWJsZWQ7CisgICAgUGxh dGZvcm0zRE9iamVjdCBtX3RleHR1cmUyREJpbmRpbmc7CisgICAgR0MzRGVudW0gbV9hY3RpdmVU ZXh0dXJlVW5pdDsKIAogICAgIFJlZlB0cjxHcmFwaGljc0NvbnRleHQzRD4gbV9jb250ZXh0Owog ICAgIEludFNpemUgbV9zaXplOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3B1L21hYy9EcmF3aW5nQnVmZmVyTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9tYWMvRHJhd2luZ0J1ZmZlck1hYy5tbQkocmV2aXNp b24gMTAxMTAzKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L21hYy9E cmF3aW5nQnVmZmVyTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC00Myw2ICs0Myw4IEBAIERyYXdp bmdCdWZmZXI6OkRyYXdpbmdCdWZmZXIoR3JhcGhpY3NDb24KICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgYm9vbCBzZXBhcmF0ZUJhY2tpbmdUZXh0dXJlKQogICAgIDogbV9zZXBhcmF0ZUJh Y2tpbmdUZXh0dXJlKHNlcGFyYXRlQmFja2luZ1RleHR1cmUpCiAgICAgLCBtX3NjaXNzb3JFbmFi bGVkKGZhbHNlKQorICAgICwgbV90ZXh0dXJlMkRCaW5kaW5nKDApCisgICAgLCBtX2FjdGl2ZVRl eHR1cmVVbml0KEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFMCkKICAgICAsIG1fY29udGV4dChj b250ZXh0KQogICAgICwgbV9zaXplKC0xLCAtMSkKICAgICAsIG1fbXVsdGlzYW1wbGVFeHRlbnNp b25TdXBwb3J0ZWQobXVsdGlzYW1wbGVFeHRlbnNpb25TdXBwb3J0ZWQpCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvcXQvRHJhd2luZ0J1ZmZlclF0LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvcXQvRHJhd2lu Z0J1ZmZlclF0LmNwcAkocmV2aXNpb24gMTAxMTAzKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3B1L3F0L0RyYXdpbmdCdWZmZXJRdC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTM4LDYgKzM4LDggQEAgRHJhd2luZ0J1ZmZlcjo6RHJhd2luZ0J1ZmZlcihHcmFwaGljc0Nvbgog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sIHNlcGFyYXRlQmFja2luZ1RleHR1cmUp CiAgICAgOiBtX3NlcGFyYXRlQmFja2luZ1RleHR1cmUoc2VwYXJhdGVCYWNraW5nVGV4dHVyZSkK ICAgICAsIG1fc2Npc3NvckVuYWJsZWQoZmFsc2UpCisgICAgLCBtX3RleHR1cmUyREJpbmRpbmco MCkKKyAgICAsIG1fYWN0aXZlVGV4dHVyZVVuaXQoR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkUw KQogICAgICwgbV9jb250ZXh0KGNvbnRleHQpCiAgICAgLCBtX3NpemUoLTEsIC0xKQogICAgICwg bV9tdWx0aXNhbXBsZUV4dGVuc2lvblN1cHBvcnRlZChtdWx0aXNhbXBsZUV4dGVuc2lvblN1cHBv cnRlZCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9EcmF3aW5n QnVmZmVyR3RrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9ndGsvRHJhd2luZ0J1ZmZlckd0ay5jcHAJKHJldmlzaW9uIDEwMTEwMykKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9EcmF3aW5nQnVmZmVyR3RrLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNDAsNiArNDAsOCBAQCBEcmF3aW5nQnVmZmVyOjpEcmF3aW5nQnVmZmVy KEdyYXBoaWNzQ29uCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgc2VwYXJhdGVC YWNraW5nVGV4dHVyZSkKICAgICA6IG1fc2VwYXJhdGVCYWNraW5nVGV4dHVyZShzZXBhcmF0ZUJh Y2tpbmdUZXh0dXJlKQogICAgICwgbV9zY2lzc29yRW5hYmxlZChmYWxzZSkKKyAgICAsIG1fdGV4 dHVyZTJEQmluZGluZygwKQorICAgICwgbV9hY3RpdmVUZXh0dXJlVW5pdChHcmFwaGljc0NvbnRl eHQzRDo6VEVYVFVSRTApCiAgICAgLCBtX2NvbnRleHQoY29udGV4dCkKICAgICAsIG1fc2l6ZSgt MSwgLTEpCiAgICAgLCBtX211bHRpc2FtcGxlRXh0ZW5zaW9uU3VwcG9ydGVkKG11bHRpc2FtcGxl RXh0ZW5zaW9uU3VwcG9ydGVkKQpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTAxMTE2KQorKysgTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMTEt MjMgIEplZmYgVGltYW51cyAgPHR3aXpAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1 bV0gIFByZXZlbnQgRHJhd2luZ0J1ZmZlciBpbnN0YW5jZXMgZnJvbSBjb3JydXB0aW5nIHRoZSBh Y3RpdmUKKyAgICAgICAgdGV4dHVyZSBzdGF0ZSBvZiB0aGUgV2ViR0wgY29udGV4dHMuIFRoZSBE cmF3aW5nQnVmZmVyIG5vdyB0cmFja3MgdGhlCisgICAgICAgIHN0YXRlIG9mIHRleHR1cmUgdW5p dCAwLCBhbmQgdGhlIGFjdGl2ZSB0ZXh0dXJlIHVuaXQsIHNvIHRoYXQgc3RhdGUgY2FuCisgICAg ICAgIGJlIHJlc3RvcmVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NzMwMzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUZXN0OiBmYXN0L2NhbnZhcy93ZWJnbC93ZWJnbC10ZXh0dXJlLWJpbmRpbmctcHJl c2VydmVkLmh0bWwKKworICAgICAgICAqIGZhc3QvY2FudmFzL3dlYmdsL3dlYmdsLXRleHR1cmUt YmluZGluZy1wcmVzZXJ2ZWQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nh bnZhcy93ZWJnbC93ZWJnbC10ZXh0dXJlLWJpbmRpbmctcHJlc2VydmVkLmh0bWw6IEFkZGVkLgor CiAyMDExLTExLTIzICBKb3NodWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgSW5kZXhlZERCOiBSZW1vdmUgc3R5bGVzaGVldCBsaW5rcyBmcm9tIGxheW91dCB0ZXN0cwpJ bmRleDogTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvd2ViZ2wtdGV4dHVyZS1iaW5kaW5n LXByZXNlcnZlZC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9j YW52YXMvd2ViZ2wvd2ViZ2wtdGV4dHVyZS1iaW5kaW5nLXByZXNlcnZlZC1leHBlY3RlZC50eHQJ KHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC93ZWJnbC10ZXh0 dXJlLWJpbmRpbmctcHJlc2VydmVkLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCAr MSw5IEBACitDaGVja3MgdGhhdCBwYWludGluZyBXZWJHTCBjb250ZW50cyBkb2Vzbid0IHBvbGx1 dGUgdGhlIGNvbnRleHQgc3RhdGUuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmll cyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworUEFT UyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCitQQVNTIFNob3Vs ZCBoYXZlIHJlbmRlcmVkIGJsdWUuCisKClByb3BlcnR5IGNoYW5nZXMgb246IExheW91dFRlc3Rz L2Zhc3QvY2FudmFzL3dlYmdsL3dlYmdsLXRleHR1cmUtYmluZGluZy1wcmVzZXJ2ZWQtZXhwZWN0 ZWQudHh0Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KQWRkZWQ6IHN2bjpleGVjdXRhYmxlCiAgICsgKgoKSW5kZXg6IExh eW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL3dlYmdsLXRleHR1cmUtYmluZGluZy1wcmVzZXJ2 ZWQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC93ZWJn bC10ZXh0dXJlLWJpbmRpbmctcHJlc2VydmVkLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRU ZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC93ZWJnbC10ZXh0dXJlLWJpbmRpbmctcHJlc2VydmVkLmh0 bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNjkgQEAKKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0 IHNyYz0iLi4vLi4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzxzY3Jp cHQgc3JjPSJyZXNvdXJjZXMvd2ViZ2wtdGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0i cmVzb3VyY2VzL3dlYmdsLXRlc3QtdXRpbHMuanMiPiA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5 PgorPGRpdiBpZD0iZGVzY3JpcHRpb24iPjwvZGl2PgorPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+ Cis8c2NyaXB0PgorZGVzY3JpcHRpb24oIkNoZWNrcyB0aGF0IHBhaW50aW5nIFdlYkdMIGNvbnRl bnRzIGRvZXNuJ3QgcG9sbHV0ZSB0aGUgY29udGV4dCBzdGF0ZS4iKTsKKwordmFyIHd0dSA9IFdl YkdMVGVzdFV0aWxzOworCitpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CisgICAg bGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgIGxheW91dFRlc3RDb250cm9s bGVyLndhaXRVbnRpbERvbmUoKTsKK30KKwordmFyIGNhbnZhczsKK3ZhciBjb250ZXh0OwordmFy IHJlcXVlc3RBbmltYXRpb25GcmFtZTsKKworZnVuY3Rpb24gZHJhdygpIHsKKyAgLy8gRHJhdyBh IGJsdWUgcXVhZCB0byB0aGUgc2NyZWVuLiAgVGhlIGNvbXBvc2l0b3Igc2hvdWxkIGhhdmUgZXhl Y3V0ZWQKKyAgLy8gYmVmb3JlIHJlYWNoaW5nIHRoaXMgcG9pbnQuICBJZiB0aGUgdGV4dHVyZSBz dGF0ZSB3YXMgY29ycnV0ZWQsIHRoZW4gCisgIC8vIGEgcmVkIHF1YWQgd2lsbCBiZSBkcmF3bi4g IFNlZSBjcmJ1Zy5jb20vMTA1MDQ1LgorICB3dHUuZHJhd1F1YWQoY29udGV4dCk7CisKKyAgd3R1 LmNoZWNrQ2FudmFzUmVjdChjb250ZXh0LCAwLCAwLCAxLCAxLCBbMCwgMCwgMjU1LCAyNTVdLCAi U2hvdWxkIGhhdmUgcmVuZGVyZWQgYmx1ZS4iLCAxKTsKKyAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0 Q29udHJvbGxlcikKKyAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUoKTsKK30K Kword2luZG93Lm9ubG9hZCA9IGZ1bmN0aW9uKCkKK3sKKyAgaWYgKHdpbmRvdy5pbml0Tm9uS2hy b25vc0ZyYW1ld29yaykgeworICAgIHdpbmRvdy5pbml0Tm9uS2hyb25vc0ZyYW1ld29yayhmYWxz ZSk7CisgIH0KKworICBjYW52YXMgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgid2ViZ2wtY2Fu dmFzIik7CisgIGNhbnZhcy53aWR0aCA9IDUwOyBjYW52YXMuaGVpZ2h0ID0gNTA7CisgIGNvbnRl eHQgPSBjcmVhdGUzRENvbnRleHQoY2FudmFzKTsKKworICByZXF1ZXN0QW5pbWF0aW9uRnJhbWUg PSB3aW5kb3cud2Via2l0UmVxdWVzdEFuaW1hdGlvbkZyYW1lCisKKyAgdmFyIHByb2dyYW0gPSB3 dHUuc2V0dXBUZXh0dXJlZFF1YWQoY29udGV4dCk7CisgIHZhciBidWZmZXJPYmplY3RzID0gd3R1 LnNldHVwVW5pdFF1YWQoY29udGV4dCk7CisgIHZhciB0ZXh0dXJlID0gd3R1LmNyZWF0ZUNvbG9y ZWRUZXh0dXJlKGNvbnRleHQsIDEsIDEsIFswLCAwLCAyNTUsIDI1NV0pOworCisgIGNvbnRleHQu dW5pZm9ybTFpKGNvbnRleHQuZ2V0VW5pZm9ybUxvY2F0aW9uKHByb2dyYW0sICJ0ZXgiKSwgMCk7 CisKKyAgY29udGV4dC5hY3RpdmVUZXh0dXJlKGNvbnRleHQuVEVYVFVSRV8wICsgNSk7CisgIGNv bnRleHQuYmluZFRleHR1cmUoY29udGV4dC5URVhUVVJFXzJELCB0ZXh0dXJlKTsKKworICBjb250 ZXh0LnZpZXdwb3J0KDAsIDAsIGNhbnZhcy53aWR0aCwgY2FudmFzLmhlaWdodCk7CisKKyAgY29u dGV4dC5jbGVhckNvbG9yKDI1NSwgMCwgMCwgMjU1KTsKKyAgY29udGV4dC5jbGVhcihjb250ZXh0 LkNPTE9SX0JVRkZFUl9CSVQgfCBjb250ZXh0LkRFUFRIX0JVRkZFUl9CSVQpOworCisgIC8vIFdl IG5lZWQgdG8gZW5zdXJlIHRoYXQgdGhlIGNvbXBvc2l0b3IgaGFzIHJ1biBiZWZvcmUgdGhlIGRy YXdpbmcKKyAgLy8gdGFrZXMgcGxhY2UuCisgIHNldFRpbWVvdXQoZHJhdywgMTAwKTsKK30KKzwv c2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMi Pjwvc2NyaXB0PgorPGNhbnZhcyBpZD0id2ViZ2wtY2FudmFzIiB3aWR0aD0iMzJweCIgaGVpZ2h0 PSIzMnB4Ij48L2NhbnZhcz4KKzwvYm9keT4KKzwvaHRtbD4KClByb3BlcnR5IGNoYW5nZXMgb246 IExheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL3dlYmdsLXRleHR1cmUtYmluZGluZy1wcmVz ZXJ2ZWQuaHRtbApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkFkZGVkOiBzdm46ZXhlY3V0YWJsZQogICArICoKCg== 116638 2011-11-25 13:53:30 -0800 2011-12-01 12:02:46 -0800 Patch bug-73033-20111125165005.patch text/plain 2354 twiz SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDEwMTE4MCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDExLTExLTI1ICBKZWZmIFRpbWFudXMgIDx0 d2l6QGNocm9taXVtLm9yZz4KKworICAgICAgICBDbGVhbmluZyB1cCBjb21tZW50cyBhbmQgdW51 c2VkIHBvcnRpb25zIG9mIGEgd2ViZ2wgdGVzdCwgYXMgcGVyIHJldmlldyBjb21tZW50cy4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczMDMzCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L2NhbnZh cy93ZWJnbC93ZWJnbC10ZXh0dXJlLWJpbmRpbmctcHJlc2VydmVkLmh0bWw6CisKIDIwMTEtMTEt MjUgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQ3Jhc2ggaW4g QmlkaVJ1bkxpc3Q8UnVuPjo6cmVwbGFjZVJ1bldpdGhSdW5zIHdpdGggYW4gZW1wdHkgYmRpIGVs ZW1lbnQKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL3dlYmdsLXRleHR1cmUt YmluZGluZy1wcmVzZXJ2ZWQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2Nh bnZhcy93ZWJnbC93ZWJnbC10ZXh0dXJlLWJpbmRpbmctcHJlc2VydmVkLmh0bWwJKHJldmlzaW9u IDEwMTE0NCkKKysrIExheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL3dlYmdsLXRleHR1cmUt YmluZGluZy1wcmVzZXJ2ZWQuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMTksMTcgKzE5LDE2IEBA IGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKIAogdmFyIGNhbnZhczsKIHZhciBj b250ZXh0OwotdmFyIHJlcXVlc3RBbmltYXRpb25GcmFtZTsKIAogZnVuY3Rpb24gZHJhdygpIHsK ICAgLy8gRHJhdyBhIGJsdWUgcXVhZCB0byB0aGUgc2NyZWVuLiAgVGhlIGNvbXBvc2l0b3Igc2hv dWxkIGhhdmUgZXhlY3V0ZWQKLSAgLy8gYmVmb3JlIHJlYWNoaW5nIHRoaXMgcG9pbnQuICBJZiB0 aGUgdGV4dHVyZSBzdGF0ZSB3YXMgY29ycnV0ZWQsIHRoZW4gCisgIC8vIGJlZm9yZSByZWFjaGlu ZyB0aGlzIHBvaW50LiAgSWYgdGhlIHRleHR1cmUgc3RhdGUgd2FzIGNvcnJ1cHRlZCwgdGhlbgog ICAvLyBhIHJlZCBxdWFkIHdpbGwgYmUgZHJhd24uICBTZWUgY3JidWcuY29tLzEwNTA0NS4KICAg d3R1LmRyYXdRdWFkKGNvbnRleHQpOwogCiAgIHd0dS5jaGVja0NhbnZhc1JlY3QoY29udGV4dCwg MCwgMCwgMSwgMSwgWzAsIDAsIDI1NSwgMjU1XSwgIlNob3VsZCBoYXZlIHJlbmRlcmVkIGJsdWUu IiwgMSk7CiAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCi0gICAgICBsYXlvdXRU ZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7CisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIubm90 aWZ5RG9uZSgpOwogfQogCiB3aW5kb3cub25sb2FkID0gZnVuY3Rpb24oKQpAQCAtMzksNyArMzgs NiBAQCB3aW5kb3cub25sb2FkID0gZnVuY3Rpb24oKQogICB9CiAKICAgY2FudmFzID0gZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoIndlYmdsLWNhbnZhcyIpOwotICBjYW52YXMud2lkdGggPSA1MDsg Y2FudmFzLmhlaWdodCA9IDUwOwogICBjb250ZXh0ID0gY3JlYXRlM0RDb250ZXh0KGNhbnZhcyk7 CiAKICAgcmVxdWVzdEFuaW1hdGlvbkZyYW1lID0gd2luZG93LndlYmtpdFJlcXVlc3RBbmltYXRp b25GcmFtZQpAQCAtNTksNyArNTcsOSBAQCB3aW5kb3cub25sb2FkID0gZnVuY3Rpb24oKQogICBj b250ZXh0LmNsZWFyKGNvbnRleHQuQ09MT1JfQlVGRkVSX0JJVCB8IGNvbnRleHQuREVQVEhfQlVG RkVSX0JJVCk7CiAKICAgLy8gV2UgbmVlZCB0byBlbnN1cmUgdGhhdCB0aGUgY29tcG9zaXRvciBo YXMgcnVuIGJlZm9yZSB0aGUgZHJhd2luZwotICAvLyB0YWtlcyBwbGFjZS4KKyAgLy8gdGFrZXMg cGxhY2UuICByZXF1ZXN0QW5pbWF0aW9uRnJhbWUgd2FzIHRyaWVkIGZvciB0aGlzIHB1cnBvc2Us CisgIC8vIGJ1dCBpdCBkaWQgbm90IHByb2R1Y2UgdGhlIGZhaWxpbmcgYmVoYXZpb3VyIGluIGNy YnVnLmNvbS8xMDUwNDUuCisgIC8vIEEgdGltZW91dCBvZiAxMDAgbXMgd2FzIGZvdW5kIHRvIGNv bnNpc3RlbnRseSByZXByb2R1Y2UgdGhlIHByb2JsZW0uCiAgIHNldFRpbWVvdXQoZHJhdywgMTAw KTsKIH0KIDwvc2NyaXB0Pgo=