29595 2009-09-21 09:01:27 -0700 [Qt] Resetting the URL property of a QWebView results in the current directory being set as file::-type URL 2011-03-24 08:30:52 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED Qt, QtTriaged P2 Normal --- 32723 1 vestbo cmarcelo benjamin cmarcelo commit-queue kent.hansen oldest_to_newest 148710 0 vestbo 2009-09-21 09:01:27 -0700 This bug report originated from Nokia internal issue QT-1191 --- Description --- To reproduce: Drop a QWebView onto a Designer form Reset the URL in the property editor 199632 1 kent.hansen 2010-03-15 07:42:18 -0700 Yup, still happens with 4.7. 370474 2 cmarcelo 2011-03-21 11:01:43 -0700 Reproduced with trunk. It is a problem when setting URL to be an empty QUrl(). I made a test case and am looking into a fix. Basically what we do wrong here is that ensureAbsolute() helper function turns an empty URL into the current directory. Stepped on this as part of coming up with tests for bug 32723. 370860 3 benjamin 2011-03-21 13:20:26 -0700 So after some discussion, it sounds reasonable to change setUrl() so it does nothing if you pass a QUrl(). Does that sounds reasonable? Here are the logs from IRC: <benjaminp> hum, this whole setUrl() with empty url() is tricky... <kling> aye, all because we wanted a 3rd state which has no webcore equivalent ;( <benjaminp> yep <benjaminp> if you setUrl(QUrl()), you expect url() to return QUrl().... <benjaminp> but what the hell are we supposed to load... :) <benjaminp> and load(QUrl()) does nothing I believe <benjaminp> lol, and in the doc of the property: "By default, this property contains an empty, invalid URL." The "by default" meaning about:blank is loaded on WebCore side... <benjaminp> kling: any opinion? <benjaminp> I think loading about:blank is reasonable for setUrl(QUrl()) <benjaminp> just to keep the thing a bit consistent <kling> benjaminp: I agree <kling> benjaminp: and I like that better than having this "undefined" behavior <kling> benjaminp: as long as it doesn't mess with history.... <kling> benjaminp: or... i don't know. maybe it should. what kind of usecase is setUrl(QUrl()) anyway. <benjaminp> hum, yep, what to do about that... <benjaminp> because if you go back in history, url() will return about:blank, not QUrl() :( -*- kling has been trying to reboot into windows for an hour to play some distracting games :3 <kling> benjaminp: yeah exactly. we don't want that :( <benjaminp> ok, let's take the other way around. What about setUrl(QUrl()) never succeed. And url() would never return QUrl() after the first load <benjaminp> kling: do you have the qtport build around? I only have the macport here. Is the first page in the history? <kling> benjaminp: lemme check <benjaminp> I think its not (/me hope) <kling> it's not <benjaminp> ok, so that would not be too bad <benjaminp> kling: what's your opinion about option (2)? <kling> i like it [...] <aparna_> benjaminp - and what about the signals? I hope signals like loadFinished would not be emitted in this case? <benjaminp> yep, that shouldn't be emitted <benjaminp> we should bailout early <kling> benjaminp: would you still set an empty document for QUrl()? <benjaminp> nope <benjaminp> just if (url.isEmpty()) return; That would be consistent with load, and we would not have to cheat the history <kling> so there would be no way to get back to the original state of the view <benjaminp> not sure what you mean <kling> i mean the state where nothing is loaded in the view <kling> you can never get back to it :) <kling> the closest thing is loading about:blank <benjaminp> oh, the initial state, I would jsut leave stuff as they are <benjaminp> when you show an empty view, url() return QUrl(), about:blank is loaded, and you don't care because that is not in the history 371958 4 cmarcelo 2011-03-22 21:47:26 -0700 I agreed with the previous comment conclusion, but after further discussion on IRC, it was verified that Qt Designer relies on setting QUrl() to reset. So this is a real use case that we might want to keep. So the proposal here is to change the semantics of QUrl() to be equivalent to QUrl("about:blank"). This fixes Qt Designer behavior and define a semantic for what we expect when setting / loading QUrl() -- which was unclear and untested before. I think this solution is better than doing nothing when we setting / loading QUrl(). This will affect for instance, the value of url() property for a newly created QWebPage. I argue the clarification of the API worth the change. 371959 5 cmarcelo 2011-03-22 21:51:36 -0700 Note that I meant: change the semantics setting/loading functions when QUrl() is passed as parameter. 371967 6 86570 cmarcelo 2011-03-22 22:27:16 -0700 Created attachment 86570 proposed patch 372113 7 86608 cmarcelo 2011-03-23 06:34:36 -0700 Created attachment 86608 proposed patch v2, added history test Added to the patch another test case to describe the expected behavior in history when using setUrl(QUrl()). 372123 8 86608 benjamin 2011-03-23 06:53:55 -0700 Comment on attachment 86608 proposed patch v2, added history test View in context: https://bugs.webkit.org/attachment.cgi?id=86608&action=review > Source/WebKit/qt/Api/qwebframe.cpp:808 > + const KURL& base = d->frame->loader()->baseURL(); > + if (base.isValid()) > + return base; I think you mean isEmpty() there. You probably miss a test for the case !url.isEmpty() && !url.isValid()? :) 372472 9 86700 cmarcelo 2011-03-23 15:11:09 -0700 Created attachment 86700 patch v3, more testing, deal with invalid but not empty url, do not translate QUrl to about:blank This patch is the negation of the two previous approaches: - Do not ignore the set of an empty URL. - Do not translate it to "about:blank". In practice, WebCore will do the translation for us, except when the QWebFrame is created. For the sake of compatibility I didn't changed it, it means that there's this url() == QUrl() state that we have no access anymore. Also added test suggested by Benjamin, which uses a QUrl that's not empty but also not valid. 372478 10 86700 kenneth 2011-03-23 15:17:17 -0700 Comment on attachment 86700 patch v3, more testing, deal with invalid but not empty url, do not translate QUrl to about:blank View in context: https://bugs.webkit.org/attachment.cgi?id=86700&action=review Looks fine to me. > Source/WebKit/qt/ChangeLog:16 > + out-of-band value to indicate that we had no lastRequestUrl stored. Now we can't to that do that* > Source/WebKit/qt/ChangeLog:17 > + anymore since, so I'm adding a bool to indicate if the lastRequestUrl is stored in the since sounds strange here s/if/whether/ > Source/WebKit/qt/ChangeLog:20 > + This patch also add three new autotests, to cover better the expected behavior of setting to better cover * > Source/WebKit/qt/ChangeLog:26 > + (QWebFrame::requestedUrl): change the way that we verify whether lastRequestedUrl is stored > + in the FrameLoaderClient. s/whether/if. whether needs an 'or' or so. > Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h:243 > + bool hasLastRequestedUrl() const { return m_hasLastRequestedUrl; } > const KURL& lastRequestedUrl() const { return m_lastRequestedUrl; } Is this because you cannot have a null url or so? Would be nice with a short comment then. 372511 11 86716 cmarcelo 2011-03-23 15:58:15 -0700 Created attachment 86716 patch v4, with comment/changelog fixes 372750 12 86716 benjamin 2011-03-24 05:30:32 -0700 Comment on attachment 86716 patch v4, with comment/changelog fixes Instead of updating those two together, I would prefer a private setter that does the job: void setLastRequestedUrl(url) { m_hasLastRequestedUrl = true; m_lastRequestedUrl = url } void reset() { m_hasLastRequestedUrl = false; m_lastRequestedUrl = KURL(); } This way, we don't risk future change fuck the state m_hasLastRequestedUrl <--> m_lastRequestedUrl Other option to not reset m_lastRequestedUrl and just return that from QWebFrame::requestedUrl() (?) 372773 13 86764 cmarcelo 2011-03-24 06:23:15 -0700 Created attachment 86764 patch v5, simplify logic for requestedurl 372792 14 86764 benjamin 2011-03-24 07:03:16 -0700 Comment on attachment 86764 patch v5, simplify logic for requestedurl Very good. 372822 15 86764 commit-queue 2011-03-24 08:30:45 -0700 Comment on attachment 86764 patch v5, simplify logic for requestedurl Clearing flags on attachment: 86764 Committed r81868: <http://trac.webkit.org/changeset/81868> 372823 16 commit-queue 2011-03-24 08:30:52 -0700 All reviewed patches have been landed. Closing bug. 86570 2011-03-22 22:27:16 -0700 2011-03-23 06:34:36 -0700 proposed patch 0001-Qt-Resetting-the-URL-property-of-a-QWebView-results-.patch text/plain 8273 cmarcelo RnJvbSBhODZjYmY0OTI1NjQ1MjYzNGUzNjE5MzgxZjdkNTliODg3YTdlZDVlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDYWlvIE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gPGNhaW8u b2xpdmVpcmFAb3BlbmJvc3NhLm9yZz4KRGF0ZTogV2VkLCAyMyBNYXIgMjAxMSAwMTo1MjozMyAt MDMwMApTdWJqZWN0OiBbUEFUQ0hdIFtRdF0gUmVzZXR0aW5nIHRoZSBVUkwgcHJvcGVydHkgb2Yg YSBRV2ViVmlldyByZXN1bHRzIGluIHRoZSBjdXJyZW50IGRpcmVjdG9yeSBiZWluZyBzZXQgYXMg ZmlsZTo6LXR5cGUgVVJMCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Mjk1OTUKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKVGhlIGJ1ZyB3YXMgY2F1c2VkIGJ5 IGVuc3VyZUFic29sdXRlVXJsKCkgaGVscGVyIGZ1bmN0aW9uIHRyZWF0aW5nIHRoZSBlbXB0eSBV UkwgYXMgYQpyZWxhdGl2ZSBVUkwsIGFuZCBwcmVwZW5kaW5nIHRoZSBjdXJyZW50IGRpcmVjdG9y eS4gUXQgRGVzaWduZXIgcmVzZXQgdGhlIFVSTCBieSBzZXR0aW5nCml0IHRvIGVtcHR5LgoKRml4 aW5nIHRoaXMgZm9yY2VzIHVzIHRvIGNob29zZSBhIG1lYW5pbmcgZm9yIHNldFVybChRVXJsKCkp IGFuZCBsb2FkKFFVcmwoKSkuIFRoaXMgY29tbWl0CmNoYW5nZXMgdGhlIGNvZGUgdG8gbWFrZSBR VXJsKCkgZXF1aXZhbGVudCB0byAiYWJvdXQ6YmxhbmsiLiBUaGlzIHdheSBRdCBEZXNpZ25lciBy ZXNldAp3aWxsIHdvcmsgYXMgZXhwZWN0ZWQuIE5vdyBuZXdseSBjcmVhdGVkIHBhZ2VzIGhhdmUg dXJsKCkgYXMgImFib3V0OmJsYW5rIiBpbnN0ZWFkIG9mCmVtcHR5IFVSTHMgYXMgcHJldmlvdXNs eSBkb2N1bWVudGVkLgoKQSB0ZXN0IGNhc2UgdGhhdCByZXByb2R1Y2VzIHRoZSBwcm9ibGVtIGNh dXNlZCBieSB0aGUgYnVnIHdhcyBhZGRlZCBhcyB3ZWxsLgoKKiBBcGkvcXdlYmZyYW1lLmNwcDoK KGVuc3VyZUFic29sdXRlVXJsKTogZG8gbm90IHRyZWF0IGVtcHR5IFVSTHMgYXMgcmVsYXRpdmUu CihRV2ViRnJhbWU6OnVybCk6IGlmIHJlc3VsdCBpcyBlbXB0eSwgcmV0dXJuIGFib3V0OmJsYW5r LgooUVdlYkZyYW1lOjpyZXF1ZXN0ZWRVcmwpOiBkaXR0by4KKFFXZWJGcmFtZTo6YmFzZVVybCk6 IGRpdHRvLgooUVdlYkZyYW1lOjpsb2FkKTogdHJhbnNsYXRlIGxvYWRzIGZvciBlbXB0eSBVUkwg dG8gImFib3V0OmJsYW5rIi4KCiogdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwOiBj aGFuZ2Ugc3ltbWV0cmljIHRlc3QgdG8gZXhwZWN0ICJhYm91dDpibGFuayIgdG8gYmUKdGhlIGZp cnN0IFVSTCBvZiBhIGNyZWF0ZWQgcGFnZS4gQWRkIGEgbmV3IHRlc3QgZm9yIGVtcHR5IFVSTCBz ZXR0aW5nIGFuZCBsb2FkaW5nLgotLS0KIFNvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5j cHAgICAgICAgICAgICAgICAgIHwgICAyNCArKysrKystLQogU291cmNlL1dlYktpdC9xdC9DaGFu Z2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDI4ICsrKysrKysrKysKIFNvdXJjZS9X ZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwIHwgICA1NiArKysrKysr KysrKysrKysrKysrLQogMyBmaWxlcyBjaGFuZ2VkLCAxMDEgaW5zZXJ0aW9ucygrKSwgNyBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3Bw IGIvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcAppbmRleCBiNGRhYWE0Li5kOTk0 OTM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKQEAgLTczMSw3ICs3MzEsNyBAQCBR TXVsdGlNYXA8UVN0cmluZywgUVN0cmluZz4gUVdlYkZyYW1lOjptZXRhRGF0YSgpIGNvbnN0CiAK IHN0YXRpYyBpbmxpbmUgUVVybCBlbnN1cmVBYnNvbHV0ZVVybChjb25zdCBRVXJsICZ1cmwpCiB7 Ci0gICAgaWYgKCF1cmwuaXNSZWxhdGl2ZSgpKQorICAgIGlmICh1cmwuaXNFbXB0eSgpIHx8ICF1 cmwuaXNSZWxhdGl2ZSgpKQogICAgICAgICByZXR1cm4gdXJsOwogCiAgICAgLy8gVGhpcyBjb250 YWlucyB0aGUgVVJMIHdpdGggYWJzb2x1dGUgcGF0aCBidXQgd2l0aG91dCAKQEAgLTc1MSw3ICs3 NTEsOCBAQCBzdGF0aWMgaW5saW5lIFFVcmwgZW5zdXJlQWJzb2x1dGVVcmwoY29uc3QgUVVybCAm dXJsKQogCiAgICAgU2V0dGluZyB0aGlzIHByb3BlcnR5IGNsZWFycyB0aGUgdmlldyBhbmQgbG9h ZHMgdGhlIFVSTC4KIAotICAgIEJ5IGRlZmF1bHQsIHRoaXMgcHJvcGVydHkgY29udGFpbnMgYW4g ZW1wdHksIGludmFsaWQgVVJMLgorICAgIEJ5IGRlZmF1bHQsIHRoaXMgcHJvcGVydHkgY29udGFp bnMgJ2Fib3V0OmJsYW5rJywgdGhhdCByZXByZXNlbnRzIGFuIGVtcHR5IHBhZ2UuCisgICAgU2V0 dGluZyBhbiBlbXB0eSBVUkwgdG8gdGhpcyBwcm9wZXJ0eSB3aWxsIGhhdmUgdGhlIHNhbWUgZWZm ZWN0IGFzIHNldHRpbmcgJ2Fib3V0OmJsYW5rJy4KIAogICAgIFxzYSB1cmxDaGFuZ2VkKCkKICov CkBAIC03NjYsNyArNzY3LDEwIEBAIHZvaWQgUVdlYkZyYW1lOjpzZXRVcmwoY29uc3QgUVVybCAm dXJsKQogCiBRVXJsIFFXZWJGcmFtZTo6dXJsKCkgY29uc3QKIHsKLSAgICByZXR1cm4gZC0+ZnJh bWUtPmRvY3VtZW50KCktPnVybCgpOworICAgIGNvbnN0IFFVcmwgdXJsID0gZC0+ZnJhbWUtPmRv Y3VtZW50KCktPnVybCgpOworICAgIGlmICh1cmwuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4g UVVybChRU3RyaW5nOjpmcm9tTGF0aW4xKCJhYm91dDpibGFuayIpKTsKKyAgICByZXR1cm4gdXJs OwogfQogCiAvKiEKQEAgLTc4Myw3ICs3ODcsMTIgQEAgUVVybCBRV2ViRnJhbWU6OnJlcXVlc3Rl ZFVybCgpIGNvbnN0CiAgICAgY29uc3QgS1VSTCYgbGFzdFJlcXVlc3RlZFVybCA9IGQtPmZyYW1l TG9hZGVyQ2xpZW50LT5sYXN0UmVxdWVzdGVkVXJsKCk7CiAgICAgaWYgKGxhc3RSZXF1ZXN0ZWRV cmwuaXNWYWxpZCgpKQogICAgICAgICByZXR1cm4gbGFzdFJlcXVlc3RlZFVybDsKLSAgICByZXR1 cm4gZC0+ZnJhbWUtPmxvYWRlcigpLT5vcmlnaW5hbFJlcXVlc3QoKS51cmwoKTsKKworICAgIGNv bnN0IEtVUkwmIG9yaWdpbmFsUmVxdWVzdFVybCA9IGQtPmZyYW1lLT5sb2FkZXIoKS0+b3JpZ2lu YWxSZXF1ZXN0KCkudXJsKCk7CisgICAgaWYgKG9yaWdpbmFsUmVxdWVzdFVybC5pc1ZhbGlkKCkp CisgICAgICAgIHJldHVybiBvcmlnaW5hbFJlcXVlc3RVcmw7CisKKyAgICByZXR1cm4gUVVybChR U3RyaW5nOjpmcm9tTGF0aW4xKCJhYm91dDpibGFuayIpKTsKIH0KIC8qIQogICAgIFxzaW5jZSA0 LjYKQEAgLTc5NCw3ICs4MDMsMTAgQEAgUVVybCBRV2ViRnJhbWU6OnJlcXVlc3RlZFVybCgpIGNv bnN0CiAKIFFVcmwgUVdlYkZyYW1lOjpiYXNlVXJsKCkgY29uc3QKIHsKLSAgICByZXR1cm4gZC0+ ZnJhbWUtPmxvYWRlcigpLT5iYXNlVVJMKCk7CisgICAgY29uc3QgS1VSTCYgYmFzZSA9IGQtPmZy YW1lLT5sb2FkZXIoKS0+YmFzZVVSTCgpOworICAgIGlmIChiYXNlLmlzVmFsaWQoKSkKKyAgICAg ICAgcmV0dXJuIGJhc2U7CisgICAgcmV0dXJuIFFVcmwoUVN0cmluZzo6ZnJvbUxhdGluMSgiYWJv dXQ6YmxhbmsiKSk7CiB9CiAKIC8qIQpAQCAtODU3LDcgKzg2OSw3IEBAIHZvaWQgUVdlYkZyYW1l Ojpsb2FkKGNvbnN0IFFOZXR3b3JrUmVxdWVzdCAmcmVxLAogICAgIGlmIChkLT5wYXJlbnRGcmFt ZSgpKQogICAgICAgICBkLT5wYWdlLT5kLT5pbnNpZGVPcGVuQ2FsbCA9IHRydWU7CiAKLSAgICBR VXJsIHVybCA9IGVuc3VyZUFic29sdXRlVXJsKHJlcS51cmwoKSk7CisgICAgUVVybCB1cmwgPSBy ZXEudXJsKCkuaXNFbXB0eSgpID8gUVVybChRU3RyaW5nOjpmcm9tTGF0aW4xKCJhYm91dDpibGFu ayIpKSA6IGVuc3VyZUFic29sdXRlVXJsKHJlcS51cmwoKSk7CiAKICAgICBXZWJDb3JlOjpSZXNv dXJjZVJlcXVlc3QgcmVxdWVzdCh1cmwpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IGMyNjc0YzQuLjk2 ZTA3ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTEtMDMtMjIgIENhaW8g TWFyY2VsbyBkZSBPbGl2ZWlyYSBGaWxobyAgPGNhaW8ub2xpdmVpcmFAb3BlbmJvc3NhLm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFJl c2V0dGluZyB0aGUgVVJMIHByb3BlcnR5IG9mIGEgUVdlYlZpZXcgcmVzdWx0cyBpbiB0aGUgY3Vy cmVudCBkaXJlY3RvcnkgYmVpbmcgc2V0IGFzIGZpbGU6Oi10eXBlIFVSTAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjk1OTUKKworICAgICAgICBUaGUg YnVnIHdhcyBjYXVzZWQgYnkgZW5zdXJlQWJzb2x1dGVVcmwoKSBoZWxwZXIgZnVuY3Rpb24gdHJl YXRpbmcgdGhlIGVtcHR5IFVSTCBhcyBhCisgICAgICAgIHJlbGF0aXZlIFVSTCwgYW5kIHByZXBl bmRpbmcgdGhlIGN1cnJlbnQgZGlyZWN0b3J5LiBRdCBEZXNpZ25lciByZXNldCB0aGUgVVJMIGJ5 IHNldHRpbmcKKyAgICAgICAgaXQgdG8gZW1wdHkuCisKKyAgICAgICAgRml4aW5nIHRoaXMgZm9y Y2VzIHVzIHRvIGNob29zZSBhIG1lYW5pbmcgZm9yIHNldFVybChRVXJsKCkpIGFuZCBsb2FkKFFV cmwoKSkuIFRoaXMgY29tbWl0CisgICAgICAgIGNoYW5nZXMgdGhlIGNvZGUgdG8gbWFrZSBRVXJs KCkgZXF1aXZhbGVudCB0byAiYWJvdXQ6YmxhbmsiLiBUaGlzIHdheSBRdCBEZXNpZ25lciByZXNl dAorICAgICAgICB3aWxsIHdvcmsgYXMgZXhwZWN0ZWQuIE5vdyBuZXdseSBjcmVhdGVkIHBhZ2Vz IGhhdmUgdXJsKCkgYXMgImFib3V0OmJsYW5rIiBpbnN0ZWFkIG9mCisgICAgICAgIGVtcHR5IFVS THMgYXMgcHJldmlvdXNseSBkb2N1bWVudGVkLgorCisgICAgICAgIEEgdGVzdCBjYXNlIHRoYXQg cmVwcm9kdWNlcyB0aGUgcHJvYmxlbSBjYXVzZWQgYnkgdGhlIGJ1ZyB3YXMgYWRkZWQgYXMgd2Vs bC4KKworICAgICAgICAqIEFwaS9xd2ViZnJhbWUuY3BwOgorICAgICAgICAoZW5zdXJlQWJzb2x1 dGVVcmwpOiBkbyBub3QgdHJlYXQgZW1wdHkgVVJMcyBhcyByZWxhdGl2ZS4KKyAgICAgICAgKFFX ZWJGcmFtZTo6dXJsKTogaWYgcmVzdWx0IGlzIGVtcHR5LCByZXR1cm4gYWJvdXQ6YmxhbmsuCisg ICAgICAgIChRV2ViRnJhbWU6OnJlcXVlc3RlZFVybCk6IGRpdHRvLgorICAgICAgICAoUVdlYkZy YW1lOjpiYXNlVXJsKTogZGl0dG8uCisgICAgICAgIChRV2ViRnJhbWU6OmxvYWQpOiB0cmFuc2xh dGUgbG9hZHMgZm9yIGVtcHR5IFVSTCB0byAiYWJvdXQ6YmxhbmsiLgorCisgICAgICAgICogdGVz dHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwOiBjaGFuZ2Ugc3ltbWV0cmljIHRlc3QgdG8g ZXhwZWN0ICJhYm91dDpibGFuayIgdG8gYmUKKyAgICAgICAgdGhlIGZpcnN0IFVSTCBvZiBhIGNy ZWF0ZWQgcGFnZS4gQWRkIGEgbmV3IHRlc3QgZm9yIGVtcHR5IFVSTCBzZXR0aW5nIGFuZCBsb2Fk aW5nLgorCiAyMDExLTAzLTIyICBBbmRyZXcgV2Fzb24gIDxyZWN0YWxvZ2ljQHJlY3RhbG9naWMu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEJlbmphbWluIFBvdWxhaW4uCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcCBiL1Nv dXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCmluZGV4IGJj MTU5NGEuLmEwODgxODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZy YW1lL3RzdF9xd2ViZnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZy YW1lL3RzdF9xd2ViZnJhbWUuY3BwCkBAIC02NTAsNiArNjUwLDcgQEAgcHJpdmF0ZSBzbG90czoK ICAgICB2b2lkIHNldENhY2hlTG9hZENvbnRyb2xBdHRyaWJ1dGUoKTsKICAgICB2b2lkIHNldFVy bFdpdGhQZW5kaW5nTG9hZHMoKTsKICAgICB2b2lkIHNldFVybFdpdGhGcmFnbWVudCgpOworICAg IHZvaWQgc2V0VXJsVG9FbXB0eSgpOwogCiBwcml2YXRlOgogICAgIFFTdHJpbmcgIGV2YWxKUyhj b25zdCBRU3RyaW5nJnMpIHsKQEAgLTIyMTEsNyArMjIxMiw3IEBAIHZvaWQgdHN0X1FXZWJGcmFt ZTo6YXJyYXlPYmplY3RFbnVtZXJhYmxlKCkKIAogdm9pZCB0c3RfUVdlYkZyYW1lOjpzeW1tZXRy aWNVcmwoKQogewotICAgIFFWRVJJRlkobV92aWV3LT51cmwoKS5pc0VtcHR5KCkpOworICAgIFFD T01QQVJFKG1fdmlldy0+dXJsKCksIFFVcmwoImFib3V0OmJsYW5rIikpOwogCiAgICAgUUNPTVBB UkUobV92aWV3LT5oaXN0b3J5KCktPmNvdW50KCksIDApOwogCkBAIC0zMzQwLDUgKzMzNDEsNTgg QEAgdm9pZCB0c3RfUVdlYkZyYW1lOjpzZXRVcmxXaXRoRnJhZ21lbnQoKQogICAgIFFDT01QQVJF KHBhZ2UubWFpbkZyYW1lKCktPnVybCgpLCB1cmwpOwogfQogCit2b2lkIHRzdF9RV2ViRnJhbWU6 OnNldFVybFRvRW1wdHkoKQoreworICAgIGludCBleHBlY3RlZExvYWRGaW5pc2hlZENvdW50ID0g MDsKKyAgICBjb25zdCBRVXJsIGFib3V0QmxhbmsoImFib3V0OmJsYW5rIik7CisgICAgY29uc3Qg UVVybCB1cmwoInFyYzovdGVzdDIuaHRtbCIpOworCisgICAgUVdlYlBhZ2UgcGFnZTsKKyAgICBR V2ViRnJhbWUqIGZyYW1lID0gcGFnZS5tYWluRnJhbWUoKTsKKyAgICBRQ09NUEFSRShmcmFtZS0+ dXJsKCksIGFib3V0QmxhbmspOworICAgIFFDT01QQVJFKGZyYW1lLT5yZXF1ZXN0ZWRVcmwoKSwg YWJvdXRCbGFuayk7CisgICAgUUNPTVBBUkUoZnJhbWUtPmJhc2VVcmwoKSwgYWJvdXRCbGFuayk7 CisKKyAgICBRU2lnbmFsU3B5IHNweShmcmFtZSwgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSkp OworCisgICAgLy8gU2V0IGV4aXN0aW5nIHVybAorICAgIGZyYW1lLT5zZXRVcmwodXJsKTsKKyAg ICBleHBlY3RlZExvYWRGaW5pc2hlZENvdW50Kys7CisgICAgOjp3YWl0Rm9yU2lnbmFsKGZyYW1l LCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSk7CisKKyAgICBRQ09NUEFSRShzcHkuY291bnQo KSwgZXhwZWN0ZWRMb2FkRmluaXNoZWRDb3VudCk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnVybCgp LCB1cmwpOworICAgIFFDT01QQVJFKGZyYW1lLT5yZXF1ZXN0ZWRVcmwoKSwgdXJsKTsKKyAgICBR Q09NUEFSRShmcmFtZS0+YmFzZVVybCgpLCB1cmwpOworCisgICAgLy8gU2V0IGVtcHR5IHVybAor ICAgIGZyYW1lLT5zZXRVcmwoUVVybCgpKTsKKyAgICBleHBlY3RlZExvYWRGaW5pc2hlZENvdW50 Kys7CisKKyAgICBRQ09NUEFSRShzcHkuY291bnQoKSwgZXhwZWN0ZWRMb2FkRmluaXNoZWRDb3Vu dCk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnVybCgpLCBhYm91dEJsYW5rKTsKKyAgICBRQ09NUEFS RShmcmFtZS0+cmVxdWVzdGVkVXJsKCksIGFib3V0QmxhbmspOworICAgIFFDT01QQVJFKGZyYW1l LT5iYXNlVXJsKCksIGFib3V0QmxhbmspOworCisgICAgLy8gU2V0IGV4aXN0aW5nIHVybAorICAg IGZyYW1lLT5zZXRVcmwodXJsKTsKKyAgICBleHBlY3RlZExvYWRGaW5pc2hlZENvdW50Kys7Cisg ICAgOjp3YWl0Rm9yU2lnbmFsKGZyYW1lLCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSk7CisK KyAgICBRQ09NUEFSRShzcHkuY291bnQoKSwgZXhwZWN0ZWRMb2FkRmluaXNoZWRDb3VudCk7Cisg ICAgUUNPTVBBUkUoZnJhbWUtPnVybCgpLCB1cmwpOworICAgIFFDT01QQVJFKGZyYW1lLT5yZXF1 ZXN0ZWRVcmwoKSwgdXJsKTsKKyAgICBRQ09NUEFSRShmcmFtZS0+YmFzZVVybCgpLCB1cmwpOwor CisgICAgLy8gTG9hZCBlbXB0eSB1cmwKKyAgICBmcmFtZS0+bG9hZChRVXJsKCkpOworICAgIGV4 cGVjdGVkTG9hZEZpbmlzaGVkQ291bnQrKzsKKworICAgIFFDT01QQVJFKHNweS5jb3VudCgpLCBl eHBlY3RlZExvYWRGaW5pc2hlZENvdW50KTsKKyAgICBRQ09NUEFSRShmcmFtZS0+dXJsKCksIGFi b3V0QmxhbmspOworICAgIFFDT01QQVJFKGZyYW1lLT5yZXF1ZXN0ZWRVcmwoKSwgYWJvdXRCbGFu ayk7CisgICAgUUNPTVBBUkUoZnJhbWUtPmJhc2VVcmwoKSwgYWJvdXRCbGFuayk7Cit9CisKIFFU RVNUX01BSU4odHN0X1FXZWJGcmFtZSkKICNpbmNsdWRlICJ0c3RfcXdlYmZyYW1lLm1vYyIKLS0g CjEuNy40Cgo= 86608 2011-03-23 06:34:36 -0700 2011-03-23 15:11:09 -0700 proposed patch v2, added history test 0001-Qt-Resetting-the-URL-property-of-a-QWebView-results-.patch text/plain 10437 cmarcelo RnJvbSAyZjMxMDJkYmY5ZDIyNzQ2NDA2ZjFhYzczNjlmNjY4Mjc5OWNkMGRiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDYWlvIE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gPGNhaW8u b2xpdmVpcmFAb3BlbmJvc3NhLm9yZz4KRGF0ZTogV2VkLCAyMyBNYXIgMjAxMSAxMDozMjoyMiAt MDMwMApTdWJqZWN0OiBbUEFUQ0hdIFtRdF0gUmVzZXR0aW5nIHRoZSBVUkwgcHJvcGVydHkgb2Yg YSBRV2ViVmlldyByZXN1bHRzIGluIHRoZSBjdXJyZW50IGRpcmVjdG9yeSBiZWluZyBzZXQgYXMg ZmlsZTo6LXR5cGUgVVJMCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Mjk1OTUKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKVGhlIGJ1ZyB3YXMgY2F1c2VkIGJ5 IGVuc3VyZUFic29sdXRlVXJsKCkgaGVscGVyIGZ1bmN0aW9uIHRyZWF0aW5nIHRoZSBlbXB0eSBV UkwgYXMgYQpyZWxhdGl2ZSBVUkwsIGFuZCBwcmVwZW5kaW5nIHRoZSBjdXJyZW50IGRpcmVjdG9y eS4gUXQgRGVzaWduZXIgcmVzZXQgdGhlIFVSTCBieSBzZXR0aW5nCml0IHRvIGVtcHR5LgoKRml4 aW5nIHRoaXMgZm9yY2VzIHVzIHRvIGNob29zZSBhIG1lYW5pbmcgZm9yIHNldFVybChRVXJsKCkp IGFuZCBsb2FkKFFVcmwoKSkuIFRoaXMgY29tbWl0CmNoYW5nZXMgdGhlIGNvZGUgdG8gbWFrZSBR VXJsKCkgZXF1aXZhbGVudCB0byAiYWJvdXQ6YmxhbmsiLiBUaGlzIHdheSBRdCBEZXNpZ25lciBy ZXNldAp3aWxsIHdvcmsgYXMgZXhwZWN0ZWQuIE5vdyBuZXdseSBjcmVhdGVkIHBhZ2VzIGhhdmUg dXJsKCkgYXMgImFib3V0OmJsYW5rIiBpbnN0ZWFkIG9mCmVtcHR5IFVSTHMgYXMgcHJldmlvdXNs eSBkb2N1bWVudGVkLgoKVHdvIG5ldyB0ZXN0IGNhc2VzIHdlcmUgYWRkZWQsIG9uZSB0byB0aGF0 IHRyYWNrcyB0aGUgcHJvYmxlbSBpbiB0aGUgYnVnIChzZXRVcmxUb0VtcHR5KSwKYW5kIGFub3Ro ZXIgdG8ga2VlcCB0cmFjayBvZiB0aGUgaGlzdG9yeSBiZWhhdmlvciB3aXRoIHRoZSBRVXJsKCkg Y2hhbmdlIGZvciBzZXR0aW5nIFVSTC4KCiogQXBpL3F3ZWJmcmFtZS5jcHA6CihlbnN1cmVBYnNv bHV0ZVVybCk6IGRvIG5vdCB0cmVhdCBlbXB0eSBVUkxzIGFzIHJlbGF0aXZlLgooUVdlYkZyYW1l Ojp1cmwpOiBpZiByZXN1bHQgaXMgZW1wdHksIHJldHVybiBhYm91dDpibGFuay4KKFFXZWJGcmFt ZTo6cmVxdWVzdGVkVXJsKTogZGl0dG8uCihRV2ViRnJhbWU6OmJhc2VVcmwpOiBkaXR0by4KKFFX ZWJGcmFtZTo6bG9hZCk6IHRyYW5zbGF0ZSBsb2FkcyBmb3IgZW1wdHkgVVJMIHRvICJhYm91dDpi bGFuayIuCgoqIHRlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcDogY2hhbmdlIHN5bW1l dHJpYyB0ZXN0IHRvIGV4cGVjdCAiYWJvdXQ6YmxhbmsiIHRvIGJlCnRoZSBmaXJzdCBVUkwgb2Yg YSBjcmVhdGVkIHBhZ2UuIEFkZCBhIG5ldyB0ZXN0IGZvciBlbXB0eSBVUkwgc2V0dGluZyBhbmQg bG9hZGluZywgYW5kCmFub3RoZXIgdG8ga2VlcCB0cmFjayBvZiBob3cgc2V0VXJsKCkgYWZmZWN0 cyBoaXN0b3J5LgotLS0KIFNvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAgICAgICAg ICAgICAgICAgIHwgICAyNCArKystCiBTb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZyAgICAgICAg ICAgICAgICAgICAgICAgICB8ICAgMzAgKysrKysrCiBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3 ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcCB8ICAxMDkgKysrKysrKysrKysrKysrKysrKy0KIDMg ZmlsZXMgY2hhbmdlZCwgMTU2IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcCBiL1NvdXJjZS9XZWJLaXQv cXQvQXBpL3F3ZWJmcmFtZS5jcHAKaW5kZXggYjRkYWFhNC4uZDk5NDkzNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0 L0FwaS9xd2ViZnJhbWUuY3BwCkBAIC03MzEsNyArNzMxLDcgQEAgUU11bHRpTWFwPFFTdHJpbmcs IFFTdHJpbmc+IFFXZWJGcmFtZTo6bWV0YURhdGEoKSBjb25zdAogCiBzdGF0aWMgaW5saW5lIFFV cmwgZW5zdXJlQWJzb2x1dGVVcmwoY29uc3QgUVVybCAmdXJsKQogewotICAgIGlmICghdXJsLmlz UmVsYXRpdmUoKSkKKyAgICBpZiAodXJsLmlzRW1wdHkoKSB8fCAhdXJsLmlzUmVsYXRpdmUoKSkK ICAgICAgICAgcmV0dXJuIHVybDsKIAogICAgIC8vIFRoaXMgY29udGFpbnMgdGhlIFVSTCB3aXRo IGFic29sdXRlIHBhdGggYnV0IHdpdGhvdXQgCkBAIC03NTEsNyArNzUxLDggQEAgc3RhdGljIGlu bGluZSBRVXJsIGVuc3VyZUFic29sdXRlVXJsKGNvbnN0IFFVcmwgJnVybCkKIAogICAgIFNldHRp bmcgdGhpcyBwcm9wZXJ0eSBjbGVhcnMgdGhlIHZpZXcgYW5kIGxvYWRzIHRoZSBVUkwuCiAKLSAg ICBCeSBkZWZhdWx0LCB0aGlzIHByb3BlcnR5IGNvbnRhaW5zIGFuIGVtcHR5LCBpbnZhbGlkIFVS TC4KKyAgICBCeSBkZWZhdWx0LCB0aGlzIHByb3BlcnR5IGNvbnRhaW5zICdhYm91dDpibGFuaycs IHRoYXQgcmVwcmVzZW50cyBhbiBlbXB0eSBwYWdlLgorICAgIFNldHRpbmcgYW4gZW1wdHkgVVJM IHRvIHRoaXMgcHJvcGVydHkgd2lsbCBoYXZlIHRoZSBzYW1lIGVmZmVjdCBhcyBzZXR0aW5nICdh Ym91dDpibGFuaycuCiAKICAgICBcc2EgdXJsQ2hhbmdlZCgpCiAqLwpAQCAtNzY2LDcgKzc2Nywx MCBAQCB2b2lkIFFXZWJGcmFtZTo6c2V0VXJsKGNvbnN0IFFVcmwgJnVybCkKIAogUVVybCBRV2Vi RnJhbWU6OnVybCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGQtPmZyYW1lLT5kb2N1bWVudCgpLT51 cmwoKTsKKyAgICBjb25zdCBRVXJsIHVybCA9IGQtPmZyYW1lLT5kb2N1bWVudCgpLT51cmwoKTsK KyAgICBpZiAodXJsLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIFFVcmwoUVN0cmluZzo6ZnJv bUxhdGluMSgiYWJvdXQ6YmxhbmsiKSk7CisgICAgcmV0dXJuIHVybDsKIH0KIAogLyohCkBAIC03 ODMsNyArNzg3LDEyIEBAIFFVcmwgUVdlYkZyYW1lOjpyZXF1ZXN0ZWRVcmwoKSBjb25zdAogICAg IGNvbnN0IEtVUkwmIGxhc3RSZXF1ZXN0ZWRVcmwgPSBkLT5mcmFtZUxvYWRlckNsaWVudC0+bGFz dFJlcXVlc3RlZFVybCgpOwogICAgIGlmIChsYXN0UmVxdWVzdGVkVXJsLmlzVmFsaWQoKSkKICAg ICAgICAgcmV0dXJuIGxhc3RSZXF1ZXN0ZWRVcmw7Ci0gICAgcmV0dXJuIGQtPmZyYW1lLT5sb2Fk ZXIoKS0+b3JpZ2luYWxSZXF1ZXN0KCkudXJsKCk7CisKKyAgICBjb25zdCBLVVJMJiBvcmlnaW5h bFJlcXVlc3RVcmwgPSBkLT5mcmFtZS0+bG9hZGVyKCktPm9yaWdpbmFsUmVxdWVzdCgpLnVybCgp OworICAgIGlmIChvcmlnaW5hbFJlcXVlc3RVcmwuaXNWYWxpZCgpKQorICAgICAgICByZXR1cm4g b3JpZ2luYWxSZXF1ZXN0VXJsOworCisgICAgcmV0dXJuIFFVcmwoUVN0cmluZzo6ZnJvbUxhdGlu MSgiYWJvdXQ6YmxhbmsiKSk7CiB9CiAvKiEKICAgICBcc2luY2UgNC42CkBAIC03OTQsNyArODAz LDEwIEBAIFFVcmwgUVdlYkZyYW1lOjpyZXF1ZXN0ZWRVcmwoKSBjb25zdAogCiBRVXJsIFFXZWJG cmFtZTo6YmFzZVVybCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGQtPmZyYW1lLT5sb2FkZXIoKS0+ YmFzZVVSTCgpOworICAgIGNvbnN0IEtVUkwmIGJhc2UgPSBkLT5mcmFtZS0+bG9hZGVyKCktPmJh c2VVUkwoKTsKKyAgICBpZiAoYmFzZS5pc1ZhbGlkKCkpCisgICAgICAgIHJldHVybiBiYXNlOwor ICAgIHJldHVybiBRVXJsKFFTdHJpbmc6OmZyb21MYXRpbjEoImFib3V0OmJsYW5rIikpOwogfQog CiAvKiEKQEAgLTg1Nyw3ICs4NjksNyBAQCB2b2lkIFFXZWJGcmFtZTo6bG9hZChjb25zdCBRTmV0 d29ya1JlcXVlc3QgJnJlcSwKICAgICBpZiAoZC0+cGFyZW50RnJhbWUoKSkKICAgICAgICAgZC0+ cGFnZS0+ZC0+aW5zaWRlT3BlbkNhbGwgPSB0cnVlOwogCi0gICAgUVVybCB1cmwgPSBlbnN1cmVB YnNvbHV0ZVVybChyZXEudXJsKCkpOworICAgIFFVcmwgdXJsID0gcmVxLnVybCgpLmlzRW1wdHko KSA/IFFVcmwoUVN0cmluZzo6ZnJvbUxhdGluMSgiYWJvdXQ6YmxhbmsiKSkgOiBlbnN1cmVBYnNv bHV0ZVVybChyZXEudXJsKCkpOwogCiAgICAgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0IHJlcXVl c3QodXJsKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCBjZjZiYmY2Li5lNTVlMDIzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5n ZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDExLTAzLTIyICBDYWlvIE1hcmNlbG8gZGUgT2xpdmVp cmEgRmlsaG8gIDxjYWlvLm9saXZlaXJhQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBSZXNldHRpbmcgdGhlIFVSTCBw cm9wZXJ0eSBvZiBhIFFXZWJWaWV3IHJlc3VsdHMgaW4gdGhlIGN1cnJlbnQgZGlyZWN0b3J5IGJl aW5nIHNldCBhcyBmaWxlOjotdHlwZSBVUkwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTI5NTk1CisKKyAgICAgICAgVGhlIGJ1ZyB3YXMgY2F1c2VkIGJ5 IGVuc3VyZUFic29sdXRlVXJsKCkgaGVscGVyIGZ1bmN0aW9uIHRyZWF0aW5nIHRoZSBlbXB0eSBV UkwgYXMgYQorICAgICAgICByZWxhdGl2ZSBVUkwsIGFuZCBwcmVwZW5kaW5nIHRoZSBjdXJyZW50 IGRpcmVjdG9yeS4gUXQgRGVzaWduZXIgcmVzZXQgdGhlIFVSTCBieSBzZXR0aW5nCisgICAgICAg IGl0IHRvIGVtcHR5LgorCisgICAgICAgIEZpeGluZyB0aGlzIGZvcmNlcyB1cyB0byBjaG9vc2Ug YSBtZWFuaW5nIGZvciBzZXRVcmwoUVVybCgpKSBhbmQgbG9hZChRVXJsKCkpLiBUaGlzIGNvbW1p dAorICAgICAgICBjaGFuZ2VzIHRoZSBjb2RlIHRvIG1ha2UgUVVybCgpIGVxdWl2YWxlbnQgdG8g ImFib3V0OmJsYW5rIi4gVGhpcyB3YXkgUXQgRGVzaWduZXIgcmVzZXQKKyAgICAgICAgd2lsbCB3 b3JrIGFzIGV4cGVjdGVkLiBOb3cgbmV3bHkgY3JlYXRlZCBwYWdlcyBoYXZlIHVybCgpIGFzICJh Ym91dDpibGFuayIgaW5zdGVhZCBvZgorICAgICAgICBlbXB0eSBVUkxzIGFzIHByZXZpb3VzbHkg ZG9jdW1lbnRlZC4KKworICAgICAgICBUd28gbmV3IHRlc3QgY2FzZXMgd2VyZSBhZGRlZCwgb25l IHRvIHRoYXQgdHJhY2tzIHRoZSBwcm9ibGVtIGluIHRoZSBidWcgKHNldFVybFRvRW1wdHkpLAor ICAgICAgICBhbmQgYW5vdGhlciB0byBrZWVwIHRyYWNrIG9mIHRoZSBoaXN0b3J5IGJlaGF2aW9y IHdpdGggdGhlIFFVcmwoKSBjaGFuZ2UgZm9yIHNldHRpbmcgVVJMLgorCisgICAgICAgICogQXBp L3F3ZWJmcmFtZS5jcHA6CisgICAgICAgIChlbnN1cmVBYnNvbHV0ZVVybCk6IGRvIG5vdCB0cmVh dCBlbXB0eSBVUkxzIGFzIHJlbGF0aXZlLgorICAgICAgICAoUVdlYkZyYW1lOjp1cmwpOiBpZiBy ZXN1bHQgaXMgZW1wdHksIHJldHVybiBhYm91dDpibGFuay4KKyAgICAgICAgKFFXZWJGcmFtZTo6 cmVxdWVzdGVkVXJsKTogZGl0dG8uCisgICAgICAgIChRV2ViRnJhbWU6OmJhc2VVcmwpOiBkaXR0 by4KKyAgICAgICAgKFFXZWJGcmFtZTo6bG9hZCk6IHRyYW5zbGF0ZSBsb2FkcyBmb3IgZW1wdHkg VVJMIHRvICJhYm91dDpibGFuayIuCisKKyAgICAgICAgKiB0ZXN0cy9xd2ViZnJhbWUvdHN0X3F3 ZWJmcmFtZS5jcHA6IGNoYW5nZSBzeW1tZXRyaWMgdGVzdCB0byBleHBlY3QgImFib3V0OmJsYW5r IiB0byBiZQorICAgICAgICB0aGUgZmlyc3QgVVJMIG9mIGEgY3JlYXRlZCBwYWdlLiBBZGQgYSBu ZXcgdGVzdCBmb3IgZW1wdHkgVVJMIHNldHRpbmcgYW5kIGxvYWRpbmcsIGFuZAorICAgICAgICBh bm90aGVyIHRvIGtlZXAgdHJhY2sgb2YgaG93IHNldFVybCgpIGFmZmVjdHMgaGlzdG9yeS4KKwog MjAxMS0wMy0yMyAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0 L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcAppbmRleCBiYzE1OTRhLi5iZGM3YjM5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZy YW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZy YW1lLmNwcApAQCAtNjUwLDYgKzY1MCw4IEBAIHByaXZhdGUgc2xvdHM6CiAgICAgdm9pZCBzZXRD YWNoZUxvYWRDb250cm9sQXR0cmlidXRlKCk7CiAgICAgdm9pZCBzZXRVcmxXaXRoUGVuZGluZ0xv YWRzKCk7CiAgICAgdm9pZCBzZXRVcmxXaXRoRnJhZ21lbnQoKTsKKyAgICB2b2lkIHNldFVybFRv RW1wdHkoKTsKKyAgICB2b2lkIHNldFVybEhpc3RvcnkoKTsKIAogcHJpdmF0ZToKICAgICBRU3Ry aW5nICBldmFsSlMoY29uc3QgUVN0cmluZyZzKSB7CkBAIC0yMjExLDcgKzIyMTMsNyBAQCB2b2lk IHRzdF9RV2ViRnJhbWU6OmFycmF5T2JqZWN0RW51bWVyYWJsZSgpCiAKIHZvaWQgdHN0X1FXZWJG cmFtZTo6c3ltbWV0cmljVXJsKCkKIHsKLSAgICBRVkVSSUZZKG1fdmlldy0+dXJsKCkuaXNFbXB0 eSgpKTsKKyAgICBRQ09NUEFSRShtX3ZpZXctPnVybCgpLCBRVXJsKCJhYm91dDpibGFuayIpKTsK IAogICAgIFFDT01QQVJFKG1fdmlldy0+aGlzdG9yeSgpLT5jb3VudCgpLCAwKTsKIApAQCAtMzM0 MCw1ICszMzQyLDExMCBAQCB2b2lkIHRzdF9RV2ViRnJhbWU6OnNldFVybFdpdGhGcmFnbWVudCgp CiAgICAgUUNPTVBBUkUocGFnZS5tYWluRnJhbWUoKS0+dXJsKCksIHVybCk7CiB9CiAKK3ZvaWQg dHN0X1FXZWJGcmFtZTo6c2V0VXJsVG9FbXB0eSgpCit7CisgICAgaW50IGV4cGVjdGVkTG9hZEZp bmlzaGVkQ291bnQgPSAwOworICAgIGNvbnN0IFFVcmwgYWJvdXRCbGFuaygiYWJvdXQ6Ymxhbmsi KTsKKyAgICBjb25zdCBRVXJsIHVybCgicXJjOi90ZXN0Mi5odG1sIik7CisKKyAgICBRV2ViUGFn ZSBwYWdlOworICAgIFFXZWJGcmFtZSogZnJhbWUgPSBwYWdlLm1haW5GcmFtZSgpOworICAgIFFD T01QQVJFKGZyYW1lLT51cmwoKSwgYWJvdXRCbGFuayk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnJl cXVlc3RlZFVybCgpLCBhYm91dEJsYW5rKTsKKyAgICBRQ09NUEFSRShmcmFtZS0+YmFzZVVybCgp LCBhYm91dEJsYW5rKTsKKworICAgIFFTaWduYWxTcHkgc3B5KGZyYW1lLCBTSUdOQUwobG9hZEZp bmlzaGVkKGJvb2wpKSk7CisKKyAgICAvLyBTZXQgZXhpc3RpbmcgdXJsCisgICAgZnJhbWUtPnNl dFVybCh1cmwpOworICAgIGV4cGVjdGVkTG9hZEZpbmlzaGVkQ291bnQrKzsKKyAgICA6OndhaXRG b3JTaWduYWwoZnJhbWUsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpKTsKKworICAgIFFDT01Q QVJFKHNweS5jb3VudCgpLCBleHBlY3RlZExvYWRGaW5pc2hlZENvdW50KTsKKyAgICBRQ09NUEFS RShmcmFtZS0+dXJsKCksIHVybCk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnJlcXVlc3RlZFVybCgp LCB1cmwpOworICAgIFFDT01QQVJFKGZyYW1lLT5iYXNlVXJsKCksIHVybCk7CisKKyAgICAvLyBT ZXQgZW1wdHkgdXJsCisgICAgZnJhbWUtPnNldFVybChRVXJsKCkpOworICAgIGV4cGVjdGVkTG9h ZEZpbmlzaGVkQ291bnQrKzsKKworICAgIFFDT01QQVJFKHNweS5jb3VudCgpLCBleHBlY3RlZExv YWRGaW5pc2hlZENvdW50KTsKKyAgICBRQ09NUEFSRShmcmFtZS0+dXJsKCksIGFib3V0Qmxhbmsp OworICAgIFFDT01QQVJFKGZyYW1lLT5yZXF1ZXN0ZWRVcmwoKSwgYWJvdXRCbGFuayk7CisgICAg UUNPTVBBUkUoZnJhbWUtPmJhc2VVcmwoKSwgYWJvdXRCbGFuayk7CisKKyAgICAvLyBTZXQgZXhp c3RpbmcgdXJsCisgICAgZnJhbWUtPnNldFVybCh1cmwpOworICAgIGV4cGVjdGVkTG9hZEZpbmlz aGVkQ291bnQrKzsKKyAgICA6OndhaXRGb3JTaWduYWwoZnJhbWUsIFNJR05BTChsb2FkRmluaXNo ZWQoYm9vbCkpKTsKKworICAgIFFDT01QQVJFKHNweS5jb3VudCgpLCBleHBlY3RlZExvYWRGaW5p c2hlZENvdW50KTsKKyAgICBRQ09NUEFSRShmcmFtZS0+dXJsKCksIHVybCk7CisgICAgUUNPTVBB UkUoZnJhbWUtPnJlcXVlc3RlZFVybCgpLCB1cmwpOworICAgIFFDT01QQVJFKGZyYW1lLT5iYXNl VXJsKCksIHVybCk7CisKKyAgICAvLyBMb2FkIGVtcHR5IHVybAorICAgIGZyYW1lLT5sb2FkKFFV cmwoKSk7CisgICAgZXhwZWN0ZWRMb2FkRmluaXNoZWRDb3VudCsrOworCisgICAgUUNPTVBBUkUo c3B5LmNvdW50KCksIGV4cGVjdGVkTG9hZEZpbmlzaGVkQ291bnQpOworICAgIFFDT01QQVJFKGZy YW1lLT51cmwoKSwgYWJvdXRCbGFuayk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnJlcXVlc3RlZFVy bCgpLCBhYm91dEJsYW5rKTsKKyAgICBRQ09NUEFSRShmcmFtZS0+YmFzZVVybCgpLCBhYm91dEJs YW5rKTsKK30KKwordm9pZCB0c3RfUVdlYkZyYW1lOjpzZXRVcmxIaXN0b3J5KCkKK3sKKyAgICBj b25zdCBRVXJsIGFib3V0QmxhbmsoImFib3V0OmJsYW5rIik7CisgICAgUVVybCB1cmw7CisgICAg aW50IGV4cGVjdGVkTG9hZEZpbmlzaGVkQ291bnQgPSAwOworICAgIFFXZWJGcmFtZSogZnJhbWUg PSBtX3BhZ2UtPm1haW5GcmFtZSgpOworICAgIFFTaWduYWxTcHkgc3B5KGZyYW1lLCBTSUdOQUwo bG9hZEZpbmlzaGVkKGJvb2wpKSk7CisKKyAgICBRQ09NUEFSRShtX3BhZ2UtPmhpc3RvcnkoKS0+ Y291bnQoKSwgMCk7CisKKyAgICBmcmFtZS0+c2V0VXJsKFFVcmwoKSk7CisgICAgZXhwZWN0ZWRM b2FkRmluaXNoZWRDb3VudCsrOworICAgIFFDT01QQVJFKHNweS5jb3VudCgpLCBleHBlY3RlZExv YWRGaW5pc2hlZENvdW50KTsKKyAgICBRQ09NUEFSRShmcmFtZS0+dXJsKCksIGFib3V0Qmxhbmsp OworICAgIFFDT01QQVJFKGZyYW1lLT5yZXF1ZXN0ZWRVcmwoKSwgYWJvdXRCbGFuayk7CisgICAg UUNPTVBBUkUobV9wYWdlLT5oaXN0b3J5KCktPmNvdW50KCksIDEpOworCisgICAgdXJsID0gUVVy bCgiaHR0cDovL25vbi5leGlzdGFudC8iKTsKKyAgICBmcmFtZS0+c2V0VXJsKHVybCk7CisgICAg Ojp3YWl0Rm9yU2lnbmFsKG1fcGFnZSwgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSkpOworICAg IGV4cGVjdGVkTG9hZEZpbmlzaGVkQ291bnQrKzsKKyAgICBRQ09NUEFSRShzcHkuY291bnQoKSwg ZXhwZWN0ZWRMb2FkRmluaXNoZWRDb3VudCk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnVybCgpLCB1 cmwpOworICAgIFFDT01QQVJFKGZyYW1lLT5yZXF1ZXN0ZWRVcmwoKSwgdXJsKTsKKyAgICBRQ09N UEFSRShtX3BhZ2UtPmhpc3RvcnkoKS0+Y291bnQoKSwgMSk7CisKKyAgICB1cmwgPSBRVXJsKCJx cmM6L3Rlc3QxLmh0bWwiKTsKKyAgICBmcmFtZS0+c2V0VXJsKHVybCk7CisgICAgOjp3YWl0Rm9y U2lnbmFsKG1fcGFnZSwgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSkpOworICAgIGV4cGVjdGVk TG9hZEZpbmlzaGVkQ291bnQrKzsKKyAgICBRQ09NUEFSRShzcHkuY291bnQoKSwgZXhwZWN0ZWRM b2FkRmluaXNoZWRDb3VudCk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnVybCgpLCB1cmwpOworICAg IFFDT01QQVJFKGZyYW1lLT5yZXF1ZXN0ZWRVcmwoKSwgdXJsKTsKKyAgICBRQ09NUEFSRShtX3Bh Z2UtPmhpc3RvcnkoKS0+Y291bnQoKSwgMik7CisKKyAgICBmcmFtZS0+c2V0VXJsKFFVcmwoKSk7 CisgICAgZXhwZWN0ZWRMb2FkRmluaXNoZWRDb3VudCsrOworICAgIFFDT01QQVJFKHNweS5jb3Vu dCgpLCBleHBlY3RlZExvYWRGaW5pc2hlZENvdW50KTsKKyAgICBRQ09NUEFSRShmcmFtZS0+dXJs KCksIGFib3V0QmxhbmspOworICAgIFFDT01QQVJFKGZyYW1lLT5yZXF1ZXN0ZWRVcmwoKSwgYWJv dXRCbGFuayk7CisgICAgUUNPTVBBUkUobV9wYWdlLT5oaXN0b3J5KCktPmNvdW50KCksIDMpOwor CisgICAgdXJsID0gUVVybCgicXJjOi90ZXN0MS5odG1sIik7CisgICAgZnJhbWUtPnNldFVybCh1 cmwpOworICAgIDo6d2FpdEZvclNpZ25hbChtX3BhZ2UsIFNJR05BTChsb2FkRmluaXNoZWQoYm9v bCkpKTsKKyAgICBleHBlY3RlZExvYWRGaW5pc2hlZENvdW50Kys7CisgICAgUUNPTVBBUkUoc3B5 LmNvdW50KCksIGV4cGVjdGVkTG9hZEZpbmlzaGVkQ291bnQpOworICAgIFFDT01QQVJFKGZyYW1l LT51cmwoKSwgdXJsKTsKKyAgICBRQ09NUEFSRShmcmFtZS0+cmVxdWVzdGVkVXJsKCksIHVybCk7 CisgICAgUUNPTVBBUkUobV9wYWdlLT5oaXN0b3J5KCktPmNvdW50KCksIDQpOworfQorCiBRVEVT VF9NQUlOKHRzdF9RV2ViRnJhbWUpCiAjaW5jbHVkZSAidHN0X3F3ZWJmcmFtZS5tb2MiCi0tIAox LjcuNAoK 86700 2011-03-23 15:11:09 -0700 2011-03-23 15:58:15 -0700 patch v3, more testing, deal with invalid but not empty url, do not translate QUrl to about:blank 0001-Qt-Resetting-the-URL-property-of-a-QWebView-results-.patch text/plain 13308 cmarcelo RnJvbSBkOTM4MGZmMWIyMWE0MWU1ZmEzNmE4NDY1YmRjNmM4MTE2NzMwYzA4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDYWlvIE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gPGNhaW8u b2xpdmVpcmFAb3BlbmJvc3NhLm9yZz4KRGF0ZTogV2VkLCAyMyBNYXIgMjAxMSAxOTowNDowNCAt MDMwMApTdWJqZWN0OiBbUEFUQ0hdIFtRdF0gUmVzZXR0aW5nIHRoZSBVUkwgcHJvcGVydHkgb2Yg YSBRV2ViVmlldyByZXN1bHRzIGluIHRoZSBjdXJyZW50IGRpcmVjdG9yeSBiZWluZyBzZXQgYXMg ZmlsZTo6LXR5cGUgVVJMCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Mjk1OTUKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKUXQgRGVzaWduZXIgcmVzZXRzIHRo ZSBVUkwgYnkgc2V0dGluZyBpdCB0byBRVXJsKCkuIFRoZSBidWcgd2FzIGNhdXNlZCBieQplbnN1 cmVBYnNvbHV0ZVVybCgpIGhlbHBlciBmdW5jdGlvbiB0cmVhdGluZyB0aGUgZW1wdHkgVVJMIGFz IGEgcmVsYXRpdmUgVVJMLCBhbmQKcHJlcGVuZGluZyB0aGUgY3VycmVudCBkaXJlY3RvcnkuCgpC eSBmaXhpbmcgdGhpcywgbm93IHdlIGNhbiBwYXNzIFFVcmwoKSBpbnZhbGlkIGFuZCBlbXB0eSBV UkxzIHRvIFdlYkNvcmUgbGF5ZXIsIHdoaWNoCndpbGwgZW5kIHVwIGxvYWRpbmcgImFib3V0OmJs YW5rIiwgYnV0IGtlZXBpbmcgaXQgYXMgYSByZXF1ZXN0ZWQgVVJMLgoKUHJldmlvdXNseSB3ZSB3 ZXJlIHN0b3JpbmcgdGhlIG1fbGFzdFJlcXVlc3RlZFVybCBidXQgY29uc2lkZXJpbmcgdGhlIGVt cHR5IFVSTCBhcyBvbmUKb3V0LW9mLWJhbmQgdmFsdWUgdG8gaW5kaWNhdGUgdGhhdCB3ZSBoYWQg bm8gbGFzdFJlcXVlc3RVcmwgc3RvcmVkLiBOb3cgd2UgY2FuJ3QgdG8gdGhhdAphbnltb3JlIHNp bmNlLCBzbyBJJ20gYWRkaW5nIGEgYm9vbCB0byBpbmRpY2F0ZSBpZiB0aGUgbGFzdFJlcXVlc3RV cmwgaXMgc3RvcmVkIGluIHRoZQpGcmFtZUxvYWRlckNsaWVudCBvciBpZiBpcyBzYWZlIHRvIGxv b2sgYXQgdGhlIGN1cnJlbnQgZG9jdW1lbnQuCgpUaGlzIHBhdGNoIGFsc28gYWRkIHRocmVlIG5l dyBhdXRvdGVzdHMsIHRvIGNvdmVyIGJldHRlciB0aGUgZXhwZWN0ZWQgYmVoYXZpb3Igb2Ygc2V0 dGluZwp0aGUgUVVybCgpIGluIGEgUVdlYkZyYW1lLgoKKiBBcGkvcXdlYmZyYW1lLmNwcDoKKGVu c3VyZUFic29sdXRlVXJsKTogZG8gbm90IHRyZWF0IGludmFsaWQgVVJMcyAoZW1wdHkgaW5jbHVk ZWQpIGFzIHJlbGF0aXZlLgooUVdlYkZyYW1lOjpyZXF1ZXN0ZWRVcmwpOiBjaGFuZ2UgdGhlIHdh eSB0aGF0IHdlIHZlcmlmeSB3aGV0aGVyIGxhc3RSZXF1ZXN0ZWRVcmwgaXMgc3RvcmVkCmluIHRo ZSBGcmFtZUxvYWRlckNsaWVudC4KCiogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRR dC5jcHA6CihXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0OjpGcmFtZUxvYWRlckNsaWVudFF0 KToKKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6OmRpc3BhdGNoRGlkU3RhcnRQcm92aXNp b25hbExvYWQpOiBmaWxsIG1faGFzTGFzdFJlcXVlc3RlZFVybC4KKFdlYkNvcmU6OkZyYW1lTG9h ZGVyQ2xpZW50UXQ6OmRpc3BhdGNoRGlkRmluaXNoTG9hZCk6IGRpdHRvLgoqIFdlYkNvcmVTdXBw b3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuaDoKKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6 Omhhc0xhc3RSZXF1ZXN0ZWRVcmwpOgoKKiB0ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5j cHA6Cih0c3RfUVdlYkZyYW1lOjpzZXRVcmxUb0VtcHR5KTogdmVyaWZ5IHRoZSBiZWhhdmlvciBv ZiBzZXR0aW5nIGVtcHR5IFVSTHMuIFRoaXMgaW5jbHVkZXMKdGhlIHJlZHVjdGlvbiBvZiB0aGUg YnVnIHJlcG9ydC4KKHRzdF9RV2ViRnJhbWU6OnNldFVybFRvSW52YWxpZCk6IHNldHRpbmcgaW52 YWxpZCwgYnV0IG5vdCBuZWNlc3NhcmlseSBlbXB0eSwgVVJMcy4KKHRzdF9RV2ViRnJhbWU6OnNl dFVybEhpc3RvcnkpOiB0byB2ZXJpZnkgaG93IHNldHRpbmcgZW1wdHkgVVJMcyBhZmZlY3QgaGlz dG9yeS4KLS0tCiBTb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwICAgICAgICAgICAg ICAgICB8ICAgIDcgKy0KIFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nICAgICAgICAgICAgICAg ICAgICAgICAgIHwgICA0MCArKysrKysKIC4uLi9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRl ckNsaWVudFF0LmNwcCAgICAgIHwgICAgMyArCiAuLi4vV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0 L0ZyYW1lTG9hZGVyQ2xpZW50UXQuaCB8ICAgIDIgKwogU291cmNlL1dlYktpdC9xdC90ZXN0cy9x d2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAgfCAgMTQ2ICsrKysrKysrKysrKysrKysrKysrCiA1 IGZpbGVzIGNoYW5nZWQsIDE5NCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAgYi9Tb3VyY2UvV2ViS2l0 L3F0L0FwaS9xd2ViZnJhbWUuY3BwCmluZGV4IGI0ZGFhYTQuLjcwMjRmNmIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9x dC9BcGkvcXdlYmZyYW1lLmNwcApAQCAtNzMxLDcgKzczMSw3IEBAIFFNdWx0aU1hcDxRU3RyaW5n LCBRU3RyaW5nPiBRV2ViRnJhbWU6Om1ldGFEYXRhKCkgY29uc3QKIAogc3RhdGljIGlubGluZSBR VXJsIGVuc3VyZUFic29sdXRlVXJsKGNvbnN0IFFVcmwgJnVybCkKIHsKLSAgICBpZiAoIXVybC5p c1JlbGF0aXZlKCkpCisgICAgaWYgKCF1cmwuaXNWYWxpZCgpIHx8ICF1cmwuaXNSZWxhdGl2ZSgp KQogICAgICAgICByZXR1cm4gdXJsOwogCiAgICAgLy8gVGhpcyBjb250YWlucyB0aGUgVVJMIHdp dGggYWJzb2x1dGUgcGF0aCBidXQgd2l0aG91dCAKQEAgLTc4MCw5ICs3ODAsOCBAQCBRVXJsIFFX ZWJGcmFtZTo6dXJsKCkgY29uc3QKICovCiBRVXJsIFFXZWJGcmFtZTo6cmVxdWVzdGVkVXJsKCkg Y29uc3QKIHsKLSAgICBjb25zdCBLVVJMJiBsYXN0UmVxdWVzdGVkVXJsID0gZC0+ZnJhbWVMb2Fk ZXJDbGllbnQtPmxhc3RSZXF1ZXN0ZWRVcmwoKTsKLSAgICBpZiAobGFzdFJlcXVlc3RlZFVybC5p c1ZhbGlkKCkpCi0gICAgICAgIHJldHVybiBsYXN0UmVxdWVzdGVkVXJsOworICAgIGlmIChkLT5m cmFtZUxvYWRlckNsaWVudC0+aGFzTGFzdFJlcXVlc3RlZFVybCgpKQorICAgICAgICByZXR1cm4g ZC0+ZnJhbWVMb2FkZXJDbGllbnQtPmxhc3RSZXF1ZXN0ZWRVcmwoKTsKICAgICByZXR1cm4gZC0+ ZnJhbWUtPmxvYWRlcigpLT5vcmlnaW5hbFJlcXVlc3QoKS51cmwoKTsKIH0KIC8qIQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5n ZUxvZwppbmRleCBjZjZiYmY2Li44YmY4YTQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDQz IEBACisyMDExLTAzLTIzICBDYWlvIE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gIDxjYWlvLm9s aXZlaXJhQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgW1F0XSBSZXNldHRpbmcgdGhlIFVSTCBwcm9wZXJ0eSBvZiBhIFFXZWJW aWV3IHJlc3VsdHMgaW4gdGhlIGN1cnJlbnQgZGlyZWN0b3J5IGJlaW5nIHNldCBhcyBmaWxlOjot dHlwZSBVUkwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTI5NTk1CisKKyAgICAgICAgUXQgRGVzaWduZXIgcmVzZXRzIHRoZSBVUkwgYnkgc2V0dGluZyBp dCB0byBRVXJsKCkuIFRoZSBidWcgd2FzIGNhdXNlZCBieQorICAgICAgICBlbnN1cmVBYnNvbHV0 ZVVybCgpIGhlbHBlciBmdW5jdGlvbiB0cmVhdGluZyB0aGUgZW1wdHkgVVJMIGFzIGEgcmVsYXRp dmUgVVJMLCBhbmQKKyAgICAgICAgcHJlcGVuZGluZyB0aGUgY3VycmVudCBkaXJlY3RvcnkuCisK KyAgICAgICAgQnkgZml4aW5nIHRoaXMsIG5vdyB3ZSBjYW4gcGFzcyBRVXJsKCkgaW52YWxpZCBh bmQgZW1wdHkgVVJMcyB0byBXZWJDb3JlIGxheWVyLCB3aGljaAorICAgICAgICB3aWxsIGVuZCB1 cCBsb2FkaW5nICJhYm91dDpibGFuayIsIGJ1dCBrZWVwaW5nIGl0IGFzIGEgcmVxdWVzdGVkIFVS TC4KKworICAgICAgICBQcmV2aW91c2x5IHdlIHdlcmUgc3RvcmluZyB0aGUgbV9sYXN0UmVxdWVz dGVkVXJsIGJ1dCBjb25zaWRlcmluZyB0aGUgZW1wdHkgVVJMIGFzIG9uZQorICAgICAgICBvdXQt b2YtYmFuZCB2YWx1ZSB0byBpbmRpY2F0ZSB0aGF0IHdlIGhhZCBubyBsYXN0UmVxdWVzdFVybCBz dG9yZWQuIE5vdyB3ZSBjYW4ndCB0byB0aGF0CisgICAgICAgIGFueW1vcmUgc2luY2UsIHNvIEkn bSBhZGRpbmcgYSBib29sIHRvIGluZGljYXRlIGlmIHRoZSBsYXN0UmVxdWVzdFVybCBpcyBzdG9y ZWQgaW4gdGhlCisgICAgICAgIEZyYW1lTG9hZGVyQ2xpZW50IG9yIGlmIGlzIHNhZmUgdG8gbG9v ayBhdCB0aGUgY3VycmVudCBkb2N1bWVudC4KKworICAgICAgICBUaGlzIHBhdGNoIGFsc28gYWRk IHRocmVlIG5ldyBhdXRvdGVzdHMsIHRvIGNvdmVyIGJldHRlciB0aGUgZXhwZWN0ZWQgYmVoYXZp b3Igb2Ygc2V0dGluZworICAgICAgICB0aGUgUVVybCgpIGluIGEgUVdlYkZyYW1lLgorCisgICAg ICAgICogQXBpL3F3ZWJmcmFtZS5jcHA6CisgICAgICAgIChlbnN1cmVBYnNvbHV0ZVVybCk6IGRv IG5vdCB0cmVhdCBpbnZhbGlkIFVSTHMgKGVtcHR5IGluY2x1ZGVkKSBhcyByZWxhdGl2ZS4KKyAg ICAgICAgKFFXZWJGcmFtZTo6cmVxdWVzdGVkVXJsKTogY2hhbmdlIHRoZSB3YXkgdGhhdCB3ZSB2 ZXJpZnkgd2hldGhlciBsYXN0UmVxdWVzdGVkVXJsIGlzIHN0b3JlZAorICAgICAgICBpbiB0aGUg RnJhbWVMb2FkZXJDbGllbnQuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRl ckNsaWVudFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6OkZy YW1lTG9hZGVyQ2xpZW50UXQpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRR dDo6ZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCk6IGZpbGwgbV9oYXNMYXN0UmVxdWVz dGVkVXJsLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRRdDo6ZGlzcGF0Y2hE aWRGaW5pc2hMb2FkKTogZGl0dG8uCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2Fk ZXJDbGllbnRRdC5oOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRRdDo6aGFz TGFzdFJlcXVlc3RlZFVybCk6CisKKyAgICAgICAgKiB0ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJm cmFtZS5jcHA6CisgICAgICAgICh0c3RfUVdlYkZyYW1lOjpzZXRVcmxUb0VtcHR5KTogdmVyaWZ5 IHRoZSBiZWhhdmlvciBvZiBzZXR0aW5nIGVtcHR5IFVSTHMuIFRoaXMgaW5jbHVkZXMKKyAgICAg ICAgdGhlIHJlZHVjdGlvbiBvZiB0aGUgYnVnIHJlcG9ydC4KKyAgICAgICAgKHRzdF9RV2ViRnJh bWU6OnNldFVybFRvSW52YWxpZCk6IHNldHRpbmcgaW52YWxpZCwgYnV0IG5vdCBuZWNlc3Nhcmls eSBlbXB0eSwgVVJMcy4KKyAgICAgICAgKHRzdF9RV2ViRnJhbWU6OnNldFVybEhpc3RvcnkpOiB0 byB2ZXJpZnkgaG93IHNldHRpbmcgZW1wdHkgVVJMcyBhZmZlY3QgaGlzdG9yeS4KKwogMjAxMS0w My0yMyAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9X ZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQv V2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKaW5kZXggMjdlZDdlZC4uZDgz NGE4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxv YWRlckNsaWVudFF0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50UXQuY3BwCkBAIC0yMDcsNiArMjA3LDcgQEAgRnJhbWVMb2FkZXJDbGll bnRRdDo6RnJhbWVMb2FkZXJDbGllbnRRdCgpCiAgICAgLCBtX3BsdWdpblZpZXcoMCkKICAgICAs IG1faGFzU2VudFJlc3BvbnNlVG9QbHVnaW4oZmFsc2UpCiAgICAgLCBtX2hhc1JlcHJlc2VudGF0 aW9uKGZhbHNlKQorICAgICwgbV9oYXNMYXN0UmVxdWVzdGVkVXJsKGZhbHNlKQogICAgICwgbV9s b2FkRXJyb3IoUmVzb3VyY2VFcnJvcigpKQogewogfQpAQCAtNDM3LDYgKzQzOCw3IEBAIHZvaWQg RnJhbWVMb2FkZXJDbGllbnRRdDo6ZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCgpCiAg ICAgaWYgKGR1bXBVc2VyR2VzdHVyZUluRnJhbWVMb2FkZXJDYWxsYmFja3MpCiAgICAgICAgIHBy aW50ZigiJXMgLSBpbiBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lXG4iLCBxUHJpbnRh YmxlKGRydFByaW50RnJhbWVVc2VyR2VzdHVyZVN0YXR1cyhtX2ZyYW1lKSkpOwogCisgICAgbV9o YXNMYXN0UmVxdWVzdGVkVXJsID0gdHJ1ZTsKICAgICBtX2xhc3RSZXF1ZXN0ZWRVcmwgPSBtX2Zy YW1lLT5sb2FkZXIoKS0+YWN0aXZlRG9jdW1lbnRMb2FkZXIoKS0+cmVxdWVzdFVSTCgpOwogCiAg ICAgaWYgKG1fd2ViRnJhbWUpCkBAIC01MjEsNiArNTIzLDcgQEAgdm9pZCBGcmFtZUxvYWRlckNs aWVudFF0OjpkaXNwYXRjaERpZEZpbmlzaExvYWQoKQogCiAgICAgLy8gVGhlIHJlcXVlc3RlZCBV Ukwgd2lsbCBiZSBhdmFpbGFibGUgaW4gdGhlIGRvY3VtZW50IGxvYWRlciB0aGF0IGp1c3QgZmlu aXNoZWQsIHNvIHdlCiAgICAgLy8gZG9uJ3QgbmVlZCB0byBrZWVwIGl0IGFueW1vcmUuCisgICAg bV9oYXNMYXN0UmVxdWVzdGVkVXJsID0gZmFsc2U7CiAgICAgbV9sYXN0UmVxdWVzdGVkVXJsID0g S1VSTCgpOwogCiAgICAgaWYgKCFtX3dlYkZyYW1lKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmggYi9Tb3VyY2UvV2ViS2l0 L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuaAppbmRleCAwMzMzNTk5Li4z NDNjMmE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1l TG9hZGVyQ2xpZW50UXQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50UXQuaApAQCAtMjM5LDYgKzIzOSw3IEBAIHB1YmxpYzoKIAogICAgIHZp cnR1YWwgUGFzc1JlZlB0cjxGcmFtZU5ldHdvcmtpbmdDb250ZXh0PiBjcmVhdGVOZXR3b3JraW5n Q29udGV4dCgpOwogCisgICAgYm9vbCBoYXNMYXN0UmVxdWVzdGVkVXJsKCkgY29uc3QgeyByZXR1 cm4gbV9oYXNMYXN0UmVxdWVzdGVkVXJsOyB9CiAgICAgY29uc3QgS1VSTCYgbGFzdFJlcXVlc3Rl ZFVybCgpIGNvbnN0IHsgcmV0dXJuIG1fbGFzdFJlcXVlc3RlZFVybDsgfQogCiAgICAgc3RhdGlj IGJvb2wgZHVtcEZyYW1lTG9hZGVyQ2FsbGJhY2tzOwpAQCAtMjY5LDYgKzI3MCw3IEBAIHByaXZh dGU6CiAgICAgLy8gU2VlIGZpbmlzaGVkTG9hZGluZygpLgogICAgIGJvb2wgbV9oYXNSZXByZXNl bnRhdGlvbjsKIAorICAgIGJvb2wgbV9oYXNMYXN0UmVxdWVzdGVkVXJsOwogICAgIEtVUkwgbV9s YXN0UmVxdWVzdGVkVXJsOwogICAgIFJlc291cmNlRXJyb3IgbV9sb2FkRXJyb3I7CiB9OwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5j cHAgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcApp bmRleCBiYzE1OTRhLi4yYzQ0ZTRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3Rz L3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3Rz L3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcApAQCAtNjUwLDYgKzY1MCw5IEBAIHByaXZhdGUg c2xvdHM6CiAgICAgdm9pZCBzZXRDYWNoZUxvYWRDb250cm9sQXR0cmlidXRlKCk7CiAgICAgdm9p ZCBzZXRVcmxXaXRoUGVuZGluZ0xvYWRzKCk7CiAgICAgdm9pZCBzZXRVcmxXaXRoRnJhZ21lbnQo KTsKKyAgICB2b2lkIHNldFVybFRvRW1wdHkoKTsKKyAgICB2b2lkIHNldFVybFRvSW52YWxpZCgp OworICAgIHZvaWQgc2V0VXJsSGlzdG9yeSgpOwogCiBwcml2YXRlOgogICAgIFFTdHJpbmcgIGV2 YWxKUyhjb25zdCBRU3RyaW5nJnMpIHsKQEAgLTMzNDAsNSArMzM0MywxNDggQEAgdm9pZCB0c3Rf UVdlYkZyYW1lOjpzZXRVcmxXaXRoRnJhZ21lbnQoKQogICAgIFFDT01QQVJFKHBhZ2UubWFpbkZy YW1lKCktPnVybCgpLCB1cmwpOwogfQogCit2b2lkIHRzdF9RV2ViRnJhbWU6OnNldFVybFRvRW1w dHkoKQoreworICAgIGludCBleHBlY3RlZExvYWRGaW5pc2hlZENvdW50ID0gMDsKKyAgICBjb25z dCBRVXJsIGFib3V0QmxhbmsoImFib3V0OmJsYW5rIik7CisgICAgY29uc3QgUVVybCB1cmwoInFy YzovdGVzdDIuaHRtbCIpOworCisgICAgUVdlYlBhZ2UgcGFnZTsKKyAgICBRV2ViRnJhbWUqIGZy YW1lID0gcGFnZS5tYWluRnJhbWUoKTsKKyAgICBRQ09NUEFSRShmcmFtZS0+dXJsKCksIFFVcmwo KSk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnJlcXVlc3RlZFVybCgpLCBRVXJsKCkpOworICAgIFFD T01QQVJFKGZyYW1lLT5iYXNlVXJsKCksIFFVcmwoKSk7CisKKyAgICBRU2lnbmFsU3B5IHNweShm cmFtZSwgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSkpOworCisgICAgLy8gU2V0IGV4aXN0aW5n IHVybAorICAgIGZyYW1lLT5zZXRVcmwodXJsKTsKKyAgICBleHBlY3RlZExvYWRGaW5pc2hlZENv dW50Kys7CisgICAgOjp3YWl0Rm9yU2lnbmFsKGZyYW1lLCBTSUdOQUwobG9hZEZpbmlzaGVkKGJv b2wpKSk7CisKKyAgICBRQ09NUEFSRShzcHkuY291bnQoKSwgZXhwZWN0ZWRMb2FkRmluaXNoZWRD b3VudCk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnVybCgpLCB1cmwpOworICAgIFFDT01QQVJFKGZy YW1lLT5yZXF1ZXN0ZWRVcmwoKSwgdXJsKTsKKyAgICBRQ09NUEFSRShmcmFtZS0+YmFzZVVybCgp LCB1cmwpOworCisgICAgLy8gU2V0IGVtcHR5IHVybAorICAgIGZyYW1lLT5zZXRVcmwoUVVybCgp KTsKKyAgICBleHBlY3RlZExvYWRGaW5pc2hlZENvdW50Kys7CisKKyAgICBRQ09NUEFSRShzcHku Y291bnQoKSwgZXhwZWN0ZWRMb2FkRmluaXNoZWRDb3VudCk7CisgICAgUUNPTVBBUkUoZnJhbWUt PnVybCgpLCBhYm91dEJsYW5rKTsKKyAgICBRQ09NUEFSRShmcmFtZS0+cmVxdWVzdGVkVXJsKCks IFFVcmwoKSk7CisgICAgUUNPTVBBUkUoZnJhbWUtPmJhc2VVcmwoKSwgYWJvdXRCbGFuayk7CisK KyAgICAvLyBTZXQgZXhpc3RpbmcgdXJsCisgICAgZnJhbWUtPnNldFVybCh1cmwpOworICAgIGV4 cGVjdGVkTG9hZEZpbmlzaGVkQ291bnQrKzsKKyAgICA6OndhaXRGb3JTaWduYWwoZnJhbWUsIFNJ R05BTChsb2FkRmluaXNoZWQoYm9vbCkpKTsKKworICAgIFFDT01QQVJFKHNweS5jb3VudCgpLCBl eHBlY3RlZExvYWRGaW5pc2hlZENvdW50KTsKKyAgICBRQ09NUEFSRShmcmFtZS0+dXJsKCksIHVy bCk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnJlcXVlc3RlZFVybCgpLCB1cmwpOworICAgIFFDT01Q QVJFKGZyYW1lLT5iYXNlVXJsKCksIHVybCk7CisKKyAgICAvLyBMb2FkIGVtcHR5IHVybAorICAg IGZyYW1lLT5sb2FkKFFVcmwoKSk7CisgICAgZXhwZWN0ZWRMb2FkRmluaXNoZWRDb3VudCsrOwor CisgICAgUUNPTVBBUkUoc3B5LmNvdW50KCksIGV4cGVjdGVkTG9hZEZpbmlzaGVkQ291bnQpOwor ICAgIFFDT01QQVJFKGZyYW1lLT51cmwoKSwgYWJvdXRCbGFuayk7CisgICAgUUNPTVBBUkUoZnJh bWUtPnJlcXVlc3RlZFVybCgpLCBRVXJsKCkpOworICAgIFFDT01QQVJFKGZyYW1lLT5iYXNlVXJs KCksIGFib3V0QmxhbmspOworfQorCit2b2lkIHRzdF9RV2ViRnJhbWU6OnNldFVybFRvSW52YWxp ZCgpCit7CisgICAgUVdlYlBhZ2UgcGFnZTsKKyAgICBRV2ViRnJhbWUqIGZyYW1lID0gcGFnZS5t YWluRnJhbWUoKTsKKworICAgIGNvbnN0IFFVcmwgaW52YWxpZFVybCgiaHR0cDovL3N0cmFuZ2U7 aG9zdG5hbWUvaGVyZSIpOworICAgIFFWRVJJRlkoIWludmFsaWRVcmwuaXNFbXB0eSgpKTsKKyAg ICBRVkVSSUZZKCFpbnZhbGlkVXJsLmlzVmFsaWQoKSk7CisgICAgUVZFUklGWShpbnZhbGlkVXJs ICE9IFFVcmwoKSk7CisKKyAgICBmcmFtZS0+c2V0VXJsKGludmFsaWRVcmwpOworICAgIFFDT01Q QVJFKGZyYW1lLT51cmwoKSwgaW52YWxpZFVybCk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnJlcXVl c3RlZFVybCgpLCBpbnZhbGlkVXJsKTsKKyAgICBRQ09NUEFSRShmcmFtZS0+YmFzZVVybCgpLCBp bnZhbGlkVXJsKTsKKworICAgIC8vIFFVcmxzIGVxdWl2YWxlbnQgdG8gUVVybCgpIHdpbGwgYmUg dHJlYXRlZCBhcyBzdWNoLgorICAgIGNvbnN0IFFVcmwgYWJvdXRCbGFuaygiYWJvdXQ6Ymxhbmsi KTsKKyAgICBjb25zdCBRVXJsIGFub3RoZXJJbnZhbGlkVXJsKCIxaHR0cDovL2J1Z3Mud2Via2l0 Lm9yZyIpOworICAgIFFWRVJJRlkoIWFub3RoZXJJbnZhbGlkVXJsLmlzRW1wdHkoKSk7IC8vIGFu ZCB0aGV5IGFyZSBub3QgbmVjZXNzYXJpbHkgZW1wdHkuCisgICAgUVZFUklGWSghYW5vdGhlcklu dmFsaWRVcmwuaXNWYWxpZCgpKTsKKyAgICBRQ09NUEFSRShhbm90aGVySW52YWxpZFVybCwgUVVy bCgpKTsKKworICAgIGZyYW1lLT5zZXRVcmwoYW5vdGhlckludmFsaWRVcmwpOworICAgIFFDT01Q QVJFKGZyYW1lLT51cmwoKSwgYWJvdXRCbGFuayk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnJlcXVl c3RlZFVybCgpLCBhbm90aGVySW52YWxpZFVybCk7CisgICAgUUNPTVBBUkUoZnJhbWUtPmJhc2VV cmwoKSwgYWJvdXRCbGFuayk7Cit9CisKK3ZvaWQgdHN0X1FXZWJGcmFtZTo6c2V0VXJsSGlzdG9y eSgpCit7CisgICAgY29uc3QgUVVybCBhYm91dEJsYW5rKCJhYm91dDpibGFuayIpOworICAgIFFV cmwgdXJsOworICAgIGludCBleHBlY3RlZExvYWRGaW5pc2hlZENvdW50ID0gMDsKKyAgICBRV2Vi RnJhbWUqIGZyYW1lID0gbV9wYWdlLT5tYWluRnJhbWUoKTsKKyAgICBRU2lnbmFsU3B5IHNweShm cmFtZSwgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSkpOworCisgICAgUUNPTVBBUkUobV9wYWdl LT5oaXN0b3J5KCktPmNvdW50KCksIDApOworCisgICAgZnJhbWUtPnNldFVybChRVXJsKCkpOwor ICAgIGV4cGVjdGVkTG9hZEZpbmlzaGVkQ291bnQrKzsKKyAgICBRQ09NUEFSRShzcHkuY291bnQo KSwgZXhwZWN0ZWRMb2FkRmluaXNoZWRDb3VudCk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnVybCgp LCBhYm91dEJsYW5rKTsKKyAgICBRQ09NUEFSRShmcmFtZS0+cmVxdWVzdGVkVXJsKCksIFFVcmwo KSk7CisgICAgUUNPTVBBUkUobV9wYWdlLT5oaXN0b3J5KCktPmNvdW50KCksIDApOworCisgICAg dXJsID0gUVVybCgiaHR0cDovL25vbi5leGlzdGFudC8iKTsKKyAgICBmcmFtZS0+c2V0VXJsKHVy bCk7CisgICAgOjp3YWl0Rm9yU2lnbmFsKG1fcGFnZSwgU0lHTkFMKGxvYWRGaW5pc2hlZChib29s KSkpOworICAgIGV4cGVjdGVkTG9hZEZpbmlzaGVkQ291bnQrKzsKKyAgICBRQ09NUEFSRShzcHku Y291bnQoKSwgZXhwZWN0ZWRMb2FkRmluaXNoZWRDb3VudCk7CisgICAgUUNPTVBBUkUoZnJhbWUt PnVybCgpLCB1cmwpOworICAgIFFDT01QQVJFKGZyYW1lLT5yZXF1ZXN0ZWRVcmwoKSwgdXJsKTsK KyAgICBRQ09NUEFSRShtX3BhZ2UtPmhpc3RvcnkoKS0+Y291bnQoKSwgMCk7CisKKyAgICB1cmwg PSBRVXJsKCJxcmM6L3Rlc3QxLmh0bWwiKTsKKyAgICBmcmFtZS0+c2V0VXJsKHVybCk7CisgICAg Ojp3YWl0Rm9yU2lnbmFsKG1fcGFnZSwgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSkpOworICAg IGV4cGVjdGVkTG9hZEZpbmlzaGVkQ291bnQrKzsKKyAgICBRQ09NUEFSRShzcHkuY291bnQoKSwg ZXhwZWN0ZWRMb2FkRmluaXNoZWRDb3VudCk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnVybCgpLCB1 cmwpOworICAgIFFDT01QQVJFKGZyYW1lLT5yZXF1ZXN0ZWRVcmwoKSwgdXJsKTsKKyAgICBRQ09N UEFSRShtX3BhZ2UtPmhpc3RvcnkoKS0+Y291bnQoKSwgMSk7CisKKyAgICBmcmFtZS0+c2V0VXJs KFFVcmwoKSk7CisgICAgZXhwZWN0ZWRMb2FkRmluaXNoZWRDb3VudCsrOworICAgIFFDT01QQVJF KHNweS5jb3VudCgpLCBleHBlY3RlZExvYWRGaW5pc2hlZENvdW50KTsKKyAgICBRQ09NUEFSRShm cmFtZS0+dXJsKCksIGFib3V0QmxhbmspOworICAgIFFDT01QQVJFKGZyYW1lLT5yZXF1ZXN0ZWRV cmwoKSwgUVVybCgpKTsKKyAgICBRQ09NUEFSRShtX3BhZ2UtPmhpc3RvcnkoKS0+Y291bnQoKSwg MSk7CisKKyAgICAvLyBMb2FkaW5nIHNhbWUgcGFnZSBhcyBjdXJyZW50IGluIGhpc3RvcnksIHNv IGhpc3RvcnkgY291bnQgZG9lc24ndCBjaGFuZ2UuCisgICAgdXJsID0gUVVybCgicXJjOi90ZXN0 MS5odG1sIik7CisgICAgZnJhbWUtPnNldFVybCh1cmwpOworICAgIDo6d2FpdEZvclNpZ25hbCht X3BhZ2UsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpKTsKKyAgICBleHBlY3RlZExvYWRGaW5p c2hlZENvdW50Kys7CisgICAgUUNPTVBBUkUoc3B5LmNvdW50KCksIGV4cGVjdGVkTG9hZEZpbmlz aGVkQ291bnQpOworICAgIFFDT01QQVJFKGZyYW1lLT51cmwoKSwgdXJsKTsKKyAgICBRQ09NUEFS RShmcmFtZS0+cmVxdWVzdGVkVXJsKCksIHVybCk7CisgICAgUUNPTVBBUkUobV9wYWdlLT5oaXN0 b3J5KCktPmNvdW50KCksIDEpOworCisgICAgdXJsID0gUVVybCgicXJjOi90ZXN0Mi5odG1sIik7 CisgICAgZnJhbWUtPnNldFVybCh1cmwpOworICAgIDo6d2FpdEZvclNpZ25hbChtX3BhZ2UsIFNJ R05BTChsb2FkRmluaXNoZWQoYm9vbCkpKTsKKyAgICBleHBlY3RlZExvYWRGaW5pc2hlZENvdW50 Kys7CisgICAgUUNPTVBBUkUoc3B5LmNvdW50KCksIGV4cGVjdGVkTG9hZEZpbmlzaGVkQ291bnQp OworICAgIFFDT01QQVJFKGZyYW1lLT51cmwoKSwgdXJsKTsKKyAgICBRQ09NUEFSRShmcmFtZS0+ cmVxdWVzdGVkVXJsKCksIHVybCk7CisgICAgUUNPTVBBUkUobV9wYWdlLT5oaXN0b3J5KCktPmNv dW50KCksIDIpOworfQorCiBRVEVTVF9NQUlOKHRzdF9RV2ViRnJhbWUpCiAjaW5jbHVkZSAidHN0 X3F3ZWJmcmFtZS5tb2MiCi0tIAoxLjcuNAoK 86716 2011-03-23 15:58:15 -0700 2011-03-24 06:23:15 -0700 patch v4, with comment/changelog fixes 0001-Qt-Resetting-the-URL-property-of-a-QWebView-results-.patch text/plain 13383 cmarcelo RnJvbSA4N2E0ZDc5Y2Q5ZDkyN2M0MjI2ZjY2ZmRjZWQzZjcxZjIyZjBmZTllIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDYWlvIE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gPGNhaW8u b2xpdmVpcmFAb3BlbmJvc3NhLm9yZz4KRGF0ZTogV2VkLCAyMyBNYXIgMjAxMSAxOTo1NDowNCAt MDMwMApTdWJqZWN0OiBbUEFUQ0hdIFtRdF0gUmVzZXR0aW5nIHRoZSBVUkwgcHJvcGVydHkgb2Yg YSBRV2ViVmlldyByZXN1bHRzIGluIHRoZSBjdXJyZW50IGRpcmVjdG9yeSBiZWluZyBzZXQgYXMg ZmlsZTo6LXR5cGUgVVJMCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Mjk1OTUKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKUXQgRGVzaWduZXIgcmVzZXRzIHRo ZSBVUkwgYnkgc2V0dGluZyBpdCB0byBRVXJsKCkuIFRoZSBidWcgd2FzIGNhdXNlZCBieQplbnN1 cmVBYnNvbHV0ZVVybCgpIGhlbHBlciBmdW5jdGlvbiB0cmVhdGluZyB0aGUgZW1wdHkgVVJMIGFz IGEgcmVsYXRpdmUgVVJMLCBhbmQKcHJlcGVuZGluZyB0aGUgY3VycmVudCBkaXJlY3RvcnkuCgpC eSBmaXhpbmcgdGhpcywgbm93IHdlIGNhbiBwYXNzIFFVcmwoKSBpbnZhbGlkIGFuZCBlbXB0eSBV UkxzIHRvIFdlYkNvcmUgbGF5ZXIsIHdoaWNoCndpbGwgZW5kIHVwIGxvYWRpbmcgImFib3V0OmJs YW5rIiwgYnV0IGtlZXBpbmcgaXQgYXMgYSByZXF1ZXN0ZWQgVVJMLgoKUHJldmlvdXNseSB3ZSB3 ZXJlIHN0b3JpbmcgdGhlIG1fbGFzdFJlcXVlc3RlZFVybCBidXQgY29uc2lkZXJpbmcgdGhlIGVt cHR5IFVSTCBhcyBvbmUKb3V0LW9mLWJhbmQgdmFsdWUgdG8gaW5kaWNhdGUgdGhhdCB3ZSBoYWQg bm8gbGFzdFJlcXVlc3RVcmwgc3RvcmVkLiBOb3cgd2UgY2FuJ3QgZG8gdGhhdAphbnltb3JlLCBz byBJJ20gYWRkaW5nIGEgYm9vbCB0byBpbmRpY2F0ZSBpZiB0aGUgbGFzdFJlcXVlc3RVcmwgaXMg c3RvcmVkIGluIHRoZQpGcmFtZUxvYWRlckNsaWVudCBvciBpZiBpcyBzYWZlIHRvIGxvb2sgYXQg dGhlIGN1cnJlbnQgZG9jdW1lbnQuCgpUaGlzIHBhdGNoIGFsc28gYWRkIHRocmVlIG5ldyBhdXRv dGVzdHMsIHRvIGJldHRlciBjb3ZlciB0aGUgZXhwZWN0ZWQgYmVoYXZpb3Igb2Ygc2V0dGluZwp0 aGUgUVVybCgpIGluIGEgUVdlYkZyYW1lLgoKKiBBcGkvcXdlYmZyYW1lLmNwcDoKKGVuc3VyZUFi c29sdXRlVXJsKTogZG8gbm90IHRyZWF0IGludmFsaWQgVVJMcyAoZW1wdHkgaW5jbHVkZWQpIGFz IHJlbGF0aXZlLgooUVdlYkZyYW1lOjpyZXF1ZXN0ZWRVcmwpOiBjaGFuZ2UgdGhlIHdheSB0aGF0 IHdlIHZlcmlmeSBpZiBsYXN0UmVxdWVzdGVkVXJsIGlzIHN0b3JlZAppbiB0aGUgRnJhbWVMb2Fk ZXJDbGllbnQuCgoqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwOgooV2Vi Q29yZTo6RnJhbWVMb2FkZXJDbGllbnRRdDo6RnJhbWVMb2FkZXJDbGllbnRRdCk6CihXZWJDb3Jl OjpGcmFtZUxvYWRlckNsaWVudFF0OjpkaXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKTog ZmlsbCBtX2hhc0xhc3RSZXF1ZXN0ZWRVcmwuCihXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0 OjpkaXNwYXRjaERpZEZpbmlzaExvYWQpOiBkaXR0by4KKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxv YWRlckNsaWVudFF0Lmg6CihXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0OjpoYXNMYXN0UmVx dWVzdGVkVXJsKToKCiogdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwOgoodHN0X1FX ZWJGcmFtZTo6c2V0VXJsVG9FbXB0eSk6IHZlcmlmeSB0aGUgYmVoYXZpb3Igb2Ygc2V0dGluZyBl bXB0eSBVUkxzLiBUaGlzIGluY2x1ZGVzCnRoZSByZWR1Y3Rpb24gb2YgdGhlIGJ1ZyByZXBvcnQu Cih0c3RfUVdlYkZyYW1lOjpzZXRVcmxUb0ludmFsaWQpOiBzZXR0aW5nIGludmFsaWQsIGJ1dCBu b3QgbmVjZXNzYXJpbHkgZW1wdHksIFVSTHMuCih0c3RfUVdlYkZyYW1lOjpzZXRVcmxIaXN0b3J5 KTogdG8gdmVyaWZ5IGhvdyBzZXR0aW5nIGVtcHR5IFVSTHMgYWZmZWN0IGhpc3RvcnkuCi0tLQog U291cmNlL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcCAgICAgICAgICAgICAgICAgfCAgICA3 ICstCiBTb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICB8 ICAgNDAgKysrKysrCiAuLi4vcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5j cHAgICAgICB8ICAgIDMgKwogLi4uL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRl ckNsaWVudFF0LmggfCAgICAzICsKIFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3Rz dF9xd2ViZnJhbWUuY3BwIHwgIDE0NiArKysrKysrKysrKysrKysrKysrKwogNSBmaWxlcyBjaGFu Z2VkLCAxOTUgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwIGIvU291cmNlL1dlYktpdC9xdC9BcGkvcXdl YmZyYW1lLmNwcAppbmRleCBiNGRhYWE0Li43MDI0ZjZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJm cmFtZS5jcHAKQEAgLTczMSw3ICs3MzEsNyBAQCBRTXVsdGlNYXA8UVN0cmluZywgUVN0cmluZz4g UVdlYkZyYW1lOjptZXRhRGF0YSgpIGNvbnN0CiAKIHN0YXRpYyBpbmxpbmUgUVVybCBlbnN1cmVB YnNvbHV0ZVVybChjb25zdCBRVXJsICZ1cmwpCiB7Ci0gICAgaWYgKCF1cmwuaXNSZWxhdGl2ZSgp KQorICAgIGlmICghdXJsLmlzVmFsaWQoKSB8fCAhdXJsLmlzUmVsYXRpdmUoKSkKICAgICAgICAg cmV0dXJuIHVybDsKIAogICAgIC8vIFRoaXMgY29udGFpbnMgdGhlIFVSTCB3aXRoIGFic29sdXRl IHBhdGggYnV0IHdpdGhvdXQgCkBAIC03ODAsOSArNzgwLDggQEAgUVVybCBRV2ViRnJhbWU6OnVy bCgpIGNvbnN0CiAqLwogUVVybCBRV2ViRnJhbWU6OnJlcXVlc3RlZFVybCgpIGNvbnN0CiB7Ci0g ICAgY29uc3QgS1VSTCYgbGFzdFJlcXVlc3RlZFVybCA9IGQtPmZyYW1lTG9hZGVyQ2xpZW50LT5s YXN0UmVxdWVzdGVkVXJsKCk7Ci0gICAgaWYgKGxhc3RSZXF1ZXN0ZWRVcmwuaXNWYWxpZCgpKQot ICAgICAgICByZXR1cm4gbGFzdFJlcXVlc3RlZFVybDsKKyAgICBpZiAoZC0+ZnJhbWVMb2FkZXJD bGllbnQtPmhhc0xhc3RSZXF1ZXN0ZWRVcmwoKSkKKyAgICAgICAgcmV0dXJuIGQtPmZyYW1lTG9h ZGVyQ2xpZW50LT5sYXN0UmVxdWVzdGVkVXJsKCk7CiAgICAgcmV0dXJuIGQtPmZyYW1lLT5sb2Fk ZXIoKS0+b3JpZ2luYWxSZXF1ZXN0KCkudXJsKCk7CiB9CiAvKiEKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXgg Y2Y2YmJmNi4uNmZmNWI4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MyBAQAorMjAxMS0w My0yMyAgQ2FpbyBNYXJjZWxvIGRlIE9saXZlaXJhIEZpbGhvICA8Y2Fpby5vbGl2ZWlyYUBvcGVu Ym9zc2Eub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFtRdF0gUmVzZXR0aW5nIHRoZSBVUkwgcHJvcGVydHkgb2YgYSBRV2ViVmlldyByZXN1bHRz IGluIHRoZSBjdXJyZW50IGRpcmVjdG9yeSBiZWluZyBzZXQgYXMgZmlsZTo6LXR5cGUgVVJMCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTU5NQorCisg ICAgICAgIFF0IERlc2lnbmVyIHJlc2V0cyB0aGUgVVJMIGJ5IHNldHRpbmcgaXQgdG8gUVVybCgp LiBUaGUgYnVnIHdhcyBjYXVzZWQgYnkKKyAgICAgICAgZW5zdXJlQWJzb2x1dGVVcmwoKSBoZWxw ZXIgZnVuY3Rpb24gdHJlYXRpbmcgdGhlIGVtcHR5IFVSTCBhcyBhIHJlbGF0aXZlIFVSTCwgYW5k CisgICAgICAgIHByZXBlbmRpbmcgdGhlIGN1cnJlbnQgZGlyZWN0b3J5LgorCisgICAgICAgIEJ5 IGZpeGluZyB0aGlzLCBub3cgd2UgY2FuIHBhc3MgUVVybCgpIGludmFsaWQgYW5kIGVtcHR5IFVS THMgdG8gV2ViQ29yZSBsYXllciwgd2hpY2gKKyAgICAgICAgd2lsbCBlbmQgdXAgbG9hZGluZyAi YWJvdXQ6YmxhbmsiLCBidXQga2VlcGluZyBpdCBhcyBhIHJlcXVlc3RlZCBVUkwuCisKKyAgICAg ICAgUHJldmlvdXNseSB3ZSB3ZXJlIHN0b3JpbmcgdGhlIG1fbGFzdFJlcXVlc3RlZFVybCBidXQg Y29uc2lkZXJpbmcgdGhlIGVtcHR5IFVSTCBhcyBvbmUKKyAgICAgICAgb3V0LW9mLWJhbmQgdmFs dWUgdG8gaW5kaWNhdGUgdGhhdCB3ZSBoYWQgbm8gbGFzdFJlcXVlc3RVcmwgc3RvcmVkLiBOb3cg d2UgY2FuJ3QgZG8gdGhhdAorICAgICAgICBhbnltb3JlLCBzbyBJJ20gYWRkaW5nIGEgYm9vbCB0 byBpbmRpY2F0ZSBpZiB0aGUgbGFzdFJlcXVlc3RVcmwgaXMgc3RvcmVkIGluIHRoZQorICAgICAg ICBGcmFtZUxvYWRlckNsaWVudCBvciBpZiBpcyBzYWZlIHRvIGxvb2sgYXQgdGhlIGN1cnJlbnQg ZG9jdW1lbnQuCisKKyAgICAgICAgVGhpcyBwYXRjaCBhbHNvIGFkZCB0aHJlZSBuZXcgYXV0b3Rl c3RzLCB0byBiZXR0ZXIgY292ZXIgdGhlIGV4cGVjdGVkIGJlaGF2aW9yIG9mIHNldHRpbmcKKyAg ICAgICAgdGhlIFFVcmwoKSBpbiBhIFFXZWJGcmFtZS4KKworICAgICAgICAqIEFwaS9xd2ViZnJh bWUuY3BwOgorICAgICAgICAoZW5zdXJlQWJzb2x1dGVVcmwpOiBkbyBub3QgdHJlYXQgaW52YWxp ZCBVUkxzIChlbXB0eSBpbmNsdWRlZCkgYXMgcmVsYXRpdmUuCisgICAgICAgIChRV2ViRnJhbWU6 OnJlcXVlc3RlZFVybCk6IGNoYW5nZSB0aGUgd2F5IHRoYXQgd2UgdmVyaWZ5IGlmIGxhc3RSZXF1 ZXN0ZWRVcmwgaXMgc3RvcmVkCisgICAgICAgIGluIHRoZSBGcmFtZUxvYWRlckNsaWVudC4KKwor ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRRdDo6RnJhbWVMb2FkZXJDbGllbnRRdCk6Cisg ICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0OjpkaXNwYXRjaERpZFN0YXJ0UHJv dmlzaW9uYWxMb2FkKTogZmlsbCBtX2hhc0xhc3RSZXF1ZXN0ZWRVcmwuCisgICAgICAgIChXZWJD b3JlOjpGcmFtZUxvYWRlckNsaWVudFF0OjpkaXNwYXRjaERpZEZpbmlzaExvYWQpOiBkaXR0by4K KyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0Lmg6CisgICAgICAg IChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0OjpoYXNMYXN0UmVxdWVzdGVkVXJsKToKKwor ICAgICAgICAqIHRlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcDoKKyAgICAgICAgKHRz dF9RV2ViRnJhbWU6OnNldFVybFRvRW1wdHkpOiB2ZXJpZnkgdGhlIGJlaGF2aW9yIG9mIHNldHRp bmcgZW1wdHkgVVJMcy4gVGhpcyBpbmNsdWRlcworICAgICAgICB0aGUgcmVkdWN0aW9uIG9mIHRo ZSBidWcgcmVwb3J0LgorICAgICAgICAodHN0X1FXZWJGcmFtZTo6c2V0VXJsVG9JbnZhbGlkKTog c2V0dGluZyBpbnZhbGlkLCBidXQgbm90IG5lY2Vzc2FyaWx5IGVtcHR5LCBVUkxzLgorICAgICAg ICAodHN0X1FXZWJGcmFtZTo6c2V0VXJsSGlzdG9yeSk6IHRvIHZlcmlmeSBob3cgc2V0dGluZyBl bXB0eSBVUkxzIGFmZmVjdCBoaXN0b3J5LgorCiAyMDExLTAzLTIzICBZdXJ5IFNlbWlraGF0c2t5 ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZlbGRt YW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9h ZGVyQ2xpZW50UXQuY3BwIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxv YWRlckNsaWVudFF0LmNwcAppbmRleCAyN2VkN2VkLi5kODM0YTg2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAK QEAgLTIwNyw2ICsyMDcsNyBAQCBGcmFtZUxvYWRlckNsaWVudFF0OjpGcmFtZUxvYWRlckNsaWVu dFF0KCkKICAgICAsIG1fcGx1Z2luVmlldygwKQogICAgICwgbV9oYXNTZW50UmVzcG9uc2VUb1Bs dWdpbihmYWxzZSkKICAgICAsIG1faGFzUmVwcmVzZW50YXRpb24oZmFsc2UpCisgICAgLCBtX2hh c0xhc3RSZXF1ZXN0ZWRVcmwoZmFsc2UpCiAgICAgLCBtX2xvYWRFcnJvcihSZXNvdXJjZUVycm9y KCkpCiB7CiB9CkBAIC00MzcsNiArNDM4LDcgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudFF0Ojpk aXNwYXRjaERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKCkKICAgICBpZiAoZHVtcFVzZXJHZXN0dXJl SW5GcmFtZUxvYWRlckNhbGxiYWNrcykKICAgICAgICAgcHJpbnRmKCIlcyAtIGluIGRpZFN0YXJ0 UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWVcbiIsIHFQcmludGFibGUoZHJ0UHJpbnRGcmFtZVVzZXJH ZXN0dXJlU3RhdHVzKG1fZnJhbWUpKSk7CiAKKyAgICBtX2hhc0xhc3RSZXF1ZXN0ZWRVcmwgPSB0 cnVlOwogICAgIG1fbGFzdFJlcXVlc3RlZFVybCA9IG1fZnJhbWUtPmxvYWRlcigpLT5hY3RpdmVE b2N1bWVudExvYWRlcigpLT5yZXF1ZXN0VVJMKCk7CiAKICAgICBpZiAobV93ZWJGcmFtZSkKQEAg LTUyMSw2ICs1MjMsNyBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50UXQ6OmRpc3BhdGNoRGlkRmlu aXNoTG9hZCgpCiAKICAgICAvLyBUaGUgcmVxdWVzdGVkIFVSTCB3aWxsIGJlIGF2YWlsYWJsZSBp biB0aGUgZG9jdW1lbnQgbG9hZGVyIHRoYXQganVzdCBmaW5pc2hlZCwgc28gd2UKICAgICAvLyBk b24ndCBuZWVkIHRvIGtlZXAgaXQgYW55bW9yZS4KKyAgICBtX2hhc0xhc3RSZXF1ZXN0ZWRVcmwg PSBmYWxzZTsKICAgICBtX2xhc3RSZXF1ZXN0ZWRVcmwgPSBLVVJMKCk7CiAKICAgICBpZiAoIW1f d2ViRnJhbWUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50UXQuaCBiL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRRdC5oCmluZGV4IDAzMzM1OTkuLjBkZWRhY2IgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5oCisrKyBi L1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5oCkBA IC0yMzksNiArMjM5LDcgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBQYXNzUmVmUHRyPEZyYW1l TmV0d29ya2luZ0NvbnRleHQ+IGNyZWF0ZU5ldHdvcmtpbmdDb250ZXh0KCk7CiAKKyAgICBib29s IGhhc0xhc3RSZXF1ZXN0ZWRVcmwoKSBjb25zdCB7IHJldHVybiBtX2hhc0xhc3RSZXF1ZXN0ZWRV cmw7IH0KICAgICBjb25zdCBLVVJMJiBsYXN0UmVxdWVzdGVkVXJsKCkgY29uc3QgeyByZXR1cm4g bV9sYXN0UmVxdWVzdGVkVXJsOyB9CiAKICAgICBzdGF0aWMgYm9vbCBkdW1wRnJhbWVMb2FkZXJD YWxsYmFja3M7CkBAIC0yNjksNiArMjcwLDggQEAgcHJpdmF0ZToKICAgICAvLyBTZWUgZmluaXNo ZWRMb2FkaW5nKCkuCiAgICAgYm9vbCBtX2hhc1JlcHJlc2VudGF0aW9uOwogCisgICAgLy8gS1VS TCgpIGlzIGEgdmFsaWQgdXJsLCBzbyBpdCBjYW5ub3QgYmUgdXNlZCB0byBpbmRpY2F0ZSBhIG5v bi1leGlzdGluZyBsYXN0UmVxdWVzdGVkVXJsLgorICAgIGJvb2wgbV9oYXNMYXN0UmVxdWVzdGVk VXJsOwogICAgIEtVUkwgbV9sYXN0UmVxdWVzdGVkVXJsOwogICAgIFJlc291cmNlRXJyb3IgbV9s b2FkRXJyb3I7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJh bWUvdHN0X3F3ZWJmcmFtZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90 c3RfcXdlYmZyYW1lLmNwcAppbmRleCBiYzE1OTRhLi4yYzQ0ZTRjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcApAQCAtNjUwLDYg KzY1MCw5IEBAIHByaXZhdGUgc2xvdHM6CiAgICAgdm9pZCBzZXRDYWNoZUxvYWRDb250cm9sQXR0 cmlidXRlKCk7CiAgICAgdm9pZCBzZXRVcmxXaXRoUGVuZGluZ0xvYWRzKCk7CiAgICAgdm9pZCBz ZXRVcmxXaXRoRnJhZ21lbnQoKTsKKyAgICB2b2lkIHNldFVybFRvRW1wdHkoKTsKKyAgICB2b2lk IHNldFVybFRvSW52YWxpZCgpOworICAgIHZvaWQgc2V0VXJsSGlzdG9yeSgpOwogCiBwcml2YXRl OgogICAgIFFTdHJpbmcgIGV2YWxKUyhjb25zdCBRU3RyaW5nJnMpIHsKQEAgLTMzNDAsNSArMzM0 MywxNDggQEAgdm9pZCB0c3RfUVdlYkZyYW1lOjpzZXRVcmxXaXRoRnJhZ21lbnQoKQogICAgIFFD T01QQVJFKHBhZ2UubWFpbkZyYW1lKCktPnVybCgpLCB1cmwpOwogfQogCit2b2lkIHRzdF9RV2Vi RnJhbWU6OnNldFVybFRvRW1wdHkoKQoreworICAgIGludCBleHBlY3RlZExvYWRGaW5pc2hlZENv dW50ID0gMDsKKyAgICBjb25zdCBRVXJsIGFib3V0QmxhbmsoImFib3V0OmJsYW5rIik7CisgICAg Y29uc3QgUVVybCB1cmwoInFyYzovdGVzdDIuaHRtbCIpOworCisgICAgUVdlYlBhZ2UgcGFnZTsK KyAgICBRV2ViRnJhbWUqIGZyYW1lID0gcGFnZS5tYWluRnJhbWUoKTsKKyAgICBRQ09NUEFSRShm cmFtZS0+dXJsKCksIFFVcmwoKSk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnJlcXVlc3RlZFVybCgp LCBRVXJsKCkpOworICAgIFFDT01QQVJFKGZyYW1lLT5iYXNlVXJsKCksIFFVcmwoKSk7CisKKyAg ICBRU2lnbmFsU3B5IHNweShmcmFtZSwgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSkpOworCisg ICAgLy8gU2V0IGV4aXN0aW5nIHVybAorICAgIGZyYW1lLT5zZXRVcmwodXJsKTsKKyAgICBleHBl Y3RlZExvYWRGaW5pc2hlZENvdW50Kys7CisgICAgOjp3YWl0Rm9yU2lnbmFsKGZyYW1lLCBTSUdO QUwobG9hZEZpbmlzaGVkKGJvb2wpKSk7CisKKyAgICBRQ09NUEFSRShzcHkuY291bnQoKSwgZXhw ZWN0ZWRMb2FkRmluaXNoZWRDb3VudCk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnVybCgpLCB1cmwp OworICAgIFFDT01QQVJFKGZyYW1lLT5yZXF1ZXN0ZWRVcmwoKSwgdXJsKTsKKyAgICBRQ09NUEFS RShmcmFtZS0+YmFzZVVybCgpLCB1cmwpOworCisgICAgLy8gU2V0IGVtcHR5IHVybAorICAgIGZy YW1lLT5zZXRVcmwoUVVybCgpKTsKKyAgICBleHBlY3RlZExvYWRGaW5pc2hlZENvdW50Kys7CisK KyAgICBRQ09NUEFSRShzcHkuY291bnQoKSwgZXhwZWN0ZWRMb2FkRmluaXNoZWRDb3VudCk7Cisg ICAgUUNPTVBBUkUoZnJhbWUtPnVybCgpLCBhYm91dEJsYW5rKTsKKyAgICBRQ09NUEFSRShmcmFt ZS0+cmVxdWVzdGVkVXJsKCksIFFVcmwoKSk7CisgICAgUUNPTVBBUkUoZnJhbWUtPmJhc2VVcmwo KSwgYWJvdXRCbGFuayk7CisKKyAgICAvLyBTZXQgZXhpc3RpbmcgdXJsCisgICAgZnJhbWUtPnNl dFVybCh1cmwpOworICAgIGV4cGVjdGVkTG9hZEZpbmlzaGVkQ291bnQrKzsKKyAgICA6OndhaXRG b3JTaWduYWwoZnJhbWUsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpKTsKKworICAgIFFDT01Q QVJFKHNweS5jb3VudCgpLCBleHBlY3RlZExvYWRGaW5pc2hlZENvdW50KTsKKyAgICBRQ09NUEFS RShmcmFtZS0+dXJsKCksIHVybCk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnJlcXVlc3RlZFVybCgp LCB1cmwpOworICAgIFFDT01QQVJFKGZyYW1lLT5iYXNlVXJsKCksIHVybCk7CisKKyAgICAvLyBM b2FkIGVtcHR5IHVybAorICAgIGZyYW1lLT5sb2FkKFFVcmwoKSk7CisgICAgZXhwZWN0ZWRMb2Fk RmluaXNoZWRDb3VudCsrOworCisgICAgUUNPTVBBUkUoc3B5LmNvdW50KCksIGV4cGVjdGVkTG9h ZEZpbmlzaGVkQ291bnQpOworICAgIFFDT01QQVJFKGZyYW1lLT51cmwoKSwgYWJvdXRCbGFuayk7 CisgICAgUUNPTVBBUkUoZnJhbWUtPnJlcXVlc3RlZFVybCgpLCBRVXJsKCkpOworICAgIFFDT01Q QVJFKGZyYW1lLT5iYXNlVXJsKCksIGFib3V0QmxhbmspOworfQorCit2b2lkIHRzdF9RV2ViRnJh bWU6OnNldFVybFRvSW52YWxpZCgpCit7CisgICAgUVdlYlBhZ2UgcGFnZTsKKyAgICBRV2ViRnJh bWUqIGZyYW1lID0gcGFnZS5tYWluRnJhbWUoKTsKKworICAgIGNvbnN0IFFVcmwgaW52YWxpZFVy bCgiaHR0cDovL3N0cmFuZ2U7aG9zdG5hbWUvaGVyZSIpOworICAgIFFWRVJJRlkoIWludmFsaWRV cmwuaXNFbXB0eSgpKTsKKyAgICBRVkVSSUZZKCFpbnZhbGlkVXJsLmlzVmFsaWQoKSk7CisgICAg UVZFUklGWShpbnZhbGlkVXJsICE9IFFVcmwoKSk7CisKKyAgICBmcmFtZS0+c2V0VXJsKGludmFs aWRVcmwpOworICAgIFFDT01QQVJFKGZyYW1lLT51cmwoKSwgaW52YWxpZFVybCk7CisgICAgUUNP TVBBUkUoZnJhbWUtPnJlcXVlc3RlZFVybCgpLCBpbnZhbGlkVXJsKTsKKyAgICBRQ09NUEFSRShm cmFtZS0+YmFzZVVybCgpLCBpbnZhbGlkVXJsKTsKKworICAgIC8vIFFVcmxzIGVxdWl2YWxlbnQg dG8gUVVybCgpIHdpbGwgYmUgdHJlYXRlZCBhcyBzdWNoLgorICAgIGNvbnN0IFFVcmwgYWJvdXRC bGFuaygiYWJvdXQ6YmxhbmsiKTsKKyAgICBjb25zdCBRVXJsIGFub3RoZXJJbnZhbGlkVXJsKCIx aHR0cDovL2J1Z3Mud2Via2l0Lm9yZyIpOworICAgIFFWRVJJRlkoIWFub3RoZXJJbnZhbGlkVXJs LmlzRW1wdHkoKSk7IC8vIGFuZCB0aGV5IGFyZSBub3QgbmVjZXNzYXJpbHkgZW1wdHkuCisgICAg UVZFUklGWSghYW5vdGhlckludmFsaWRVcmwuaXNWYWxpZCgpKTsKKyAgICBRQ09NUEFSRShhbm90 aGVySW52YWxpZFVybCwgUVVybCgpKTsKKworICAgIGZyYW1lLT5zZXRVcmwoYW5vdGhlckludmFs aWRVcmwpOworICAgIFFDT01QQVJFKGZyYW1lLT51cmwoKSwgYWJvdXRCbGFuayk7CisgICAgUUNP TVBBUkUoZnJhbWUtPnJlcXVlc3RlZFVybCgpLCBhbm90aGVySW52YWxpZFVybCk7CisgICAgUUNP TVBBUkUoZnJhbWUtPmJhc2VVcmwoKSwgYWJvdXRCbGFuayk7Cit9CisKK3ZvaWQgdHN0X1FXZWJG cmFtZTo6c2V0VXJsSGlzdG9yeSgpCit7CisgICAgY29uc3QgUVVybCBhYm91dEJsYW5rKCJhYm91 dDpibGFuayIpOworICAgIFFVcmwgdXJsOworICAgIGludCBleHBlY3RlZExvYWRGaW5pc2hlZENv dW50ID0gMDsKKyAgICBRV2ViRnJhbWUqIGZyYW1lID0gbV9wYWdlLT5tYWluRnJhbWUoKTsKKyAg ICBRU2lnbmFsU3B5IHNweShmcmFtZSwgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSkpOworCisg ICAgUUNPTVBBUkUobV9wYWdlLT5oaXN0b3J5KCktPmNvdW50KCksIDApOworCisgICAgZnJhbWUt PnNldFVybChRVXJsKCkpOworICAgIGV4cGVjdGVkTG9hZEZpbmlzaGVkQ291bnQrKzsKKyAgICBR Q09NUEFSRShzcHkuY291bnQoKSwgZXhwZWN0ZWRMb2FkRmluaXNoZWRDb3VudCk7CisgICAgUUNP TVBBUkUoZnJhbWUtPnVybCgpLCBhYm91dEJsYW5rKTsKKyAgICBRQ09NUEFSRShmcmFtZS0+cmVx dWVzdGVkVXJsKCksIFFVcmwoKSk7CisgICAgUUNPTVBBUkUobV9wYWdlLT5oaXN0b3J5KCktPmNv dW50KCksIDApOworCisgICAgdXJsID0gUVVybCgiaHR0cDovL25vbi5leGlzdGFudC8iKTsKKyAg ICBmcmFtZS0+c2V0VXJsKHVybCk7CisgICAgOjp3YWl0Rm9yU2lnbmFsKG1fcGFnZSwgU0lHTkFM KGxvYWRGaW5pc2hlZChib29sKSkpOworICAgIGV4cGVjdGVkTG9hZEZpbmlzaGVkQ291bnQrKzsK KyAgICBRQ09NUEFSRShzcHkuY291bnQoKSwgZXhwZWN0ZWRMb2FkRmluaXNoZWRDb3VudCk7Cisg ICAgUUNPTVBBUkUoZnJhbWUtPnVybCgpLCB1cmwpOworICAgIFFDT01QQVJFKGZyYW1lLT5yZXF1 ZXN0ZWRVcmwoKSwgdXJsKTsKKyAgICBRQ09NUEFSRShtX3BhZ2UtPmhpc3RvcnkoKS0+Y291bnQo KSwgMCk7CisKKyAgICB1cmwgPSBRVXJsKCJxcmM6L3Rlc3QxLmh0bWwiKTsKKyAgICBmcmFtZS0+ c2V0VXJsKHVybCk7CisgICAgOjp3YWl0Rm9yU2lnbmFsKG1fcGFnZSwgU0lHTkFMKGxvYWRGaW5p c2hlZChib29sKSkpOworICAgIGV4cGVjdGVkTG9hZEZpbmlzaGVkQ291bnQrKzsKKyAgICBRQ09N UEFSRShzcHkuY291bnQoKSwgZXhwZWN0ZWRMb2FkRmluaXNoZWRDb3VudCk7CisgICAgUUNPTVBB UkUoZnJhbWUtPnVybCgpLCB1cmwpOworICAgIFFDT01QQVJFKGZyYW1lLT5yZXF1ZXN0ZWRVcmwo KSwgdXJsKTsKKyAgICBRQ09NUEFSRShtX3BhZ2UtPmhpc3RvcnkoKS0+Y291bnQoKSwgMSk7CisK KyAgICBmcmFtZS0+c2V0VXJsKFFVcmwoKSk7CisgICAgZXhwZWN0ZWRMb2FkRmluaXNoZWRDb3Vu dCsrOworICAgIFFDT01QQVJFKHNweS5jb3VudCgpLCBleHBlY3RlZExvYWRGaW5pc2hlZENvdW50 KTsKKyAgICBRQ09NUEFSRShmcmFtZS0+dXJsKCksIGFib3V0QmxhbmspOworICAgIFFDT01QQVJF KGZyYW1lLT5yZXF1ZXN0ZWRVcmwoKSwgUVVybCgpKTsKKyAgICBRQ09NUEFSRShtX3BhZ2UtPmhp c3RvcnkoKS0+Y291bnQoKSwgMSk7CisKKyAgICAvLyBMb2FkaW5nIHNhbWUgcGFnZSBhcyBjdXJy ZW50IGluIGhpc3RvcnksIHNvIGhpc3RvcnkgY291bnQgZG9lc24ndCBjaGFuZ2UuCisgICAgdXJs ID0gUVVybCgicXJjOi90ZXN0MS5odG1sIik7CisgICAgZnJhbWUtPnNldFVybCh1cmwpOworICAg IDo6d2FpdEZvclNpZ25hbChtX3BhZ2UsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpKTsKKyAg ICBleHBlY3RlZExvYWRGaW5pc2hlZENvdW50Kys7CisgICAgUUNPTVBBUkUoc3B5LmNvdW50KCks IGV4cGVjdGVkTG9hZEZpbmlzaGVkQ291bnQpOworICAgIFFDT01QQVJFKGZyYW1lLT51cmwoKSwg dXJsKTsKKyAgICBRQ09NUEFSRShmcmFtZS0+cmVxdWVzdGVkVXJsKCksIHVybCk7CisgICAgUUNP TVBBUkUobV9wYWdlLT5oaXN0b3J5KCktPmNvdW50KCksIDEpOworCisgICAgdXJsID0gUVVybCgi cXJjOi90ZXN0Mi5odG1sIik7CisgICAgZnJhbWUtPnNldFVybCh1cmwpOworICAgIDo6d2FpdEZv clNpZ25hbChtX3BhZ2UsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpKTsKKyAgICBleHBlY3Rl ZExvYWRGaW5pc2hlZENvdW50Kys7CisgICAgUUNPTVBBUkUoc3B5LmNvdW50KCksIGV4cGVjdGVk TG9hZEZpbmlzaGVkQ291bnQpOworICAgIFFDT01QQVJFKGZyYW1lLT51cmwoKSwgdXJsKTsKKyAg ICBRQ09NUEFSRShmcmFtZS0+cmVxdWVzdGVkVXJsKCksIHVybCk7CisgICAgUUNPTVBBUkUobV9w YWdlLT5oaXN0b3J5KCktPmNvdW50KCksIDIpOworfQorCiBRVEVTVF9NQUlOKHRzdF9RV2ViRnJh bWUpCiAjaW5jbHVkZSAidHN0X3F3ZWJmcmFtZS5tb2MiCi0tIAoxLjcuNAoK 86764 2011-03-24 06:23:15 -0700 2011-03-24 08:30:45 -0700 patch v5, simplify logic for requestedurl 0001-Qt-Resetting-the-URL-property-of-a-QWebView-results-.patch text/plain 11071 cmarcelo RnJvbSAwMDUwNjRjMjFmYWY4MDg3ZDQ5ZTRjY2M1Y2U4MzI1YjRjOTMzMTU4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDYWlvIE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gPGNhaW8u b2xpdmVpcmFAb3BlbmJvc3NhLm9yZz4KRGF0ZTogVGh1LCAyNCBNYXIgMjAxMSAxMDoyMToxNiAt MDMwMApTdWJqZWN0OiBbUEFUQ0hdIFtRdF0gUmVzZXR0aW5nIHRoZSBVUkwgcHJvcGVydHkgb2Yg YSBRV2ViVmlldyByZXN1bHRzIGluIHRoZSBjdXJyZW50IGRpcmVjdG9yeSBiZWluZyBzZXQgYXMg ZmlsZTo6LXR5cGUgVVJMCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Mjk1OTUKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKUXQgRGVzaWduZXIgcmVzZXRzIHRo ZSBVUkwgYnkgc2V0dGluZyBpdCB0byBRVXJsKCkuIFRoZSBidWcgd2FzIGNhdXNlZCBieQplbnN1 cmVBYnNvbHV0ZVVybCgpIGhlbHBlciBmdW5jdGlvbiB0cmVhdGluZyB0aGUgZW1wdHkgVVJMIGFz IGEgcmVsYXRpdmUgVVJMLCBhbmQKcHJlcGVuZGluZyB0aGUgY3VycmVudCBkaXJlY3RvcnkuCgpC eSBmaXhpbmcgdGhpcywgbm93IHdlIGNhbiBwYXNzIFFVcmwoKSBpbnZhbGlkIGFuZCBlbXB0eSBV UkxzIHRvIFdlYkNvcmUgbGF5ZXIsIHdoaWNoCndpbGwgZW5kIHVwIGxvYWRpbmcgImFib3V0OmJs YW5rIiwgYnV0IGtlZXBpbmcgaXQgYXMgYSByZXF1ZXN0ZWQgVVJMLgoKVGhpcyBwYXRjaCBhbHNv IHNpbXBsaWZpZXMgdGhlIGxvZ2ljIGZvciByZXF1ZXN0ZWRVcmwoKSwgc2luY2UgbV9sYXN0UmVx dWVzdGVkVXJsCmlzIGZpbGxlZCBmb3IgdGhlIGxvYWRlZCBVUkxzIGFzIHdlbGwsIHdlIGNhbiB1 c2UgaXQgaW4gZXZlcnkgY2FzZS4KClRocmVlIG5ldyBhdXRvdGVzdHMgd2VyZSBhZGRlZCwgdG8g YmV0dGVyIGNvdmVyIHRoZSBleHBlY3RlZCBiZWhhdmlvciBvZiBzZXR0aW5nCnRoZSBRVXJsKCkg aW4gYSBRV2ViRnJhbWUuCgoqIEFwaS9xd2ViZnJhbWUuY3BwOgooZW5zdXJlQWJzb2x1dGVVcmwp OiBkbyBub3QgdHJlYXQgaW52YWxpZCBVUkxzIChlbXB0eSBpbmNsdWRlZCkgYXMgcmVsYXRpdmUu CihRV2ViRnJhbWU6OnJlcXVlc3RlZFVybCk6IGFsd2F5cyB1c2UgbV9sYXN0UmVxdWVzdGVkVXJs LgoKKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcDoKKFdlYkNvcmU6OkZy YW1lTG9hZGVyQ2xpZW50UXQ6OmRpc3BhdGNoRGlkRmluaXNoTG9hZCk6IGRvIG5vdCBjbGVhciBt X2xhc3RSZXF1ZXN0ZWRVcmwKYW55bW9yZSwgc2luY2Ugd2UgYWx3YXlzIHJlbHkgb24gaXQgZXZl biBmb3IgbG9hZGVkIGZyYW1lcy4KCiogdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3Bw OgoodHN0X1FXZWJGcmFtZTo6c2V0VXJsVG9FbXB0eSk6IHZlcmlmeSB0aGUgYmVoYXZpb3Igb2Yg c2V0dGluZyBlbXB0eSBVUkxzLiBUaGlzIGluY2x1ZGVzCnRoZSByZWR1Y3Rpb24gb2YgdGhlIGJ1 ZyByZXBvcnQuCih0c3RfUVdlYkZyYW1lOjpzZXRVcmxUb0ludmFsaWQpOiBzZXR0aW5nIGludmFs aWQsIGJ1dCBub3QgbmVjZXNzYXJpbHkgZW1wdHksIFVSTHMuCih0c3RfUVdlYkZyYW1lOjpzZXRV cmxIaXN0b3J5KTogdG8gdmVyaWZ5IGhvdyBzZXR0aW5nIGVtcHR5IFVSTHMgYWZmZWN0IGhpc3Rv cnkuCi0tLQogU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcCAgICAgICAgICAgICAg ICAgfCAgICA3ICstCiBTb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAg ICAgICAgICB8ICAgMzQgKysrKysKIC4uLi9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNs aWVudFF0LmNwcCAgICAgIHwgICAgNCAtCiBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFt ZS90c3RfcXdlYmZyYW1lLmNwcCB8ICAxNDYgKysrKysrKysrKysrKysrKysrKysKIDQgZmlsZXMg Y2hhbmdlZCwgMTgyIGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvQXBp L3F3ZWJmcmFtZS5jcHAKaW5kZXggYjRkYWFhNC4uZTUxMjRiZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9x d2ViZnJhbWUuY3BwCkBAIC03MzEsNyArNzMxLDcgQEAgUU11bHRpTWFwPFFTdHJpbmcsIFFTdHJp bmc+IFFXZWJGcmFtZTo6bWV0YURhdGEoKSBjb25zdAogCiBzdGF0aWMgaW5saW5lIFFVcmwgZW5z dXJlQWJzb2x1dGVVcmwoY29uc3QgUVVybCAmdXJsKQogewotICAgIGlmICghdXJsLmlzUmVsYXRp dmUoKSkKKyAgICBpZiAoIXVybC5pc1ZhbGlkKCkgfHwgIXVybC5pc1JlbGF0aXZlKCkpCiAgICAg ICAgIHJldHVybiB1cmw7CiAKICAgICAvLyBUaGlzIGNvbnRhaW5zIHRoZSBVUkwgd2l0aCBhYnNv bHV0ZSBwYXRoIGJ1dCB3aXRob3V0IApAQCAtNzgwLDEwICs3ODAsNyBAQCBRVXJsIFFXZWJGcmFt ZTo6dXJsKCkgY29uc3QKICovCiBRVXJsIFFXZWJGcmFtZTo6cmVxdWVzdGVkVXJsKCkgY29uc3QK IHsKLSAgICBjb25zdCBLVVJMJiBsYXN0UmVxdWVzdGVkVXJsID0gZC0+ZnJhbWVMb2FkZXJDbGll bnQtPmxhc3RSZXF1ZXN0ZWRVcmwoKTsKLSAgICBpZiAobGFzdFJlcXVlc3RlZFVybC5pc1ZhbGlk KCkpCi0gICAgICAgIHJldHVybiBsYXN0UmVxdWVzdGVkVXJsOwotICAgIHJldHVybiBkLT5mcmFt ZS0+bG9hZGVyKCktPm9yaWdpbmFsUmVxdWVzdCgpLnVybCgpOworICAgIHJldHVybiBkLT5mcmFt ZUxvYWRlckNsaWVudC0+bGFzdFJlcXVlc3RlZFVybCgpOwogfQogLyohCiAgICAgXHNpbmNlIDQu NgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 L3F0L0NoYW5nZUxvZwppbmRleCBjZjZiYmY2Li4yOWNkN2I3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAt MSwzICsxLDM3IEBACisyMDExLTAzLTI0ICBDYWlvIE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8g IDxjYWlvLm9saXZlaXJhQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBSZXNldHRpbmcgdGhlIFVSTCBwcm9wZXJ0eSBv ZiBhIFFXZWJWaWV3IHJlc3VsdHMgaW4gdGhlIGN1cnJlbnQgZGlyZWN0b3J5IGJlaW5nIHNldCBh cyBmaWxlOjotdHlwZSBVUkwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTI5NTk1CisKKyAgICAgICAgUXQgRGVzaWduZXIgcmVzZXRzIHRoZSBVUkwgYnkg c2V0dGluZyBpdCB0byBRVXJsKCkuIFRoZSBidWcgd2FzIGNhdXNlZCBieQorICAgICAgICBlbnN1 cmVBYnNvbHV0ZVVybCgpIGhlbHBlciBmdW5jdGlvbiB0cmVhdGluZyB0aGUgZW1wdHkgVVJMIGFz IGEgcmVsYXRpdmUgVVJMLCBhbmQKKyAgICAgICAgcHJlcGVuZGluZyB0aGUgY3VycmVudCBkaXJl Y3RvcnkuCisKKyAgICAgICAgQnkgZml4aW5nIHRoaXMsIG5vdyB3ZSBjYW4gcGFzcyBRVXJsKCkg aW52YWxpZCBhbmQgZW1wdHkgVVJMcyB0byBXZWJDb3JlIGxheWVyLCB3aGljaAorICAgICAgICB3 aWxsIGVuZCB1cCBsb2FkaW5nICJhYm91dDpibGFuayIsIGJ1dCBrZWVwaW5nIGl0IGFzIGEgcmVx dWVzdGVkIFVSTC4KKworICAgICAgICBUaGlzIHBhdGNoIGFsc28gc2ltcGxpZmllcyB0aGUgbG9n aWMgZm9yIHJlcXVlc3RlZFVybCgpLCBzaW5jZSBtX2xhc3RSZXF1ZXN0ZWRVcmwKKyAgICAgICAg aXMgZmlsbGVkIGZvciB0aGUgbG9hZGVkIFVSTHMgYXMgd2VsbCwgd2UgY2FuIHVzZSBpdCBpbiBl dmVyeSBjYXNlLgorCisgICAgICAgIFRocmVlIG5ldyBhdXRvdGVzdHMgd2VyZSBhZGRlZCwgdG8g YmV0dGVyIGNvdmVyIHRoZSBleHBlY3RlZCBiZWhhdmlvciBvZiBzZXR0aW5nCisgICAgICAgIHRo ZSBRVXJsKCkgaW4gYSBRV2ViRnJhbWUuCisKKyAgICAgICAgKiBBcGkvcXdlYmZyYW1lLmNwcDoK KyAgICAgICAgKGVuc3VyZUFic29sdXRlVXJsKTogZG8gbm90IHRyZWF0IGludmFsaWQgVVJMcyAo ZW1wdHkgaW5jbHVkZWQpIGFzIHJlbGF0aXZlLgorICAgICAgICAoUVdlYkZyYW1lOjpyZXF1ZXN0 ZWRVcmwpOiBhbHdheXMgdXNlIG1fbGFzdFJlcXVlc3RlZFVybC4KKworICAgICAgICAqIFdlYkNv cmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJh bWVMb2FkZXJDbGllbnRRdDo6ZGlzcGF0Y2hEaWRGaW5pc2hMb2FkKTogZG8gbm90IGNsZWFyIG1f bGFzdFJlcXVlc3RlZFVybAorICAgICAgICBhbnltb3JlLCBzaW5jZSB3ZSBhbHdheXMgcmVseSBv biBpdCBldmVuIGZvciBsb2FkZWQgZnJhbWVzLgorCisgICAgICAgICogdGVzdHMvcXdlYmZyYW1l L3RzdF9xd2ViZnJhbWUuY3BwOgorICAgICAgICAodHN0X1FXZWJGcmFtZTo6c2V0VXJsVG9FbXB0 eSk6IHZlcmlmeSB0aGUgYmVoYXZpb3Igb2Ygc2V0dGluZyBlbXB0eSBVUkxzLiBUaGlzIGluY2x1 ZGVzCisgICAgICAgIHRoZSByZWR1Y3Rpb24gb2YgdGhlIGJ1ZyByZXBvcnQuCisgICAgICAgICh0 c3RfUVdlYkZyYW1lOjpzZXRVcmxUb0ludmFsaWQpOiBzZXR0aW5nIGludmFsaWQsIGJ1dCBub3Qg bmVjZXNzYXJpbHkgZW1wdHksIFVSTHMuCisgICAgICAgICh0c3RfUVdlYkZyYW1lOjpzZXRVcmxI aXN0b3J5KTogdG8gdmVyaWZ5IGhvdyBzZXR0aW5nIGVtcHR5IFVSTHMgYWZmZWN0IGhpc3Rvcnku CisKIDIwMTEtMDMtMjMgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAgYi9Tb3VyY2Uv V2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwCmluZGV4IDI3 ZWQ3ZWQuLmI5NDIzOTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBv cnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3Jl U3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcApAQCAtNTE5LDEwICs1MTksNiBAQCB2b2lk IEZyYW1lTG9hZGVyQ2xpZW50UXQ6OmRpc3BhdGNoRGlkRmluaXNoTG9hZCgpCiAgICAgLy8gQ2xl YXJzIHRoZSBwcmV2aW91cyBlcnJvci4KICAgICBtX2xvYWRFcnJvciA9IFJlc291cmNlRXJyb3Io KTsKIAotICAgIC8vIFRoZSByZXF1ZXN0ZWQgVVJMIHdpbGwgYmUgYXZhaWxhYmxlIGluIHRoZSBk b2N1bWVudCBsb2FkZXIgdGhhdCBqdXN0IGZpbmlzaGVkLCBzbyB3ZQotICAgIC8vIGRvbid0IG5l ZWQgdG8ga2VlcCBpdCBhbnltb3JlLgotICAgIG1fbGFzdFJlcXVlc3RlZFVybCA9IEtVUkwoKTsK LQogICAgIGlmICghbV93ZWJGcmFtZSkKICAgICAgICAgcmV0dXJuOwogICAgIG1fd2ViRnJhbWUt PnBhZ2UoKS0+ZC0+dXBkYXRlTmF2aWdhdGlvbkFjdGlvbnMoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwIGIvU291cmNlL1dl YktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAKaW5kZXggYmMxNTk0YS4u MmM0NGU0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0 X3F3ZWJmcmFtZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0 X3F3ZWJmcmFtZS5jcHAKQEAgLTY1MCw2ICs2NTAsOSBAQCBwcml2YXRlIHNsb3RzOgogICAgIHZv aWQgc2V0Q2FjaGVMb2FkQ29udHJvbEF0dHJpYnV0ZSgpOwogICAgIHZvaWQgc2V0VXJsV2l0aFBl bmRpbmdMb2FkcygpOwogICAgIHZvaWQgc2V0VXJsV2l0aEZyYWdtZW50KCk7CisgICAgdm9pZCBz ZXRVcmxUb0VtcHR5KCk7CisgICAgdm9pZCBzZXRVcmxUb0ludmFsaWQoKTsKKyAgICB2b2lkIHNl dFVybEhpc3RvcnkoKTsKIAogcHJpdmF0ZToKICAgICBRU3RyaW5nICBldmFsSlMoY29uc3QgUVN0 cmluZyZzKSB7CkBAIC0zMzQwLDUgKzMzNDMsMTQ4IEBAIHZvaWQgdHN0X1FXZWJGcmFtZTo6c2V0 VXJsV2l0aEZyYWdtZW50KCkKICAgICBRQ09NUEFSRShwYWdlLm1haW5GcmFtZSgpLT51cmwoKSwg dXJsKTsKIH0KIAordm9pZCB0c3RfUVdlYkZyYW1lOjpzZXRVcmxUb0VtcHR5KCkKK3sKKyAgICBp bnQgZXhwZWN0ZWRMb2FkRmluaXNoZWRDb3VudCA9IDA7CisgICAgY29uc3QgUVVybCBhYm91dEJs YW5rKCJhYm91dDpibGFuayIpOworICAgIGNvbnN0IFFVcmwgdXJsKCJxcmM6L3Rlc3QyLmh0bWwi KTsKKworICAgIFFXZWJQYWdlIHBhZ2U7CisgICAgUVdlYkZyYW1lKiBmcmFtZSA9IHBhZ2UubWFp bkZyYW1lKCk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnVybCgpLCBRVXJsKCkpOworICAgIFFDT01Q QVJFKGZyYW1lLT5yZXF1ZXN0ZWRVcmwoKSwgUVVybCgpKTsKKyAgICBRQ09NUEFSRShmcmFtZS0+ YmFzZVVybCgpLCBRVXJsKCkpOworCisgICAgUVNpZ25hbFNweSBzcHkoZnJhbWUsIFNJR05BTChs b2FkRmluaXNoZWQoYm9vbCkpKTsKKworICAgIC8vIFNldCBleGlzdGluZyB1cmwKKyAgICBmcmFt ZS0+c2V0VXJsKHVybCk7CisgICAgZXhwZWN0ZWRMb2FkRmluaXNoZWRDb3VudCsrOworICAgIDo6 d2FpdEZvclNpZ25hbChmcmFtZSwgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSkpOworCisgICAg UUNPTVBBUkUoc3B5LmNvdW50KCksIGV4cGVjdGVkTG9hZEZpbmlzaGVkQ291bnQpOworICAgIFFD T01QQVJFKGZyYW1lLT51cmwoKSwgdXJsKTsKKyAgICBRQ09NUEFSRShmcmFtZS0+cmVxdWVzdGVk VXJsKCksIHVybCk7CisgICAgUUNPTVBBUkUoZnJhbWUtPmJhc2VVcmwoKSwgdXJsKTsKKworICAg IC8vIFNldCBlbXB0eSB1cmwKKyAgICBmcmFtZS0+c2V0VXJsKFFVcmwoKSk7CisgICAgZXhwZWN0 ZWRMb2FkRmluaXNoZWRDb3VudCsrOworCisgICAgUUNPTVBBUkUoc3B5LmNvdW50KCksIGV4cGVj dGVkTG9hZEZpbmlzaGVkQ291bnQpOworICAgIFFDT01QQVJFKGZyYW1lLT51cmwoKSwgYWJvdXRC bGFuayk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnJlcXVlc3RlZFVybCgpLCBRVXJsKCkpOworICAg IFFDT01QQVJFKGZyYW1lLT5iYXNlVXJsKCksIGFib3V0QmxhbmspOworCisgICAgLy8gU2V0IGV4 aXN0aW5nIHVybAorICAgIGZyYW1lLT5zZXRVcmwodXJsKTsKKyAgICBleHBlY3RlZExvYWRGaW5p c2hlZENvdW50Kys7CisgICAgOjp3YWl0Rm9yU2lnbmFsKGZyYW1lLCBTSUdOQUwobG9hZEZpbmlz aGVkKGJvb2wpKSk7CisKKyAgICBRQ09NUEFSRShzcHkuY291bnQoKSwgZXhwZWN0ZWRMb2FkRmlu aXNoZWRDb3VudCk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnVybCgpLCB1cmwpOworICAgIFFDT01Q QVJFKGZyYW1lLT5yZXF1ZXN0ZWRVcmwoKSwgdXJsKTsKKyAgICBRQ09NUEFSRShmcmFtZS0+YmFz ZVVybCgpLCB1cmwpOworCisgICAgLy8gTG9hZCBlbXB0eSB1cmwKKyAgICBmcmFtZS0+bG9hZChR VXJsKCkpOworICAgIGV4cGVjdGVkTG9hZEZpbmlzaGVkQ291bnQrKzsKKworICAgIFFDT01QQVJF KHNweS5jb3VudCgpLCBleHBlY3RlZExvYWRGaW5pc2hlZENvdW50KTsKKyAgICBRQ09NUEFSRShm cmFtZS0+dXJsKCksIGFib3V0QmxhbmspOworICAgIFFDT01QQVJFKGZyYW1lLT5yZXF1ZXN0ZWRV cmwoKSwgUVVybCgpKTsKKyAgICBRQ09NUEFSRShmcmFtZS0+YmFzZVVybCgpLCBhYm91dEJsYW5r KTsKK30KKwordm9pZCB0c3RfUVdlYkZyYW1lOjpzZXRVcmxUb0ludmFsaWQoKQoreworICAgIFFX ZWJQYWdlIHBhZ2U7CisgICAgUVdlYkZyYW1lKiBmcmFtZSA9IHBhZ2UubWFpbkZyYW1lKCk7CisK KyAgICBjb25zdCBRVXJsIGludmFsaWRVcmwoImh0dHA6Ly9zdHJhbmdlO2hvc3RuYW1lL2hlcmUi KTsKKyAgICBRVkVSSUZZKCFpbnZhbGlkVXJsLmlzRW1wdHkoKSk7CisgICAgUVZFUklGWSghaW52 YWxpZFVybC5pc1ZhbGlkKCkpOworICAgIFFWRVJJRlkoaW52YWxpZFVybCAhPSBRVXJsKCkpOwor CisgICAgZnJhbWUtPnNldFVybChpbnZhbGlkVXJsKTsKKyAgICBRQ09NUEFSRShmcmFtZS0+dXJs KCksIGludmFsaWRVcmwpOworICAgIFFDT01QQVJFKGZyYW1lLT5yZXF1ZXN0ZWRVcmwoKSwgaW52 YWxpZFVybCk7CisgICAgUUNPTVBBUkUoZnJhbWUtPmJhc2VVcmwoKSwgaW52YWxpZFVybCk7CisK KyAgICAvLyBRVXJscyBlcXVpdmFsZW50IHRvIFFVcmwoKSB3aWxsIGJlIHRyZWF0ZWQgYXMgc3Vj aC4KKyAgICBjb25zdCBRVXJsIGFib3V0QmxhbmsoImFib3V0OmJsYW5rIik7CisgICAgY29uc3Qg UVVybCBhbm90aGVySW52YWxpZFVybCgiMWh0dHA6Ly9idWdzLndlYmtpdC5vcmciKTsKKyAgICBR VkVSSUZZKCFhbm90aGVySW52YWxpZFVybC5pc0VtcHR5KCkpOyAvLyBhbmQgdGhleSBhcmUgbm90 IG5lY2Vzc2FyaWx5IGVtcHR5LgorICAgIFFWRVJJRlkoIWFub3RoZXJJbnZhbGlkVXJsLmlzVmFs aWQoKSk7CisgICAgUUNPTVBBUkUoYW5vdGhlckludmFsaWRVcmwsIFFVcmwoKSk7CisKKyAgICBm cmFtZS0+c2V0VXJsKGFub3RoZXJJbnZhbGlkVXJsKTsKKyAgICBRQ09NUEFSRShmcmFtZS0+dXJs KCksIGFib3V0QmxhbmspOworICAgIFFDT01QQVJFKGZyYW1lLT5yZXF1ZXN0ZWRVcmwoKSwgYW5v dGhlckludmFsaWRVcmwpOworICAgIFFDT01QQVJFKGZyYW1lLT5iYXNlVXJsKCksIGFib3V0Qmxh bmspOworfQorCit2b2lkIHRzdF9RV2ViRnJhbWU6OnNldFVybEhpc3RvcnkoKQoreworICAgIGNv bnN0IFFVcmwgYWJvdXRCbGFuaygiYWJvdXQ6YmxhbmsiKTsKKyAgICBRVXJsIHVybDsKKyAgICBp bnQgZXhwZWN0ZWRMb2FkRmluaXNoZWRDb3VudCA9IDA7CisgICAgUVdlYkZyYW1lKiBmcmFtZSA9 IG1fcGFnZS0+bWFpbkZyYW1lKCk7CisgICAgUVNpZ25hbFNweSBzcHkoZnJhbWUsIFNJR05BTChs b2FkRmluaXNoZWQoYm9vbCkpKTsKKworICAgIFFDT01QQVJFKG1fcGFnZS0+aGlzdG9yeSgpLT5j b3VudCgpLCAwKTsKKworICAgIGZyYW1lLT5zZXRVcmwoUVVybCgpKTsKKyAgICBleHBlY3RlZExv YWRGaW5pc2hlZENvdW50Kys7CisgICAgUUNPTVBBUkUoc3B5LmNvdW50KCksIGV4cGVjdGVkTG9h ZEZpbmlzaGVkQ291bnQpOworICAgIFFDT01QQVJFKGZyYW1lLT51cmwoKSwgYWJvdXRCbGFuayk7 CisgICAgUUNPTVBBUkUoZnJhbWUtPnJlcXVlc3RlZFVybCgpLCBRVXJsKCkpOworICAgIFFDT01Q QVJFKG1fcGFnZS0+aGlzdG9yeSgpLT5jb3VudCgpLCAwKTsKKworICAgIHVybCA9IFFVcmwoImh0 dHA6Ly9ub24uZXhpc3RhbnQvIik7CisgICAgZnJhbWUtPnNldFVybCh1cmwpOworICAgIDo6d2Fp dEZvclNpZ25hbChtX3BhZ2UsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpKTsKKyAgICBleHBl Y3RlZExvYWRGaW5pc2hlZENvdW50Kys7CisgICAgUUNPTVBBUkUoc3B5LmNvdW50KCksIGV4cGVj dGVkTG9hZEZpbmlzaGVkQ291bnQpOworICAgIFFDT01QQVJFKGZyYW1lLT51cmwoKSwgdXJsKTsK KyAgICBRQ09NUEFSRShmcmFtZS0+cmVxdWVzdGVkVXJsKCksIHVybCk7CisgICAgUUNPTVBBUkUo bV9wYWdlLT5oaXN0b3J5KCktPmNvdW50KCksIDApOworCisgICAgdXJsID0gUVVybCgicXJjOi90 ZXN0MS5odG1sIik7CisgICAgZnJhbWUtPnNldFVybCh1cmwpOworICAgIDo6d2FpdEZvclNpZ25h bChtX3BhZ2UsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpKTsKKyAgICBleHBlY3RlZExvYWRG aW5pc2hlZENvdW50Kys7CisgICAgUUNPTVBBUkUoc3B5LmNvdW50KCksIGV4cGVjdGVkTG9hZEZp bmlzaGVkQ291bnQpOworICAgIFFDT01QQVJFKGZyYW1lLT51cmwoKSwgdXJsKTsKKyAgICBRQ09N UEFSRShmcmFtZS0+cmVxdWVzdGVkVXJsKCksIHVybCk7CisgICAgUUNPTVBBUkUobV9wYWdlLT5o aXN0b3J5KCktPmNvdW50KCksIDEpOworCisgICAgZnJhbWUtPnNldFVybChRVXJsKCkpOworICAg IGV4cGVjdGVkTG9hZEZpbmlzaGVkQ291bnQrKzsKKyAgICBRQ09NUEFSRShzcHkuY291bnQoKSwg ZXhwZWN0ZWRMb2FkRmluaXNoZWRDb3VudCk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnVybCgpLCBh Ym91dEJsYW5rKTsKKyAgICBRQ09NUEFSRShmcmFtZS0+cmVxdWVzdGVkVXJsKCksIFFVcmwoKSk7 CisgICAgUUNPTVBBUkUobV9wYWdlLT5oaXN0b3J5KCktPmNvdW50KCksIDEpOworCisgICAgLy8g TG9hZGluZyBzYW1lIHBhZ2UgYXMgY3VycmVudCBpbiBoaXN0b3J5LCBzbyBoaXN0b3J5IGNvdW50 IGRvZXNuJ3QgY2hhbmdlLgorICAgIHVybCA9IFFVcmwoInFyYzovdGVzdDEuaHRtbCIpOworICAg IGZyYW1lLT5zZXRVcmwodXJsKTsKKyAgICA6OndhaXRGb3JTaWduYWwobV9wYWdlLCBTSUdOQUwo bG9hZEZpbmlzaGVkKGJvb2wpKSk7CisgICAgZXhwZWN0ZWRMb2FkRmluaXNoZWRDb3VudCsrOwor ICAgIFFDT01QQVJFKHNweS5jb3VudCgpLCBleHBlY3RlZExvYWRGaW5pc2hlZENvdW50KTsKKyAg ICBRQ09NUEFSRShmcmFtZS0+dXJsKCksIHVybCk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnJlcXVl c3RlZFVybCgpLCB1cmwpOworICAgIFFDT01QQVJFKG1fcGFnZS0+aGlzdG9yeSgpLT5jb3VudCgp LCAxKTsKKworICAgIHVybCA9IFFVcmwoInFyYzovdGVzdDIuaHRtbCIpOworICAgIGZyYW1lLT5z ZXRVcmwodXJsKTsKKyAgICA6OndhaXRGb3JTaWduYWwobV9wYWdlLCBTSUdOQUwobG9hZEZpbmlz aGVkKGJvb2wpKSk7CisgICAgZXhwZWN0ZWRMb2FkRmluaXNoZWRDb3VudCsrOworICAgIFFDT01Q QVJFKHNweS5jb3VudCgpLCBleHBlY3RlZExvYWRGaW5pc2hlZENvdW50KTsKKyAgICBRQ09NUEFS RShmcmFtZS0+dXJsKCksIHVybCk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnJlcXVlc3RlZFVybCgp LCB1cmwpOworICAgIFFDT01QQVJFKG1fcGFnZS0+aGlzdG9yeSgpLT5jb3VudCgpLCAyKTsKK30K KwogUVRFU1RfTUFJTih0c3RfUVdlYkZyYW1lKQogI2luY2x1ZGUgInRzdF9xd2ViZnJhbWUubW9j IgotLSAKMS43LjQKCg==