110388 2013-02-20 14:54:10 -0800 Preloads should be cleared when JavaScript cancels loading prematurely. 2013-02-22 14:02:02 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simonjam simonjam abarth ap dglazkov esprehn+autocc japhet koivisto ojan.autocc tonyg webkit.review.bot oldest_to_newest 837787 0 simonjam 2013-02-20 14:54:10 -0800 Preloads should be cleared on document.write() 837792 1 189386 simonjam 2013-02-20 14:55:34 -0800 Created attachment 189386 Patch 837794 2 simonjam 2013-02-20 14:57:04 -0800 This was discovered and reported internally at Google. Preloaded resources were being reused after a document.write() even though they were explicitly marked no-cache. 837797 3 189386 abarth 2013-02-20 14:58:18 -0800 Comment on attachment 189386 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189386&action=review > Source/WebCore/dom/Document.cpp:4407 > + // Parser should have picked up all preloads by now > + m_cachedResourceLoader->clearPreloads(); This isn't true for the threaded parser. The threaded parser doesn't finish synchronously. 837801 4 simonjam 2013-02-20 14:59:40 -0800 (In reply to comment #3) > (From update of attachment 189386 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=189386&action=review > > > Source/WebCore/dom/Document.cpp:4407 > > + // Parser should have picked up all preloads by now > > + m_cachedResourceLoader->clearPreloads(); > > This isn't true for the threaded parser. The threaded parser doesn't finish synchronously. It calls finishedParsing() before it's actually finished? 837840 5 189386 webkit.review.bot 2013-02-20 15:37:24 -0800 Comment on attachment 189386 Patch Attachment 189386 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/16660547 New failing tests: fast/js/regress/inlined-put-by-id-transition.html 837847 6 simonjam 2013-02-20 15:41:38 -0800 (In reply to comment #5) > (From update of attachment 189386 [details]) > Attachment 189386 [details] did not pass chromium-ews (chromium-xvfb): > Output: http://queues.webkit.org/results/16660547 > > New failing tests: > fast/js/regress/inlined-put-by-id-transition.html This appears to be a flake. It doesn't reproduce locally and seems totally unrelated. 837963 7 189386 koivisto 2013-02-20 17:10:35 -0800 Comment on attachment 189386 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189386&action=review > Source/WebCore/ChangeLog:9 > + > + We should clear preloads as soon as the parser finishes, instead of waiting for > + implicitClose(), which doesn't happen with a document.write(). Why? Please describe the problem you are fixing in the ChangeLog. 837964 8 koivisto 2013-02-20 17:11:02 -0800 (In reply to comment #2) > This was discovered and reported internally at Google. Preloaded resources were being reused after a document.write() even though they were explicitly marked no-cache. What makes you think this is a bug? 837970 9 189421 simonjam 2013-02-20 17:16:33 -0800 Created attachment 189421 Patch 837971 10 simonjam 2013-02-20 17:16:56 -0800 (In reply to comment #7) > (From update of attachment 189386 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=189386&action=review > > > Source/WebCore/ChangeLog:9 > > + > > + We should clear preloads as soon as the parser finishes, instead of waiting for > > + implicitClose(), which doesn't happen with a document.write(). > > Why? Please describe the problem you are fixing in the ChangeLog. Done. 838107 11 abarth 2013-02-20 19:48:23 -0800 > It calls finishedParsing() before it's actually finished? Nope. You're right! I was confused with finishParsing. :) 838511 12 189421 koivisto 2013-02-21 09:32:33 -0800 Comment on attachment 189421 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189421&action=review > Source/WebCore/ChangeLog:11 > + Preloads should be cleared on document.write() > + https://bugs.webkit.org/show_bug.cgi?id=110388 > + > + Reviewed by NOBODY (OOPS!). > + > + If a page preloads a resource, then uses document.write(), that resource is forever marked > + as a preload and will always be fetched from cache even after an explicit reload. Instead, > + we should clear the preloads as soon as the parser finishes, rather than waiting for > + implicitClose. I still don't quite understand. What does document.write have to do with this? Your test case does not use document.write. 838649 13 189568 simonjam 2013-02-21 11:51:03 -0800 Created attachment 189568 Patch 838655 14 simonjam 2013-02-21 11:55:47 -0800 (In reply to comment #12) > (From update of attachment 189421 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=189421&action=review > > > Source/WebCore/ChangeLog:11 > > + Preloads should be cleared on document.write() > > + https://bugs.webkit.org/show_bug.cgi?id=110388 > > + > > + Reviewed by NOBODY (OOPS!). > > + > > + If a page preloads a resource, then uses document.write(), that resource is forever marked > > + as a preload and will always be fetched from cache even after an explicit reload. Instead, > > + we should clear the preloads as soon as the parser finishes, rather than waiting for > > + implicitClose. > > I still don't quite understand. What does document.write have to do with this? Your test case does not use document.write. Oh. Good point. I must've inadvertently removed that while I was working on it. It seems both cases cause problems though, so I've updated the description to match. Basically (if it's not clear already), the problem is that some resources get permanently marked as preloads. When you reload the page, we reuse the resource from memory cache because it's still marked as as preload even though the resource is explicitly no-cache. So, we need to more aggressively clear out the preloads when JavaScript stops the parser. 838660 15 189569 simonjam 2013-02-21 11:59:23 -0800 Created attachment 189569 Patch 839047 16 abarth 2013-02-21 17:16:13 -0800 Antti, did you have further comments on this patch? 839558 17 189569 koivisto 2013-02-22 07:15:08 -0800 Comment on attachment 189569 Patch Ok, r=me 839917 18 189569 webkit.review.bot 2013-02-22 14:01:56 -0800 Comment on attachment 189569 Patch Clearing flags on attachment: 189569 Committed r143789: <http://trac.webkit.org/changeset/143789> 839918 19 webkit.review.bot 2013-02-22 14:02:02 -0800 All reviewed patches have been landed. Closing bug. 189386 2013-02-20 14:55:34 -0800 2013-02-20 17:16:30 -0800 Patch bug-110388-20130220145156.patch text/plain 5059 simonjam U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDRjMTc1OTM5MTJmZmZh NGVkYjYyZWQzMDA3MTRlNmRmMTM5OWM3NC4uZDY1ZjRjNzU5MTk0MjliNTlkNTFkODA0ZmM0MTQ3 OThjMjY1ZDRhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAyLTIwICBKYW1l cyBTaW1vbnNlbiAgPHNpbW9uamFtQGNocm9taXVtLm9yZz4KKworICAgICAgICBQcmVsb2FkcyBz aG91bGQgYmUgY2xlYXJlZCBvbiBkb2N1bWVudC53cml0ZSgpCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTAzODgKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBzaG91bGQgY2xlYXIgcHJlbG9hZHMgYXMg c29vbiBhcyB0aGUgcGFyc2VyIGZpbmlzaGVzLCBpbnN0ZWFkIG9mIHdhaXRpbmcgZm9yCisgICAg ICAgIGltcGxpY2l0Q2xvc2UoKSwgd2hpY2ggZG9lc24ndCBoYXBwZW4gd2l0aCBhIGRvY3VtZW50 LndyaXRlKCkuCisKKyAgICAgICAgVGVzdDogaHR0cC90ZXN0cy9jYWNoZS9wcmVsb2FkLWNsZWFy ZWQtYWZ0ZXItZG9jdW1lbnQtd3JpdGUuaHRtbAorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjppbXBsaWNpdENsb3NlKToKKyAgICAgICAg KFdlYkNvcmU6OkRvY3VtZW50OjpmaW5pc2hlZFBhcnNpbmcpOgorCiAyMDEzLTAyLTIwICBEYXZp ZCBIeWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KIAogICAgICAgICBbTmV3IE11bHRpY29sdW1uXSBD b2x1bW4gZ2FwIGlzIGNvbXB1dGVkIGluY29ycmVjdGx5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAK aW5kZXggNzQ3NTExZjQwNTRmOTJiOGE4YjMxYjMwNTFjNjA5Yjg2MjY2NWE0ZS4uY2JjYWYxZTVj YjdiNzcxMjU2MWZiZDdkNWI1NTcxYjEyYzFkMTUxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3Bw CkBAIC0yMzYyLDkgKzIzNjIsNiBAQCB2b2lkIERvY3VtZW50OjppbXBsaWNpdENsb3NlKCkKICAg ICAvLyBvbkxvYWQgZXZlbnQgaGFuZGxlciwgYXMgaW4gUmFkYXIgMzIwNjUyNC4KICAgICBkZXRh Y2hQYXJzZXIoKTsKIAotICAgIC8vIFBhcnNlciBzaG91bGQgaGF2ZSBwaWNrZWQgdXAgYWxsIHBy ZWxvYWRzIGJ5IG5vdwotICAgIG1fY2FjaGVkUmVzb3VyY2VMb2FkZXItPmNsZWFyUHJlbG9hZHMo KTsKLQogICAgIC8vIEZJWE1FOiBXZSBraWNrIG9mZiB0aGUgaWNvbiBsb2FkZXIgd2hlbiB0aGUg RG9jdW1lbnQgaXMgZG9uZSBwYXJzaW5nLgogICAgIC8vIFRoZXJlIGFyZSBlYXJsaWVyIG9wcG9y dHVuaXRpZXMgd2UgY291bGQgc3RhcnQgaXQ6CiAgICAgLy8gIC1XaGVuIHRoZSA8aGVhZD4gZmlu aXNoZXMgcGFyc2luZwpAQCAtNDQwNSw2ICs0NDAyLDkgQEAgdm9pZCBEb2N1bWVudDo6ZmluaXNo ZWRQYXJzaW5nKCkKICAgICAvLyBhbGl2ZSBpbmRlZmluaXRlbHkgYnkgc29tZXRoaW5nIGlubm9j dW91cyBsaWtlIEpTIHNldHRpbmcgLmlubmVySFRNTCByZXBlYXRlZGx5IG9uIGEgdGltZXIuCiAg ICAgc3RhdGljIGNvbnN0IGludCB0aW1lVG9LZWVwU2hhcmVkT2JqZWN0UG9vbEFsaXZlQWZ0ZXJQ YXJzaW5nRmluaXNoZWRJblNlY29uZHMgPSAxMDsKICAgICBtX3NoYXJlZE9iamVjdFBvb2xDbGVh clRpbWVyLnN0YXJ0T25lU2hvdCh0aW1lVG9LZWVwU2hhcmVkT2JqZWN0UG9vbEFsaXZlQWZ0ZXJQ YXJzaW5nRmluaXNoZWRJblNlY29uZHMpOworCisgICAgLy8gUGFyc2VyIHNob3VsZCBoYXZlIHBp Y2tlZCB1cCBhbGwgcHJlbG9hZHMgYnkgbm93CisgICAgbV9jYWNoZWRSZXNvdXJjZUxvYWRlci0+ Y2xlYXJQcmVsb2FkcygpOwogfQogCiB2b2lkIERvY3VtZW50OjpzaGFyZWRPYmplY3RQb29sQ2xl YXJUaW1lckZpcmVkKFRpbWVyPERvY3VtZW50PiopCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggN2FlZDYzMzc0MmNmMDcyMzdj YjFiNjkwNmQ1YzAxMDc1NDQ0Nzc2ZC4uY2JlN2M3MjVlY2FjODQwODI1MzdlYmQzYTdmMzRkMGMx MzFkNTI4NiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEzLTAyLTIwICBKYW1lcyBTaW1vbnNl biAgPHNpbW9uamFtQGNocm9taXVtLm9yZz4KKworICAgICAgICBQcmVsb2FkcyBzaG91bGQgYmUg Y2xlYXJlZCBvbiBkb2N1bWVudC53cml0ZSgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMTAzODgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvY2FjaGUvcHJlbG9hZC1jbGVhcmVkLWFm dGVyLWRvY3VtZW50LXdyaXRlLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90 ZXN0cy9jYWNoZS9wcmVsb2FkLWNsZWFyZWQtYWZ0ZXItZG9jdW1lbnQtd3JpdGUuaHRtbDogQWRk ZWQuCisKIDIwMTMtMDItMjAgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgogCiAgICAg ICAgIFtOZXcgTXVsdGljb2x1bW5dIENvbHVtbiBnYXAgaXMgY29tcHV0ZWQgaW5jb3JyZWN0bHku CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2NhY2hlL3ByZWxvYWQtY2xlYXJl ZC1hZnRlci1kb2N1bWVudC13cml0ZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL2NhY2hlL3ByZWxvYWQtY2xlYXJlZC1hZnRlci1kb2N1bWVudC13cml0ZS1leHBlY3RlZC50 eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uZTViMWQ4MmU0ZWZmOGFmYTVjMTFmYzllODFkOTU2NzIzMWRlOTRmMgot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvY2FjaGUvcHJlbG9hZC1j bGVhcmVkLWFmdGVyLWRvY3VtZW50LXdyaXRlLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDIgQEAK K0NPTlNPTEUgTUVTU0FHRTogbGluZSAyMjogUmVsb2FkaW5nCitQQVNTCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9odHRwL3Rlc3RzL2NhY2hlL3ByZWxvYWQtY2xlYXJlZC1hZnRlci1kb2N1bWVu dC13cml0ZS5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jYWNoZS9wcmVsb2FkLWNsZWFy ZWQtYWZ0ZXItZG9jdW1lbnQtd3JpdGUuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44ZjhjMmQ1M2Y3ODFjM2U0 MWQ2N2U1MDdjMjA1OTJmYzRjM2Y1ZjI0Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy9jYWNoZS9wcmVsb2FkLWNsZWFyZWQtYWZ0ZXItZG9jdW1lbnQtd3JpdGUuaHRt bApAQCAtMCwwICsxLDM5IEBACis8aHRtbD4KKyAgPGhlYWQ+CisgICAgPHNjcmlwdD4KKyAgICAg IGZ1bmN0aW9uIHNhdmVBbmRDaGVja1JhbmRvbU51bWJlcigpIHsKKyAgICAgICAgaWYgKCFzZXNz aW9uU3RvcmFnZS5sYXN0UmFuZG9tKSB7CisgICAgICAgICAgc2Vzc2lvblN0b3JhZ2UubGFzdFJh bmRvbSA9IHJhbmRvbU51bWJlcjsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICB3aW5kb3cu cGFzc2VkID0gc2Vzc2lvblN0b3JhZ2UubGFzdFJhbmRvbSAhPSByYW5kb21OdW1iZXI7CisgICAg ICAgIH0KKyAgICAgIH0KKyAgICA8L3NjcmlwdD4KKyAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2 YXNjcmlwdCIgc3JjPSJyZXNvdXJjZXMvY2FjaGUtc2ltdWxhdG9yLmNnaT91bmlxdWVJZD0xJkNh Y2hlLWNvbnRyb2w9bm8tc3RvcmUsbm8tY2FjaGUscHJpdmF0ZSxtdXN0LXJldmFsaWRhdGUsbWF4 LWFnZT0wIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3Jj PSJyZXNvdXJjZXMvY2FjaGUtc2ltdWxhdG9yLmNnaT91bmlxdWVJZD0yJkNhY2hlLWNvbnRyb2w9 bm8tc3RvcmUsbm8tY2FjaGUscHJpdmF0ZSxtdXN0LXJldmFsaWRhdGUsbWF4LWFnZT0wIiBvbmxv YWQ9InNhdmVBbmRDaGVja1JhbmRvbU51bWJlcigpOyI+PC9zY3JpcHQ+CisgIDwvaGVhZD4KKyAg PGJvZHk+CisgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorICAgICAgaWYgKHdp bmRvdy50ZXN0UnVubmVyKSB7CisgICAgICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworICAg ICAgICB0ZXN0UnVubmVyLndhaXRVbnRpbERvbmUoKTsKKyAgICAgIH0KKyAgICAgIGlmIChkb2N1 bWVudC5yZWZlcnJlciAhPSBkb2N1bWVudC5sb2NhdGlvbi50b1N0cmluZygpKSB7CisgICAgICAg IGNvbnNvbGUubG9nKCdSZWxvYWRpbmcnKTsKKyAgICAgICAgZG9jdW1lbnQubG9jYXRpb24ucmVs b2FkKCk7CisgICAgICB9IGVsc2UgeworICAgICAgICBpZiAod2luZG93LnBhc3NlZCA9PT0gdHJ1 ZSkgeworICAgICAgICAgIGRvY3VtZW50LmJvZHkuaW5uZXJUZXh0ID0gIlBBU1MiOworICAgICAg ICB9IGVsc2UgaWYgKHdpbmRvdy5wYXNzZWQgPT09IGZhbHNlKSB7CisgICAgICAgICAgZG9jdW1l bnQuYm9keS5pbm5lclRleHQgPSAiRkFJTCI7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAg ZG9jdW1lbnQuYm9keS5pbm5lclRleHQgPSAiRVJST1IiOworICAgICAgICB9CisgICAgICAgIGRl bGV0ZSBzZXNzaW9uU3RvcmFnZS5sYXN0UmFuZG9tOworICAgICAgICBpZiAod2luZG93LnRlc3RS dW5uZXIpIHsKKyAgICAgICAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKKyAgICAgICAgfQor ICAgICAgfQorICAgIDwvc2NyaXB0PgorICA8L2JvZHk+Cis8L2h0bWw+Cg== 189421 2013-02-20 17:16:33 -0800 2013-02-21 11:50:58 -0800 Patch bug-110388-20130220171254.patch text/plain 5216 simonjam U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDRjMTc1OTM5MTJmZmZh NGVkYjYyZWQzMDA3MTRlNmRmMTM5OWM3NC4uMzRjMjY2ZmFhMWM2N2ZmZTNiY2VmMWM1ODY4MDJi NzU1Yjg5ODhjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTAyLTIwICBKYW1l cyBTaW1vbnNlbiAgPHNpbW9uamFtQGNocm9taXVtLm9yZz4KKworICAgICAgICBQcmVsb2FkcyBz aG91bGQgYmUgY2xlYXJlZCBvbiBkb2N1bWVudC53cml0ZSgpCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTAzODgKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJZiBhIHBhZ2UgcHJlbG9hZHMgYSByZXNvdXJj ZSwgdGhlbiB1c2VzIGRvY3VtZW50LndyaXRlKCksIHRoYXQgcmVzb3VyY2UgaXMgZm9yZXZlciBt YXJrZWQKKyAgICAgICAgYXMgYSBwcmVsb2FkIGFuZCB3aWxsIGFsd2F5cyBiZSBmZXRjaGVkIGZy b20gY2FjaGUgZXZlbiBhZnRlciBhbiBleHBsaWNpdCByZWxvYWQuIEluc3RlYWQsCisgICAgICAg IHdlIHNob3VsZCBjbGVhciB0aGUgcHJlbG9hZHMgYXMgc29vbiBhcyB0aGUgcGFyc2VyIGZpbmlz aGVzLCByYXRoZXIgdGhhbiB3YWl0aW5nIGZvcgorICAgICAgICBpbXBsaWNpdENsb3NlLgorCisg ICAgICAgIFRlc3Q6IGh0dHAvdGVzdHMvY2FjaGUvcHJlbG9hZC1jbGVhcmVkLWFmdGVyLWRvY3Vt ZW50LXdyaXRlLmh0bWwKKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpEb2N1bWVudDo6aW1wbGljaXRDbG9zZSk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1 bWVudDo6ZmluaXNoZWRQYXJzaW5nKToKKwogMjAxMy0wMi0yMCAgRGF2aWQgSHlhdHQgIDxoeWF0 dEBhcHBsZS5jb20+CiAKICAgICAgICAgW05ldyBNdWx0aWNvbHVtbl0gQ29sdW1uIGdhcCBpcyBj b21wdXRlZCBpbmNvcnJlY3RseS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1 bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IDc0NzUxMWY0 MDU0ZjkyYjhhOGIzMWIzMDUxYzYwOWI4NjI2NjVhNGUuLmNiY2FmMWU1Y2I3Yjc3MTI1NjFmYmQ3 ZDViNTU3MWIxMmMxZDE1MTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtMjM2Miw5ICsy MzYyLDYgQEAgdm9pZCBEb2N1bWVudDo6aW1wbGljaXRDbG9zZSgpCiAgICAgLy8gb25Mb2FkIGV2 ZW50IGhhbmRsZXIsIGFzIGluIFJhZGFyIDMyMDY1MjQuCiAgICAgZGV0YWNoUGFyc2VyKCk7CiAK LSAgICAvLyBQYXJzZXIgc2hvdWxkIGhhdmUgcGlja2VkIHVwIGFsbCBwcmVsb2FkcyBieSBub3cK LSAgICBtX2NhY2hlZFJlc291cmNlTG9hZGVyLT5jbGVhclByZWxvYWRzKCk7Ci0KICAgICAvLyBG SVhNRTogV2Uga2ljayBvZmYgdGhlIGljb24gbG9hZGVyIHdoZW4gdGhlIERvY3VtZW50IGlzIGRv bmUgcGFyc2luZy4KICAgICAvLyBUaGVyZSBhcmUgZWFybGllciBvcHBvcnR1bml0aWVzIHdlIGNv dWxkIHN0YXJ0IGl0OgogICAgIC8vICAtV2hlbiB0aGUgPGhlYWQ+IGZpbmlzaGVzIHBhcnNpbmcK QEAgLTQ0MDUsNiArNDQwMiw5IEBAIHZvaWQgRG9jdW1lbnQ6OmZpbmlzaGVkUGFyc2luZygpCiAg ICAgLy8gYWxpdmUgaW5kZWZpbml0ZWx5IGJ5IHNvbWV0aGluZyBpbm5vY3VvdXMgbGlrZSBKUyBz ZXR0aW5nIC5pbm5lckhUTUwgcmVwZWF0ZWRseSBvbiBhIHRpbWVyLgogICAgIHN0YXRpYyBjb25z dCBpbnQgdGltZVRvS2VlcFNoYXJlZE9iamVjdFBvb2xBbGl2ZUFmdGVyUGFyc2luZ0ZpbmlzaGVk SW5TZWNvbmRzID0gMTA7CiAgICAgbV9zaGFyZWRPYmplY3RQb29sQ2xlYXJUaW1lci5zdGFydE9u ZVNob3QodGltZVRvS2VlcFNoYXJlZE9iamVjdFBvb2xBbGl2ZUFmdGVyUGFyc2luZ0ZpbmlzaGVk SW5TZWNvbmRzKTsKKworICAgIC8vIFBhcnNlciBzaG91bGQgaGF2ZSBwaWNrZWQgdXAgYWxsIHBy ZWxvYWRzIGJ5IG5vdworICAgIG1fY2FjaGVkUmVzb3VyY2VMb2FkZXItPmNsZWFyUHJlbG9hZHMo KTsKIH0KIAogdm9pZCBEb2N1bWVudDo6c2hhcmVkT2JqZWN0UG9vbENsZWFyVGltZXJGaXJlZChU aW1lcjxEb2N1bWVudD4qKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDdhZWQ2MzM3NDJjZjA3MjM3Y2IxYjY5MDZkNWMwMTA3 NTQ0NDc3NmQuLmNiZTdjNzI1ZWNhYzg0MDgyNTM3ZWJkM2E3ZjM0ZDBjMTMxZDUyODYgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxMyBAQAorMjAxMy0wMi0yMCAgSmFtZXMgU2ltb25zZW4gIDxzaW1vbmphbUBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUHJlbG9hZHMgc2hvdWxkIGJlIGNsZWFyZWQgb24gZG9j dW1lbnQud3JpdGUoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTEwMzg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBodHRwL3Rlc3RzL2NhY2hlL3ByZWxvYWQtY2xlYXJlZC1hZnRlci1kb2N1bWVudC13 cml0ZS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvY2FjaGUvcHJl bG9hZC1jbGVhcmVkLWFmdGVyLWRvY3VtZW50LXdyaXRlLmh0bWw6IEFkZGVkLgorCiAyMDEzLTAy LTIwICBEYXZpZCBIeWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KIAogICAgICAgICBbTmV3IE11bHRp Y29sdW1uXSBDb2x1bW4gZ2FwIGlzIGNvbXB1dGVkIGluY29ycmVjdGx5LgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jYWNoZS9wcmVsb2FkLWNsZWFyZWQtYWZ0ZXItZG9jdW1l bnQtd3JpdGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jYWNoZS9wcmVs b2FkLWNsZWFyZWQtYWZ0ZXItZG9jdW1lbnQtd3JpdGUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LmU1YjFkODJlNGVmZjhhZmE1YzExZmM5ZTgxZDk1NjcyMzFkZTk0ZjIKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2NhY2hlL3ByZWxvYWQtY2xlYXJlZC1hZnRlci1k b2N1bWVudC13cml0ZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwyIEBACitDT05TT0xFIE1FU1NB R0U6IGxpbmUgMjI6IFJlbG9hZGluZworUEFTUwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9jYWNoZS9wcmVsb2FkLWNsZWFyZWQtYWZ0ZXItZG9jdW1lbnQtd3JpdGUuaHRtbCBi L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvY2FjaGUvcHJlbG9hZC1jbGVhcmVkLWFmdGVyLWRvY3Vt ZW50LXdyaXRlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOGY4YzJkNTNmNzgxYzNlNDFkNjdlNTA3YzIwNTky ZmM0YzNmNWYyNAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvY2Fj aGUvcHJlbG9hZC1jbGVhcmVkLWFmdGVyLWRvY3VtZW50LXdyaXRlLmh0bWwKQEAgLTAsMCArMSwz OSBAQAorPGh0bWw+CisgIDxoZWFkPgorICAgIDxzY3JpcHQ+CisgICAgICBmdW5jdGlvbiBzYXZl QW5kQ2hlY2tSYW5kb21OdW1iZXIoKSB7CisgICAgICAgIGlmICghc2Vzc2lvblN0b3JhZ2UubGFz dFJhbmRvbSkgeworICAgICAgICAgIHNlc3Npb25TdG9yYWdlLmxhc3RSYW5kb20gPSByYW5kb21O dW1iZXI7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgd2luZG93LnBhc3NlZCA9IHNlc3Np b25TdG9yYWdlLmxhc3RSYW5kb20gIT0gcmFuZG9tTnVtYmVyOworICAgICAgICB9CisgICAgICB9 CisgICAgPC9zY3JpcHQ+CisgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0i cmVzb3VyY2VzL2NhY2hlLXNpbXVsYXRvci5jZ2k/dW5pcXVlSWQ9MSZDYWNoZS1jb250cm9sPW5v LXN0b3JlLG5vLWNhY2hlLHByaXZhdGUsbXVzdC1yZXZhbGlkYXRlLG1heC1hZ2U9MCI+PC9zY3Jp cHQ+CisgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0icmVzb3VyY2VzL2Nh Y2hlLXNpbXVsYXRvci5jZ2k/dW5pcXVlSWQ9MiZDYWNoZS1jb250cm9sPW5vLXN0b3JlLG5vLWNh Y2hlLHByaXZhdGUsbXVzdC1yZXZhbGlkYXRlLG1heC1hZ2U9MCIgb25sb2FkPSJzYXZlQW5kQ2hl Y2tSYW5kb21OdW1iZXIoKTsiPjwvc2NyaXB0PgorICA8L2hlYWQ+CisgIDxib2R5PgorICAgIDxz Y3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KKyAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5l cikgeworICAgICAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKyAgICAgICAgdGVzdFJ1bm5l ci53YWl0VW50aWxEb25lKCk7CisgICAgICB9CisgICAgICBpZiAoZG9jdW1lbnQucmVmZXJyZXIg IT0gZG9jdW1lbnQubG9jYXRpb24udG9TdHJpbmcoKSkgeworICAgICAgICBjb25zb2xlLmxvZygn UmVsb2FkaW5nJyk7CisgICAgICAgIGRvY3VtZW50LmxvY2F0aW9uLnJlbG9hZCgpOworICAgICAg fSBlbHNlIHsKKyAgICAgICAgaWYgKHdpbmRvdy5wYXNzZWQgPT09IHRydWUpIHsKKyAgICAgICAg ICBkb2N1bWVudC5ib2R5LmlubmVyVGV4dCA9ICJQQVNTIjsKKyAgICAgICAgfSBlbHNlIGlmICh3 aW5kb3cucGFzc2VkID09PSBmYWxzZSkgeworICAgICAgICAgIGRvY3VtZW50LmJvZHkuaW5uZXJU ZXh0ID0gIkZBSUwiOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgIGRvY3VtZW50LmJvZHku aW5uZXJUZXh0ID0gIkVSUk9SIjsKKyAgICAgICAgfQorICAgICAgICBkZWxldGUgc2Vzc2lvblN0 b3JhZ2UubGFzdFJhbmRvbTsKKyAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAg ICAgICAgdGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7CisgICAgICAgIH0KKyAgICAgIH0KKyAgICA8 L3NjcmlwdD4KKyAgPC9ib2R5PgorPC9odG1sPgo= 189568 2013-02-21 11:51:03 -0800 2013-02-21 11:59:20 -0800 Patch bug-110388-20130221114723.patch text/plain 5227 simonjam U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDRjMTc1OTM5MTJmZmZh NGVkYjYyZWQzMDA3MTRlNmRmMTM5OWM3NC4uY2M0MmE4NWI4ODc1YWU5MWIzNmZlZjUwZTJmZDY5 MTE5NDU1NDdlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAyLTIwICBKYW1l cyBTaW1vbnNlbiAgPHNpbW9uamFtQGNocm9taXVtLm9yZz4KKworICAgICAgICBQcmVsb2FkcyBz aG91bGQgYmUgY2xlYXJlZCB3aGVuIEphdmFTY3JpcHQgY2FuY2VscyBsb2FkaW5nIHByZW1hdHVy ZWx5LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEw Mzg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWYg YSBwYWdlIHByZWxvYWRzIGEgcmVzb3VyY2UsIGJ1dCBKYXZhU2NyaXB0IGFib3J0cyBwYXJzaW5n IGZvciBhbnkgcmVhc29uIChmb3IgZXhhbXBsZSwgYQorICAgICAgICByZWRpcmVjdCBvciBkb2N1 bWVudC53cml0ZSgpKSwgdGhlIHJlc291cmNlIGlzIGZvcmV2ZXIgbWFya2VkIGEgcHJlbG9hZCBh bmQgd29uJ3QgYmUgcmVsb2FkZWQKKyAgICAgICAgZXZlbiBpZiBpdCdzIGV4cGxpY2l0bHkgbWFy a2VkIG5vLWNhY2hlIGFuZCB0aGUgcGFnZSBpcyByZWxvYWRlZC4KKworICAgICAgICBUZXN0OiBo dHRwL3Rlc3RzL2NhY2hlL3ByZWxvYWQtY2xlYXJlZC1hZnRlci1kb2N1bWVudC13cml0ZS5odG1s CisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1l bnQ6OmltcGxpY2l0Q2xvc2UpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmZpbmlzaGVk UGFyc2luZyk6CisKIDIwMTMtMDItMjAgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgog CiAgICAgICAgIFtOZXcgTXVsdGljb2x1bW5dIENvbHVtbiBnYXAgaXMgY29tcHV0ZWQgaW5jb3Jy ZWN0bHkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291 cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCA3NDc1MTFmNDA1NGY5MmI4YThiMzFi MzA1MWM2MDliODYyNjY1YTRlLi5jYmNhZjFlNWNiN2I3NzEyNTYxZmJkN2Q1YjU1NzFiMTJjMWQx NTEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTIzNjIsOSArMjM2Miw2IEBAIHZvaWQg RG9jdW1lbnQ6OmltcGxpY2l0Q2xvc2UoKQogICAgIC8vIG9uTG9hZCBldmVudCBoYW5kbGVyLCBh cyBpbiBSYWRhciAzMjA2NTI0LgogICAgIGRldGFjaFBhcnNlcigpOwogCi0gICAgLy8gUGFyc2Vy IHNob3VsZCBoYXZlIHBpY2tlZCB1cCBhbGwgcHJlbG9hZHMgYnkgbm93Ci0gICAgbV9jYWNoZWRS ZXNvdXJjZUxvYWRlci0+Y2xlYXJQcmVsb2FkcygpOwotCiAgICAgLy8gRklYTUU6IFdlIGtpY2sg b2ZmIHRoZSBpY29uIGxvYWRlciB3aGVuIHRoZSBEb2N1bWVudCBpcyBkb25lIHBhcnNpbmcuCiAg ICAgLy8gVGhlcmUgYXJlIGVhcmxpZXIgb3Bwb3J0dW5pdGllcyB3ZSBjb3VsZCBzdGFydCBpdDoK ICAgICAvLyAgLVdoZW4gdGhlIDxoZWFkPiBmaW5pc2hlcyBwYXJzaW5nCkBAIC00NDA1LDYgKzQ0 MDIsOSBAQCB2b2lkIERvY3VtZW50OjpmaW5pc2hlZFBhcnNpbmcoKQogICAgIC8vIGFsaXZlIGlu ZGVmaW5pdGVseSBieSBzb21ldGhpbmcgaW5ub2N1b3VzIGxpa2UgSlMgc2V0dGluZyAuaW5uZXJI VE1MIHJlcGVhdGVkbHkgb24gYSB0aW1lci4KICAgICBzdGF0aWMgY29uc3QgaW50IHRpbWVUb0tl ZXBTaGFyZWRPYmplY3RQb29sQWxpdmVBZnRlclBhcnNpbmdGaW5pc2hlZEluU2Vjb25kcyA9IDEw OwogICAgIG1fc2hhcmVkT2JqZWN0UG9vbENsZWFyVGltZXIuc3RhcnRPbmVTaG90KHRpbWVUb0tl ZXBTaGFyZWRPYmplY3RQb29sQWxpdmVBZnRlclBhcnNpbmdGaW5pc2hlZEluU2Vjb25kcyk7CisK KyAgICAvLyBQYXJzZXIgc2hvdWxkIGhhdmUgcGlja2VkIHVwIGFsbCBwcmVsb2FkcyBieSBub3cK KyAgICBtX2NhY2hlZFJlc291cmNlTG9hZGVyLT5jbGVhclByZWxvYWRzKCk7CiB9CiAKIHZvaWQg RG9jdW1lbnQ6OnNoYXJlZE9iamVjdFBvb2xDbGVhclRpbWVyRmlyZWQoVGltZXI8RG9jdW1lbnQ+ KikKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwppbmRleCA3YWVkNjMzNzQyY2YwNzIzN2NiMWI2OTA2ZDVjMDEwNzU0NDQ3NzZkLi40Yjg2 NWZkNTUxMDE1OGYzODcyOGU1MWM0MTEwNGJkNzFlYzAyMmZkIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTMtMDItMjAgIEphbWVzIFNpbW9uc2VuICA8c2ltb25qYW1AY2hyb21pdW0ub3JnPgor CisgICAgICAgIFByZWxvYWRzIHNob3VsZCBiZSBjbGVhcmVkIHdoZW4gSmF2YVNjcmlwdCBjYW5j ZWxzIGxvYWRpbmcgcHJlbWF0dXJlbHkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMTAzODgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvY2FjaGUvcHJlbG9hZC1jbGVhcmVkLWFmdGVy LWRvY3VtZW50LXdyaXRlLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0 cy9jYWNoZS9wcmVsb2FkLWNsZWFyZWQtYWZ0ZXItZG9jdW1lbnQtd3JpdGUuaHRtbDogQWRkZWQu CisKIDIwMTMtMDItMjAgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgogCiAgICAgICAg IFtOZXcgTXVsdGljb2x1bW5dIENvbHVtbiBnYXAgaXMgY29tcHV0ZWQgaW5jb3JyZWN0bHkuCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2NhY2hlL3ByZWxvYWQtY2xlYXJlZC1h ZnRlci1kb2N1bWVudC13cml0ZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L2NhY2hlL3ByZWxvYWQtY2xlYXJlZC1hZnRlci1kb2N1bWVudC13cml0ZS1leHBlY3RlZC50eHQK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uZTViMWQ4MmU0ZWZmOGFmYTVjMTFmYzllODFkOTU2NzIzMWRlOTRmMgotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvY2FjaGUvcHJlbG9hZC1jbGVh cmVkLWFmdGVyLWRvY3VtZW50LXdyaXRlLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDIgQEAKK0NP TlNPTEUgTUVTU0FHRTogbGluZSAyMjogUmVsb2FkaW5nCitQQVNTCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9odHRwL3Rlc3RzL2NhY2hlL3ByZWxvYWQtY2xlYXJlZC1hZnRlci1kb2N1bWVudC13 cml0ZS5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jYWNoZS9wcmVsb2FkLWNsZWFyZWQt YWZ0ZXItZG9jdW1lbnQtd3JpdGUuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44ZjhjMmQ1M2Y3ODFjM2U0MWQ2 N2U1MDdjMjA1OTJmYzRjM2Y1ZjI0Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9jYWNoZS9wcmVsb2FkLWNsZWFyZWQtYWZ0ZXItZG9jdW1lbnQtd3JpdGUuaHRtbApA QCAtMCwwICsxLDM5IEBACis8aHRtbD4KKyAgPGhlYWQ+CisgICAgPHNjcmlwdD4KKyAgICAgIGZ1 bmN0aW9uIHNhdmVBbmRDaGVja1JhbmRvbU51bWJlcigpIHsKKyAgICAgICAgaWYgKCFzZXNzaW9u U3RvcmFnZS5sYXN0UmFuZG9tKSB7CisgICAgICAgICAgc2Vzc2lvblN0b3JhZ2UubGFzdFJhbmRv bSA9IHJhbmRvbU51bWJlcjsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICB3aW5kb3cucGFz c2VkID0gc2Vzc2lvblN0b3JhZ2UubGFzdFJhbmRvbSAhPSByYW5kb21OdW1iZXI7CisgICAgICAg IH0KKyAgICAgIH0KKyAgICA8L3NjcmlwdD4KKyAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNj cmlwdCIgc3JjPSJyZXNvdXJjZXMvY2FjaGUtc2ltdWxhdG9yLmNnaT91bmlxdWVJZD0xJkNhY2hl LWNvbnRyb2w9bm8tc3RvcmUsbm8tY2FjaGUscHJpdmF0ZSxtdXN0LXJldmFsaWRhdGUsbWF4LWFn ZT0wIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJy ZXNvdXJjZXMvY2FjaGUtc2ltdWxhdG9yLmNnaT91bmlxdWVJZD0yJkNhY2hlLWNvbnRyb2w9bm8t c3RvcmUsbm8tY2FjaGUscHJpdmF0ZSxtdXN0LXJldmFsaWRhdGUsbWF4LWFnZT0wIiBvbmxvYWQ9 InNhdmVBbmRDaGVja1JhbmRvbU51bWJlcigpOyI+PC9zY3JpcHQ+CisgIDwvaGVhZD4KKyAgPGJv ZHk+CisgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorICAgICAgaWYgKHdpbmRv dy50ZXN0UnVubmVyKSB7CisgICAgICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworICAgICAg ICB0ZXN0UnVubmVyLndhaXRVbnRpbERvbmUoKTsKKyAgICAgIH0KKyAgICAgIGlmIChkb2N1bWVu dC5yZWZlcnJlciAhPSBkb2N1bWVudC5sb2NhdGlvbi50b1N0cmluZygpKSB7CisgICAgICAgIGNv bnNvbGUubG9nKCdSZWxvYWRpbmcnKTsKKyAgICAgICAgZG9jdW1lbnQubG9jYXRpb24ucmVsb2Fk KCk7CisgICAgICB9IGVsc2UgeworICAgICAgICBpZiAod2luZG93LnBhc3NlZCA9PT0gdHJ1ZSkg eworICAgICAgICAgIGRvY3VtZW50LmJvZHkuaW5uZXJUZXh0ID0gIlBBU1MiOworICAgICAgICB9 IGVsc2UgaWYgKHdpbmRvdy5wYXNzZWQgPT09IGZhbHNlKSB7CisgICAgICAgICAgZG9jdW1lbnQu Ym9keS5pbm5lclRleHQgPSAiRkFJTCI7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgZG9j dW1lbnQuYm9keS5pbm5lclRleHQgPSAiRVJST1IiOworICAgICAgICB9CisgICAgICAgIGRlbGV0 ZSBzZXNzaW9uU3RvcmFnZS5sYXN0UmFuZG9tOworICAgICAgICBpZiAod2luZG93LnRlc3RSdW5u ZXIpIHsKKyAgICAgICAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKKyAgICAgICAgfQorICAg ICAgfQorICAgIDwvc2NyaXB0PgorICA8L2JvZHk+Cis8L2h0bWw+Cg== 189569 2013-02-21 11:59:23 -0800 2013-02-22 14:01:55 -0800 Patch bug-110388-20130221115543.patch text/plain 5302 simonjam U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDRjMTc1OTM5MTJmZmZh NGVkYjYyZWQzMDA3MTRlNmRmMTM5OWM3NC4uOTYyNjJlMDk1Zjk2ZDE1MzQ0ZjYzZWZmYWE3Mjdl NjFhMmY0Y2UwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAyLTIwICBKYW1l cyBTaW1vbnNlbiAgPHNpbW9uamFtQGNocm9taXVtLm9yZz4KKworICAgICAgICBQcmVsb2FkcyBz aG91bGQgYmUgY2xlYXJlZCB3aGVuIEphdmFTY3JpcHQgY2FuY2VscyBsb2FkaW5nIHByZW1hdHVy ZWx5LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEw Mzg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWYg YSBwYWdlIHByZWxvYWRzIGEgcmVzb3VyY2UsIGJ1dCBKYXZhU2NyaXB0IGFib3J0cyBwYXJzaW5n IGZvciBhbnkgcmVhc29uIChmb3IgZXhhbXBsZSwgYQorICAgICAgICByZWRpcmVjdCBvciBkb2N1 bWVudC53cml0ZSgpKSwgdGhlIHJlc291cmNlIGlzIGZvcmV2ZXIgbWFya2VkIGEgcHJlbG9hZCBh bmQgd29uJ3QgYmUgcmVsb2FkZWQKKyAgICAgICAgZXZlbiBpZiBpdCdzIGV4cGxpY2l0bHkgbWFy a2VkIG5vLWNhY2hlIGFuZCB0aGUgcGFnZSBpcyByZWxvYWRlZC4KKworICAgICAgICBUZXN0OiBo dHRwL3Rlc3RzL2NhY2hlL3ByZWxvYWQtY2xlYXJlZC1hZnRlci1wYXJyc2luZy1jYW5jZWxlZC1i eS1qcy5odG1sCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RG9jdW1lbnQ6OmltcGxpY2l0Q2xvc2UpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6 OmZpbmlzaGVkUGFyc2luZyk6CisKIDIwMTMtMDItMjAgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBw bGUuY29tPgogCiAgICAgICAgIFtOZXcgTXVsdGljb2x1bW5dIENvbHVtbiBnYXAgaXMgY29tcHV0 ZWQgaW5jb3JyZWN0bHkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCA3NDc1MTFmNDA1NGY5 MmI4YThiMzFiMzA1MWM2MDliODYyNjY1YTRlLi5jYmNhZjFlNWNiN2I3NzEyNTYxZmJkN2Q1YjU1 NzFiMTJjMWQxNTEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTIzNjIsOSArMjM2Miw2 IEBAIHZvaWQgRG9jdW1lbnQ6OmltcGxpY2l0Q2xvc2UoKQogICAgIC8vIG9uTG9hZCBldmVudCBo YW5kbGVyLCBhcyBpbiBSYWRhciAzMjA2NTI0LgogICAgIGRldGFjaFBhcnNlcigpOwogCi0gICAg Ly8gUGFyc2VyIHNob3VsZCBoYXZlIHBpY2tlZCB1cCBhbGwgcHJlbG9hZHMgYnkgbm93Ci0gICAg bV9jYWNoZWRSZXNvdXJjZUxvYWRlci0+Y2xlYXJQcmVsb2FkcygpOwotCiAgICAgLy8gRklYTUU6 IFdlIGtpY2sgb2ZmIHRoZSBpY29uIGxvYWRlciB3aGVuIHRoZSBEb2N1bWVudCBpcyBkb25lIHBh cnNpbmcuCiAgICAgLy8gVGhlcmUgYXJlIGVhcmxpZXIgb3Bwb3J0dW5pdGllcyB3ZSBjb3VsZCBz dGFydCBpdDoKICAgICAvLyAgLVdoZW4gdGhlIDxoZWFkPiBmaW5pc2hlcyBwYXJzaW5nCkBAIC00 NDA1LDYgKzQ0MDIsOSBAQCB2b2lkIERvY3VtZW50OjpmaW5pc2hlZFBhcnNpbmcoKQogICAgIC8v IGFsaXZlIGluZGVmaW5pdGVseSBieSBzb21ldGhpbmcgaW5ub2N1b3VzIGxpa2UgSlMgc2V0dGlu ZyAuaW5uZXJIVE1MIHJlcGVhdGVkbHkgb24gYSB0aW1lci4KICAgICBzdGF0aWMgY29uc3QgaW50 IHRpbWVUb0tlZXBTaGFyZWRPYmplY3RQb29sQWxpdmVBZnRlclBhcnNpbmdGaW5pc2hlZEluU2Vj b25kcyA9IDEwOwogICAgIG1fc2hhcmVkT2JqZWN0UG9vbENsZWFyVGltZXIuc3RhcnRPbmVTaG90 KHRpbWVUb0tlZXBTaGFyZWRPYmplY3RQb29sQWxpdmVBZnRlclBhcnNpbmdGaW5pc2hlZEluU2Vj b25kcyk7CisKKyAgICAvLyBQYXJzZXIgc2hvdWxkIGhhdmUgcGlja2VkIHVwIGFsbCBwcmVsb2Fk cyBieSBub3cKKyAgICBtX2NhY2hlZFJlc291cmNlTG9hZGVyLT5jbGVhclByZWxvYWRzKCk7CiB9 CiAKIHZvaWQgRG9jdW1lbnQ6OnNoYXJlZE9iamVjdFBvb2xDbGVhclRpbWVyRmlyZWQoVGltZXI8 RG9jdW1lbnQ+KikKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwppbmRleCA3YWVkNjMzNzQyY2YwNzIzN2NiMWI2OTA2ZDVjMDEwNzU0NDQ3 NzZkLi45OTU3MGM0MDE2MzMxYzdlN2VjMGQ2ZGI0Y2ZjZTg4MzQ0NmY4OWZhIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTMgQEAKKzIwMTMtMDItMjAgIEphbWVzIFNpbW9uc2VuICA8c2ltb25qYW1AY2hyb21p dW0ub3JnPgorCisgICAgICAgIFByZWxvYWRzIHNob3VsZCBiZSBjbGVhcmVkIHdoZW4gSmF2YVNj cmlwdCBjYW5jZWxzIGxvYWRpbmcgcHJlbWF0dXJlbHkuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTAzODgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvY2FjaGUvcHJlbG9hZC1jbGVh cmVkLWFmdGVyLXBhcnJzaW5nLWNhbmNlbGVkLWJ5LWpzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisg ICAgICAgICogaHR0cC90ZXN0cy9jYWNoZS9wcmVsb2FkLWNsZWFyZWQtYWZ0ZXItcGFycnNpbmct Y2FuY2VsZWQtYnktanMuaHRtbDogQWRkZWQuCisKIDIwMTMtMDItMjAgIERhdmlkIEh5YXR0ICA8 aHlhdHRAYXBwbGUuY29tPgogCiAgICAgICAgIFtOZXcgTXVsdGljb2x1bW5dIENvbHVtbiBnYXAg aXMgY29tcHV0ZWQgaW5jb3JyZWN0bHkuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL2NhY2hlL3ByZWxvYWQtY2xlYXJlZC1hZnRlci1wYXJzaW5nLWNhbmNlbGVkLWJ5LWpzLWV4 cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvY2FjaGUvcHJlbG9hZC1jbGVhcmVk LWFmdGVyLXBhcnNpbmctY2FuY2VsZWQtYnktanMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmU1 YjFkODJlNGVmZjhhZmE1YzExZmM5ZTgxZDk1NjcyMzFkZTk0ZjIKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2NhY2hlL3ByZWxvYWQtY2xlYXJlZC1hZnRlci1wYXJz aW5nLWNhbmNlbGVkLWJ5LWpzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDIgQEAKK0NPTlNPTEUg TUVTU0FHRTogbGluZSAyMjogUmVsb2FkaW5nCitQQVNTCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL2NhY2hlL3ByZWxvYWQtY2xlYXJlZC1hZnRlci1wYXJzaW5nLWNhbmNlbGVk LWJ5LWpzLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2NhY2hlL3ByZWxvYWQtY2xlYXJl ZC1hZnRlci1wYXJzaW5nLWNhbmNlbGVkLWJ5LWpzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOGY4YzJkNTNm NzgxYzNlNDFkNjdlNTA3YzIwNTkyZmM0YzNmNWYyNAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvY2FjaGUvcHJlbG9hZC1jbGVhcmVkLWFmdGVyLXBhcnNpbmctY2Fu Y2VsZWQtYnktanMuaHRtbApAQCAtMCwwICsxLDM5IEBACis8aHRtbD4KKyAgPGhlYWQ+CisgICAg PHNjcmlwdD4KKyAgICAgIGZ1bmN0aW9uIHNhdmVBbmRDaGVja1JhbmRvbU51bWJlcigpIHsKKyAg ICAgICAgaWYgKCFzZXNzaW9uU3RvcmFnZS5sYXN0UmFuZG9tKSB7CisgICAgICAgICAgc2Vzc2lv blN0b3JhZ2UubGFzdFJhbmRvbSA9IHJhbmRvbU51bWJlcjsKKyAgICAgICAgfSBlbHNlIHsKKyAg ICAgICAgICB3aW5kb3cucGFzc2VkID0gc2Vzc2lvblN0b3JhZ2UubGFzdFJhbmRvbSAhPSByYW5k b21OdW1iZXI7CisgICAgICAgIH0KKyAgICAgIH0KKyAgICA8L3NjcmlwdD4KKyAgICA8c2NyaXB0 IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJyZXNvdXJjZXMvY2FjaGUtc2ltdWxhdG9yLmNn aT91bmlxdWVJZD0xJkNhY2hlLWNvbnRyb2w9bm8tc3RvcmUsbm8tY2FjaGUscHJpdmF0ZSxtdXN0 LXJldmFsaWRhdGUsbWF4LWFnZT0wIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHR5cGU9InRleHQv amF2YXNjcmlwdCIgc3JjPSJyZXNvdXJjZXMvY2FjaGUtc2ltdWxhdG9yLmNnaT91bmlxdWVJZD0y JkNhY2hlLWNvbnRyb2w9bm8tc3RvcmUsbm8tY2FjaGUscHJpdmF0ZSxtdXN0LXJldmFsaWRhdGUs bWF4LWFnZT0wIiBvbmxvYWQ9InNhdmVBbmRDaGVja1JhbmRvbU51bWJlcigpOyI+PC9zY3JpcHQ+ CisgIDwvaGVhZD4KKyAgPGJvZHk+CisgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQi PgorICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAgICAgIHRlc3RSdW5uZXIuZHVt cEFzVGV4dCgpOworICAgICAgICB0ZXN0UnVubmVyLndhaXRVbnRpbERvbmUoKTsKKyAgICAgIH0K KyAgICAgIGlmIChkb2N1bWVudC5yZWZlcnJlciAhPSBkb2N1bWVudC5sb2NhdGlvbi50b1N0cmlu ZygpKSB7CisgICAgICAgIGNvbnNvbGUubG9nKCdSZWxvYWRpbmcnKTsKKyAgICAgICAgZG9jdW1l bnQubG9jYXRpb24ucmVsb2FkKCk7CisgICAgICB9IGVsc2UgeworICAgICAgICBpZiAod2luZG93 LnBhc3NlZCA9PT0gdHJ1ZSkgeworICAgICAgICAgIGRvY3VtZW50LmJvZHkuaW5uZXJUZXh0ID0g IlBBU1MiOworICAgICAgICB9IGVsc2UgaWYgKHdpbmRvdy5wYXNzZWQgPT09IGZhbHNlKSB7Cisg ICAgICAgICAgZG9jdW1lbnQuYm9keS5pbm5lclRleHQgPSAiRkFJTCI7CisgICAgICAgIH0gZWxz ZSB7CisgICAgICAgICAgZG9jdW1lbnQuYm9keS5pbm5lclRleHQgPSAiRVJST1IiOworICAgICAg ICB9CisgICAgICAgIGRlbGV0ZSBzZXNzaW9uU3RvcmFnZS5sYXN0UmFuZG9tOworICAgICAgICBp ZiAod2luZG93LnRlc3RSdW5uZXIpIHsKKyAgICAgICAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUo KTsKKyAgICAgICAgfQorICAgICAgfQorICAgIDwvc2NyaXB0PgorICA8L2JvZHk+Cis8L2h0bWw+ Cg==