35671 2010-03-03 04:01:00 -0800 [Qt] Even if QNetworkRequest::AlwaysCache is set on a request, a page will be loaded from the network the first time 2010-12-11 19:22:12 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED Qt P2 Normal --- 1 vestbo webkit-qt-unassigned jhanssen kent.hansen webkit.review.bot oldest_to_newest 195477 0 vestbo 2010-03-03 04:01:00 -0800 This bug report originated from issue QTBUG-4839 http://bugreports.qt.nokia.com/browse/QTBUG-4839 --- Description --- The following example (whole example in the attachment) will load the page from the network even if QNetworkRequest::AlwaysCache is set. the documentation says "only load from cache, indicating error if the item was not cached (i.e., off-line mode)": <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent"> <pre class="code-java">QWebPage *webPage = ui->webView->page(); QNetworkAccessManager *netAccessMgr = <span class="code-keyword">new</span> QNetworkAccessManager(<span class="code-keyword">this</span>); QNetworkDiskCache *dc = <span class="code-keyword">new</span> QNetworkDiskCache(<span class="code-keyword">this</span>); dc->setCacheDirectory(<span class="code-quote">"cache"</span>); netAccessMgr->setCache(dc); webPage->setNetworkAccessManager(netAccessMgr); QNetworkRequest *request = <span class="code-keyword">new</span> QNetworkRequest(QUrl(ui->lineEdit->text())); request->setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysCache); ui->webView->load(*request);</pre> </div></div> --- Comments --- Do we have an AlwaysCache autotest? Yes, we do have a test. This is not a QNetworkAccessManager issue. It's a QWebFrame issue, that doesn't honour the attributes set in the request. PS: your sample code leaks the QNetworkRequest. Don't use "new". 198997 1 kent.hansen 2010-03-12 05:59:43 -0800 Reproduced with r55658. 317458 2 75649 jhanssen 2010-12-05 23:26:37 -0800 Created attachment 75649 Patch 317611 3 75649 tonikitoo 2010-12-06 07:25:24 -0800 Comment on attachment 75649 Patch lgtm 319972 4 75649 eric 2010-12-09 23:55:40 -0800 Comment on attachment 75649 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=75649&action=review > WebKit/qt/Api/qwebframe.cpp:867 > + switch (cacheLoadValue) { > + case QNetworkRequest::AlwaysNetwork: > + request.setCachePolicy(WebCore::ReloadIgnoringCacheData); > + break; > + case QNetworkRequest::PreferCache: > + request.setCachePolicy(WebCore::ReturnCacheDataElseLoad); > + break; > + case QNetworkRequest::AlwaysCache: > + request.setCachePolicy(WebCore::ReturnCacheDataDontLoad); > + break; > + case QNetworkRequest::PreferNetwork: > + request.setCachePolicy(WebCore::UseProtocolCachePolicy); > + break; This would be much better as a helper function to convert the enum. Then you only need one request.setCachePolicy call and this function gets much cleaner. 320415 5 76261 jhanssen 2010-12-10 14:25:35 -0800 Created attachment 76261 Patch 320636 6 76261 kling 2010-12-11 03:31:28 -0800 Comment on attachment 76261 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=76261&action=review LGTM, two small things: > WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:3075 > + : QNetworkAccessManager(parent), m_lastCacheLoad(QNetworkRequest::PreferNetwork) Style, initializers should be on separate lines. > WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:3083 > + m_lastCacheLoad = static_cast<QNetworkRequest::CacheLoadControl>(cacheLoad.toInt()); You're using toInt() here and toUInt() in QWebFrame::load(). 320670 7 76305 jhanssen 2010-12-11 05:46:00 -0800 Created attachment 76305 Patch 320671 8 jhanssen 2010-12-11 05:47:03 -0800 (In reply to comment #6) > (From update of attachment 76261 [details]) > > WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:3083 > > + m_lastCacheLoad = static_cast<QNetworkRequest::CacheLoadControl>(cacheLoad.toInt()); > > You're using toInt() here and toUInt() in QWebFrame::load(). Indeed, nice catch. I should have spotted that :) 320735 9 76305 webkit.review.bot 2010-12-11 19:22:06 -0800 Comment on attachment 76305 Patch Clearing flags on attachment: 76305 Committed r73865: <http://trac.webkit.org/changeset/73865> 320736 10 webkit.review.bot 2010-12-11 19:22:12 -0800 All reviewed patches have been landed. Closing bug. 75649 2010-12-05 23:26:37 -0800 2010-12-10 14:25:32 -0800 Patch bug-35671-20101205232636.patch text/plain 4921 jhanssen ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcCBiL1dlYktpdC9xdC9BcGkv cXdlYmZyYW1lLmNwcAppbmRleCAzY2RiZWYyNmM3YmEwNDk3MDkzZGU2Y2YyYWFjMjljNTZmZDY0 NTM0Li5lNjIyNGUyNzcyNGJkNjUyZDIyMjgwODIyOTI0YzZlNjlmOWMwOWU2IDEwMDY0NAotLS0g YS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJh bWUuY3BwCkBAIC04NDcsNiArODQ3LDMwIEBAIHZvaWQgUVdlYkZyYW1lOjpsb2FkKGNvbnN0IFFO ZXR3b3JrUmVxdWVzdCAmcmVxLAogICAgICAgICAgICAgYnJlYWs7CiAgICAgfQogCisgICAgUVZh cmlhbnQgY2FjaGVMb2FkID0gcmVxLmF0dHJpYnV0ZShRTmV0d29ya1JlcXVlc3Q6OkNhY2hlTG9h ZENvbnRyb2xBdHRyaWJ1dGUpOworICAgIGlmIChjYWNoZUxvYWQuaXNWYWxpZCgpKSB7CisgICAg ICAgIGJvb2wgb2s7CisgICAgICAgIHVpbnQgY2FjaGVMb2FkVmFsdWUgPSBjYWNoZUxvYWQudG9V SW50KCZvayk7CisgICAgICAgIGlmIChvaykgeworICAgICAgICAgICAgc3dpdGNoIChjYWNoZUxv YWRWYWx1ZSkgeworICAgICAgICAgICAgY2FzZSBRTmV0d29ya1JlcXVlc3Q6OkFsd2F5c05ldHdv cms6CisgICAgICAgICAgICAgICAgcmVxdWVzdC5zZXRDYWNoZVBvbGljeShXZWJDb3JlOjpSZWxv YWRJZ25vcmluZ0NhY2hlRGF0YSk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAg ICBjYXNlIFFOZXR3b3JrUmVxdWVzdDo6UHJlZmVyQ2FjaGU6CisgICAgICAgICAgICAgICAgcmVx dWVzdC5zZXRDYWNoZVBvbGljeShXZWJDb3JlOjpSZXR1cm5DYWNoZURhdGFFbHNlTG9hZCk7Cisg ICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIFFOZXR3b3JrUmVxdWVzdDo6 QWx3YXlzQ2FjaGU6CisgICAgICAgICAgICAgICAgcmVxdWVzdC5zZXRDYWNoZVBvbGljeShXZWJD b3JlOjpSZXR1cm5DYWNoZURhdGFEb250TG9hZCk7CisgICAgICAgICAgICAgICAgYnJlYWs7Cisg ICAgICAgICAgICBjYXNlIFFOZXR3b3JrUmVxdWVzdDo6UHJlZmVyTmV0d29yazoKKyAgICAgICAg ICAgICAgICByZXF1ZXN0LnNldENhY2hlUG9saWN5KFdlYkNvcmU6OlVzZVByb3RvY29sQ2FjaGVQ b2xpY3kpOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgZGVmYXVsdDoKKyAg ICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH0KKwog ICAgIFFMaXN0PFFCeXRlQXJyYXk+IGh0dHBIZWFkZXJzID0gcmVxLnJhd0hlYWRlckxpc3QoKTsK ICAgICBmb3IgKGludCBpID0gMDsgaSA8IGh0dHBIZWFkZXJzLnNpemUoKTsgKytpKSB7CiAgICAg ICAgIGNvbnN0IFFCeXRlQXJyYXkgJmhlYWRlck5hbWUgPSBodHRwSGVhZGVycy5hdChpKTsKZGlm ZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4 IGQzNjE2MjQ1NjcyNjYxMTYyZWE4MzNlM2I1ZTU5MDA2MzcwYWUyMmMuLjc2N2JlNjY3MDIzZGU5 YzA2OWExNzE5MTQ5YjM5YjYyNGZlM2U2NjAgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEwLTEyLTA1 ICBKYW4gRXJpayBIYW5zc2VuICA8amhhbnNzZW5Ac2VuY2hhLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFFXZWJGcmFtZSBkb2VzIG5v dCBzdXBwb3J0IFFOZXR3b3JrUmVxdWVzdDo6Q2FjaGVMb2FkQ29udHJvbC4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1NjcxCisKKyAgICAgICAgTWFr ZSBRV2ViRnJhbWUgcmVzcGVjdCB0aGUgUU5ldHdvcmtSZXF1ZXN0OjpDYWNoZUxvYWRDb250cm9s IGF0dHJpYnV0ZQorICAgICAgICBzZXQgb24gdGhlIHJlcXVlc3QsIGlmIGFueS4KKworICAgICAg ICAqIEFwaS9xd2ViZnJhbWUuY3BwOgorICAgICAgICAoUVdlYkZyYW1lOjpsb2FkKToKKyAgICAg ICAgKiB0ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHA6CisgICAgICAgICh0c3RfUVdl YkZyYW1lOjpzZXRDYWNoZUxvYWRDb250cm9sQXR0cmlidXRlKToKKwogMjAxMC0xMi0wMSAgSmlh IFB1ICA8anB1QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4K ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAg Yi9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCmluZGV4IGViM2Fl MGE5ZWNkM2ViODc0NTU4M2JhMWZiMmE5OTE5MWJhMzZiNGYuLmY4YzJlNGI5NzBhYjFlYWVjZDhi ODQwOTE4YmIzYTI3NGVmYTc4OWEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJh bWUvdHN0X3F3ZWJmcmFtZS5jcHAKKysrIGIvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3Rf cXdlYmZyYW1lLmNwcApAQCAtNjI1LDYgKzYyNSw3IEBAIHByaXZhdGUgc2xvdHM6CiAgICAgdm9p ZCBpbnRyb3NwZWN0UXRNZXRob2RzKCk7CiAgICAgdm9pZCBzZXRDb250ZW50X2RhdGEoKTsKICAg ICB2b2lkIHNldENvbnRlbnQoKTsKKyAgICB2b2lkIHNldENhY2hlTG9hZENvbnRyb2xBdHRyaWJ1 dGUoKTsKIAogcHJpdmF0ZToKICAgICBRU3RyaW5nICBldmFsSlMoY29uc3QgUVN0cmluZyZzKSB7 CkBAIC0zMDY4LDUgKzMwNjksNTcgQEAgdm9pZCB0c3RfUVdlYkZyYW1lOjpzZXRDb250ZW50KCkK ICAgICBRQ09NUEFSRShleHBlY3RlZCAsIG1haW5GcmFtZS0+dG9QbGFpblRleHQoKSk7CiB9CiAK K2NsYXNzIENhY2hlTmV0d29ya0FjY2Vzc01hbmFnZXIgOiBwdWJsaWMgUU5ldHdvcmtBY2Nlc3NN YW5hZ2VyIHsKK3B1YmxpYzoKKyAgICBDYWNoZU5ldHdvcmtBY2Nlc3NNYW5hZ2VyKFFPYmplY3Qq IHBhcmVudCA9IDApCisgICAgICAgIDogUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyKHBhcmVudCksIG1f bGFzdENhY2hlTG9hZChRTmV0d29ya1JlcXVlc3Q6OlByZWZlck5ldHdvcmspCisgICAgeworICAg IH0KKworICAgIHZpcnR1YWwgUU5ldHdvcmtSZXBseSogY3JlYXRlUmVxdWVzdChPcGVyYXRpb24s IGNvbnN0IFFOZXR3b3JrUmVxdWVzdCYgcmVxdWVzdCwgUUlPRGV2aWNlKikKKyAgICB7CisgICAg ICAgIFFWYXJpYW50IGNhY2hlTG9hZCA9IHJlcXVlc3QuYXR0cmlidXRlKFFOZXR3b3JrUmVxdWVz dDo6Q2FjaGVMb2FkQ29udHJvbEF0dHJpYnV0ZSk7CisgICAgICAgIGlmIChjYWNoZUxvYWQuaXNW YWxpZCgpKQorICAgICAgICAgICAgbV9sYXN0Q2FjaGVMb2FkID0gc3RhdGljX2Nhc3Q8UU5ldHdv cmtSZXF1ZXN0OjpDYWNoZUxvYWRDb250cm9sPihjYWNoZUxvYWQudG9JbnQoKSk7CisgICAgICAg IGVsc2UKKyAgICAgICAgICAgIG1fbGFzdENhY2hlTG9hZCA9IFFOZXR3b3JrUmVxdWVzdDo6UHJl ZmVyTmV0d29yazsgLy8gZGVmYXVsdCB2YWx1ZQorICAgICAgICByZXR1cm4gbmV3IEZha2VSZXBs eShyZXF1ZXN0LCB0aGlzKTsKKyAgICB9CisKKyAgICBRTmV0d29ya1JlcXVlc3Q6OkNhY2hlTG9h ZENvbnRyb2wgbGFzdENhY2hlTG9hZCgpIGNvbnN0CisgICAgeworICAgICAgICByZXR1cm4gbV9s YXN0Q2FjaGVMb2FkOworICAgIH0KKworcHJpdmF0ZToKKyAgICBRTmV0d29ya1JlcXVlc3Q6OkNh Y2hlTG9hZENvbnRyb2wgbV9sYXN0Q2FjaGVMb2FkOworfTsKKwordm9pZCB0c3RfUVdlYkZyYW1l OjpzZXRDYWNoZUxvYWRDb250cm9sQXR0cmlidXRlKCkKK3sKKyAgICBRV2ViUGFnZSBwYWdlOwor ICAgIENhY2hlTmV0d29ya0FjY2Vzc01hbmFnZXIqIG1hbmFnZXIgPSBuZXcgQ2FjaGVOZXR3b3Jr QWNjZXNzTWFuYWdlcigmcGFnZSk7CisgICAgcGFnZS5zZXROZXR3b3JrQWNjZXNzTWFuYWdlciht YW5hZ2VyKTsKKyAgICBRV2ViRnJhbWUqIGZyYW1lID0gcGFnZS5tYWluRnJhbWUoKTsKKworICAg IFFOZXR3b3JrUmVxdWVzdCByZXF1ZXN0KFFVcmwoImh0dHA6Ly9hYmNkZWYuYWJjZGVmLyIpKTsK KworICAgIHJlcXVlc3Quc2V0QXR0cmlidXRlKFFOZXR3b3JrUmVxdWVzdDo6Q2FjaGVMb2FkQ29u dHJvbEF0dHJpYnV0ZSwgUU5ldHdvcmtSZXF1ZXN0OjpBbHdheXNDYWNoZSk7CisgICAgZnJhbWUt PmxvYWQocmVxdWVzdCk7CisgICAgUUNPTVBBUkUobWFuYWdlci0+bGFzdENhY2hlTG9hZCgpLCBR TmV0d29ya1JlcXVlc3Q6OkFsd2F5c0NhY2hlKTsKKworICAgIHJlcXVlc3Quc2V0QXR0cmlidXRl KFFOZXR3b3JrUmVxdWVzdDo6Q2FjaGVMb2FkQ29udHJvbEF0dHJpYnV0ZSwgUU5ldHdvcmtSZXF1 ZXN0OjpQcmVmZXJDYWNoZSk7CisgICAgZnJhbWUtPmxvYWQocmVxdWVzdCk7CisgICAgUUNPTVBB UkUobWFuYWdlci0+bGFzdENhY2hlTG9hZCgpLCBRTmV0d29ya1JlcXVlc3Q6OlByZWZlckNhY2hl KTsKKworICAgIHJlcXVlc3Quc2V0QXR0cmlidXRlKFFOZXR3b3JrUmVxdWVzdDo6Q2FjaGVMb2Fk Q29udHJvbEF0dHJpYnV0ZSwgUU5ldHdvcmtSZXF1ZXN0OjpBbHdheXNOZXR3b3JrKTsKKyAgICBm cmFtZS0+bG9hZChyZXF1ZXN0KTsKKyAgICBRQ09NUEFSRShtYW5hZ2VyLT5sYXN0Q2FjaGVMb2Fk KCksIFFOZXR3b3JrUmVxdWVzdDo6QWx3YXlzTmV0d29yayk7CisKKyAgICByZXF1ZXN0LnNldEF0 dHJpYnV0ZShRTmV0d29ya1JlcXVlc3Q6OkNhY2hlTG9hZENvbnRyb2xBdHRyaWJ1dGUsIFFOZXR3 b3JrUmVxdWVzdDo6UHJlZmVyTmV0d29yayk7CisgICAgZnJhbWUtPmxvYWQocmVxdWVzdCk7Cisg ICAgUUNPTVBBUkUobWFuYWdlci0+bGFzdENhY2hlTG9hZCgpLCBRTmV0d29ya1JlcXVlc3Q6OlBy ZWZlck5ldHdvcmspOworfQorCiBRVEVTVF9NQUlOKHRzdF9RV2ViRnJhbWUpCiAjaW5jbHVkZSAi dHN0X3F3ZWJmcmFtZS5tb2MiCg== 76261 2010-12-10 14:25:35 -0800 2010-12-11 05:45:57 -0800 Patch bug-35671-20101210142533.patch text/plain 5415 jhanssen ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcCBiL1dlYktpdC9xdC9BcGkv cXdlYmZyYW1lLmNwcAppbmRleCA2MmU3NjBjOGFkN2U1NzcyY2EwNTkxNWE2N2MzNWZlZDE0YTE0 MGJhLi4xMDhlMGQ0ZGUxYjc3ZjA1MjMyMjA5MWNmMGE5OGJkM2FmMjQyNTMzIDEwMDY0NAotLS0g YS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJh bWUuY3BwCkBAIC0yMDEsNiArMjAxLDIxIEBAIHZvaWQgUVdFQktJVF9FWFBPUlQgcXR3ZWJraXRf d2ViZnJhbWVfc2Nyb2xsUmVjdXJzaXZlbHkoUVdlYkZyYW1lKiBxRnJhbWUsIGludCBkCiAgICAg fSB3aGlsZSAocUZyYW1lKTsKIH0KIAorc3RhdGljIGlubGluZSBSZXNvdXJjZVJlcXVlc3RDYWNo ZVBvbGljeSBjYWNoZUxvYWRDb250cm9sVG9DYWNoZVBvbGljeSh1aW50IGNhY2hlTG9hZENvbnRy b2wpCit7CisgICAgc3dpdGNoIChjYWNoZUxvYWRDb250cm9sKSB7CisgICAgY2FzZSBRTmV0d29y a1JlcXVlc3Q6OkFsd2F5c05ldHdvcms6CisgICAgICAgIHJldHVybiBXZWJDb3JlOjpSZWxvYWRJ Z25vcmluZ0NhY2hlRGF0YTsKKyAgICBjYXNlIFFOZXR3b3JrUmVxdWVzdDo6UHJlZmVyQ2FjaGU6 CisgICAgICAgIHJldHVybiBXZWJDb3JlOjpSZXR1cm5DYWNoZURhdGFFbHNlTG9hZDsKKyAgICBj YXNlIFFOZXR3b3JrUmVxdWVzdDo6QWx3YXlzQ2FjaGU6CisgICAgICAgIHJldHVybiBXZWJDb3Jl OjpSZXR1cm5DYWNoZURhdGFEb250TG9hZDsKKyAgICBkZWZhdWx0OgorICAgICAgICBicmVhazsK KyAgICB9CisgICAgcmV0dXJuIFdlYkNvcmU6OlVzZVByb3RvY29sQ2FjaGVQb2xpY3k7Cit9CisK IFFXZWJGcmFtZURhdGE6OlFXZWJGcmFtZURhdGEoV2ViQ29yZTo6UGFnZSogcGFyZW50UGFnZSwg V2ViQ29yZTo6RnJhbWUqIHBhcmVudEZyYW1lLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBXZWJDb3JlOjpIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93bmVyRnJhbWVFbGVtZW50LAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBXVEY6OlN0cmluZyYgZnJhbWVOYW1lKQpA QCAtODQ2LDYgKzg2MSw3IEBAIHZvaWQgUVdlYkZyYW1lOjpsb2FkKGNvbnN0IFFVcmwgJnVybCkK IAogICBcc2Egc2V0VXJsKCkKICovCisKIHZvaWQgUVdlYkZyYW1lOjpsb2FkKGNvbnN0IFFOZXR3 b3JrUmVxdWVzdCAmcmVxLAogICAgICAgICAgICAgICAgICAgICAgUU5ldHdvcmtBY2Nlc3NNYW5h Z2VyOjpPcGVyYXRpb24gb3BlcmF0aW9uLAogICAgICAgICAgICAgICAgICAgICAgY29uc3QgUUJ5 dGVBcnJheSAmYm9keSkKQEAgLTg4Myw2ICs4OTksMTQgQEAgdm9pZCBRV2ViRnJhbWU6OmxvYWQo Y29uc3QgUU5ldHdvcmtSZXF1ZXN0ICZyZXEsCiAgICAgICAgICAgICBicmVhazsKICAgICB9CiAK KyAgICBRVmFyaWFudCBjYWNoZUxvYWQgPSByZXEuYXR0cmlidXRlKFFOZXR3b3JrUmVxdWVzdDo6 Q2FjaGVMb2FkQ29udHJvbEF0dHJpYnV0ZSk7CisgICAgaWYgKGNhY2hlTG9hZC5pc1ZhbGlkKCkp IHsKKyAgICAgICAgYm9vbCBvazsKKyAgICAgICAgdWludCBjYWNoZUxvYWRWYWx1ZSA9IGNhY2hl TG9hZC50b1VJbnQoJm9rKTsKKyAgICAgICAgaWYgKG9rKQorICAgICAgICAgICAgcmVxdWVzdC5z ZXRDYWNoZVBvbGljeShjYWNoZUxvYWRDb250cm9sVG9DYWNoZVBvbGljeShjYWNoZUxvYWRWYWx1 ZSkpOworICAgIH0KKwogICAgIFFMaXN0PFFCeXRlQXJyYXk+IGh0dHBIZWFkZXJzID0gcmVxLnJh d0hlYWRlckxpc3QoKTsKICAgICBmb3IgKGludCBpID0gMDsgaSA8IGh0dHBIZWFkZXJzLnNpemUo KTsgKytpKSB7CiAgICAgICAgIGNvbnN0IFFCeXRlQXJyYXkgJmhlYWRlck5hbWUgPSBodHRwSGVh ZGVycy5hdChpKTsKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQv Q2hhbmdlTG9nCmluZGV4IDkxYTAyZDY5ZWUxNWU4NDFmOTNmNjhhZGI0MTk2ODYyNjM4NDE1MjMu LjRhYjFjZTIzM2EzZTViMDI1NTQ2NTBkNzRhNDAwNWQ3Nzc4OTNiZTAgMTAwNjQ0Ci0tLSBhL1dl YktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDEwLTEyLTEwICBKYW4gRXJpayBIYW5zc2VuICA8amhhbnNzZW5Ac2VuY2hhLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFFX ZWJGcmFtZSBkb2VzIG5vdCBzdXBwb3J0IFFOZXR3b3JrUmVxdWVzdDo6Q2FjaGVMb2FkQ29udHJv bAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU2NzEK KworICAgICAgICBNYWtlIFFXZWJGcmFtZSByZXNwZWN0IHRoZSBRTmV0d29ya1JlcXVlc3Q6OkNh Y2hlTG9hZENvbnRyb2wgYXR0cmlidXRlCisgICAgICAgIHNldCBvbiB0aGUgcmVxdWVzdCwgaWYg YW55LgorCisgICAgICAgICogQXBpL3F3ZWJmcmFtZS5jcHA6CisgICAgICAgIChjYWNoZUxvYWRD b250cm9sVG9DYWNoZVBvbGljeSk6CisgICAgICAgIChRV2ViRnJhbWU6OmxvYWQpOgorICAgICAg ICAqIHRlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcDoKKwogMjAxMC0xMi0xMCAgSm9j ZWx5biBUdXJjb3R0ZSAgPGpvY2VseW4udHVyY290dGVAbm9raWEuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgpkaWZmIC0tZ2l0IGEvV2ViS2l0 L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcCBiL1dlYktpdC9xdC90ZXN0cy9x d2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAKaW5kZXggZWIzYWUwYTllY2QzZWI4NzQ1NTgzYmEx ZmIyYTk5MTkxYmEzNmI0Zi4uZjhjMmU0Yjk3MGFiMWVhZWNkOGI4NDA5MThiYjNhMjc0ZWZhNzg5 YSAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNw cAorKysgYi9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCkBAIC02 MjUsNiArNjI1LDcgQEAgcHJpdmF0ZSBzbG90czoKICAgICB2b2lkIGludHJvc3BlY3RRdE1ldGhv ZHMoKTsKICAgICB2b2lkIHNldENvbnRlbnRfZGF0YSgpOwogICAgIHZvaWQgc2V0Q29udGVudCgp OworICAgIHZvaWQgc2V0Q2FjaGVMb2FkQ29udHJvbEF0dHJpYnV0ZSgpOwogCiBwcml2YXRlOgog ICAgIFFTdHJpbmcgIGV2YWxKUyhjb25zdCBRU3RyaW5nJnMpIHsKQEAgLTMwNjgsNSArMzA2OSw1 NyBAQCB2b2lkIHRzdF9RV2ViRnJhbWU6OnNldENvbnRlbnQoKQogICAgIFFDT01QQVJFKGV4cGVj dGVkICwgbWFpbkZyYW1lLT50b1BsYWluVGV4dCgpKTsKIH0KIAorY2xhc3MgQ2FjaGVOZXR3b3Jr QWNjZXNzTWFuYWdlciA6IHB1YmxpYyBRTmV0d29ya0FjY2Vzc01hbmFnZXIgeworcHVibGljOgor ICAgIENhY2hlTmV0d29ya0FjY2Vzc01hbmFnZXIoUU9iamVjdCogcGFyZW50ID0gMCkKKyAgICAg ICAgOiBRTmV0d29ya0FjY2Vzc01hbmFnZXIocGFyZW50KSwgbV9sYXN0Q2FjaGVMb2FkKFFOZXR3 b3JrUmVxdWVzdDo6UHJlZmVyTmV0d29yaykKKyAgICB7CisgICAgfQorCisgICAgdmlydHVhbCBR TmV0d29ya1JlcGx5KiBjcmVhdGVSZXF1ZXN0KE9wZXJhdGlvbiwgY29uc3QgUU5ldHdvcmtSZXF1 ZXN0JiByZXF1ZXN0LCBRSU9EZXZpY2UqKQorICAgIHsKKyAgICAgICAgUVZhcmlhbnQgY2FjaGVM b2FkID0gcmVxdWVzdC5hdHRyaWJ1dGUoUU5ldHdvcmtSZXF1ZXN0OjpDYWNoZUxvYWRDb250cm9s QXR0cmlidXRlKTsKKyAgICAgICAgaWYgKGNhY2hlTG9hZC5pc1ZhbGlkKCkpCisgICAgICAgICAg ICBtX2xhc3RDYWNoZUxvYWQgPSBzdGF0aWNfY2FzdDxRTmV0d29ya1JlcXVlc3Q6OkNhY2hlTG9h ZENvbnRyb2w+KGNhY2hlTG9hZC50b0ludCgpKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAg bV9sYXN0Q2FjaGVMb2FkID0gUU5ldHdvcmtSZXF1ZXN0OjpQcmVmZXJOZXR3b3JrOyAvLyBkZWZh dWx0IHZhbHVlCisgICAgICAgIHJldHVybiBuZXcgRmFrZVJlcGx5KHJlcXVlc3QsIHRoaXMpOwor ICAgIH0KKworICAgIFFOZXR3b3JrUmVxdWVzdDo6Q2FjaGVMb2FkQ29udHJvbCBsYXN0Q2FjaGVM b2FkKCkgY29uc3QKKyAgICB7CisgICAgICAgIHJldHVybiBtX2xhc3RDYWNoZUxvYWQ7CisgICAg fQorCitwcml2YXRlOgorICAgIFFOZXR3b3JrUmVxdWVzdDo6Q2FjaGVMb2FkQ29udHJvbCBtX2xh c3RDYWNoZUxvYWQ7Cit9OworCit2b2lkIHRzdF9RV2ViRnJhbWU6OnNldENhY2hlTG9hZENvbnRy b2xBdHRyaWJ1dGUoKQoreworICAgIFFXZWJQYWdlIHBhZ2U7CisgICAgQ2FjaGVOZXR3b3JrQWNj ZXNzTWFuYWdlciogbWFuYWdlciA9IG5ldyBDYWNoZU5ldHdvcmtBY2Nlc3NNYW5hZ2VyKCZwYWdl KTsKKyAgICBwYWdlLnNldE5ldHdvcmtBY2Nlc3NNYW5hZ2VyKG1hbmFnZXIpOworICAgIFFXZWJG cmFtZSogZnJhbWUgPSBwYWdlLm1haW5GcmFtZSgpOworCisgICAgUU5ldHdvcmtSZXF1ZXN0IHJl cXVlc3QoUVVybCgiaHR0cDovL2FiY2RlZi5hYmNkZWYvIikpOworCisgICAgcmVxdWVzdC5zZXRB dHRyaWJ1dGUoUU5ldHdvcmtSZXF1ZXN0OjpDYWNoZUxvYWRDb250cm9sQXR0cmlidXRlLCBRTmV0 d29ya1JlcXVlc3Q6OkFsd2F5c0NhY2hlKTsKKyAgICBmcmFtZS0+bG9hZChyZXF1ZXN0KTsKKyAg ICBRQ09NUEFSRShtYW5hZ2VyLT5sYXN0Q2FjaGVMb2FkKCksIFFOZXR3b3JrUmVxdWVzdDo6QWx3 YXlzQ2FjaGUpOworCisgICAgcmVxdWVzdC5zZXRBdHRyaWJ1dGUoUU5ldHdvcmtSZXF1ZXN0OjpD YWNoZUxvYWRDb250cm9sQXR0cmlidXRlLCBRTmV0d29ya1JlcXVlc3Q6OlByZWZlckNhY2hlKTsK KyAgICBmcmFtZS0+bG9hZChyZXF1ZXN0KTsKKyAgICBRQ09NUEFSRShtYW5hZ2VyLT5sYXN0Q2Fj aGVMb2FkKCksIFFOZXR3b3JrUmVxdWVzdDo6UHJlZmVyQ2FjaGUpOworCisgICAgcmVxdWVzdC5z ZXRBdHRyaWJ1dGUoUU5ldHdvcmtSZXF1ZXN0OjpDYWNoZUxvYWRDb250cm9sQXR0cmlidXRlLCBR TmV0d29ya1JlcXVlc3Q6OkFsd2F5c05ldHdvcmspOworICAgIGZyYW1lLT5sb2FkKHJlcXVlc3Qp OworICAgIFFDT01QQVJFKG1hbmFnZXItPmxhc3RDYWNoZUxvYWQoKSwgUU5ldHdvcmtSZXF1ZXN0 OjpBbHdheXNOZXR3b3JrKTsKKworICAgIHJlcXVlc3Quc2V0QXR0cmlidXRlKFFOZXR3b3JrUmVx dWVzdDo6Q2FjaGVMb2FkQ29udHJvbEF0dHJpYnV0ZSwgUU5ldHdvcmtSZXF1ZXN0OjpQcmVmZXJO ZXR3b3JrKTsKKyAgICBmcmFtZS0+bG9hZChyZXF1ZXN0KTsKKyAgICBRQ09NUEFSRShtYW5hZ2Vy LT5sYXN0Q2FjaGVMb2FkKCksIFFOZXR3b3JrUmVxdWVzdDo6UHJlZmVyTmV0d29yayk7Cit9CisK IFFURVNUX01BSU4odHN0X1FXZWJGcmFtZSkKICNpbmNsdWRlICJ0c3RfcXdlYmZyYW1lLm1vYyIK 76305 2010-12-11 05:46:00 -0800 2010-12-11 19:22:06 -0800 Patch bug-35671-20101211054559.patch text/plain 5189 jhanssen ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcCBiL1dlYktpdC9xdC9BcGkv cXdlYmZyYW1lLmNwcAppbmRleCA2MmU3NjBjOGFkN2U1NzcyY2EwNTkxNWE2N2MzNWZlZDE0YTE0 MGJhLi43MDFjZmUwNzFkN2RjMWJkMmU5YmM2YWYxMDZiNTNlMGI1ZjliZmVjIDEwMDY0NAotLS0g YS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJh bWUuY3BwCkBAIC0yMDEsNiArMjAxLDIxIEBAIHZvaWQgUVdFQktJVF9FWFBPUlQgcXR3ZWJraXRf d2ViZnJhbWVfc2Nyb2xsUmVjdXJzaXZlbHkoUVdlYkZyYW1lKiBxRnJhbWUsIGludCBkCiAgICAg fSB3aGlsZSAocUZyYW1lKTsKIH0KIAorc3RhdGljIGlubGluZSBSZXNvdXJjZVJlcXVlc3RDYWNo ZVBvbGljeSBjYWNoZUxvYWRDb250cm9sVG9DYWNoZVBvbGljeSh1aW50IGNhY2hlTG9hZENvbnRy b2wpCit7CisgICAgc3dpdGNoIChjYWNoZUxvYWRDb250cm9sKSB7CisgICAgY2FzZSBRTmV0d29y a1JlcXVlc3Q6OkFsd2F5c05ldHdvcms6CisgICAgICAgIHJldHVybiBXZWJDb3JlOjpSZWxvYWRJ Z25vcmluZ0NhY2hlRGF0YTsKKyAgICBjYXNlIFFOZXR3b3JrUmVxdWVzdDo6UHJlZmVyQ2FjaGU6 CisgICAgICAgIHJldHVybiBXZWJDb3JlOjpSZXR1cm5DYWNoZURhdGFFbHNlTG9hZDsKKyAgICBj YXNlIFFOZXR3b3JrUmVxdWVzdDo6QWx3YXlzQ2FjaGU6CisgICAgICAgIHJldHVybiBXZWJDb3Jl OjpSZXR1cm5DYWNoZURhdGFEb250TG9hZDsKKyAgICBkZWZhdWx0OgorICAgICAgICBicmVhazsK KyAgICB9CisgICAgcmV0dXJuIFdlYkNvcmU6OlVzZVByb3RvY29sQ2FjaGVQb2xpY3k7Cit9CisK IFFXZWJGcmFtZURhdGE6OlFXZWJGcmFtZURhdGEoV2ViQ29yZTo6UGFnZSogcGFyZW50UGFnZSwg V2ViQ29yZTo6RnJhbWUqIHBhcmVudEZyYW1lLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBXZWJDb3JlOjpIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93bmVyRnJhbWVFbGVtZW50LAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBXVEY6OlN0cmluZyYgZnJhbWVOYW1lKQpA QCAtODgzLDYgKzg5OCwxNCBAQCB2b2lkIFFXZWJGcmFtZTo6bG9hZChjb25zdCBRTmV0d29ya1Jl cXVlc3QgJnJlcSwKICAgICAgICAgICAgIGJyZWFrOwogICAgIH0KIAorICAgIFFWYXJpYW50IGNh Y2hlTG9hZCA9IHJlcS5hdHRyaWJ1dGUoUU5ldHdvcmtSZXF1ZXN0OjpDYWNoZUxvYWRDb250cm9s QXR0cmlidXRlKTsKKyAgICBpZiAoY2FjaGVMb2FkLmlzVmFsaWQoKSkgeworICAgICAgICBib29s IG9rOworICAgICAgICB1aW50IGNhY2hlTG9hZFZhbHVlID0gY2FjaGVMb2FkLnRvVUludCgmb2sp OworICAgICAgICBpZiAob2spCisgICAgICAgICAgICByZXF1ZXN0LnNldENhY2hlUG9saWN5KGNh Y2hlTG9hZENvbnRyb2xUb0NhY2hlUG9saWN5KGNhY2hlTG9hZFZhbHVlKSk7CisgICAgfQorCiAg ICAgUUxpc3Q8UUJ5dGVBcnJheT4gaHR0cEhlYWRlcnMgPSByZXEucmF3SGVhZGVyTGlzdCgpOwog ICAgIGZvciAoaW50IGkgPSAwOyBpIDwgaHR0cEhlYWRlcnMuc2l6ZSgpOyArK2kpIHsKICAgICAg ICAgY29uc3QgUUJ5dGVBcnJheSAmaGVhZGVyTmFtZSA9IGh0dHBIZWFkZXJzLmF0KGkpOwpkaWZm IC0tZ2l0IGEvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXgg OTY0YzQ4NDAzZjlhOWNiMjk4NWZlNzVkMmEzNDc5OTQ3NDNjNDQ2Ni4uMWRmZDBkMDkzMmRiMTVk NTgzNzIyZGMxZDcwMmU5MWM1MTE0ODYxZiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0NoYW5nZUxv ZworKysgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMTItMTEg IEphbiBFcmlrIEhhbnNzZW4gIDxqaGFuc3NlbkBzZW5jaGEuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gUVdlYkZyYW1lIGRvZXMgbm90 IHN1cHBvcnQgUU5ldHdvcmtSZXF1ZXN0OjpDYWNoZUxvYWRDb250cm9sCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTY3MQorCisgICAgICAgIE1ha2Ug UVdlYkZyYW1lIHJlc3BlY3QgdGhlIFFOZXR3b3JrUmVxdWVzdDo6Q2FjaGVMb2FkQ29udHJvbCBh dHRyaWJ1dGUKKyAgICAgICAgc2V0IG9uIHRoZSByZXF1ZXN0LCBpZiBhbnkuCisKKyAgICAgICAg KiBBcGkvcXdlYmZyYW1lLmNwcDoKKyAgICAgICAgKGNhY2hlTG9hZENvbnRyb2xUb0NhY2hlUG9s aWN5KToKKyAgICAgICAgKFFXZWJGcmFtZTo6bG9hZCk6CisgICAgICAgICogdGVzdHMvcXdlYmZy YW1lL3RzdF9xd2ViZnJhbWUuY3BwOgorCiAyMDEwLTEyLTEwICBLcml0aGlnYXNzcmVlIFNhbWJh bXVydGh5ICA8a3JpdGhpZ2Fzc3JlZS5zYW1iYW11cnRoeUBub2tpYS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29yYXJvLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L3Rlc3Rz L3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcCBiL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUv dHN0X3F3ZWJmcmFtZS5jcHAKaW5kZXggZWIzYWUwYTllY2QzZWI4NzQ1NTgzYmExZmIyYTk5MTkx YmEzNmI0Zi4uNjkyMzMxNTU5YTk2OTliNWQzNWRjNjJkZTExNzZhZTFiN2I0ZmFmMCAxMDA2NDQK LS0tIGEvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcAorKysgYi9X ZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCkBAIC02MjUsNiArNjI1 LDcgQEAgcHJpdmF0ZSBzbG90czoKICAgICB2b2lkIGludHJvc3BlY3RRdE1ldGhvZHMoKTsKICAg ICB2b2lkIHNldENvbnRlbnRfZGF0YSgpOwogICAgIHZvaWQgc2V0Q29udGVudCgpOworICAgIHZv aWQgc2V0Q2FjaGVMb2FkQ29udHJvbEF0dHJpYnV0ZSgpOwogCiBwcml2YXRlOgogICAgIFFTdHJp bmcgIGV2YWxKUyhjb25zdCBRU3RyaW5nJnMpIHsKQEAgLTMwNjgsNSArMzA2OSw1OCBAQCB2b2lk IHRzdF9RV2ViRnJhbWU6OnNldENvbnRlbnQoKQogICAgIFFDT01QQVJFKGV4cGVjdGVkICwgbWFp bkZyYW1lLT50b1BsYWluVGV4dCgpKTsKIH0KIAorY2xhc3MgQ2FjaGVOZXR3b3JrQWNjZXNzTWFu YWdlciA6IHB1YmxpYyBRTmV0d29ya0FjY2Vzc01hbmFnZXIgeworcHVibGljOgorICAgIENhY2hl TmV0d29ya0FjY2Vzc01hbmFnZXIoUU9iamVjdCogcGFyZW50ID0gMCkKKyAgICAgICAgOiBRTmV0 d29ya0FjY2Vzc01hbmFnZXIocGFyZW50KQorICAgICAgICAsIG1fbGFzdENhY2hlTG9hZChRTmV0 d29ya1JlcXVlc3Q6OlByZWZlck5ldHdvcmspCisgICAgeworICAgIH0KKworICAgIHZpcnR1YWwg UU5ldHdvcmtSZXBseSogY3JlYXRlUmVxdWVzdChPcGVyYXRpb24sIGNvbnN0IFFOZXR3b3JrUmVx dWVzdCYgcmVxdWVzdCwgUUlPRGV2aWNlKikKKyAgICB7CisgICAgICAgIFFWYXJpYW50IGNhY2hl TG9hZCA9IHJlcXVlc3QuYXR0cmlidXRlKFFOZXR3b3JrUmVxdWVzdDo6Q2FjaGVMb2FkQ29udHJv bEF0dHJpYnV0ZSk7CisgICAgICAgIGlmIChjYWNoZUxvYWQuaXNWYWxpZCgpKQorICAgICAgICAg ICAgbV9sYXN0Q2FjaGVMb2FkID0gc3RhdGljX2Nhc3Q8UU5ldHdvcmtSZXF1ZXN0OjpDYWNoZUxv YWRDb250cm9sPihjYWNoZUxvYWQudG9VSW50KCkpOworICAgICAgICBlbHNlCisgICAgICAgICAg ICBtX2xhc3RDYWNoZUxvYWQgPSBRTmV0d29ya1JlcXVlc3Q6OlByZWZlck5ldHdvcms7IC8vIGRl ZmF1bHQgdmFsdWUKKyAgICAgICAgcmV0dXJuIG5ldyBGYWtlUmVwbHkocmVxdWVzdCwgdGhpcyk7 CisgICAgfQorCisgICAgUU5ldHdvcmtSZXF1ZXN0OjpDYWNoZUxvYWRDb250cm9sIGxhc3RDYWNo ZUxvYWQoKSBjb25zdAorICAgIHsKKyAgICAgICAgcmV0dXJuIG1fbGFzdENhY2hlTG9hZDsKKyAg ICB9CisKK3ByaXZhdGU6CisgICAgUU5ldHdvcmtSZXF1ZXN0OjpDYWNoZUxvYWRDb250cm9sIG1f bGFzdENhY2hlTG9hZDsKK307CisKK3ZvaWQgdHN0X1FXZWJGcmFtZTo6c2V0Q2FjaGVMb2FkQ29u dHJvbEF0dHJpYnV0ZSgpCit7CisgICAgUVdlYlBhZ2UgcGFnZTsKKyAgICBDYWNoZU5ldHdvcmtB Y2Nlc3NNYW5hZ2VyKiBtYW5hZ2VyID0gbmV3IENhY2hlTmV0d29ya0FjY2Vzc01hbmFnZXIoJnBh Z2UpOworICAgIHBhZ2Uuc2V0TmV0d29ya0FjY2Vzc01hbmFnZXIobWFuYWdlcik7CisgICAgUVdl YkZyYW1lKiBmcmFtZSA9IHBhZ2UubWFpbkZyYW1lKCk7CisKKyAgICBRTmV0d29ya1JlcXVlc3Qg cmVxdWVzdChRVXJsKCJodHRwOi8vYWJjZGVmLmFiY2RlZi8iKSk7CisKKyAgICByZXF1ZXN0LnNl dEF0dHJpYnV0ZShRTmV0d29ya1JlcXVlc3Q6OkNhY2hlTG9hZENvbnRyb2xBdHRyaWJ1dGUsIFFO ZXR3b3JrUmVxdWVzdDo6QWx3YXlzQ2FjaGUpOworICAgIGZyYW1lLT5sb2FkKHJlcXVlc3QpOwor ICAgIFFDT01QQVJFKG1hbmFnZXItPmxhc3RDYWNoZUxvYWQoKSwgUU5ldHdvcmtSZXF1ZXN0OjpB bHdheXNDYWNoZSk7CisKKyAgICByZXF1ZXN0LnNldEF0dHJpYnV0ZShRTmV0d29ya1JlcXVlc3Q6 OkNhY2hlTG9hZENvbnRyb2xBdHRyaWJ1dGUsIFFOZXR3b3JrUmVxdWVzdDo6UHJlZmVyQ2FjaGUp OworICAgIGZyYW1lLT5sb2FkKHJlcXVlc3QpOworICAgIFFDT01QQVJFKG1hbmFnZXItPmxhc3RD YWNoZUxvYWQoKSwgUU5ldHdvcmtSZXF1ZXN0OjpQcmVmZXJDYWNoZSk7CisKKyAgICByZXF1ZXN0 LnNldEF0dHJpYnV0ZShRTmV0d29ya1JlcXVlc3Q6OkNhY2hlTG9hZENvbnRyb2xBdHRyaWJ1dGUs IFFOZXR3b3JrUmVxdWVzdDo6QWx3YXlzTmV0d29yayk7CisgICAgZnJhbWUtPmxvYWQocmVxdWVz dCk7CisgICAgUUNPTVBBUkUobWFuYWdlci0+bGFzdENhY2hlTG9hZCgpLCBRTmV0d29ya1JlcXVl c3Q6OkFsd2F5c05ldHdvcmspOworCisgICAgcmVxdWVzdC5zZXRBdHRyaWJ1dGUoUU5ldHdvcmtS ZXF1ZXN0OjpDYWNoZUxvYWRDb250cm9sQXR0cmlidXRlLCBRTmV0d29ya1JlcXVlc3Q6OlByZWZl ck5ldHdvcmspOworICAgIGZyYW1lLT5sb2FkKHJlcXVlc3QpOworICAgIFFDT01QQVJFKG1hbmFn ZXItPmxhc3RDYWNoZUxvYWQoKSwgUU5ldHdvcmtSZXF1ZXN0OjpQcmVmZXJOZXR3b3JrKTsKK30K KwogUVRFU1RfTUFJTih0c3RfUVdlYkZyYW1lKQogI2luY2x1ZGUgInRzdF9xd2ViZnJhbWUubW9j Igo=