25867 2009-05-19 10:29:31 -0700 [QT] Implement original_url getter method to the API 2009-07-29 08:21:43 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 27444 0 tonikitoo webkit-unassigned ariya.hidayat kenneth robert tonikitoo oldest_to_newest 121933 0 tonikitoo 2009-05-19 10:29:31 -0700 In some cases (e.g. sites that redirects) the application may be interested in the original URL entered by the user, not only in the resolved one. We should consider including support for that in our API, if convenient. 121934 1 kenneth 2009-05-19 10:32:01 -0700 Please name it originalUrl() and let it return a QUrl. What to do it they user gives an invalid URL? what will originalUrl return? a nulled QUrl? 124139 2 tonikitoo 2009-06-03 06:09:30 -0700 (In reply to comment #1) > What to do it they user gives an invalid URL? what will originalUrl return? a nulled QUrl? it will return an empty qurl, not null. 124140 3 tonikitoo 2009-06-03 06:09:59 -0700 TESTCASE: In practical terms, I am calling "original url" here the url fixed but not yet resolved loaded by the current main frame, e.g. : 1) if user runs: $ ./QtLauncher google.com 2) it gets "fixed" to "http://google.com/" 3) it gets "resolved" to "http://www.google.com" 4) sometimes it also gets "redirected" to other pages , e.g. "http://www.google.com.br" --> originalUrl() would return 2). --> url() would return either 3) or 4). SCENARIO: The motivation for this simple add comes from a feature we needed to implement a while back while working on a frontend for our webkit-efl port [1], and we thought that it could also be useful for other ports. [1] http://code.staikos.net/cgi-bin/gitweb.cgi?p=webkit;a=shortlog;h=shared/webkit-efl In our case we had the following scenario: 1) we have a history management implemented in ui side. 2) during the mainFrame's loading process, it firstly calls |WebCoreSupport::updateGlobalHistory()| passing the URL being loaded(see quoted code below). It is the url not resolved or redirected yet. (...) void FrameLoaderClientQt::updateGlobalHistory() { QWebHistoryInterface *history = QWebHistoryInterface::defaultInterface(); if (history) history->addHistoryEntry(m_frame->loader()->documentLoader()->urlForHistory().prettyURL()); } (...) We stored the url passed in in our history database as a primary key. 3) yet in the loading process, server responses to the loading process and we get urlChanged and titleChanged signals emited. In our case, we want to update the history database entry of the just obtained |title| for the web page. At that time (when titleChanged signal gets emited) we get the original url by calling mainFrame->originalUrl(), find the history entry in the database associated to it and update it w/ the new title value. 129968 4 32309 tonikitoo 2009-07-06 11:21:29 -0700 Created attachment 32309 patch 0.1 - implement originalUrl support ps: I have not figure out a good way to add tests to this. any input welcome. 129977 5 32310 tonikitoo 2009-07-06 12:51:41 -0700 Created attachment 32310 patch 0.2 - implement originalUrl support updated to ToT 131553 6 32310 hausmann 2009-07-14 07:16:55 -0700 Comment on attachment 32310 patch 0.2 - implement originalUrl support Clearing from the review queue as per comment from IRC: <tonikitoo> manyoso, tronical i am finishing originalURl patch ... adding a better test (as suggested by fawek) and better docs, as per simon's suggestion ... 132323 7 32888 tonikitoo 2009-07-16 12:55:58 -0700 Created attachment 32888 patch 0.2 - implement originalUrl support Test added: it creates a proper FakeNetworkAccessManager (:QNetworkAccessManager) and FakeReply (:QNetworkReply) in order to a redirect. 132325 8 32888 tonikitoo 2009-07-16 12:59:18 -0700 Comment on attachment 32888 patch 0.2 - implement originalUrl support see patch 0.3 also in http://code.staikos.net/cgi-bin/gitweb.cgi?p=webkit;a=commitdiff;h=7aa68b24bcf949b3f78c25008e48a5de44d074b6 132387 9 32888 tonikitoo 2009-07-16 16:13:52 -0700 Comment on attachment 32888 patch 0.2 - implement originalUrl support cleanring review flag ... improvements to come ! 132639 10 32958 tonikitoo 2009-07-17 11:06:24 -0700 Created attachment 32958 patch 0.3 - implement originalUrl support WIP: cleaned up 133140 11 33085 tonikitoo 2009-07-20 08:08:23 -0700 Created attachment 33085 patch 0.4 - implement originalUrl support 133141 12 tonikitoo 2009-07-20 08:09:40 -0700 patch is ready for review, but can not land before patch in bug 27444. setting it as a dep. 134222 13 33361 tonikitoo 2009-07-23 13:23:54 -0700 Created attachment 33361 patch 0.5 - implement originalUrl support ready for review. 134250 14 33361 tonikitoo 2009-07-23 14:12:39 -0700 Comment on attachment 33361 patch 0.5 - implement originalUrl support clearing review again. got comments from itc 134523 15 33432 tonikitoo 2009-07-24 05:52:38 -0700 Created attachment 33432 patch 0.6 - implement originalUrl support 1) ran style code script 2) left name as originalURL to match w/ QWebHistory::originalURL (as w/ gtk API ) 3) updated to ToT 4) adde class doc overview 134536 16 tonikitoo 2009-07-24 07:04:55 -0700 branch where to find the neswest patch (easier cherry pick) http://code.staikos.net/cgi-bin/gitweb.cgi?p=webkit;a=shortlog;h=antonio/original-url 134563 17 33432 hausmann 2009-07-24 08:14:58 -0700 Comment on attachment 33432 patch 0.6 - implement originalUrl support r=me Please submit a separate patch for the function renaming, as discussed on IRC :) 134606 18 tonikitoo 2009-07-24 11:22:29 -0700 fixed thanks simon, adam and kenneth. (In reply to comment #17) > (From update of attachment 33432 [details]) > r=me landed in r46364 > Please submit a separate patch for the function renaming, as discussed on IRC > :) landed in r46367 (r=Adam Treat on irc) 135025 19 robert 2009-07-27 14:49:48 -0700 Why the check for d->frameLoaderClient->m_loadSucceeded when deciding which url to return? This check happens to break my use-case of this feature, which is to handle SSL failures that occur as the result of redirects (e.g. https://hotmail.com). When the failure occurs m_loadSucceeded is not yet true, and won't be until the ssl failure is accepted by the user. 135316 20 tonikitoo 2009-07-28 12:15:59 -0700 (In reply to comment #19) > Why the check for d->frameLoaderClient->m_loadSucceeded when deciding which url > to return? mwenge, when the load is not successful (e.g. user loads an non-existent url) the d->loader()->activeDocumentLoader stays referring the latest successful load (not to the latest failing one). so we could not query the originalUrl off of it. please see details in bug 27444 . given that, I used this m_loadSucceeded flag to identify if the load was successful or not. If it is not, we do a special handler for it. > This check happens to break my use-case of this feature, which is to handle SSL > failures that occur as the result of redirects (e.g. https://hotmail.com). When > the failure occurs m_loadSucceeded is not yet true, and won't be until the ssl > failure is accepted by the user. so it is not TRUE yet BUT load has not finished ... hum ... right I will think of something for it. we could have another bug for it, maybe 135595 21 tonikitoo 2009-07-29 08:21:43 -0700 > > This check happens to break my use-case of this feature, which is to handle SSL > > failures that occur as the result of redirects (e.g. https://hotmail.com). When > > the failure occurs m_loadSucceeded is not yet true, and won't be until the ssl > > failure is accepted by the user. > > so it is not TRUE yet BUT load has not finished ... hum ... right I will think > of something for it. we could have another bug for it, maybe filed bug 27804 32309 2009-07-06 11:21:29 -0700 2009-07-06 12:51:41 -0700 patch 0.1 - implement originalUrl support BUG_25867_v1.diff text/plain 2713 tonikitoo Y29tbWl0IDZmYWRiYTEyMmFhNjYzNmViMmIyYjVhYjYwNmJmOWVjYjhiNTg5MDQKQXV0aG9yOiBB bnRvbmlvIEdvbWVzICh0b25pa2l0b28pIDxhbnRvbmlvLmdvbWVzQG9wZW5ib3NzYS5vcmc+CkRh dGU6ICAgV2VkIE1heSAyMCAxNjo0NzozMSAyMDA5IC0wNDAwCgogICAgMjAwOS0wNS0yMCAgQW50 b25pbyBHb21lcyAgIDxhbnRvbmlvLmdvbWVzQG9wZW5ib3NzYS5vcmc+CiAgICAKICAgICAgICBJ bXBsZW1lbnRlZCA6Om9yaWdpbmFsVXJsKCkgbWV0aG9kIGFuZCBvcmlnaW5hbFVybCBwcm9wZXJ0 eSBmb3IgUVdlYkZyYW1lLgogICAgCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CiAgICAKICAgICAgICAqIEFwaS9xd2ViZnJhbWUuY3BwOgogICAgICAgIChRV2ViRnJhbWU6Om9y aWdpbmFsVXJsKToKICAgICAgICAqIEFwaS9xd2ViZnJhbWUuaDoKCmRpZmYgLS1naXQgYS9XZWJL aXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKaW5k ZXggN2FkNmFiZC4uOWY2Y2ZhYSAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUu Y3BwCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcApAQCAtNDg2LDYgKzQ4NiwyNSBA QCBRVXJsIFFXZWJGcmFtZTo6dXJsKCkgY29uc3QKIH0KIAogLyohCisgICAgXHNpbmNlIDQuNgor ICAgIFxwcm9wZXJ0eSBRV2ViRnJhbWU6Om9yaWdpbmFsVXJsCisKKyAgICBUaGUgb3JpZ2luYWwg dXJsIGxvYWRlZCBieSB0aGUgZnJhbWUgY3VycmVudGx5IHZpZXdlZC4gVGhlIFVSTCBtYXkgZGlm ZmVyIGZyb20KKyAgICB0aGUgb25lIHJldHVybmVkIGJ5IHVybCgpIGlmIGEgRE5TIHJlc29sdXRp b24gb3IgYSByZWRpcmVjdGlvbiBvY2N1cnIuCisKKyAgICBJbnZhbGlkIHVybCB3aWxsIHJldHVy biBhbiBlbXB0eSBRVXJsLgorCisgICAgXHNhIHVybCgpLCBzZXRVcmwoKQorKi8KK1FVcmwgUVdl YkZyYW1lOjpvcmlnaW5hbFVybCgpIGNvbnN0Cit7CisgICAgaWYgKCFkLT5mcmFtZS0+bG9hZGVy KCktPmFjdGl2ZURvY3VtZW50TG9hZGVyKCkpCisgICAgICAgIHJldHVybiBRVXJsKCk7CisKKyAg ICByZXR1cm4gZC0+ZnJhbWUtPmxvYWRlcigpLT5vcmlnaW5hbFJlcXVlc3QoKS51cmwoKTsKK30K KworLyohCiAgICAgXHByb3BlcnR5IFFXZWJGcmFtZTo6aWNvbgogICAgIFxicmllZiB0aGUgaWNv biBhc3NvY2lhdGVkIHdpdGggdGhpcyBmcmFtZQogCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBp L3F3ZWJmcmFtZS5oIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuaAppbmRleCAyZjJlNWU2Li4z ZDQwNjUxIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oCisrKyBiL1dlYktp dC9xdC9BcGkvcXdlYmZyYW1lLmgKQEAgLTExMSw2ICsxMTEsNyBAQCBjbGFzcyBRV0VCS0lUX0VY UE9SVCBRV2ViRnJhbWUgOiBwdWJsaWMgUU9iamVjdAogICAgIFFfUFJPUEVSVFkocXJlYWwgem9v bUZhY3RvciBSRUFEIHpvb21GYWN0b3IgV1JJVEUgc2V0Wm9vbUZhY3RvcikKICAgICBRX1BST1BF UlRZKFFTdHJpbmcgdGl0bGUgUkVBRCB0aXRsZSkKICAgICBRX1BST1BFUlRZKFFVcmwgdXJsIFJF QUQgdXJsIFdSSVRFIHNldFVybCkKKyAgICBRX1BST1BFUlRZKFFVcmwgb3JpZ2luYWxVcmwgUkVB RCBvcmlnaW5hbFVybCkKICAgICBRX1BST1BFUlRZKFFJY29uIGljb24gUkVBRCBpY29uKQogICAg IFFfUFJPUEVSVFkoUVNpemUgY29udGVudHNTaXplIFJFQUQgY29udGVudHNTaXplKQogICAgIFFf UFJPUEVSVFkoUVBvaW50IHNjcm9sbFBvc2l0aW9uIFJFQUQgc2Nyb2xsUG9zaXRpb24gV1JJVEUg c2V0U2Nyb2xsUG9zaXRpb24pCkBAIC0xNDIsNiArMTQzLDcgQEAgcHVibGljOgogICAgIFFTdHJp bmcgdGl0bGUoKSBjb25zdDsKICAgICB2b2lkIHNldFVybChjb25zdCBRVXJsICZ1cmwpOwogICAg IFFVcmwgdXJsKCkgY29uc3Q7CisgICAgUVVybCBvcmlnaW5hbFVybCgpIGNvbnN0OwogICAgIFFJ Y29uIGljb24oKSBjb25zdDsKICAgICBRTXVsdGlNYXA8UVN0cmluZywgUVN0cmluZz4gbWV0YURh dGEoKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1dlYktpdC9x dC9DaGFuZ2VMb2cKaW5kZXggZGZhZjc3Ny4uMjhkOTY3ZCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0 L0NoYW5nZUxvZworKysgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC04Niw2ICs4NiwxNiBAQAog ICAgICAgICAodHN0X1FXZWJWaWV3OjpndWVzc1VybEZyb21TdHJpbmdfZGF0YSk6CiAgICAgICAg ICh0c3RfUVdlYlZpZXc6Omd1ZXNzVXJsRnJvbVN0cmluZyk6CiAKKzIwMDktMDUtMjIgIEFudG9u aW8gR29tZXMgICA8YW50b25pby5nb21lc0BvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudGVkIDo6b3JpZ2luYWxV cmwoKSBtZXRob2QgZm9yIFFXZWJGcmFtZS4KKworICAgICAgICAqIEFwaS9xd2ViZnJhbWUuY3Bw OgorICAgICAgICAoUVdlYkZyYW1lOjpvcmlnaW5hbFVybCk6CisgICAgICAgICogQXBpL3F3ZWJm cmFtZS5oOgorCiAyMDA5LTA1LTIzICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+ CiAKICAgICAgICAgUGFydCAyIG9mIDI6IEJ1ZyAyNTQ5NTogSW1wbGVtZW50IFBhc3NPd25QdHIg YW5kIHJlcGxhY2UgdXNlcyBvZiBzdGQ6OmF1dG9fcHRyCg== 32310 2009-07-06 12:51:41 -0700 2009-07-16 12:55:58 -0700 patch 0.2 - implement originalUrl support BUG_25867_v2.diff text/plain 2759 tonikitoo Y29tbWl0IDBlYmU5YzRmN2UyNzdlOGI1Y2JkNWM4YjM0NDU4YTMwNTEwMDViMGIKQXV0aG9yOiBB bnRvbmlvIEdvbWVzICh0b25pa2l0b28pIDxhbnRvbmlvLmdvbWVzQG9wZW5ib3NzYS5vcmc+CkRh dGU6ICAgV2VkIE1heSAyMCAxNjo0NzozMSAyMDA5IC0wNDAwCgogICAgMjAwOS0wNS0yMCAgQW50 b25pbyBHb21lcyAgIDxhbnRvbmlvLmdvbWVzQG9wZW5ib3NzYS5vcmc+CiAgICAKICAgICAgICBJ bXBsZW1lbnRlZCA6Om9yaWdpbmFsVXJsKCkgbWV0aG9kIGFuZCBvcmlnaW5hbFVybCBwcm9wZXJ0 eSBmb3IgUVdlYkZyYW1lLgogICAgCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CiAgICAKICAgICAgICAqIEFwaS9xd2ViZnJhbWUuY3BwOgogICAgICAgIChRV2ViRnJhbWU6Om9y aWdpbmFsVXJsKToKICAgICAgICAqIEFwaS9xd2ViZnJhbWUuaDoKCmRpZmYgLS1naXQgYS9XZWJL aXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKaW5k ZXggMWFhZDJmMy4uZDEwMGE2OSAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUu Y3BwCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcApAQCAtNDk0LDYgKzQ5NCwyNSBA QCBRVXJsIFFXZWJGcmFtZTo6dXJsKCkgY29uc3QKIH0KIAogLyohCisgICAgXHNpbmNlIDQuNgor ICAgIFxwcm9wZXJ0eSBRV2ViRnJhbWU6Om9yaWdpbmFsVXJsCisKKyAgICBUaGUgb3JpZ2luYWwg dXJsIGxvYWRlZCBieSB0aGUgZnJhbWUgY3VycmVudGx5IHZpZXdlZC4gVGhlIFVSTCBtYXkgZGlm ZmVyIGZyb20KKyAgICB0aGUgb25lIHJldHVybmVkIGJ5IHVybCgpIGlmIGEgRE5TIHJlc29sdXRp b24gb3IgYSByZWRpcmVjdGlvbiBvY2N1cnIuCisKKyAgICBJbnZhbGlkIHVybCB3aWxsIHJldHVy biBhbiBlbXB0eSBRVXJsLgorCisgICAgXHNhIHVybCgpLCBzZXRVcmwoKQorKi8KK1FVcmwgUVdl YkZyYW1lOjpvcmlnaW5hbFVybCgpIGNvbnN0Cit7CisgICAgaWYgKCFkLT5mcmFtZS0+bG9hZGVy KCktPmFjdGl2ZURvY3VtZW50TG9hZGVyKCkpCisgICAgICAgIHJldHVybiBRVXJsKCk7CisKKyAg ICByZXR1cm4gZC0+ZnJhbWUtPmxvYWRlcigpLT5vcmlnaW5hbFJlcXVlc3QoKS51cmwoKTsKK30K Ky8qIQorICAgIFxzaW5jZSA0LjYKICAgICBccHJvcGVydHkgUVdlYkZyYW1lOjpiYXNlVXJsCiAg ICAgXGJyaWVmIHRoZSBiYXNlIFVSTCBvZiB0aGUgZnJhbWUsIGNhbiBiZSB1c2VkIHRvIHJlc29s dmUgcmVsYXRpdmUgVVJMcwogICAgIFxzaW5jZSA0LjYKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9B cGkvcXdlYmZyYW1lLmggYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oCmluZGV4IDg1ZGQ1ZWUu LmYwNDljY2QgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmgKKysrIGIvV2Vi S2l0L3F0L0FwaS9xd2ViZnJhbWUuaApAQCAtMTA5LDYgKzEwOSw3IEBAIGNsYXNzIFFXRUJLSVRf RVhQT1JUIFFXZWJGcmFtZSA6IHB1YmxpYyBRT2JqZWN0CiAgICAgUV9QUk9QRVJUWShxcmVhbCB6 b29tRmFjdG9yIFJFQUQgem9vbUZhY3RvciBXUklURSBzZXRab29tRmFjdG9yKQogICAgIFFfUFJP UEVSVFkoUVN0cmluZyB0aXRsZSBSRUFEIHRpdGxlKQogICAgIFFfUFJPUEVSVFkoUVVybCB1cmwg UkVBRCB1cmwgV1JJVEUgc2V0VXJsKQorICAgIFFfUFJPUEVSVFkoUVVybCBvcmlnaW5hbFVybCBS RUFEIG9yaWdpbmFsVXJsKQogICAgIFFfUFJPUEVSVFkoUVVybCBiYXNlVXJsIFJFQUQgYmFzZVVy bCkKICAgICBRX1BST1BFUlRZKFFJY29uIGljb24gUkVBRCBpY29uKQogICAgIFFfUFJPUEVSVFko UVNpemUgY29udGVudHNTaXplIFJFQUQgY29udGVudHNTaXplKQpAQCAtMTQyLDYgKzE0Myw3IEBA IHB1YmxpYzoKICAgICBRU3RyaW5nIHRpdGxlKCkgY29uc3Q7CiAgICAgdm9pZCBzZXRVcmwoY29u c3QgUVVybCAmdXJsKTsKICAgICBRVXJsIHVybCgpIGNvbnN0OworICAgIFFVcmwgb3JpZ2luYWxV cmwoKSBjb25zdDsKICAgICBRVXJsIGJhc2VVcmwoKSBjb25zdDsKICAgICBRSWNvbiBpY29uKCkg Y29uc3Q7CiAgICAgUU11bHRpTWFwPFFTdHJpbmcsIFFTdHJpbmc+IG1ldGFEYXRhKCkgY29uc3Q7 CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpp bmRleCAzMzU1M2YwLi5jNGVkNDNlIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTU1NSw2ICs1NTUsMTYgQEAKICAgICAgICAgKHRz dF9RV2ViVmlldzo6Z3Vlc3NVcmxGcm9tU3RyaW5nX2RhdGEpOgogICAgICAgICAodHN0X1FXZWJW aWV3OjpndWVzc1VybEZyb21TdHJpbmcpOgogCisyMDA5LTA1LTIyICBBbnRvbmlvIEdvbWVzICAg PGFudG9uaW8uZ29tZXNAb3BlbmJvc3NhLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1lbnRlZCA6Om9yaWdpbmFsVXJsKCkgbWV0aG9k IGZvciBRV2ViRnJhbWUuCisKKyAgICAgICAgKiBBcGkvcXdlYmZyYW1lLmNwcDoKKyAgICAgICAg KFFXZWJGcmFtZTo6b3JpZ2luYWxVcmwpOgorICAgICAgICAqIEFwaS9xd2ViZnJhbWUuaDoKKwog MjAwOS0wNS0yMyAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAg IFBhcnQgMiBvZiAyOiBCdWcgMjU0OTU6IEltcGxlbWVudCBQYXNzT3duUHRyIGFuZCByZXBsYWNl IHVzZXMgb2Ygc3RkOjphdXRvX3B0cgo= 32888 2009-07-16 12:55:58 -0700 2009-07-17 11:06:24 -0700 patch 0.2 - implement originalUrl support BUG_25867_v3.diff text/plain 6809 tonikitoo Y29tbWl0IDdhYTY4YjI0YmNmOTQ5YjNmNzhjMjUwMDhlNDhhNWRlNDRkMDc0YjYKQXV0aG9yOiBB bnRvbmlvIEdvbWVzICh0b25pa2l0b28pIDxhbnRvbmlvLmdvbWVzQG9wZW5ib3NzYS5vcmc+CkRh dGU6ICAgVGh1IEp1bCAxNiAxNTo0NjozNiAyMDA5IC0wNDAwCgogICAgMjAwOS0wNy0xNiAgQW50 b25pbyBHb21lcyAgIDxhbnRvbmlvLmdvbWVzQG9wZW5ib3NzYS5vcmc+CiAgICAKICAgICAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAgICAKICAgICAgICAgICAgW1FUXSBJbXBs ZW1lbnQgb3JpZ2luYWxfdXJsIGdldHRlciBtZXRob2QgdG8gdGhlIEFQSQogICAgICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjU4NjcKICAgIAogICAgICAg ICAgICAqIEFwaS9xd2ViZnJhbWUuY3BwOgogICAgICAgICAgICAoUVdlYkZyYW1lOjpvcmlnaW5h bFVybCk6CiAgICAgICAgICAgICogQXBpL3F3ZWJmcmFtZS5oOgogICAgICAgICAgICAqIHRlc3Rz L3F3ZWJmcmFtZS9xd2ViZnJhbWUucXJjOgogICAgICAgICAgICAqIHRlc3RzL3F3ZWJmcmFtZS90 ZXN0MS5odG1sOiBBZGRlZC4KICAgICAgICAgICAgKiB0ZXN0cy9xd2ViZnJhbWUvdGVzdDIuaHRt bDogQWRkZWQuCiAgICAgICAgICAgICogdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3Bw OgoKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcCBiL1dlYktpdC9xdC9B cGkvcXdlYmZyYW1lLmNwcAppbmRleCAyOWQzODBkLi5jZTExZDQ0IDEwMDY0NAotLS0gYS9XZWJL aXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3Bw CkBAIC01MjEsNiArNTIxLDI1IEBAIFFVcmwgUVdlYkZyYW1lOjp1cmwoKSBjb25zdAogfQogCiAv KiEKKyAgICBcc2luY2UgNC42CisgICAgXHByb3BlcnR5IFFXZWJGcmFtZTo6b3JpZ2luYWxVcmwK KworICAgIFRoZSBvcmlnaW5hbCB1cmwgbG9hZGVkIGJ5IHRoZSBmcmFtZSBjdXJyZW50bHkgdmll d2VkLiBUaGUgVVJMIG1heSBkaWZmZXIgZnJvbQorICAgIHRoZSBvbmUgcmV0dXJuZWQgYnkgdXJs KCkgaWYgYSBETlMgcmVzb2x1dGlvbiBvciBhIHJlZGlyZWN0aW9uIG9jY3Vycy4KKworICAgIElu dmFsaWQgdXJsIHdpbGwgcmV0dXJuIGFuIGVtcHR5IFFVcmwuCisKKyAgICBcc2EgdXJsKCksIHNl dFVybCgpCisqLworUVVybCBRV2ViRnJhbWU6Om9yaWdpbmFsVXJsKCkgY29uc3QKK3sKKyAgICBp ZiAoIWQtPmZyYW1lLT5sb2FkZXIoKS0+YWN0aXZlRG9jdW1lbnRMb2FkZXIoKSkKKyAgICAgICAg cmV0dXJuIFFVcmwoKTsKKworICAgIHJldHVybiBkLT5mcmFtZS0+bG9hZGVyKCktPm9yaWdpbmFs UmVxdWVzdCgpLnVybCgpOworfQorLyohCisgICAgXHNpbmNlIDQuNgogICAgIFxwcm9wZXJ0eSBR V2ViRnJhbWU6OmJhc2VVcmwKICAgICBcYnJpZWYgdGhlIGJhc2UgVVJMIG9mIHRoZSBmcmFtZSwg Y2FuIGJlIHVzZWQgdG8gcmVzb2x2ZSByZWxhdGl2ZSBVUkxzCiAgICAgXHNpbmNlIDQuNgpkaWZm IC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuaCBiL1dlYktpdC9xdC9BcGkvcXdlYmZy YW1lLmgKaW5kZXggMmM1MzA5YS4uMDkzNTViMCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9x d2ViZnJhbWUuaAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oCkBAIC0xMDksNiArMTA5 LDcgQEAgY2xhc3MgUVdFQktJVF9FWFBPUlQgUVdlYkZyYW1lIDogcHVibGljIFFPYmplY3QKICAg ICBRX1BST1BFUlRZKHFyZWFsIHpvb21GYWN0b3IgUkVBRCB6b29tRmFjdG9yIFdSSVRFIHNldFpv b21GYWN0b3IpCiAgICAgUV9QUk9QRVJUWShRU3RyaW5nIHRpdGxlIFJFQUQgdGl0bGUpCiAgICAg UV9QUk9QRVJUWShRVXJsIHVybCBSRUFEIHVybCBXUklURSBzZXRVcmwpCisgICAgUV9QUk9QRVJU WShRVXJsIG9yaWdpbmFsVXJsIFJFQUQgb3JpZ2luYWxVcmwpCiAgICAgUV9QUk9QRVJUWShRVXJs IGJhc2VVcmwgUkVBRCBiYXNlVXJsKQogICAgIFFfUFJPUEVSVFkoUUljb24gaWNvbiBSRUFEIGlj b24pCiAgICAgUV9QUk9QRVJUWShRU2l6ZSBjb250ZW50c1NpemUgUkVBRCBjb250ZW50c1NpemUp CkBAIC0xNDIsNiArMTQzLDcgQEAgcHVibGljOgogICAgIFFTdHJpbmcgdGl0bGUoKSBjb25zdDsK ICAgICB2b2lkIHNldFVybChjb25zdCBRVXJsICZ1cmwpOwogICAgIFFVcmwgdXJsKCkgY29uc3Q7 CisgICAgUVVybCBvcmlnaW5hbFVybCgpIGNvbnN0OwogICAgIFFVcmwgYmFzZVVybCgpIGNvbnN0 OwogICAgIFFJY29uIGljb24oKSBjb25zdDsKICAgICBRTXVsdGlNYXA8UVN0cmluZywgUVN0cmlu Zz4gbWV0YURhdGEoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9X ZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDgwNTRjNDcuLjNjMDllYWEgMTAwNjQ0Ci0tLSBhL1dl YktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDA5LTA3LTE2ICBBbnRvbmlvIEdvbWVzICAgPGFudG9uaW8uZ29tZXNAb3BlbmJvc3Nh Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb UVRdIEltcGxlbWVudCBvcmlnaW5hbF91cmwgZ2V0dGVyIG1ldGhvZCB0byB0aGUgQVBJCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTg2NworCisgICAg ICAgICogQXBpL3F3ZWJmcmFtZS5jcHA6CisgICAgICAgIChRV2ViRnJhbWU6Om9yaWdpbmFsVXJs KToKKyAgICAgICAgKiBBcGkvcXdlYmZyYW1lLmg6CisgICAgICAgICogdGVzdHMvcXdlYmZyYW1l L3F3ZWJmcmFtZS5xcmM6CisgICAgICAgICogdGVzdHMvcXdlYmZyYW1lL3Rlc3QxLmh0bWw6IEFk ZGVkLgorICAgICAgICAqIHRlc3RzL3F3ZWJmcmFtZS90ZXN0Mi5odG1sOiBBZGRlZC4KKyAgICAg ICAgKiB0ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHA6CisKIDIwMDktMDctMTUgIFlh ZWwgQWhhcm9uICA8eWFlbC5haGFyb25Abm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IFNpbW9uIEhhdXNtYW5uLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS9x d2ViZnJhbWUucXJjIGIvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS9xd2ViZnJhbWUucXJjCmlu ZGV4IDI2NmNkY2UuLjk2MTVlMjcgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJh bWUvcXdlYmZyYW1lLnFyYworKysgYi9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3F3ZWJmcmFt ZS5xcmMKQEAgLTIsNSArMiw3IEBACiA8cXJlc291cmNlIHByZWZpeD0iLyI+CiA8ZmlsZT5pbWFn ZS5wbmc8L2ZpbGU+CiA8ZmlsZT5zdHlsZS5jc3M8L2ZpbGU+Cis8ZmlsZT50ZXN0MS5odG1sPC9m aWxlPgorPGZpbGU+dGVzdDIuaHRtbDwvZmlsZT4KIDwvcXJlc291cmNlPgogPC9SQ0M+CmRpZmYg LS1naXQgYS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3Rlc3QxLmh0bWwgYi9XZWJLaXQvcXQv dGVzdHMvcXdlYmZyYW1lL3Rlc3QxLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMC4uYjMyM2Y5NgotLS0gL2Rldi9udWxsCisrKyBiL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJh bWUvdGVzdDEuaHRtbApAQCAtMCwwICsxIEBACis8aHRtbD48Ym9keT48cD5Tb21lIHRleHQgMTwv cD48L2JvZHk+PC9odG1sPgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90 ZXN0Mi5odG1sIGIvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90ZXN0Mi5odG1sCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjYzYWMxZjYKLS0tIC9kZXYvbnVsbAorKysgYi9X ZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3Rlc3QyLmh0bWwKQEAgLTAsMCArMSBAQAorPGh0bWw+ PGJvZHk+IDxwPlNvbWUgdGV4dCAyPC9wPjwvYm9keT48L2h0bWw+CmRpZmYgLS1naXQgYS9XZWJL aXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwIGIvV2ViS2l0L3F0L3Rlc3Rz L3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcAppbmRleCBjMGU3MmJlLi4zZmRhYzkwIDEwMDY0 NAotLS0gYS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCisrKyBi L1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAKQEAgLTMxLDYgKzMx LDcgQEAKICNpbmNsdWRlIDxRQ29tYm9Cb3g+CiAjaW5jbHVkZSA8UVJlZ0V4cD4KICNpbmNsdWRl IDxRTmV0d29ya1JlcXVlc3Q+CisjaW5jbHVkZSA8UU5ldHdvcmtSZXBseT4KIC8vVEVTVEVEX0NM QVNTPQogLy9URVNURURfRklMRVM9CiAKQEAgLTU3Myw2ICs1NzQsNyBAQCBwcml2YXRlIHNsb3Rz OgogICAgIHZvaWQgcHJvZ3Jlc3NTaWduYWwoKTsKICAgICB2b2lkIHVybENoYW5nZSgpOwogICAg IHZvaWQgZG9tQ3ljbGVzKCk7CisgICAgdm9pZCBvcmlnaW5hbFVybCgpOwogICAgIHZvaWQgc2V0 SHRtbCgpOwogICAgIHZvaWQgc2V0SHRtbFdpdGhSZXNvdXJjZSgpOwogICAgIHZvaWQgaXB2Nkhv c3RFbmNvZGluZygpOwpAQCAtMjE1OSw2ICsyMTYxLDY0IEBAIHZvaWQgdHN0X1FXZWJGcmFtZTo6 ZG9tQ3ljbGVzKCkKICAgICBRVkVSSUZZKHYudHlwZSgpID09IFFWYXJpYW50OjpNYXApOwogfQog CitjbGFzcyBGYWtlUmVwbHkgOiBwdWJsaWMgUU5ldHdvcmtSZXBseQoreworICAgIFFfT0JKRUNU CisKKyAgICBwdWJsaWM6CisgICAgICAgIEZha2VSZXBseShjb25zdCBRTmV0d29ya1JlcXVlc3Qg JnJlcXVlc3QsIFFPYmplY3QgKnBhcmVudCA9IDApCisgICAgICAgICAgICA6IFFOZXR3b3JrUmVw bHkocGFyZW50KQorICAgICAgICB7CisgICAgICAgICAgICBzZXRPcGVyYXRpb24oUU5ldHdvcmtB Y2Nlc3NNYW5hZ2VyOjpHZXRPcGVyYXRpb24pOworICAgICAgICAgICAgc2V0UmVxdWVzdChyZXF1 ZXN0KTsKKyAgICAgICAgICAgIHNldFVybChyZXF1ZXN0LnVybCgpKTsKKyAgICAgICAgICAgIHNl dEhlYWRlcihRTmV0d29ya1JlcXVlc3Q6OkxvY2F0aW9uSGVhZGVyLCBRU3RyaW5nKCJxcmM6L3Rl c3QyLmh0bWwiKSk7CisgICAgICAgICAgICBzZXRBdHRyaWJ1dGUoUU5ldHdvcmtSZXF1ZXN0OjpS ZWRpcmVjdGlvblRhcmdldEF0dHJpYnV0ZSwgUVVybCgicXJjOi90ZXN0Mi5odG1sIikpOworCisg ICAgICAgICAgICBvcGVuKFFJT0RldmljZTo6UmVhZE9ubHkpOworICAgICAgICAgICAgUVRpbWVy OjpzaW5nbGVTaG90KDAsIHRoaXMsIFNMT1QodGltZW91dCgpKSk7CisgICAgICAgIH0KKyAgICAg ICAgfkZha2VSZXBseSgpIHsgY2xvc2UoKTsgfQorICAgICAgICB2aXJ0dWFsIHZvaWQgYWJvcnQo KSB7fQorICAgICAgICB2aXJ0dWFsIHZvaWQgY2xvc2UoKSB7fSAKKyAgICBwcm90ZWN0ZWQ6IAor ICAgICAgICBxaW50NjQgcmVhZERhdGEoY2hhciAqZGF0YSwgcWludDY0IG1heFNpemUpIHsgcmV0 dXJuIDA7IH0KKyAgICBwcml2YXRlIHNsb3RzOgorICAgICAgICB2b2lkIHRpbWVvdXQoKSB7Cisg ICAgICAgICAgICBlbWl0IG1ldGFEYXRhQ2hhbmdlZCgpOworICAgICAgICAgICAgZW1pdCByZWFk eVJlYWQoKTsKKyAgICAgICAgICAgIGVtaXQgZmluaXNoZWQoKTsKKyAgICAgICAgfQorfTsKKwor Y2xhc3MgRmFrZU5ldHdvcmtNYW5hZ2VyIDogcHVibGljIFFOZXR3b3JrQWNjZXNzTWFuYWdlcgor eworcHVibGljOgorICAgIEZha2VOZXR3b3JrTWFuYWdlcihRT2JqZWN0KiBwYXJlbnQpIDogUU5l dHdvcmtBY2Nlc3NNYW5hZ2VyKHBhcmVudCkgeyBwcmludGYoImFpYWlhXG4iKTt9CisKK3Byb3Rl Y3RlZDoKKyAgICB2aXJ0dWFsIFFOZXR3b3JrUmVwbHkqIGNyZWF0ZVJlcXVlc3QoT3BlcmF0aW9u IG9wLCBjb25zdCBRTmV0d29ya1JlcXVlc3QgJnJlcXVlc3QsIFFJT0RldmljZSogb3V0Z29pbmdE YXRhKSB7CisgICAgICAgIGlmIChvcCA9PSBRTmV0d29ya0FjY2Vzc01hbmFnZXI6OkdldE9wZXJh dGlvbgorICAgICAgICAgICAgJiYgcmVxdWVzdC51cmwoKS50b1N0cmluZygpID09ICJxcmM6L3Rl c3QxLmh0bWwiKQorICAgICAgICAgICAgcmV0dXJuIG5ldyBGYWtlUmVwbHkocmVxdWVzdCwgdGhp cyk7CisKKyAgICAgICAgcmV0dXJuIFFOZXR3b3JrQWNjZXNzTWFuYWdlcjo6Y3JlYXRlUmVxdWVz dChvcCwgcmVxdWVzdCwgb3V0Z29pbmdEYXRhKTsKKyAgICB9Cit9OworCit2b2lkIHRzdF9RV2Vi RnJhbWU6Om9yaWdpbmFsVXJsKCkKK3sKKyAgICBGYWtlTmV0d29ya01hbmFnZXIqIG5ldHdvcmtN YW5hZ2VyID0gbmV3IEZha2VOZXR3b3JrTWFuYWdlcihtX3BhZ2UpOworICAgIG1fcGFnZS0+c2V0 TmV0d29ya0FjY2Vzc01hbmFnZXIobmV0d29ya01hbmFnZXIpOworCisgICAgUVNpZ25hbFNweSBz cHkobV9wYWdlLCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSk7CisgICAgbV92aWV3LT5wYWdl KCktPm1haW5GcmFtZSgpLT5zZXRVcmwoUVVybCgicXJjOi90ZXN0MS5odG1sIikpOworICAgIFFU ZXN0OjpxV2FpdCgyMDApOworICAgIFFDT01QQVJFKHNweS5jb3VudCgpLCAxKTsKKyAgICBRQ09N UEFSRShtX3BhZ2UtPm1haW5GcmFtZSgpLT5vcmlnaW5hbFVybCgpLCBRVXJsKCJxcmM6L3Rlc3Qx Lmh0bWwiKSk7CisgICAgUUNPTVBBUkUobV9wYWdlLT5tYWluRnJhbWUoKS0+dXJsKCksIFFVcmwo InFyYzovdGVzdDIuaHRtbCIpKTsKK30KKwogdm9pZCB0c3RfUVdlYkZyYW1lOjpzZXRIdG1sKCkK IHsKICAgICBRU3RyaW5nIGh0bWwoIjxodG1sPjxoZWFkPjwvaGVhZD48Ym9keT48cD5oZWxsbyB3 b3JsZDwvcD48L2JvZHk+PC9odG1sPiIpOwo= 32958 2009-07-17 11:06:24 -0700 2009-07-20 08:08:23 -0700 patch 0.3 - implement originalUrl support BUG_25867_v3.diff text/plain 6861 tonikitoo Y29tbWl0IDViNmM3ODViZGJjMjRmYWFlYzJlYTgyMTkyOWE4ZDBmY2U4N2ZlNDcKQXV0aG9yOiBB bnRvbmlvIEdvbWVzICh0b25pa2l0b28pIDxhbnRvbmlvLmdvbWVzQG9wZW5ib3NzYS5vcmc+CkRh dGU6ICAgVGh1IEp1bCAxNiAxNTo0NjozNiAyMDA5IC0wNDAwCgogICAgMjAwOS0wNy0xNiAgQW50 b25pbyBHb21lcyAgIDxhbnRvbmlvLmdvbWVzQG9wZW5ib3NzYS5vcmc+CiAgICAKICAgICAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAgICAKICAgICAgICAgICAgW1FUXSBJbXBs ZW1lbnQgb3JpZ2luYWxfdXJsIGdldHRlciBtZXRob2QgdG8gdGhlIEFQSQogICAgICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjU4NjcKICAgIAogICAgICAg ICAgICAqIEFwaS9xd2ViZnJhbWUuY3BwOgogICAgICAgICAgICAoUVdlYkZyYW1lOjpvcmlnaW5h bFVybCk6CiAgICAgICAgICAgICogQXBpL3F3ZWJmcmFtZS5oOgogICAgICAgICAgICAqIHRlc3Rz L3F3ZWJmcmFtZS9xd2ViZnJhbWUucXJjOgogICAgICAgICAgICAqIHRlc3RzL3F3ZWJmcmFtZS90 ZXN0MS5odG1sOiBBZGRlZC4KICAgICAgICAgICAgKiB0ZXN0cy9xd2ViZnJhbWUvdGVzdDIuaHRt bDogQWRkZWQuCiAgICAgICAgICAgICogdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3Bw OgoKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcCBiL1dlYktpdC9xdC9B cGkvcXdlYmZyYW1lLmNwcAppbmRleCAyOWQzODBkLi5jZTExZDQ0IDEwMDY0NAotLS0gYS9XZWJL aXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3Bw CkBAIC01MjEsNiArNTIxLDI1IEBAIFFVcmwgUVdlYkZyYW1lOjp1cmwoKSBjb25zdAogfQogCiAv KiEKKyAgICBcc2luY2UgNC42CisgICAgXHByb3BlcnR5IFFXZWJGcmFtZTo6b3JpZ2luYWxVcmwK KworICAgIFRoZSBvcmlnaW5hbCB1cmwgbG9hZGVkIGJ5IHRoZSBmcmFtZSBjdXJyZW50bHkgdmll d2VkLiBUaGUgVVJMIG1heSBkaWZmZXIgZnJvbQorICAgIHRoZSBvbmUgcmV0dXJuZWQgYnkgdXJs KCkgaWYgYSBETlMgcmVzb2x1dGlvbiBvciBhIHJlZGlyZWN0aW9uIG9jY3Vycy4KKworICAgIElu dmFsaWQgdXJsIHdpbGwgcmV0dXJuIGFuIGVtcHR5IFFVcmwuCisKKyAgICBcc2EgdXJsKCksIHNl dFVybCgpCisqLworUVVybCBRV2ViRnJhbWU6Om9yaWdpbmFsVXJsKCkgY29uc3QKK3sKKyAgICBp ZiAoIWQtPmZyYW1lLT5sb2FkZXIoKS0+YWN0aXZlRG9jdW1lbnRMb2FkZXIoKSkKKyAgICAgICAg cmV0dXJuIFFVcmwoKTsKKworICAgIHJldHVybiBkLT5mcmFtZS0+bG9hZGVyKCktPm9yaWdpbmFs UmVxdWVzdCgpLnVybCgpOworfQorLyohCisgICAgXHNpbmNlIDQuNgogICAgIFxwcm9wZXJ0eSBR V2ViRnJhbWU6OmJhc2VVcmwKICAgICBcYnJpZWYgdGhlIGJhc2UgVVJMIG9mIHRoZSBmcmFtZSwg Y2FuIGJlIHVzZWQgdG8gcmVzb2x2ZSByZWxhdGl2ZSBVUkxzCiAgICAgXHNpbmNlIDQuNgpkaWZm IC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuaCBiL1dlYktpdC9xdC9BcGkvcXdlYmZy YW1lLmgKaW5kZXggMmM1MzA5YS4uMDkzNTViMCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9x d2ViZnJhbWUuaAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oCkBAIC0xMDksNiArMTA5 LDcgQEAgY2xhc3MgUVdFQktJVF9FWFBPUlQgUVdlYkZyYW1lIDogcHVibGljIFFPYmplY3QKICAg ICBRX1BST1BFUlRZKHFyZWFsIHpvb21GYWN0b3IgUkVBRCB6b29tRmFjdG9yIFdSSVRFIHNldFpv b21GYWN0b3IpCiAgICAgUV9QUk9QRVJUWShRU3RyaW5nIHRpdGxlIFJFQUQgdGl0bGUpCiAgICAg UV9QUk9QRVJUWShRVXJsIHVybCBSRUFEIHVybCBXUklURSBzZXRVcmwpCisgICAgUV9QUk9QRVJU WShRVXJsIG9yaWdpbmFsVXJsIFJFQUQgb3JpZ2luYWxVcmwpCiAgICAgUV9QUk9QRVJUWShRVXJs IGJhc2VVcmwgUkVBRCBiYXNlVXJsKQogICAgIFFfUFJPUEVSVFkoUUljb24gaWNvbiBSRUFEIGlj b24pCiAgICAgUV9QUk9QRVJUWShRU2l6ZSBjb250ZW50c1NpemUgUkVBRCBjb250ZW50c1NpemUp CkBAIC0xNDIsNiArMTQzLDcgQEAgcHVibGljOgogICAgIFFTdHJpbmcgdGl0bGUoKSBjb25zdDsK ICAgICB2b2lkIHNldFVybChjb25zdCBRVXJsICZ1cmwpOwogICAgIFFVcmwgdXJsKCkgY29uc3Q7 CisgICAgUVVybCBvcmlnaW5hbFVybCgpIGNvbnN0OwogICAgIFFVcmwgYmFzZVVybCgpIGNvbnN0 OwogICAgIFFJY29uIGljb24oKSBjb25zdDsKICAgICBRTXVsdGlNYXA8UVN0cmluZywgUVN0cmlu Zz4gbWV0YURhdGEoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9X ZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDgwNTRjNDcuLjNjMDllYWEgMTAwNjQ0Ci0tLSBhL1dl YktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDA5LTA3LTE2ICBBbnRvbmlvIEdvbWVzICAgPGFudG9uaW8uZ29tZXNAb3BlbmJvc3Nh Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb UVRdIEltcGxlbWVudCBvcmlnaW5hbF91cmwgZ2V0dGVyIG1ldGhvZCB0byB0aGUgQVBJCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTg2NworCisgICAg ICAgICogQXBpL3F3ZWJmcmFtZS5jcHA6CisgICAgICAgIChRV2ViRnJhbWU6Om9yaWdpbmFsVXJs KToKKyAgICAgICAgKiBBcGkvcXdlYmZyYW1lLmg6CisgICAgICAgICogdGVzdHMvcXdlYmZyYW1l L3F3ZWJmcmFtZS5xcmM6CisgICAgICAgICogdGVzdHMvcXdlYmZyYW1lL3Rlc3QxLmh0bWw6IEFk ZGVkLgorICAgICAgICAqIHRlc3RzL3F3ZWJmcmFtZS90ZXN0Mi5odG1sOiBBZGRlZC4KKyAgICAg ICAgKiB0ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHA6CisKIDIwMDktMDctMTUgIFlh ZWwgQWhhcm9uICA8eWFlbC5haGFyb25Abm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IFNpbW9uIEhhdXNtYW5uLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS9x d2ViZnJhbWUucXJjIGIvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS9xd2ViZnJhbWUucXJjCmlu ZGV4IDI2NmNkY2UuLjk2MTVlMjcgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJh bWUvcXdlYmZyYW1lLnFyYworKysgYi9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3F3ZWJmcmFt ZS5xcmMKQEAgLTIsNSArMiw3IEBACiA8cXJlc291cmNlIHByZWZpeD0iLyI+CiA8ZmlsZT5pbWFn ZS5wbmc8L2ZpbGU+CiA8ZmlsZT5zdHlsZS5jc3M8L2ZpbGU+Cis8ZmlsZT50ZXN0MS5odG1sPC9m aWxlPgorPGZpbGU+dGVzdDIuaHRtbDwvZmlsZT4KIDwvcXJlc291cmNlPgogPC9SQ0M+CmRpZmYg LS1naXQgYS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3Rlc3QxLmh0bWwgYi9XZWJLaXQvcXQv dGVzdHMvcXdlYmZyYW1lL3Rlc3QxLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMC4uYjMyM2Y5NgotLS0gL2Rldi9udWxsCisrKyBiL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJh bWUvdGVzdDEuaHRtbApAQCAtMCwwICsxIEBACis8aHRtbD48Ym9keT48cD5Tb21lIHRleHQgMTwv cD48L2JvZHk+PC9odG1sPgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90 ZXN0Mi5odG1sIGIvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90ZXN0Mi5odG1sCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjYzYWMxZjYKLS0tIC9kZXYvbnVsbAorKysgYi9X ZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3Rlc3QyLmh0bWwKQEAgLTAsMCArMSBAQAorPGh0bWw+ PGJvZHk+IDxwPlNvbWUgdGV4dCAyPC9wPjwvYm9keT48L2h0bWw+CmRpZmYgLS1naXQgYS9XZWJL aXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwIGIvV2ViS2l0L3F0L3Rlc3Rz L3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcAppbmRleCBjMGU3MmJlLi45ZjgwNDNkIDEwMDY0 NAotLS0gYS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCisrKyBi L1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAKQEAgLTMxLDYgKzMx LDcgQEAKICNpbmNsdWRlIDxRQ29tYm9Cb3g+CiAjaW5jbHVkZSA8UVJlZ0V4cD4KICNpbmNsdWRl IDxRTmV0d29ya1JlcXVlc3Q+CisjaW5jbHVkZSA8UU5ldHdvcmtSZXBseT4KIC8vVEVTVEVEX0NM QVNTPQogLy9URVNURURfRklMRVM9CiAKQEAgLTU3Myw2ICs1NzQsNyBAQCBwcml2YXRlIHNsb3Rz OgogICAgIHZvaWQgcHJvZ3Jlc3NTaWduYWwoKTsKICAgICB2b2lkIHVybENoYW5nZSgpOwogICAg IHZvaWQgZG9tQ3ljbGVzKCk7CisgICAgdm9pZCBvcmlnaW5hbFVybCgpOwogICAgIHZvaWQgc2V0 SHRtbCgpOwogICAgIHZvaWQgc2V0SHRtbFdpdGhSZXNvdXJjZSgpOwogICAgIHZvaWQgaXB2Nkhv c3RFbmNvZGluZygpOwpAQCAtMjE1OSw2ICsyMTYxLDY4IEBAIHZvaWQgdHN0X1FXZWJGcmFtZTo6 ZG9tQ3ljbGVzKCkKICAgICBRVkVSSUZZKHYudHlwZSgpID09IFFWYXJpYW50OjpNYXApOwogfQog CitjbGFzcyBGYWtlUmVwbHkgOiBwdWJsaWMgUU5ldHdvcmtSZXBseQoreworICAgIFFfT0JKRUNU CisKKyAgICBwdWJsaWM6CisgICAgICAgIEZha2VSZXBseShjb25zdCBRTmV0d29ya1JlcXVlc3Qg JnJlcXVlc3QsIFFPYmplY3QgKnBhcmVudCA9IDApCisgICAgICAgICAgICA6IFFOZXR3b3JrUmVw bHkocGFyZW50KQorICAgICAgICB7CisgICAgICAgICAgICBzZXRPcGVyYXRpb24oUU5ldHdvcmtB Y2Nlc3NNYW5hZ2VyOjpHZXRPcGVyYXRpb24pOworICAgICAgICAgICAgc2V0UmVxdWVzdChyZXF1 ZXN0KTsKKyAgICAgICAgICAgIHNldFVybChyZXF1ZXN0LnVybCgpKTsKKyAgICAgICAgICAgIHNl dEhlYWRlcihRTmV0d29ya1JlcXVlc3Q6OkxvY2F0aW9uSGVhZGVyLCBRU3RyaW5nKCJxcmM6L3Rl c3QyLmh0bWwiKSk7CisgICAgICAgICAgICBzZXRBdHRyaWJ1dGUoUU5ldHdvcmtSZXF1ZXN0OjpS ZWRpcmVjdGlvblRhcmdldEF0dHJpYnV0ZSwgUVVybCgicXJjOi90ZXN0Mi5odG1sIikpOworCisg ICAgICAgICAgICBvcGVuKFFJT0RldmljZTo6UmVhZE9ubHkpOworICAgICAgICAgICAgUVRpbWVy OjpzaW5nbGVTaG90KDAsIHRoaXMsIFNMT1QodGltZW91dCgpKSk7CisgICAgICAgIH0KKyAgICAg ICAgfkZha2VSZXBseSgpIHsgY2xvc2UoKTsgfQorICAgICAgICB2aXJ0dWFsIHZvaWQgYWJvcnQo KSB7fQorICAgICAgICB2aXJ0dWFsIHZvaWQgY2xvc2UoKSB7fSAKKyAgICBwcm90ZWN0ZWQ6IAor ICAgICAgICBxaW50NjQgcmVhZERhdGEoY2hhciAqZGF0YSwgcWludDY0IG1heFNpemUpIHsgcmV0 dXJuIDA7IH0KKyAgICBwcml2YXRlIHNsb3RzOgorICAgICAgICB2b2lkIHRpbWVvdXQoKSB7Cisg ICAgICAgICAgICBlbWl0IG1ldGFEYXRhQ2hhbmdlZCgpOworICAgICAgICAgICAgZW1pdCByZWFk eVJlYWQoKTsKKyAgICAgICAgICAgIGVtaXQgZmluaXNoZWQoKTsKKyAgICAgICAgfQorfTsKKwor Y2xhc3MgRmFrZU5ldHdvcmtNYW5hZ2VyIDogcHVibGljIFFOZXR3b3JrQWNjZXNzTWFuYWdlcgor eworcHVibGljOgorICAgIEZha2VOZXR3b3JrTWFuYWdlcihRT2JqZWN0KiBwYXJlbnQpIDogUU5l dHdvcmtBY2Nlc3NNYW5hZ2VyKHBhcmVudCkgeyB9CisKK3Byb3RlY3RlZDoKKyAgICB2aXJ0dWFs IFFOZXR3b3JrUmVwbHkqIGNyZWF0ZVJlcXVlc3QoT3BlcmF0aW9uIG9wLCBjb25zdCBRTmV0d29y a1JlcXVlc3QgJnJlcXVlc3QsIFFJT0RldmljZSogb3V0Z29pbmdEYXRhKSB7CisgICAgICAgIGlm IChvcCA9PSBRTmV0d29ya0FjY2Vzc01hbmFnZXI6OkdldE9wZXJhdGlvbgorICAgICAgICAgICAg JiYgcmVxdWVzdC51cmwoKS50b1N0cmluZygpID09ICJxcmM6L3Rlc3QxLmh0bWwiKQorICAgICAg ICAgICAgcmV0dXJuIG5ldyBGYWtlUmVwbHkocmVxdWVzdCwgdGhpcyk7CisKKyAgICAgICAgcmV0 dXJuIFFOZXR3b3JrQWNjZXNzTWFuYWdlcjo6Y3JlYXRlUmVxdWVzdChvcCwgcmVxdWVzdCwgb3V0 Z29pbmdEYXRhKTsKKyAgICB9Cit9OworCit2b2lkIHRzdF9RV2ViRnJhbWU6Om9yaWdpbmFsVXJs KCkKK3sKKyAgICBRV2ViUGFnZSBwYWdlOworICAgIFFXZWJGcmFtZSogZnJhbWUgPSBwYWdlLm1h aW5GcmFtZSgpOworCisgICAgLy8gaW4gZmV3IHNlY29uZHMsIHRoZSBpbWFnZSBzaG91bGQgYmUg Y29tcGxldGV5IGxvYWRlZAorICAgIFFTaWduYWxTcHkgc3B5KCZwYWdlLCBTSUdOQUwobG9hZEZp bmlzaGVkKGJvb2wpKSk7CisgICAgRmFrZU5ldHdvcmtNYW5hZ2VyKiBuZXR3b3JrTWFuYWdlciA9 IG5ldyBGYWtlTmV0d29ya01hbmFnZXIoJnBhZ2UpOworICAgIHBhZ2Uuc2V0TmV0d29ya0FjY2Vz c01hbmFnZXIobmV0d29ya01hbmFnZXIpOworCisgICAgZnJhbWUtPnNldFVybChRVXJsKCJxcmM6 L3Rlc3QxLmh0bWwiKSk7CisgICAgUVRlc3Q6OnFXYWl0KDIwMCk7CisgICAgUUNPTVBBUkUoc3B5 LmNvdW50KCksIDEpOworICAgIFFDT01QQVJFKGZyYW1lLT5vcmlnaW5hbFVybCgpLCBRVXJsKCJx cmM6L3Rlc3QxLmh0bWwiKSk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnVybCgpLCBRVXJsKCJxcmM6 L3Rlc3QyLmh0bWwiKSk7Cit9CisKIHZvaWQgdHN0X1FXZWJGcmFtZTo6c2V0SHRtbCgpCiB7CiAg ICAgUVN0cmluZyBodG1sKCI8aHRtbD48aGVhZD48L2hlYWQ+PGJvZHk+PHA+aGVsbG8gd29ybGQ8 L3A+PC9ib2R5PjwvaHRtbD4iKTsK 33085 2009-07-20 08:08:23 -0700 2009-07-23 13:23:54 -0700 patch 0.4 - implement originalUrl support BUG_25867_v4.diff text/plain 7737 tonikitoo Y29tbWl0IGY4YTI3YzFiYWVmNmJlMGZjZjAwMjQ2YjljMjQ5NWY3ZjIxNmVlNzYKQXV0aG9yOiBB bnRvbmlvIEdvbWVzICh0b25pa2l0b28pIDxhbnRvbmlvLmdvbWVzQG9wZW5ib3NzYS5vcmc+CkRh dGU6ICAgVGh1IEp1bCAxNiAxNTo0NjozNiAyMDA5IC0wNDAwCgogICAgMjAwOS0wNy0xNiAgQW50 b25pbyBHb21lcyAgIDxhbnRvbmlvLmdvbWVzQG9wZW5ib3NzYS5vcmc+CiAgICAKICAgICAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAgICAKICAgICAgICAgICAgW1FUXSBJbXBs ZW1lbnQgb3JpZ2luYWxfdXJsIGdldHRlciBtZXRob2QgdG8gdGhlIEFQSQogICAgICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjU4NjcKICAgIAogICAgICAg ICAgICAqIEFwaS9xd2ViZnJhbWUuY3BwOgogICAgICAgICAgICAoUVdlYkZyYW1lOjpvcmlnaW5h bFVybCk6CiAgICAgICAgICAgICogQXBpL3F3ZWJmcmFtZS5oOgogICAgICAgICAgICAqIHRlc3Rz L3F3ZWJmcmFtZS9xd2ViZnJhbWUucXJjOgogICAgICAgICAgICAqIHRlc3RzL3F3ZWJmcmFtZS90 ZXN0MS5odG1sOiBBZGRlZC4KICAgICAgICAgICAgKiB0ZXN0cy9xd2ViZnJhbWUvdGVzdDIuaHRt bDogQWRkZWQuCiAgICAgICAgICAgICogdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3Bw OgoKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcCBiL1dlYktpdC9xdC9B cGkvcXdlYmZyYW1lLmNwcAppbmRleCBiNmU0YTlkLi43MzZhYzFjIDEwMDY0NAotLS0gYS9XZWJL aXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3Bw CkBAIC01MjEsNiArNTIxLDI1IEBAIFFVcmwgUVdlYkZyYW1lOjp1cmwoKSBjb25zdAogfQogCiAv KiEKKyAgICBcc2luY2UgNC42CisgICAgXHByb3BlcnR5IFFXZWJGcmFtZTo6b3JpZ2luYWxVcmwK KworICAgIFRoZSBvcmlnaW5hbCB1cmwgbG9hZGVkIGJ5IHRoZSBmcmFtZSBjdXJyZW50bHkgdmll d2VkLiBUaGUgVVJMIG1heSBkaWZmZXIgZnJvbQorICAgIHRoZSBvbmUgcmV0dXJuZWQgYnkgdXJs KCkgaWYgYSBETlMgcmVzb2x1dGlvbiBvciBhIHJlZGlyZWN0aW9uIG9jY3Vycy4KKworICAgIElu dmFsaWQgdXJsIHdpbGwgcmV0dXJuIGFuIGVtcHR5IFFVcmwuCisKKyAgICBcc2EgdXJsKCksIHNl dFVybCgpCisqLworUVVybCBRV2ViRnJhbWU6Om9yaWdpbmFsVXJsKCkgY29uc3QKK3sKKyAgICBp ZiAoIWQtPmZyYW1lLT5sb2FkZXIoKS0+YWN0aXZlRG9jdW1lbnRMb2FkZXIoKSkKKyAgICAgICAg cmV0dXJuIFFVcmwoKTsKKworICAgIHJldHVybiBkLT5mcmFtZS0+bG9hZGVyKCktPm9yaWdpbmFs UmVxdWVzdCgpLnVybCgpOworfQorLyohCisgICAgXHNpbmNlIDQuNgogICAgIFxwcm9wZXJ0eSBR V2ViRnJhbWU6OmJhc2VVcmwKICAgICBcYnJpZWYgdGhlIGJhc2UgVVJMIG9mIHRoZSBmcmFtZSwg Y2FuIGJlIHVzZWQgdG8gcmVzb2x2ZSByZWxhdGl2ZSBVUkxzCiAgICAgXHNpbmNlIDQuNgpkaWZm IC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuaCBiL1dlYktpdC9xdC9BcGkvcXdlYmZy YW1lLmgKaW5kZXggMmM1MzA5YS4uMDkzNTViMCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9x d2ViZnJhbWUuaAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oCkBAIC0xMDksNiArMTA5 LDcgQEAgY2xhc3MgUVdFQktJVF9FWFBPUlQgUVdlYkZyYW1lIDogcHVibGljIFFPYmplY3QKICAg ICBRX1BST1BFUlRZKHFyZWFsIHpvb21GYWN0b3IgUkVBRCB6b29tRmFjdG9yIFdSSVRFIHNldFpv b21GYWN0b3IpCiAgICAgUV9QUk9QRVJUWShRU3RyaW5nIHRpdGxlIFJFQUQgdGl0bGUpCiAgICAg UV9QUk9QRVJUWShRVXJsIHVybCBSRUFEIHVybCBXUklURSBzZXRVcmwpCisgICAgUV9QUk9QRVJU WShRVXJsIG9yaWdpbmFsVXJsIFJFQUQgb3JpZ2luYWxVcmwpCiAgICAgUV9QUk9QRVJUWShRVXJs IGJhc2VVcmwgUkVBRCBiYXNlVXJsKQogICAgIFFfUFJPUEVSVFkoUUljb24gaWNvbiBSRUFEIGlj b24pCiAgICAgUV9QUk9QRVJUWShRU2l6ZSBjb250ZW50c1NpemUgUkVBRCBjb250ZW50c1NpemUp CkBAIC0xNDIsNiArMTQzLDcgQEAgcHVibGljOgogICAgIFFTdHJpbmcgdGl0bGUoKSBjb25zdDsK ICAgICB2b2lkIHNldFVybChjb25zdCBRVXJsICZ1cmwpOwogICAgIFFVcmwgdXJsKCkgY29uc3Q7 CisgICAgUVVybCBvcmlnaW5hbFVybCgpIGNvbnN0OwogICAgIFFVcmwgYmFzZVVybCgpIGNvbnN0 OwogICAgIFFJY29uIGljb24oKSBjb25zdDsKICAgICBRTXVsdGlNYXA8UVN0cmluZywgUVN0cmlu Zz4gbWV0YURhdGEoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9X ZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IGFiY2NkMjEuLjZiM2M3NGQgMTAwNjQ0Ci0tLSBhL1dl YktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDA5LTA3LTE3ICBBbnRvbmlvIEdvbWVzICAgPGFudG9uaW8uZ29tZXNAb3BlbmJvc3Nh Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb UVRdIEltcGxlbWVudCBvcmlnaW5hbF91cmwgZ2V0dGVyIG1ldGhvZCB0byB0aGUgQVBJCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTg2NworCisgICAg ICAgICogQXBpL3F3ZWJmcmFtZS5jcHA6CisgICAgICAgIChRV2ViRnJhbWU6Om9yaWdpbmFsVXJs KToKKyAgICAgICAgKiBBcGkvcXdlYmZyYW1lLmg6CisgICAgICAgICogdGVzdHMvcXdlYmZyYW1l L3F3ZWJmcmFtZS5xcmM6CisgICAgICAgICogdGVzdHMvcXdlYmZyYW1lL3Rlc3QxLmh0bWw6IEFk ZGVkLgorICAgICAgICAqIHRlc3RzL3F3ZWJmcmFtZS90ZXN0Mi5odG1sOiBBZGRlZC4KKyAgICAg ICAgKiB0ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHA6CisKIDIwMDktMDctMjAgIExh c3psbyBHb21ib3MgIDxsYXN6bG8uMS5nb21ib3NAbm9raWEuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IEhvbGdlciBGcmV5dGhlci4KZGlmZiAtLWdpdCBhL1dlYktpdC9xdC90ZXN0cy9xd2Vi ZnJhbWUvcXdlYmZyYW1lLnFyYyBiL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvcXdlYmZyYW1l LnFyYwppbmRleCAyNjZjZGNlLi45NjE1ZTI3IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvdGVzdHMv cXdlYmZyYW1lL3F3ZWJmcmFtZS5xcmMKKysrIGIvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS9x d2ViZnJhbWUucXJjCkBAIC0yLDUgKzIsNyBAQAogPHFyZXNvdXJjZSBwcmVmaXg9Ii8iPgogPGZp bGU+aW1hZ2UucG5nPC9maWxlPgogPGZpbGU+c3R5bGUuY3NzPC9maWxlPgorPGZpbGU+dGVzdDEu aHRtbDwvZmlsZT4KKzxmaWxlPnRlc3QyLmh0bWw8L2ZpbGU+CiA8L3FyZXNvdXJjZT4KIDwvUkND PgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90ZXN0MS5odG1sIGIvV2Vi S2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90ZXN0MS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAuLmIzMjNmOTYKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJLaXQvcXQvdGVzdHMv cXdlYmZyYW1lL3Rlc3QxLmh0bWwKQEAgLTAsMCArMSBAQAorPGh0bWw+PGJvZHk+PHA+U29tZSB0 ZXh0IDE8L3A+PC9ib2R5PjwvaHRtbD4KZGlmZiAtLWdpdCBhL1dlYktpdC9xdC90ZXN0cy9xd2Vi ZnJhbWUvdGVzdDIuaHRtbCBiL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdGVzdDIuaHRtbApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42M2FjMWY2Ci0tLSAvZGV2L251bGwK KysrIGIvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90ZXN0Mi5odG1sCkBAIC0wLDAgKzEgQEAK KzxodG1sPjxib2R5PiA8cD5Tb21lIHRleHQgMjwvcD48L2JvZHk+PC9odG1sPgpkaWZmIC0tZ2l0 IGEvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcCBiL1dlYktpdC9x dC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAKaW5kZXggYzBlNzJiZS4uY2E3YTJm NiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNw cAorKysgYi9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCkBAIC0z MSw2ICszMSw3IEBACiAjaW5jbHVkZSA8UUNvbWJvQm94PgogI2luY2x1ZGUgPFFSZWdFeHA+CiAj aW5jbHVkZSA8UU5ldHdvcmtSZXF1ZXN0PgorI2luY2x1ZGUgPFFOZXR3b3JrUmVwbHk+CiAvL1RF U1RFRF9DTEFTUz0KIC8vVEVTVEVEX0ZJTEVTPQogCkBAIC01NzMsNiArNTc0LDcgQEAgcHJpdmF0 ZSBzbG90czoKICAgICB2b2lkIHByb2dyZXNzU2lnbmFsKCk7CiAgICAgdm9pZCB1cmxDaGFuZ2Uo KTsKICAgICB2b2lkIGRvbUN5Y2xlcygpOworICAgIHZvaWQgb3JpZ2luYWxVcmwoKTsKICAgICB2 b2lkIHNldEh0bWwoKTsKICAgICB2b2lkIHNldEh0bWxXaXRoUmVzb3VyY2UoKTsKICAgICB2b2lk IGlwdjZIb3N0RW5jb2RpbmcoKTsKQEAgLTIxNTksNiArMjE2MSw4OCBAQCB2b2lkIHRzdF9RV2Vi RnJhbWU6OmRvbUN5Y2xlcygpCiAgICAgUVZFUklGWSh2LnR5cGUoKSA9PSBRVmFyaWFudDo6TWFw KTsKIH0KIAorY2xhc3MgRmFrZVJlcGx5IDogcHVibGljIFFOZXR3b3JrUmVwbHkKK3sKKyAgICBR X09CSkVDVAorCisgICAgcHVibGljOgorICAgICAgICBGYWtlUmVwbHkoY29uc3QgUU5ldHdvcmtS ZXF1ZXN0ICZyZXF1ZXN0LCBRT2JqZWN0ICpwYXJlbnQgPSAwKQorICAgICAgICAgICAgOiBRTmV0 d29ya1JlcGx5KHBhcmVudCkKKyAgICAgICAgeworICAgICAgICAgICAgc2V0T3BlcmF0aW9uKFFO ZXR3b3JrQWNjZXNzTWFuYWdlcjo6R2V0T3BlcmF0aW9uKTsKKyAgICAgICAgICAgIHNldFJlcXVl c3QocmVxdWVzdCk7CisgICAgICAgICAgICBpZiAocmVxdWVzdC51cmwoKSA9PSBRVXJsKCJxcmM6 L3Rlc3QxLmh0bWwiKSkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBzZXRIZWFkZXIo UU5ldHdvcmtSZXF1ZXN0OjpMb2NhdGlvbkhlYWRlciwgUVN0cmluZygicXJjOi90ZXN0Mi5odG1s IikpOworICAgICAgICAgICAgICAgIHNldEF0dHJpYnV0ZShRTmV0d29ya1JlcXVlc3Q6OlJlZGly ZWN0aW9uVGFyZ2V0QXR0cmlidXRlLCBRVXJsKCJxcmM6L3Rlc3QyLmh0bWwiKSk7CisgICAgICAg ICAgICB9IGVsc2UKKyAgICAgICAgICAgICAgICBzZXRFcnJvcihRTmV0d29ya1JlcGx5OjpIb3N0 Tm90Rm91bmRFcnJvciwgdHIoIkludmFsaWQgVVJMIikpOworCisgICAgICAgICAgICBvcGVuKFFJ T0RldmljZTo6UmVhZE9ubHkpOworICAgICAgICAgICAgUVRpbWVyOjpzaW5nbGVTaG90KDAsIHRo aXMsIFNMT1QodGltZW91dCgpKSk7CisgICAgICAgIH0KKyAgICAgICAgfkZha2VSZXBseSgpIHsg Y2xvc2UoKTsgfQorICAgICAgICB2aXJ0dWFsIHZvaWQgYWJvcnQoKSB7fQorICAgICAgICB2aXJ0 dWFsIHZvaWQgY2xvc2UoKSB7fQorICAgIHByb3RlY3RlZDoKKyAgICAgICAgcWludDY0IHJlYWRE YXRhKGNoYXIgKmRhdGEsIHFpbnQ2NCBtYXhTaXplKSB7IHJldHVybiAwOyB9CisgICAgcHJpdmF0 ZSBzbG90czoKKyAgICAgICAgdm9pZCB0aW1lb3V0KCkgeworICAgICAgICAgICAgaWYgKHJlcXVl c3QoKS51cmwoKSA9PSBRVXJsKCJxcmM6Ly90ZXN0MS5odG1sIikpCisgICAgICAgICAgICAgICAg ZW1pdCBlcnJvcih0aGlzLT5lcnJvcigpKTsgIAorICAgICAgICAgICAgZWxzZSBpZiAocmVxdWVz dCgpLnVybCgpID09IFFVcmwoImh0dHA6Ly9hYmNkZWYuYWJjZGVmLyIpKQorICAgICAgICAgICAg ICAgIGVtaXQgbWV0YURhdGFDaGFuZ2VkKCk7CisKKyAgICAgICAgICAgIGVtaXQgcmVhZHlSZWFk KCk7CisgICAgICAgICAgICBlbWl0IGZpbmlzaGVkKCk7CisgICAgICAgIH0KK307CisKK2NsYXNz IEZha2VOZXR3b3JrTWFuYWdlciA6IHB1YmxpYyBRTmV0d29ya0FjY2Vzc01hbmFnZXIKK3sKK3B1 YmxpYzoKKyAgICBGYWtlTmV0d29ya01hbmFnZXIoUU9iamVjdCogcGFyZW50KSA6IFFOZXR3b3Jr QWNjZXNzTWFuYWdlcihwYXJlbnQpIHsgfQorCitwcm90ZWN0ZWQ6CisgICAgdmlydHVhbCBRTmV0 d29ya1JlcGx5KiBjcmVhdGVSZXF1ZXN0KE9wZXJhdGlvbiBvcCwgY29uc3QgUU5ldHdvcmtSZXF1 ZXN0ICZyZXF1ZXN0LCBRSU9EZXZpY2UqIG91dGdvaW5nRGF0YSkgeworICAgICAgICBpZiAob3Ag PT0gUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyOjpHZXRPcGVyYXRpb24KKyAgICAgICAgICAgICYmIChy ZXF1ZXN0LnVybCgpLnRvU3RyaW5nKCkgPT0gInFyYzovdGVzdDEuaHRtbCIKKyAgICAgICAgICAg IHx8ICByZXF1ZXN0LnVybCgpLnRvU3RyaW5nKCkgPT0gImh0dHA6Ly9hYmNkZWYuYWJjZGVmLyIp KQorICAgICAgICAgICAgcmV0dXJuIG5ldyBGYWtlUmVwbHkocmVxdWVzdCwgdGhpcyk7CisKKyAg ICAgICAgcmV0dXJuIFFOZXR3b3JrQWNjZXNzTWFuYWdlcjo6Y3JlYXRlUmVxdWVzdChvcCwgcmVx dWVzdCwgb3V0Z29pbmdEYXRhKTsKKyAgICB9Cit9OworCit2b2lkIHRzdF9RV2ViRnJhbWU6Om9y aWdpbmFsVXJsKCkKK3sKKyAgICBRV2ViUGFnZSBwYWdlOworICAgIFFXZWJGcmFtZSogZnJhbWUg PSBwYWdlLm1haW5GcmFtZSgpOworCisgICAgLy8gaW4gZmV3IHNlY29uZHMsIHRoZSBpbWFnZSBz aG91bGQgYmUgY29tcGxldGV5IGxvYWRlZAorICAgIFFTaWduYWxTcHkgc3B5KCZwYWdlLCBTSUdO QUwobG9hZEZpbmlzaGVkKGJvb2wpKSk7CisgICAgRmFrZU5ldHdvcmtNYW5hZ2VyKiBuZXR3b3Jr TWFuYWdlciA9IG5ldyBGYWtlTmV0d29ya01hbmFnZXIoJnBhZ2UpOworICAgIHBhZ2Uuc2V0TmV0 d29ya0FjY2Vzc01hbmFnZXIobmV0d29ya01hbmFnZXIpOworCisgICAgZnJhbWUtPnNldFVybChR VXJsKCJxcmM6L3Rlc3QxLmh0bWwiKSk7CisgICAgUVRlc3Q6OnFXYWl0KDIwMCk7CisgICAgUUNP TVBBUkUoc3B5LmNvdW50KCksIDEpOworICAgIFFDT01QQVJFKGZyYW1lLT5vcmlnaW5hbFVybCgp LCBRVXJsKCJxcmM6L3Rlc3QxLmh0bWwiKSk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnVybCgpLCBR VXJsKCJxcmM6L3Rlc3QyLmh0bWwiKSk7CisKKyAgICBmcmFtZS0+c2V0VXJsKFFVcmwoInFyYzov dW5leGlzdGVudC5odG1sIikpOworICAgIFFUZXN0OjpxV2FpdCgyMDApOworICAgIFFDT01QQVJF KHNweS5jb3VudCgpLCAyKTsKKyAgICBRQ09NUEFSRShmcmFtZS0+b3JpZ2luYWxVcmwoKSwgUVVy bCgicXJjOi91bmV4aXN0ZW50Lmh0bWwiKSk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnVybCgpLCBR VXJsKCJxcmM6L3VuZXhpc3RlbnQuaHRtbCIpKTsKKworICAgIGZyYW1lLT5zZXRVcmwoUVVybCgi aHR0cDovL2FiY2RlZi5hYmNkZWYiKSk7CisgICAgUVRlc3Q6OnFXYWl0KDIwMCk7CisgICAgUUNP TVBBUkUoc3B5LmNvdW50KCksIDMpOworICAgIFFDT01QQVJFKGZyYW1lLT5vcmlnaW5hbFVybCgp LCBRVXJsKCJodHRwOi8vYWJjZGVmLmFiY2RlZi8iKSk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnVy bCgpLCBRVXJsKCJodHRwOi8vYWJjZGVmLmFiY2RlZi8iKSk7Cit9CisKIHZvaWQgdHN0X1FXZWJG cmFtZTo6c2V0SHRtbCgpCiB7CiAgICAgUVN0cmluZyBodG1sKCI8aHRtbD48aGVhZD48L2hlYWQ+ PGJvZHk+PHA+aGVsbG8gd29ybGQ8L3A+PC9ib2R5PjwvaHRtbD4iKTsK 33361 2009-07-23 13:23:54 -0700 2009-07-24 05:52:38 -0700 patch 0.5 - implement originalUrl support BUG_25867_v5.diff text/plain 7825 tonikitoo Y29tbWl0IDlmOGViZTVkOTcyNTYwZDE2MTM5YTliYWFjOWFlYmNhNDU2ODYzOTIKQXV0aG9yOiBB bnRvbmlvIEdvbWVzICh0b25pa2l0b28pIDxhbnRvbmlvLmdvbWVzQG9wZW5ib3NzYS5vcmc+CkRh dGU6ICAgVGh1IEp1bCAxNiAxNTo0NjozNiAyMDA5IC0wNDAwCgogICAgMjAwOS0wNy0xNiAgQW50 b25pbyBHb21lcyAgIDxhbnRvbmlvLmdvbWVzQG9wZW5ib3NzYS5vcmc+CiAgICAKICAgICAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAgICAKICAgICAgICAgICAgW1FUXSBJbXBs ZW1lbnQgb3JpZ2luYWxfdXJsIGdldHRlciBtZXRob2QgdG8gdGhlIEFQSQogICAgICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjU4NjcKICAgIAogICAgICAg ICAgICAqIEFwaS9xd2ViZnJhbWUuY3BwOgogICAgICAgICAgICAoUVdlYkZyYW1lOjpvcmlnaW5h bFVybCk6CiAgICAgICAgICAgICogQXBpL3F3ZWJmcmFtZS5oOgogICAgICAgICAgICAqIHRlc3Rz L3F3ZWJmcmFtZS9xd2ViZnJhbWUucXJjOgogICAgICAgICAgICAqIHRlc3RzL3F3ZWJmcmFtZS90 ZXN0MS5odG1sOiBBZGRlZC4KICAgICAgICAgICAgKiB0ZXN0cy9xd2ViZnJhbWUvdGVzdDIuaHRt bDogQWRkZWQuCiAgICAgICAgICAgICogdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3Bw OgoKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcCBiL1dlYktpdC9xdC9B cGkvcXdlYmZyYW1lLmNwcAppbmRleCBhZWEyMzgwLi41ODhiZDkyIDEwMDY0NAotLS0gYS9XZWJL aXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3Bw CkBAIC01MjEsNiArNTIxLDI2IEBAIFFVcmwgUVdlYkZyYW1lOjp1cmwoKSBjb25zdAogfQogCiAv KiEKKyAgICBcc2luY2UgNC42CisgICAgXHByb3BlcnR5IFFXZWJGcmFtZTo6b3JpZ2luYWxVcmwK KworICAgIFRoZSBvcmlnaW5hbCB1cmwgbG9hZGVkIGJ5IHRoZSBmcmFtZSBjdXJyZW50bHkgdmll d2VkLiBUaGUgVVJMIG1heSBkaWZmZXIgZnJvbQorICAgIHRoZSBvbmUgcmV0dXJuZWQgYnkgdXJs KCkgaWYgYSBETlMgcmVzb2x1dGlvbiBvciBhIHJlZGlyZWN0aW9uIG9jY3Vycy4KKworICAgIElu dmFsaWQgdXJsIHdpbGwgcmV0dXJuIGFuIGVtcHR5IFFVcmwuCisKKyAgICBcc2EgdXJsKCksIHNl dFVybCgpCisqLworUVVybCBRV2ViRnJhbWU6Om9yaWdpbmFsVXJsKCkgY29uc3QKK3sKKyAgICBp ZiAoIWQtPmZyYW1lLT5sb2FkZXIoKS0+YWN0aXZlRG9jdW1lbnRMb2FkZXIoKQorICAgICAgICB8 fCAhZC0+ZnJhbWVMb2FkZXJDbGllbnQtPm1fbG9hZFN1Y2NlZWRlZCkKKyAgICAgICAgcmV0dXJu IFFVcmwoZC0+ZnJhbWUtPmxvYWRlcigpLT5vdXRnb2luZ1JlZmVycmVyKCkpOworCisgICAgcmV0 dXJuIGQtPmZyYW1lLT5sb2FkZXIoKS0+b3JpZ2luYWxSZXF1ZXN0KCkudXJsKCk7Cit9CisvKiEK KyAgICBcc2luY2UgNC42CiAgICAgXHByb3BlcnR5IFFXZWJGcmFtZTo6YmFzZVVybAogICAgIFxi cmllZiB0aGUgYmFzZSBVUkwgb2YgdGhlIGZyYW1lLCBjYW4gYmUgdXNlZCB0byByZXNvbHZlIHJl bGF0aXZlIFVSTHMKICAgICBcc2luY2UgNC42CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3 ZWJmcmFtZS5oIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuaAppbmRleCBmMTQwYTIxLi5hYTY5 ZTE2IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oCisrKyBiL1dlYktpdC9x dC9BcGkvcXdlYmZyYW1lLmgKQEAgLTEwNyw2ICsxMDcsNyBAQCBjbGFzcyBRV0VCS0lUX0VYUE9S VCBRV2ViRnJhbWUgOiBwdWJsaWMgUU9iamVjdCB7CiAgICAgUV9QUk9QRVJUWShxcmVhbCB6b29t RmFjdG9yIFJFQUQgem9vbUZhY3RvciBXUklURSBzZXRab29tRmFjdG9yKQogICAgIFFfUFJPUEVS VFkoUVN0cmluZyB0aXRsZSBSRUFEIHRpdGxlKQogICAgIFFfUFJPUEVSVFkoUVVybCB1cmwgUkVB RCB1cmwgV1JJVEUgc2V0VXJsKQorICAgIFFfUFJPUEVSVFkoUVVybCBvcmlnaW5hbFVybCBSRUFE IG9yaWdpbmFsVXJsKQogICAgIFFfUFJPUEVSVFkoUVVybCBiYXNlVXJsIFJFQUQgYmFzZVVybCkK ICAgICBRX1BST1BFUlRZKFFJY29uIGljb24gUkVBRCBpY29uKQogICAgIFFfUFJPUEVSVFkoUVNp emUgY29udGVudHNTaXplIFJFQUQgY29udGVudHNTaXplKQpAQCAtMTQwLDYgKzE0MSw3IEBAIHB1 YmxpYzoKICAgICBRU3RyaW5nIHRpdGxlKCkgY29uc3Q7CiAgICAgdm9pZCBzZXRVcmwoY29uc3Qg UVVybCAmdXJsKTsKICAgICBRVXJsIHVybCgpIGNvbnN0OworICAgIFFVcmwgb3JpZ2luYWxVcmwo KSBjb25zdDsKICAgICBRVXJsIGJhc2VVcmwoKSBjb25zdDsKICAgICBRSWNvbiBpY29uKCkgY29u c3Q7CiAgICAgUU11bHRpTWFwPFFTdHJpbmcsIFFTdHJpbmc+IG1ldGFEYXRhKCkgY29uc3Q7CmRp ZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRl eCAyZjA3MzI4Li5iYWQwYzE3IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBi L1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAwOS0wNy0yMyAgQW50b25p byBHb21lcyAgIDxhbnRvbmlvLmdvbWVzQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1FUXSBJbXBsZW1lbnQgb3JpZ2luYWxf dXJsIGdldHRlciBtZXRob2QgdG8gdGhlIEFQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjU4NjcKKworICAgICAgICAqIEFwaS9xd2ViZnJhbWUuY3Bw OgorICAgICAgICAoUVdlYkZyYW1lOjpvcmlnaW5hbFVybCk6CisgICAgICAgICogQXBpL3F3ZWJm cmFtZS5oOgorICAgICAgICAqIHRlc3RzL3F3ZWJmcmFtZS9xd2ViZnJhbWUucXJjOgorICAgICAg ICAqIHRlc3RzL3F3ZWJmcmFtZS90ZXN0MS5odG1sOiBBZGRlZC4KKyAgICAgICAgKiB0ZXN0cy9x d2ViZnJhbWUvdGVzdDIuaHRtbDogQWRkZWQuCisgICAgICAgICogdGVzdHMvcXdlYmZyYW1lL3Rz dF9xd2ViZnJhbWUuY3BwOgorCiAyMDA5LTA3LTIzICBMYXN6bG8gR29tYm9zICA8bGFzemxvLjEu Z29tYm9zQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4K ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvcXdlYmZyYW1lLnFyYyBiL1dl YktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvcXdlYmZyYW1lLnFyYwppbmRleCAyNjZjZGNlLi45NjE1 ZTI3IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3F3ZWJmcmFtZS5xcmMK KysrIGIvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS9xd2ViZnJhbWUucXJjCkBAIC0yLDUgKzIs NyBAQAogPHFyZXNvdXJjZSBwcmVmaXg9Ii8iPgogPGZpbGU+aW1hZ2UucG5nPC9maWxlPgogPGZp bGU+c3R5bGUuY3NzPC9maWxlPgorPGZpbGU+dGVzdDEuaHRtbDwvZmlsZT4KKzxmaWxlPnRlc3Qy Lmh0bWw8L2ZpbGU+CiA8L3FyZXNvdXJjZT4KIDwvUkNDPgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0 L3Rlc3RzL3F3ZWJmcmFtZS90ZXN0MS5odG1sIGIvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90 ZXN0MS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmIzMjNmOTYKLS0t IC9kZXYvbnVsbAorKysgYi9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3Rlc3QxLmh0bWwKQEAg LTAsMCArMSBAQAorPGh0bWw+PGJvZHk+PHA+U29tZSB0ZXh0IDE8L3A+PC9ib2R5PjwvaHRtbD4K ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdGVzdDIuaHRtbCBiL1dlYktp dC9xdC90ZXN0cy9xd2ViZnJhbWUvdGVzdDIuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwLi42M2FjMWY2Ci0tLSAvZGV2L251bGwKKysrIGIvV2ViS2l0L3F0L3Rlc3RzL3F3 ZWJmcmFtZS90ZXN0Mi5odG1sCkBAIC0wLDAgKzEgQEAKKzxodG1sPjxib2R5PiA8cD5Tb21lIHRl eHQgMjwvcD48L2JvZHk+PC9odG1sPgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJm cmFtZS90c3RfcXdlYmZyYW1lLmNwcCBiL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3 ZWJmcmFtZS5jcHAKaW5kZXggYzBlNzJiZS4uMTQ3OWI0OCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0 L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcAorKysgYi9XZWJLaXQvcXQvdGVzdHMv cXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCkBAIC0zMSw2ICszMSw3IEBACiAjaW5jbHVkZSA8 UUNvbWJvQm94PgogI2luY2x1ZGUgPFFSZWdFeHA+CiAjaW5jbHVkZSA8UU5ldHdvcmtSZXF1ZXN0 PgorI2luY2x1ZGUgPFFOZXR3b3JrUmVwbHk+CiAvL1RFU1RFRF9DTEFTUz0KIC8vVEVTVEVEX0ZJ TEVTPQogCkBAIC01NzMsNiArNTc0LDcgQEAgcHJpdmF0ZSBzbG90czoKICAgICB2b2lkIHByb2dy ZXNzU2lnbmFsKCk7CiAgICAgdm9pZCB1cmxDaGFuZ2UoKTsKICAgICB2b2lkIGRvbUN5Y2xlcygp OworICAgIHZvaWQgb3JpZ2luYWxVcmwoKTsKICAgICB2b2lkIHNldEh0bWwoKTsKICAgICB2b2lk IHNldEh0bWxXaXRoUmVzb3VyY2UoKTsKICAgICB2b2lkIGlwdjZIb3N0RW5jb2RpbmcoKTsKQEAg LTIxNTksNiArMjE2MSw4OCBAQCB2b2lkIHRzdF9RV2ViRnJhbWU6OmRvbUN5Y2xlcygpCiAgICAg UVZFUklGWSh2LnR5cGUoKSA9PSBRVmFyaWFudDo6TWFwKTsKIH0KIAorY2xhc3MgRmFrZVJlcGx5 IDogcHVibGljIFFOZXR3b3JrUmVwbHkKK3sKKyAgICBRX09CSkVDVAorCisgICAgcHVibGljOgor ICAgICAgICBGYWtlUmVwbHkoY29uc3QgUU5ldHdvcmtSZXF1ZXN0ICZyZXF1ZXN0LCBRT2JqZWN0 ICpwYXJlbnQgPSAwKQorICAgICAgICAgICAgOiBRTmV0d29ya1JlcGx5KHBhcmVudCkKKyAgICAg ICAgeworICAgICAgICAgICAgc2V0T3BlcmF0aW9uKFFOZXR3b3JrQWNjZXNzTWFuYWdlcjo6R2V0 T3BlcmF0aW9uKTsKKyAgICAgICAgICAgIHNldFJlcXVlc3QocmVxdWVzdCk7CisgICAgICAgICAg ICBpZiAocmVxdWVzdC51cmwoKSA9PSBRVXJsKCJxcmM6L3Rlc3QxLmh0bWwiKSkKKyAgICAgICAg ICAgIHsKKyAgICAgICAgICAgICAgICBzZXRIZWFkZXIoUU5ldHdvcmtSZXF1ZXN0OjpMb2NhdGlv bkhlYWRlciwgUVN0cmluZygicXJjOi90ZXN0Mi5odG1sIikpOworICAgICAgICAgICAgICAgIHNl dEF0dHJpYnV0ZShRTmV0d29ya1JlcXVlc3Q6OlJlZGlyZWN0aW9uVGFyZ2V0QXR0cmlidXRlLCBR VXJsKCJxcmM6L3Rlc3QyLmh0bWwiKSk7CisgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAg ICAgICBzZXRFcnJvcihRTmV0d29ya1JlcGx5OjpIb3N0Tm90Rm91bmRFcnJvciwgdHIoIkludmFs aWQgVVJMIikpOworCisgICAgICAgICAgICBvcGVuKFFJT0RldmljZTo6UmVhZE9ubHkpOworICAg ICAgICAgICAgUVRpbWVyOjpzaW5nbGVTaG90KDAsIHRoaXMsIFNMT1QodGltZW91dCgpKSk7Cisg ICAgICAgIH0KKyAgICAgICAgfkZha2VSZXBseSgpIHsgY2xvc2UoKTsgfQorICAgICAgICB2aXJ0 dWFsIHZvaWQgYWJvcnQoKSB7fQorICAgICAgICB2aXJ0dWFsIHZvaWQgY2xvc2UoKSB7fQorICAg IHByb3RlY3RlZDoKKyAgICAgICAgcWludDY0IHJlYWREYXRhKGNoYXIgKmRhdGEsIHFpbnQ2NCBt YXhTaXplKSB7IHJldHVybiAwOyB9CisgICAgcHJpdmF0ZSBzbG90czoKKyAgICAgICAgdm9pZCB0 aW1lb3V0KCkgeworICAgICAgICAgICAgaWYgKHJlcXVlc3QoKS51cmwoKSA9PSBRVXJsKCJxcmM6 Ly90ZXN0MS5odG1sIikpCisgICAgICAgICAgICAgICAgZW1pdCBlcnJvcih0aGlzLT5lcnJvcigp KTsKKyAgICAgICAgICAgIGVsc2UgaWYgKHJlcXVlc3QoKS51cmwoKSA9PSBRVXJsKCJodHRwOi8v YWJjZGVmLmFiY2RlZi8iKSkKKyAgICAgICAgICAgICAgICBlbWl0IG1ldGFEYXRhQ2hhbmdlZCgp OworCisgICAgICAgICAgICBlbWl0IHJlYWR5UmVhZCgpOworICAgICAgICAgICAgZW1pdCBmaW5p c2hlZCgpOworICAgICAgICB9Cit9OworCitjbGFzcyBGYWtlTmV0d29ya01hbmFnZXIgOiBwdWJs aWMgUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyCit7CitwdWJsaWM6CisgICAgRmFrZU5ldHdvcmtNYW5h Z2VyKFFPYmplY3QqIHBhcmVudCkgOiBRTmV0d29ya0FjY2Vzc01hbmFnZXIocGFyZW50KSB7IH0K KworcHJvdGVjdGVkOgorICAgIHZpcnR1YWwgUU5ldHdvcmtSZXBseSogY3JlYXRlUmVxdWVzdChP cGVyYXRpb24gb3AsIGNvbnN0IFFOZXR3b3JrUmVxdWVzdCAmcmVxdWVzdCwgUUlPRGV2aWNlKiBv dXRnb2luZ0RhdGEpIHsKKyAgICAgICAgaWYgKG9wID09IFFOZXR3b3JrQWNjZXNzTWFuYWdlcjo6 R2V0T3BlcmF0aW9uCisgICAgICAgICAgICAmJiAocmVxdWVzdC51cmwoKS50b1N0cmluZygpID09 ICJxcmM6L3Rlc3QxLmh0bWwiCisgICAgICAgICAgICB8fCAgcmVxdWVzdC51cmwoKS50b1N0cmlu ZygpID09ICJodHRwOi8vYWJjZGVmLmFiY2RlZi8iKSkKKyAgICAgICAgICAgIHJldHVybiBuZXcg RmFrZVJlcGx5KHJlcXVlc3QsIHRoaXMpOworCisgICAgICAgIHJldHVybiBRTmV0d29ya0FjY2Vz c01hbmFnZXI6OmNyZWF0ZVJlcXVlc3Qob3AsIHJlcXVlc3QsIG91dGdvaW5nRGF0YSk7CisgICAg fQorfTsKKwordm9pZCB0c3RfUVdlYkZyYW1lOjpvcmlnaW5hbFVybCgpCit7CisgICAgUVdlYlBh Z2UgcGFnZTsKKyAgICBRV2ViRnJhbWUqIGZyYW1lID0gcGFnZS5tYWluRnJhbWUoKTsKKworICAg IC8vIGluIGZldyBzZWNvbmRzLCB0aGUgaW1hZ2Ugc2hvdWxkIGJlIGNvbXBsZXRleSBsb2FkZWQK KyAgICBRU2lnbmFsU3B5IHNweSgmcGFnZSwgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSkpOwor ICAgIEZha2VOZXR3b3JrTWFuYWdlciogbmV0d29ya01hbmFnZXIgPSBuZXcgRmFrZU5ldHdvcmtN YW5hZ2VyKCZwYWdlKTsKKyAgICBwYWdlLnNldE5ldHdvcmtBY2Nlc3NNYW5hZ2VyKG5ldHdvcmtN YW5hZ2VyKTsKKworICAgIGZyYW1lLT5zZXRVcmwoUVVybCgicXJjOi90ZXN0MS5odG1sIikpOwor ICAgIFFUZXN0OjpxV2FpdCgyMDApOworICAgIFFDT01QQVJFKHNweS5jb3VudCgpLCAxKTsKKyAg ICBRQ09NUEFSRShmcmFtZS0+b3JpZ2luYWxVcmwoKSwgUVVybCgicXJjOi90ZXN0MS5odG1sIikp OworICAgIFFDT01QQVJFKGZyYW1lLT51cmwoKSwgUVVybCgicXJjOi90ZXN0Mi5odG1sIikpOwor CisgICAgZnJhbWUtPnNldFVybChRVXJsKCJxcmM6L3VuZXhpc3RlbnQuaHRtbCIpKTsKKyAgICBR VGVzdDo6cVdhaXQoMjAwKTsKKyAgICBRQ09NUEFSRShzcHkuY291bnQoKSwgMik7CisgICAgUUNP TVBBUkUoZnJhbWUtPm9yaWdpbmFsVXJsKCksIFFVcmwoInFyYzovdW5leGlzdGVudC5odG1sIikp OworICAgIFFDT01QQVJFKGZyYW1lLT51cmwoKSwgUVVybCgicXJjOi91bmV4aXN0ZW50Lmh0bWwi KSk7CisKKyAgICBmcmFtZS0+c2V0VXJsKFFVcmwoImh0dHA6Ly9hYmNkZWYuYWJjZGVmIikpOwor ICAgIFFUZXN0OjpxV2FpdCgyMDApOworICAgIFFDT01QQVJFKHNweS5jb3VudCgpLCAzKTsKKyAg ICBRQ09NUEFSRShmcmFtZS0+b3JpZ2luYWxVcmwoKSwgUVVybCgiaHR0cDovL2FiY2RlZi5hYmNk ZWYvIikpOworICAgIFFDT01QQVJFKGZyYW1lLT51cmwoKSwgUVVybCgiaHR0cDovL2FiY2RlZi5h YmNkZWYvIikpOworfQorCiB2b2lkIHRzdF9RV2ViRnJhbWU6OnNldEh0bWwoKQogewogICAgIFFT dHJpbmcgaHRtbCgiPGh0bWw+PGhlYWQ+PC9oZWFkPjxib2R5PjxwPmhlbGxvIHdvcmxkPC9wPjwv Ym9keT48L2h0bWw+Iik7Cg== 33432 2009-07-24 05:52:38 -0700 2009-07-24 08:14:58 -0700 patch 0.6 - implement originalUrl support BUG_25867_v6.diff text/plain 8735 tonikitoo Y29tbWl0IGE2ZjdlOGJlNGI5MWYwMGE5NTcxMmMzMDEwNzYyOTY3M2Q2ODg1N2MKQXV0aG9yOiBB bnRvbmlvIEdvbWVzICh0b25pa2l0b28pIDxhbnRvbmlvLmdvbWVzQG9wZW5ib3NzYS5vcmc+CkRh dGU6ICAgVGh1IEp1bCAxNiAxNTo0NjozNiAyMDA5IC0wNDAwCgogICAgMjAwOS0wNy0yNCAgQW50 b25pbyBHb21lcyAgIDxhbnRvbmlvLmdvbWVzQG9wZW5ib3NzYS5vcmc+CiAgICAKICAgICAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAgICAKICAgICAgICAgICAgW1FUXSBJbXBs ZW1lbnQgb3JpZ2luYWxVcmwgZ2V0dGVyIG1ldGhvZCB0byB0aGUgQVBJCiAgICAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTg2NwogICAgCiAgICAgICAg ICAgICogQXBpL3F3ZWJmcmFtZS5jcHA6CiAgICAgICAgICAgIChRV2ViRnJhbWU6Om9yaWdpbmFs VXJsKToKICAgICAgICAgICAgKiBBcGkvcXdlYmZyYW1lLmg6CiAgICAgICAgICAgICogdGVzdHMv cXdlYmZyYW1lL3F3ZWJmcmFtZS5xcmM6CiAgICAgICAgICAgICogdGVzdHMvcXdlYmZyYW1lL3Rl c3QxLmh0bWw6IEFkZGVkLgogICAgICAgICAgICAqIHRlc3RzL3F3ZWJmcmFtZS90ZXN0Mi5odG1s OiBBZGRlZC4KICAgICAgICAgICAgKiB0ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHA6 CgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwIGIvV2ViS2l0L3F0L0Fw aS9xd2ViZnJhbWUuY3BwCmluZGV4IGFlYTIzODAuLjIyMzczNmUgMTAwNjQ0Ci0tLSBhL1dlYktp dC9xdC9BcGkvcXdlYmZyYW1lLmNwcAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAK QEAgLTI4MCw2ICsyODAsMTMgQEAgdm9pZCBRV2ViRnJhbWVQcml2YXRlOjpyZW5kZXJQcml2YXRl KFFQYWludGVyICpwYWludGVyLCBjb25zdCBRUmVnaW9uICZjbGlwLCBib28KICAgICBcbHtFbGVt ZW50cyBvZiBRV2ViVmlld30gZm9yIGFuIGV4cGxhbmF0aW9uIG9mIGhvdyB3ZWIKICAgICBmcmFt ZXMgYXJlIHJlbGF0ZWQgdG8gYSB3ZWIgcGFnZSBhbmQgd2ViIHZpZXcuCiAKKyAgICBUaGUgUVdl YkZyYW1lIGNsYXNzIGFsc28gb2ZmZXJzIG1ldGhvZHMgdG8gcmV0cmlldmUgYm90aCB0aGUgVVJM IGN1cnJlbnRseQorICAgIGxvYWRlZCBieSB0aGUgZnJhbWUgKHNlZSB1cmwoKSkgYXMgd2VsbCBh cyB0aGUgVVJMIG9yaWdpbmFsbHkgcmVxdWVzdGVkCisgICAgdG8gYmUgbG9hZGVkIChzZWUgb3Jp Z2luYWxVcmwoKSkuIFRoZXNlIG1ldGhvZHMgbWFrZSBwb3NzaWJsZSB0aGUgcmV0cmlldmFsCisg ICAgb2YgdGhlIFVSTCBiZWZvcmUgYW5kIGFmdGVyIGEgRE5TIHJlc29sdXRpb24gb3IgYSByZWRp cmVjdGlvbiBvY2N1cnMgZHVyaW5nCisgICAgdGhlIGxvYWQgcHJvY2Vzcy4gVGhlIG9yaWdpbmFs VXJsKCkgYWxzbyBtYXRjaGVzIHRvIHRoZSBVUkwgYWRkZWQgdG8gdGhlCisgICAgZnJhbWUgaGlz dG9yeSAoXGx7UXdlYkhpc3Rvcnl9KSBpZiBsb2FkIGlzIHN1Y2Nlc3NmdWwuCisKICAgICBUaGUg dGl0bGUgb2YgYW4gSFRNTCBmcmFtZSBjYW4gYmUgYWNjZXNzZWQgd2l0aCB0aGUgdGl0bGUoKSBw cm9wZXJ0eS4KICAgICBBZGRpdGlvbmFsbHksIGEgZnJhbWUgbWF5IGFsc28gc3BlY2lmeSBhbiBp Y29uLCB3aGljaCBjYW4gYmUgYWNjZXNzZWQKICAgICB1c2luZyB0aGUgaWNvbigpIHByb3BlcnR5 LiBJZiB0aGUgdGl0bGUgb3IgdGhlIGljb24gY2hhbmdlcywgdGhlCkBAIC01MjEsNiArNTI4LDI0 IEBAIFFVcmwgUVdlYkZyYW1lOjp1cmwoKSBjb25zdAogfQogCiAvKiEKKyAgICBcc2luY2UgNC42 CisgICAgXHByb3BlcnR5IFFXZWJGcmFtZTo6b3JpZ2luYWxVcmwKKworICAgIFRoZSBvcmlnaW5h bCB1cmwgbG9hZGVkIGJ5IHRoZSBmcmFtZSBjdXJyZW50bHkgdmlld2VkLiBUaGUgVVJMIG1heSBk aWZmZXIgZnJvbQorICAgIHRoZSBvbmUgcmV0dXJuZWQgYnkgdXJsKCkgaWYgYSBETlMgcmVzb2x1 dGlvbiBvciBhIHJlZGlyZWN0aW9uIG9jY3Vycy4KKworICAgIFxzYSB1cmwoKSwgc2V0VXJsKCkK KyovCitRVXJsIFFXZWJGcmFtZTo6b3JpZ2luYWxVcmwoKSBjb25zdAoreworICAgIGlmICghZC0+ ZnJhbWUtPmxvYWRlcigpLT5hY3RpdmVEb2N1bWVudExvYWRlcigpCisgICAgICAgIHx8ICFkLT5m cmFtZUxvYWRlckNsaWVudC0+bV9sb2FkU3VjY2VlZGVkKQorICAgICAgICByZXR1cm4gUVVybChk LT5mcmFtZS0+bG9hZGVyKCktPm91dGdvaW5nUmVmZXJyZXIoKSk7CisKKyAgICByZXR1cm4gZC0+ ZnJhbWUtPmxvYWRlcigpLT5vcmlnaW5hbFJlcXVlc3QoKS51cmwoKTsKK30KKy8qIQorICAgIFxz aW5jZSA0LjYKICAgICBccHJvcGVydHkgUVdlYkZyYW1lOjpiYXNlVXJsCiAgICAgXGJyaWVmIHRo ZSBiYXNlIFVSTCBvZiB0aGUgZnJhbWUsIGNhbiBiZSB1c2VkIHRvIHJlc29sdmUgcmVsYXRpdmUg VVJMcwogICAgIFxzaW5jZSA0LjYKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1l LmggYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oCmluZGV4IGYxNDBhMjEuLmFhNjllMTYgMTAw NjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmgKKysrIGIvV2ViS2l0L3F0L0FwaS9x d2ViZnJhbWUuaApAQCAtMTA3LDYgKzEwNyw3IEBAIGNsYXNzIFFXRUJLSVRfRVhQT1JUIFFXZWJG cmFtZSA6IHB1YmxpYyBRT2JqZWN0IHsKICAgICBRX1BST1BFUlRZKHFyZWFsIHpvb21GYWN0b3Ig UkVBRCB6b29tRmFjdG9yIFdSSVRFIHNldFpvb21GYWN0b3IpCiAgICAgUV9QUk9QRVJUWShRU3Ry aW5nIHRpdGxlIFJFQUQgdGl0bGUpCiAgICAgUV9QUk9QRVJUWShRVXJsIHVybCBSRUFEIHVybCBX UklURSBzZXRVcmwpCisgICAgUV9QUk9QRVJUWShRVXJsIG9yaWdpbmFsVXJsIFJFQUQgb3JpZ2lu YWxVcmwpCiAgICAgUV9QUk9QRVJUWShRVXJsIGJhc2VVcmwgUkVBRCBiYXNlVXJsKQogICAgIFFf UFJPUEVSVFkoUUljb24gaWNvbiBSRUFEIGljb24pCiAgICAgUV9QUk9QRVJUWShRU2l6ZSBjb250 ZW50c1NpemUgUkVBRCBjb250ZW50c1NpemUpCkBAIC0xNDAsNiArMTQxLDcgQEAgcHVibGljOgog ICAgIFFTdHJpbmcgdGl0bGUoKSBjb25zdDsKICAgICB2b2lkIHNldFVybChjb25zdCBRVXJsICZ1 cmwpOwogICAgIFFVcmwgdXJsKCkgY29uc3Q7CisgICAgUVVybCBvcmlnaW5hbFVybCgpIGNvbnN0 OwogICAgIFFVcmwgYmFzZVVybCgpIGNvbnN0OwogICAgIFFJY29uIGljb24oKSBjb25zdDsKICAg ICBRTXVsdGlNYXA8UVN0cmluZywgUVN0cmluZz4gbWV0YURhdGEoKSBjb25zdDsKZGlmZiAtLWdp dCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IGU5YmNm Y2UuLmVmMDdkZDggMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0 L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDA5LTA3LTI0ICBBbnRvbmlvIEdvbWVz ICAgPGFudG9uaW8uZ29tZXNAb3BlbmJvc3NhLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUVRdIEltcGxlbWVudCBvcmlnaW5hbFVybCBnZXR0 ZXIgbWV0aG9kIHRvIHRoZSBBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTI1ODY3CisKKyAgICAgICAgKiBBcGkvcXdlYmZyYW1lLmNwcDoKKyAgICAg ICAgKFFXZWJGcmFtZTo6b3JpZ2luYWxVcmwpOgorICAgICAgICAqIEFwaS9xd2ViZnJhbWUuaDoK KyAgICAgICAgKiB0ZXN0cy9xd2ViZnJhbWUvcXdlYmZyYW1lLnFyYzoKKyAgICAgICAgKiB0ZXN0 cy9xd2ViZnJhbWUvdGVzdDEuaHRtbDogQWRkZWQuCisgICAgICAgICogdGVzdHMvcXdlYmZyYW1l L3Rlc3QyLmh0bWw6IEFkZGVkLgorICAgICAgICAqIHRlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZy YW1lLmNwcDoKKwogMjAwOS0wNy0yNCAgQW5kcmVpIFBvcGVzY3UgIDxhbmRyZWlwQGdvb2dsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kZXJzIENhcmxzc29uLgpkaWZmIC0tZ2l0IGEv V2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS9xd2ViZnJhbWUucXJjIGIvV2ViS2l0L3F0L3Rlc3Rz L3F3ZWJmcmFtZS9xd2ViZnJhbWUucXJjCmluZGV4IDI2NmNkY2UuLjk2MTVlMjcgMTAwNjQ0Ci0t LSBhL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvcXdlYmZyYW1lLnFyYworKysgYi9XZWJLaXQv cXQvdGVzdHMvcXdlYmZyYW1lL3F3ZWJmcmFtZS5xcmMKQEAgLTIsNSArMiw3IEBACiA8cXJlc291 cmNlIHByZWZpeD0iLyI+CiA8ZmlsZT5pbWFnZS5wbmc8L2ZpbGU+CiA8ZmlsZT5zdHlsZS5jc3M8 L2ZpbGU+Cis8ZmlsZT50ZXN0MS5odG1sPC9maWxlPgorPGZpbGU+dGVzdDIuaHRtbDwvZmlsZT4K IDwvcXJlc291cmNlPgogPC9SQ0M+CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZy YW1lL3Rlc3QxLmh0bWwgYi9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3Rlc3QxLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYjMyM2Y5NgotLS0gL2Rldi9udWxsCisr KyBiL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdGVzdDEuaHRtbApAQCAtMCwwICsxIEBACis8 aHRtbD48Ym9keT48cD5Tb21lIHRleHQgMTwvcD48L2JvZHk+PC9odG1sPgpkaWZmIC0tZ2l0IGEv V2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90ZXN0Mi5odG1sIGIvV2ViS2l0L3F0L3Rlc3RzL3F3 ZWJmcmFtZS90ZXN0Mi5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjYz YWMxZjYKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3Rlc3Qy Lmh0bWwKQEAgLTAsMCArMSBAQAorPGh0bWw+PGJvZHk+IDxwPlNvbWUgdGV4dCAyPC9wPjwvYm9k eT48L2h0bWw+CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2Vi ZnJhbWUuY3BwIGIvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcApp bmRleCBjMGU3MmJlLi5kZjg2ZTc3IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZy YW1lL3RzdF9xd2ViZnJhbWUuY3BwCisrKyBiL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0 X3F3ZWJmcmFtZS5jcHAKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlIDxRQ29tYm9Cb3g+CiAj aW5jbHVkZSA8UVJlZ0V4cD4KICNpbmNsdWRlIDxRTmV0d29ya1JlcXVlc3Q+CisjaW5jbHVkZSA8 UU5ldHdvcmtSZXBseT4KIC8vVEVTVEVEX0NMQVNTPQogLy9URVNURURfRklMRVM9CiAKQEAgLTU3 Myw2ICs1NzQsNyBAQCBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgcHJvZ3Jlc3NTaWduYWwoKTsK ICAgICB2b2lkIHVybENoYW5nZSgpOwogICAgIHZvaWQgZG9tQ3ljbGVzKCk7CisgICAgdm9pZCBv cmlnaW5hbFVybCgpOwogICAgIHZvaWQgc2V0SHRtbCgpOwogICAgIHZvaWQgc2V0SHRtbFdpdGhS ZXNvdXJjZSgpOwogICAgIHZvaWQgaXB2Nkhvc3RFbmNvZGluZygpOwpAQCAtMjE1OSw2ICsyMTYx LDkzIEBAIHZvaWQgdHN0X1FXZWJGcmFtZTo6ZG9tQ3ljbGVzKCkKICAgICBRVkVSSUZZKHYudHlw ZSgpID09IFFWYXJpYW50OjpNYXApOwogfQogCitjbGFzcyBGYWtlUmVwbHkgOiBwdWJsaWMgUU5l dHdvcmtSZXBseSB7CisgICAgUV9PQkpFQ1QKKworICAgIHB1YmxpYzoKKyAgICAgICAgRmFrZVJl cGx5KGNvbnN0IFFOZXR3b3JrUmVxdWVzdCYgcmVxdWVzdCwgUU9iamVjdCogcGFyZW50ID0gMCkK KyAgICAgICAgICAgIDogUU5ldHdvcmtSZXBseShwYXJlbnQpCisgICAgICAgIHsKKyAgICAgICAg ICAgIHNldE9wZXJhdGlvbihRTmV0d29ya0FjY2Vzc01hbmFnZXI6OkdldE9wZXJhdGlvbik7Cisg ICAgICAgICAgICBzZXRSZXF1ZXN0KHJlcXVlc3QpOworICAgICAgICAgICAgaWYgKHJlcXVlc3Qu dXJsKCkgPT0gUVVybCgicXJjOi90ZXN0MS5odG1sIikpIHsKKyAgICAgICAgICAgICAgICBzZXRI ZWFkZXIoUU5ldHdvcmtSZXF1ZXN0OjpMb2NhdGlvbkhlYWRlciwgUVN0cmluZygicXJjOi90ZXN0 Mi5odG1sIikpOworICAgICAgICAgICAgICAgIHNldEF0dHJpYnV0ZShRTmV0d29ya1JlcXVlc3Q6 OlJlZGlyZWN0aW9uVGFyZ2V0QXR0cmlidXRlLCBRVXJsKCJxcmM6L3Rlc3QyLmh0bWwiKSk7Cisg ICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgICAgICBzZXRFcnJvcihRTmV0d29ya1JlcGx5 OjpIb3N0Tm90Rm91bmRFcnJvciwgdHIoIkludmFsaWQgVVJMIikpOworCisgICAgICAgICAgICBv cGVuKFFJT0RldmljZTo6UmVhZE9ubHkpOworICAgICAgICAgICAgUVRpbWVyOjpzaW5nbGVTaG90 KDAsIHRoaXMsIFNMT1QodGltZW91dCgpKSk7CisgICAgICAgIH0KKyAgICAgICAgfkZha2VSZXBs eSgpCisgICAgICAgIHsKKyAgICAgICAgICAgIGNsb3NlKCk7CisgICAgICAgIH0KKyAgICAgICAg dmlydHVhbCB2b2lkIGFib3J0KCkge30KKyAgICAgICAgdmlydHVhbCB2b2lkIGNsb3NlKCkge30K KyAgICBwcm90ZWN0ZWQ6CisgICAgICAgIHFpbnQ2NCByZWFkRGF0YShjaGFyKiBkYXRhLCBxaW50 NjQgbWF4U2l6ZSkKKyAgICAgICAgeworICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIH0K KyAgICBwcml2YXRlIHNsb3RzOgorICAgICAgICB2b2lkIHRpbWVvdXQoKQorICAgICAgICB7Cisg ICAgICAgICAgICBpZiAocmVxdWVzdCgpLnVybCgpID09IFFVcmwoInFyYzovL3Rlc3QxLmh0bWwi KSkKKyAgICAgICAgICAgICAgICBlbWl0IGVycm9yKHRoaXMtPmVycm9yKCkpOworICAgICAgICAg ICAgZWxzZSBpZiAocmVxdWVzdCgpLnVybCgpID09IFFVcmwoImh0dHA6Ly9hYmNkZWYuYWJjZGVm LyIpKQorICAgICAgICAgICAgICAgIGVtaXQgbWV0YURhdGFDaGFuZ2VkKCk7CisKKyAgICAgICAg ICAgIGVtaXQgcmVhZHlSZWFkKCk7CisgICAgICAgICAgICBlbWl0IGZpbmlzaGVkKCk7CisgICAg ICAgIH0KK307CisKK2NsYXNzIEZha2VOZXR3b3JrTWFuYWdlciA6IHB1YmxpYyBRTmV0d29ya0Fj Y2Vzc01hbmFnZXIgeworcHVibGljOgorICAgIEZha2VOZXR3b3JrTWFuYWdlcihRT2JqZWN0KiBw YXJlbnQpIDogUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyKHBhcmVudCkgeyB9CisKK3Byb3RlY3RlZDoK KyAgICB2aXJ0dWFsIFFOZXR3b3JrUmVwbHkqIGNyZWF0ZVJlcXVlc3QoT3BlcmF0aW9uIG9wLCBj b25zdCBRTmV0d29ya1JlcXVlc3QmIHJlcXVlc3QsIFFJT0RldmljZSogb3V0Z29pbmdEYXRhKQor ICAgIHsKKyAgICAgICAgaWYgKG9wID09IFFOZXR3b3JrQWNjZXNzTWFuYWdlcjo6R2V0T3BlcmF0 aW9uCisgICAgICAgICAgICAmJiAocmVxdWVzdC51cmwoKS50b1N0cmluZygpID09ICJxcmM6L3Rl c3QxLmh0bWwiCisgICAgICAgICAgICB8fCAgcmVxdWVzdC51cmwoKS50b1N0cmluZygpID09ICJo dHRwOi8vYWJjZGVmLmFiY2RlZi8iKSkKKyAgICAgICAgICAgIHJldHVybiBuZXcgRmFrZVJlcGx5 KHJlcXVlc3QsIHRoaXMpOworCisgICAgICAgIHJldHVybiBRTmV0d29ya0FjY2Vzc01hbmFnZXI6 OmNyZWF0ZVJlcXVlc3Qob3AsIHJlcXVlc3QsIG91dGdvaW5nRGF0YSk7CisgICAgfQorfTsKKwor dm9pZCB0c3RfUVdlYkZyYW1lOjpvcmlnaW5hbFVybCgpCit7CisgICAgUVdlYlBhZ2UgcGFnZTsK KyAgICBRV2ViRnJhbWUqIGZyYW1lID0gcGFnZS5tYWluRnJhbWUoKTsKKworICAgIC8vIGluIGZl dyBzZWNvbmRzLCB0aGUgaW1hZ2Ugc2hvdWxkIGJlIGNvbXBsZXRlbHkgbG9hZGVkCisgICAgUVNp Z25hbFNweSBzcHkoJnBhZ2UsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpKTsKKyAgICBGYWtl TmV0d29ya01hbmFnZXIqIG5ldHdvcmtNYW5hZ2VyID0gbmV3IEZha2VOZXR3b3JrTWFuYWdlcigm cGFnZSk7CisgICAgcGFnZS5zZXROZXR3b3JrQWNjZXNzTWFuYWdlcihuZXR3b3JrTWFuYWdlcik7 CisKKyAgICBmcmFtZS0+c2V0VXJsKFFVcmwoInFyYzovdGVzdDEuaHRtbCIpKTsKKyAgICBRVGVz dDo6cVdhaXQoMjAwKTsKKyAgICBRQ09NUEFSRShzcHkuY291bnQoKSwgMSk7CisgICAgUUNPTVBB UkUoZnJhbWUtPm9yaWdpbmFsVXJsKCksIFFVcmwoInFyYzovdGVzdDEuaHRtbCIpKTsKKyAgICBR Q09NUEFSRShmcmFtZS0+dXJsKCksIFFVcmwoInFyYzovdGVzdDIuaHRtbCIpKTsKKworICAgIGZy YW1lLT5zZXRVcmwoUVVybCgicXJjOi9ub24tZXhpc3RlbnQuaHRtbCIpKTsKKyAgICBRVGVzdDo6 cVdhaXQoMjAwKTsKKyAgICBRQ09NUEFSRShzcHkuY291bnQoKSwgMik7CisgICAgUUNPTVBBUkUo ZnJhbWUtPm9yaWdpbmFsVXJsKCksIFFVcmwoInFyYzovbm9uLWV4aXN0ZW50Lmh0bWwiKSk7Cisg ICAgUUNPTVBBUkUoZnJhbWUtPnVybCgpLCBRVXJsKCJxcmM6L25vbi1leGlzdGVudC5odG1sIikp OworCisgICAgZnJhbWUtPnNldFVybChRVXJsKCJodHRwOi8vYWJjZGVmLmFiY2RlZiIpKTsKKyAg ICBRVGVzdDo6cVdhaXQoMjAwKTsKKyAgICBRQ09NUEFSRShzcHkuY291bnQoKSwgMyk7CisgICAg UUNPTVBBUkUoZnJhbWUtPm9yaWdpbmFsVXJsKCksIFFVcmwoImh0dHA6Ly9hYmNkZWYuYWJjZGVm LyIpKTsKKyAgICBRQ09NUEFSRShmcmFtZS0+dXJsKCksIFFVcmwoImh0dHA6Ly9hYmNkZWYuYWJj ZGVmLyIpKTsKK30KKwogdm9pZCB0c3RfUVdlYkZyYW1lOjpzZXRIdG1sKCkKIHsKICAgICBRU3Ry aW5nIGh0bWwoIjxodG1sPjxoZWFkPjwvaGVhZD48Ym9keT48cD5oZWxsbyB3b3JsZDwvcD48L2Jv ZHk+PC9odG1sPiIpOwo=