44158 2010-08-18 02:14:59 -0700 [soup] implement ResourceHandle::platformSetDefersLoading 2010-12-06 04:32:06 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 44261 50009 44157 1 pnormand webkit-unassigned abarth eric mrobinson webkit.review.bot oldest_to_newest 265997 0 pnormand 2010-08-18 02:14:59 -0700 as in subject, using soup_session_pause_message and soup_session_unpause_message 266017 1 64680 pnormand 2010-08-18 03:19:25 -0700 Created attachment 64680 proposed patch 266185 2 64680 gustavo 2010-08-18 10:06:37 -0700 Comment on attachment 64680 proposed patch I think this is a good thing to have, since other platforms support it, but do we have an idea of what this gains us? Is there a way to test it? It looks like we want to also check whether the message should start deferred: the constructor has a boolean: ResourceHandle(const ResourceRequest&, ResourceHandleClient*, bool defersLoading, bool shouldContentSniff);. Mac checks m_defersLoading when a new message is queued, and pauses it, it seems. I'll say r- for the lack of checking if we should start deferred, but it would be great if we could know why we are implementing this before we do. 266191 3 mrobinson 2010-08-18 10:11:54 -0700 A quick grep shows that this is used throughout WebCore including extensively in PluginStream code to avoid bugs with plugins. It will also soon be used to pause/resume the download in WebKitWebSourceGStreamer. 266192 4 mrobinson 2010-08-18 10:12:58 -0700 I should also mention that I originally suggested to pnormand that he use this instead of reimplementing the functionality behind #ifdefs in https://bugs.webkit.org/show_bug.cgi?id=41512 . 267205 5 pnormand 2010-08-20 04:48:18 -0700 Oh right, I forgot about this one. Not sure I have time today but monday for sure I will revise the patch. Thanks kov for this first look at the code. 267855 6 65105 pnormand 2010-08-23 05:08:38 -0700 Created attachment 65105 proposed patch About a test that would cover this I was thinking that maybe bug 42152 could be a good candidate but not sure yet. Opinions? 267926 7 mrobinson 2010-08-23 08:39:36 -0700 Yes, that's an excellent idea. If you implement those things, pass the test and then add them to this patch I will r+ it. Thanks! 269749 8 pnormand 2010-08-25 23:41:49 -0700 (In reply to comment #7) > Yes, that's an excellent idea. If you implement those things, pass the test and then add them to this patch I will r+ it. Thanks! Filed a patch there but I only had to add the required DRT stuff to make the test pass, so not sure anymore it is a good test to test this patch ;) 271444 9 65917 pnormand 2010-08-30 08:38:24 -0700 Created attachment 65917 proposed patch Added a check for d->m_msg before using it and a note about GIO 271466 10 pnormand 2010-08-30 09:35:11 -0700 The WebCore/manual-tests/xhr-failure-behind-alert.html test triggers the platformSetDefersLoading() code path but in that case d->m_msg is NULL because no connection to the server was made (because none is running at 127.0.0.1:7 ...) ;) 271520 11 65917 danw 2010-08-30 11:35:23 -0700 Comment on attachment 65917 proposed patch > soup_session_queue_message(session, d->m_msg, finishedCallback, handle); > > + if (d->m_defersLoading) > + soup_session_pause_message(session, d->m_msg); This won't work; pause/unpause are sort of lame, and only work once I/O has actually started (eg, after the message has been assigned to a connection). If you want the message to be deferred right away, you need to just not queue it. 271985 12 65917 pnormand 2010-08-31 01:56:21 -0700 Comment on attachment 65917 proposed patch Unmarking for review, I think it'd be better to wait the patch from bug 44261 to land so we can implement a better patch for this bug. 296220 13 71174 pnormand 2010-10-19 09:01:56 -0700 Created attachment 71174 updated patch As Dan suggested, in startHttp I avoid sending the requested if it's initially deferred. 296224 14 71176 pnormand 2010-10-19 09:07:59 -0700 Created attachment 71176 updated patch 296240 15 71176 mrobinson 2010-10-19 09:48:32 -0700 Comment on attachment 71176 updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=71176&action=review > WebCore/platform/network/soup/ResourceHandleSoup.cpp:739 > + // Only supported for http(s) transfers. Something similar would > + // probably be needed for data transfers done with GIO. This comment is inaccurate now that data URLs are handled by soup, I think. :) > WebCore/platform/network/soup/ResourceHandleSoup.cpp:746 > + else > + soup_session_unpause_message(defaultSession(), d->m_soupMessage.get()); I think this presents a problem. The time between the creation of m_soupRequest and m_soupMessage is an asynchronous call. If setDefersLoading(...) was called while that call was in progress, the message would not be paused properly. Perhaps there should be a companion call to soup_session_pause_message if the message is m_defersLoading is true in sendRequestCallback. 296695 16 pnormand 2010-10-20 01:26:11 -0700 (In reply to comment #15) > (From update of attachment 71176 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=71176&action=review > > > WebCore/platform/network/soup/ResourceHandleSoup.cpp:739 > > + // Only supported for http(s) transfers. Something similar would > > + // probably be needed for data transfers done with GIO. > > This comment is inaccurate now that data URLs are handled by soup, I think. :) > Well I think it's still accurate ;) m_soupMessage is created only in startHttp(). startData and the data uri loading doesn't use it, afaics. > > WebCore/platform/network/soup/ResourceHandleSoup.cpp:746 > > + else > > + soup_session_unpause_message(defaultSession(), d->m_soupMessage.get()); > > I think this presents a problem. The time between the creation of m_soupRequest and m_soupMessage is an asynchronous call. If setDefersLoading(...) was called while that call was in progress, the message would not be paused properly. Perhaps there should be a companion call to soup_session_pause_message if the message is m_defersLoading is true in sendRequestCallback. Hum, that's right indeed. Will send a new patch, thanks for reviewing :) 297762 17 mrobinson 2010-10-21 18:00:01 -0700 This should be fixed since r67722. Closing. 297850 18 pnormand 2010-10-21 23:42:54 -0700 How come a style bot commit have fixed this bug? 298000 19 mrobinson 2010-10-22 08:54:50 -0700 (In reply to comment #18) > How come a style bot commit have fixed this bug? Sorry, wrong bug. 312857 20 74669 pnormand 2010-11-23 08:17:09 -0800 Created attachment 74669 updated patch 312865 21 74669 mrobinson 2010-11-23 08:36:38 -0800 Comment on attachment 74669 updated patch Great. 313158 22 pnormand 2010-11-24 00:26:38 -0800 Committed r72647: <http://trac.webkit.org/changeset/72647> 313169 23 pnormand 2010-11-24 01:21:21 -0800 This patch broke the build (yes I checked here before landing :/). Rollout is in progress, see bug 50009 313174 24 webkit.review.bot 2010-11-24 01:32:56 -0800 http://trac.webkit.org/changeset/72647 might have broken GTK Linux 32-bit Release 317524 25 75664 pnormand 2010-12-06 03:38:36 -0800 Created attachment 75664 updated patch The tests were failing because loadResourceSynchronously() was creating a deferred ResourceHandle. 317548 26 75664 mrobinson 2010-12-06 04:25:16 -0800 Comment on attachment 75664 updated patch Nice catch. 317553 27 pnormand 2010-12-06 04:32:06 -0800 Committed r73357: <http://trac.webkit.org/changeset/73357> 64680 2010-08-18 03:19:25 -0700 2010-08-23 05:08:38 -0700 proposed patch proposed-patch.patch text/plain 1750 pnormand RnJvbSBhYWZiYTdjNTJhNzdiZWFjMDliMTFkMzQwODg4ZjkyZDE4MzBlMjYwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBXZWQsIDE4IEF1ZyAyMDEwIDExOjE2OjU1ICswMjAwClN1YmplY3Q6IFtQQVRDSF0g cHJvcG9zZWQgcGF0Y2gKCi0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgIDExICsrKysrKysrKysrCiAuLi4vcGxhdGZvcm0vbmV0d29yay9z b3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAgICB8ICAgIDcgKysrKystLQogMiBmaWxlcyBjaGFu Z2VkLCAxNiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYkNv cmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQyNmYxOC4uZWY3M2IzMyAx MDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNCBAQAorMjAxMC0wOC0xOCAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGln YWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgW3NvdXBdIGltcGxlbWVudCBSZXNvdXJjZUhhbmRsZTo6cGxhdGZvcm1TZXREZWZlcnNMb2Fk aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDE1 OAorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6cGxhdGZvcm1TZXREZWZlcnNM b2FkaW5nKTogSW1wbGVtZW50ZWQKKyAgICAgICAgdXNpbmcgdGhlIHNvdXBfc2Vzc2lvbl97LHVu fXBhdXNlX21lc3NhZ2UgQVBJcy4KKwogMjAxMC0wOC0xOCAgU2hpbmljaGlybyBIYW1hamkgIDxo YW1hamlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERpbWl0cmkgR2xhemtv di4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFu ZGxlU291cC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRs ZVNvdXAuY3BwCmluZGV4IDk2YTJmMjUuLmY5ZmVlOTMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKKysrIGIvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcApAQCAtNjM3LDkgKzYz NywxMiBAQCBib29sIFJlc291cmNlSGFuZGxlOjpzdXBwb3J0c0J1ZmZlcmVkRGF0YSgpCiAgICAg cmV0dXJuIGZhbHNlOwogfQogCi12b2lkIFJlc291cmNlSGFuZGxlOjpwbGF0Zm9ybVNldERlZmVy c0xvYWRpbmcoYm9vbCkKK3ZvaWQgUmVzb3VyY2VIYW5kbGU6OnBsYXRmb3JtU2V0RGVmZXJzTG9h ZGluZyhib29sIGRlZmVyc0xvYWRpbmcpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBp ZiAoZGVmZXJzTG9hZGluZykKKyAgICAgICAgc291cF9zZXNzaW9uX3BhdXNlX21lc3NhZ2UoZGVm YXVsdFNlc3Npb24oKSwgZC0+bV9tc2cpOworICAgIGVsc2UKKyAgICAgICAgc291cF9zZXNzaW9u X3VucGF1c2VfbWVzc2FnZShkZWZhdWx0U2Vzc2lvbigpLCBkLT5tX21zZyk7CiB9CiAKIGJvb2wg UmVzb3VyY2VIYW5kbGU6OmxvYWRzQmxvY2tlZCgpCi0tIAoxLjcuMQ== 65105 2010-08-23 05:08:38 -0700 2010-08-30 08:38:24 -0700 proposed patch proposed-patch.patch text/plain 2115 pnormand RnJvbSBiNGU4MmRjNWU4MjBlMDY4YzU2NDllMjg3M2EwZDVhYThmMzY4MjZhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBNb24sIDIzIEF1ZyAyMDEwIDA5OjIwOjIzICswMjAwClN1YmplY3Q6IFtQQVRDSF0g cHJvcG9zZWQgcGF0Y2gKCi0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgIDExICsrKysrKysrKysrCiAuLi4vcGxhdGZvcm0vbmV0d29yay9z b3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAgICB8ICAgMTIgKysrKysrKysrKy0tCiAyIGZpbGVz IGNoYW5nZWQsIDIxIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkM2M5MjE2Li5mYWNl NWI2IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE0IEBACisyMDEwLTA4LTE4ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1h bmRAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBbc291cF0gaW1wbGVtZW50IFJlc291cmNlSGFuZGxlOjpwbGF0Zm9ybVNldERlZmVy c0xvYWRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTQ0MTU4CisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVT b3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlOjpwbGF0Zm9ybVNldERl ZmVyc0xvYWRpbmcpOiBJbXBsZW1lbnRlZAorICAgICAgICB1c2luZyB0aGUgc291cF9zZXNzaW9u X3ssdW59cGF1c2VfbWVzc2FnZSBBUElzLgorCiAyMDEwLTA4LTIzICBNaWtoYWlsIE5hZ2Fub3Yg IDxtbmFnYW5vdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVs ZG1hbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNl SGFuZGxlU291cC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhh bmRsZVNvdXAuY3BwCmluZGV4IDk2YTJmMjUuLjc3MDJjMGQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKKysrIGIvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcApAQCAtNTc1LDYg KzU3NSw5IEBAIHN0YXRpYyBib29sIHN0YXJ0SHR0cChSZXNvdXJjZUhhbmRsZSogaGFuZGxlKQog ICAgIGdfb2JqZWN0X3JlZihkLT5tX21zZyk7CiAgICAgc291cF9zZXNzaW9uX3F1ZXVlX21lc3Nh Z2Uoc2Vzc2lvbiwgZC0+bV9tc2csIGZpbmlzaGVkQ2FsbGJhY2ssIGhhbmRsZSk7CiAKKyAgICBp ZiAoZC0+bV9kZWZlcnNMb2FkaW5nKQorICAgICAgICBzb3VwX3Nlc3Npb25fcGF1c2VfbWVzc2Fn ZShzZXNzaW9uLCBkLT5tX21zZyk7CisKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApAQCAtNjM3LDkg KzY0MCwxNCBAQCBib29sIFJlc291cmNlSGFuZGxlOjpzdXBwb3J0c0J1ZmZlcmVkRGF0YSgpCiAg ICAgcmV0dXJuIGZhbHNlOwogfQogCi12b2lkIFJlc291cmNlSGFuZGxlOjpwbGF0Zm9ybVNldERl ZmVyc0xvYWRpbmcoYm9vbCkKK3ZvaWQgUmVzb3VyY2VIYW5kbGU6OnBsYXRmb3JtU2V0RGVmZXJz TG9hZGluZyhib29sIGRlZmVyc0xvYWRpbmcpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAg ICAvLyBJbml0aWFsIGltcGxlbWVudGF0aW9uIG9mIHRoaXMgbWV0aG9kIHdhcyByZXF1aXJlZCBm b3IgYnVnICM0NDE1Ny4KKworICAgIGlmIChkZWZlcnNMb2FkaW5nKQorICAgICAgICBzb3VwX3Nl c3Npb25fcGF1c2VfbWVzc2FnZShkZWZhdWx0U2Vzc2lvbigpLCBkLT5tX21zZyk7CisgICAgZWxz ZQorICAgICAgICBzb3VwX3Nlc3Npb25fdW5wYXVzZV9tZXNzYWdlKGRlZmF1bHRTZXNzaW9uKCks IGQtPm1fbXNnKTsKIH0KIAogYm9vbCBSZXNvdXJjZUhhbmRsZTo6bG9hZHNCbG9ja2VkKCkKLS0g CjEuNy4x 65917 2010-08-30 08:38:24 -0700 2010-10-19 09:01:56 -0700 proposed patch proposed-patch.patch text/plain 2291 pnormand RnJvbSA4ZDg4MjMyYjQ4OTk0ZTUzMTZkZGRiZTQ3ODdkNjZjNzU2NWFkMjU3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBNb24sIDIzIEF1ZyAyMDEwIDA5OjIwOjIzICswMjAwClN1YmplY3Q6IFtQQVRDSF0g cHJvcG9zZWQgcGF0Y2gKCi0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgIDExICsrKysrKysrKysrCiAuLi4vcGxhdGZvcm0vbmV0d29yay9z b3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAgICB8ICAgMTcgKysrKysrKysrKysrKysrLS0KIDIg ZmlsZXMgY2hhbmdlZCwgMjYgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDZlMWY5N2Qu LjllYzdmY2IgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDgtMTggIFBoaWxpcHBlIE5vcm1hbmQgIDxw bm9ybWFuZEBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFtzb3VwXSBpbXBsZW1lbnQgUmVzb3VyY2VIYW5kbGU6OnBsYXRmb3JtU2V0 RGVmZXJzTG9hZGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NDQxNTgKKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhh bmRsZVNvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OnBsYXRmb3Jt U2V0RGVmZXJzTG9hZGluZyk6IEltcGxlbWVudGVkCisgICAgICAgIHVzaW5nIHRoZSBzb3VwX3Nl c3Npb25feyx1bn1wYXVzZV9tZXNzYWdlIEFQSXMuCisKIDIwMTAtMDgtMzAgIFBhdmVsIEZlbGRt YW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWXVyeSBT ZW1pa2hhdHNreS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jl c291cmNlSGFuZGxlU291cC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNv dXJjZUhhbmRsZVNvdXAuY3BwCmluZGV4IDk2YTJmMjUuLjM0Yzg2NWQgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKKysrIGIv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcApAQCAt NTc1LDYgKzU3NSw5IEBAIHN0YXRpYyBib29sIHN0YXJ0SHR0cChSZXNvdXJjZUhhbmRsZSogaGFu ZGxlKQogICAgIGdfb2JqZWN0X3JlZihkLT5tX21zZyk7CiAgICAgc291cF9zZXNzaW9uX3F1ZXVl X21lc3NhZ2Uoc2Vzc2lvbiwgZC0+bV9tc2csIGZpbmlzaGVkQ2FsbGJhY2ssIGhhbmRsZSk7CiAK KyAgICBpZiAoZC0+bV9kZWZlcnNMb2FkaW5nKQorICAgICAgICBzb3VwX3Nlc3Npb25fcGF1c2Vf bWVzc2FnZShzZXNzaW9uLCBkLT5tX21zZyk7CisKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApAQCAt NjM3LDkgKzY0MCwxOSBAQCBib29sIFJlc291cmNlSGFuZGxlOjpzdXBwb3J0c0J1ZmZlcmVkRGF0 YSgpCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi12b2lkIFJlc291cmNlSGFuZGxlOjpwbGF0Zm9y bVNldERlZmVyc0xvYWRpbmcoYm9vbCkKK3ZvaWQgUmVzb3VyY2VIYW5kbGU6OnBsYXRmb3JtU2V0 RGVmZXJzTG9hZGluZyhib29sIGRlZmVyc0xvYWRpbmcpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQo KTsKKyAgICAvLyBJbml0aWFsIGltcGxlbWVudGF0aW9uIG9mIHRoaXMgbWV0aG9kIHdhcyByZXF1 aXJlZCBmb3IgYnVnICM0NDE1Ny4KKworICAgIC8vIE9ubHkgc3VwcG9ydGVkIGZvciBodHRwKHMp IHRyYW5zZmVycy4gU29tZXRoaW5nIHNpbWlsYXIgd291bGQKKyAgICAvLyBwcm9iYWJseSBiZSBu ZWVkZWQgZm9yIGRhdGEgdHJhbnNmZXJzIGRvbmUgd2l0aCBHSU8uCisgICAgaWYgKCFkLT5tX21z ZykKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKGRlZmVyc0xvYWRpbmcpCisgICAgICAgIHNv dXBfc2Vzc2lvbl9wYXVzZV9tZXNzYWdlKGRlZmF1bHRTZXNzaW9uKCksIGQtPm1fbXNnKTsKKyAg ICBlbHNlCisgICAgICAgIHNvdXBfc2Vzc2lvbl91bnBhdXNlX21lc3NhZ2UoZGVmYXVsdFNlc3Np b24oKSwgZC0+bV9tc2cpOwogfQogCiBib29sIFJlc291cmNlSGFuZGxlOjpsb2Fkc0Jsb2NrZWQo KQotLSAKMS43LjE= 71174 2010-10-19 09:01:56 -0700 2010-10-19 09:07:59 -0700 updated patch updated-patch.patch text/plain 3108 pnormand RnJvbSBmNzRhZTU4YmVmNjk5YWUxNjZhZGI4MWM5NmVkN2I2NDhkOTZlMmEwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBUdWUsIDE5IE9jdCAyMDEwIDE4OjAyOjU2ICswMjAwClN1YmplY3Q6IFtQQVRDSF0g dXBkYXRlZCBwYXRjaAoKLS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB8ICAgMTEgKysrKysrKwogLi4uL3BsYXRmb3JtL25ldHdvcmsvc291cC9S ZXNvdXJjZUhhbmRsZVNvdXAuY3BwICAgfCAgIDMyICsrKysrKysrKysrKysrKysrLS0KIDIgZmls ZXMgY2hhbmdlZCwgMzkgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDlmYjFlNTQuLjI5 NGNiNWIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDgtMTggIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9y bWFuZEBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFtzb3VwXSBpbXBsZW1lbnQgUmVzb3VyY2VIYW5kbGU6OnBsYXRmb3JtU2V0RGVm ZXJzTG9hZGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NDQxNTgKKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRs ZVNvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OnBsYXRmb3JtU2V0 RGVmZXJzTG9hZGluZyk6IEltcGxlbWVudGVkCisgICAgICAgIHVzaW5nIHRoZSBzb3VwX3Nlc3Np b25feyx1bn1wYXVzZV9tZXNzYWdlIEFQSXMuCisKIDIwMTAtMTAtMTkgIFBoaWxpcHBlIE5vcm1h bmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFhhbiBMb3Bl ei4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFu ZGxlU291cC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRs ZVNvdXAuY3BwCmluZGV4IDA1YzY1OWYuLjBmNWQ0NjYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKKysrIGIvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcApAQCAtNjU0LDggKzY1 NCwxMSBAQCBzdGF0aWMgYm9vbCBzdGFydEh0dHAoUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSkKICAg ICBpZiAoIXNvdXBfbWVzc2FnZV9oZWFkZXJzX2dldF9vbmUoc291cE1lc3NhZ2UtPnJlcXVlc3Rf aGVhZGVycywgIkFjY2VwdCIpKQogICAgICAgICBzb3VwX21lc3NhZ2VfaGVhZGVyc19hcHBlbmQo c291cE1lc3NhZ2UtPnJlcXVlc3RfaGVhZGVycywgIkFjY2VwdCIsICIqLyoiKTsKIAotICAgIGQt Pm1fY2FuY2VsbGFibGUgPSBhZG9wdFBsYXRmb3JtUmVmKGdfY2FuY2VsbGFibGVfbmV3KCkpOwot ICAgIHdlYmtpdF9zb3VwX3JlcXVlc3Rfc2VuZF9hc3luYyhkLT5tX3NvdXBSZXF1ZXN0LmdldCgp LCBkLT5tX2NhbmNlbGxhYmxlLmdldCgpLCBzZW5kUmVxdWVzdENhbGxiYWNrLCAwKTsKKyAgICAv LyBTZW5kIHRoZSByZXF1ZXN0IG9ubHkgaWYgaXQncyBub3QgYmVlbiBleHBsaWNpdGVseSBkZWZl cnJlZC4KKyAgICBpZiAoIWQtPm1fZGVmZXJzTG9hZGluZykgeworICAgICAgICBkLT5tX2NhbmNl bGxhYmxlID0gYWRvcHRQbGF0Zm9ybVJlZihnX2NhbmNlbGxhYmxlX25ldygpKTsKKyAgICAgICAg d2Via2l0X3NvdXBfcmVxdWVzdF9zZW5kX2FzeW5jKGQtPm1fc291cFJlcXVlc3QuZ2V0KCksIGQt Pm1fY2FuY2VsbGFibGUuZ2V0KCksIHNlbmRSZXF1ZXN0Q2FsbGJhY2ssIDApOworICAgIH0KIAog ICAgIHJldHVybiB0cnVlOwogfQpAQCAtNzE5LDkgKzcyMiwzMCBAQCBib29sIFJlc291cmNlSGFu ZGxlOjpzdXBwb3J0c0J1ZmZlcmVkRGF0YSgpCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi12b2lk IFJlc291cmNlSGFuZGxlOjpwbGF0Zm9ybVNldERlZmVyc0xvYWRpbmcoYm9vbCkKK3ZvaWQgUmVz b3VyY2VIYW5kbGU6OnBsYXRmb3JtU2V0RGVmZXJzTG9hZGluZyhib29sIGRlZmVyc0xvYWRpbmcp CiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAvLyBJbml0aWFsIGltcGxlbWVudGF0aW9u IG9mIHRoaXMgbWV0aG9kIHdhcyByZXF1aXJlZCBmb3IgYnVnICM0NDE1Ny4KKworICAgIGlmIChk LT5tX2NhbmNlbGxlZCkKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKCFkLT5tX2NhbmNlbGxh YmxlICYmIGQtPm1fc291cFJlcXVlc3QuZ2V0KCkpIHsKKyAgICAgICAgaWYgKCFkZWZlcnNMb2Fk aW5nKSB7CisgICAgICAgICAgICBkLT5tX2NhbmNlbGxhYmxlID0gYWRvcHRQbGF0Zm9ybVJlZihn X2NhbmNlbGxhYmxlX25ldygpKTsKKyAgICAgICAgICAgIHdlYmtpdF9zb3VwX3JlcXVlc3Rfc2Vu ZF9hc3luYyhkLT5tX3NvdXBSZXF1ZXN0LmdldCgpLCBkLT5tX2NhbmNlbGxhYmxlLmdldCgpLCBz ZW5kUmVxdWVzdENhbGxiYWNrLCAwKTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm47CisgICAg fQorCisgICAgLy8gT25seSBzdXBwb3J0ZWQgZm9yIGh0dHAocykgdHJhbnNmZXJzLiBTb21ldGhp bmcgc2ltaWxhciB3b3VsZAorICAgIC8vIHByb2JhYmx5IGJlIG5lZWRlZCBmb3IgZGF0YSB0cmFu c2ZlcnMgZG9uZSB3aXRoIEdJTy4KKyAgICBpZiAoIWQtPm1fc291cE1lc3NhZ2UpCisgICAgICAg IHJldHVybjsKKworICAgIGlmIChkZWZlcnNMb2FkaW5nKQorICAgICAgICBzb3VwX3Nlc3Npb25f cGF1c2VfbWVzc2FnZShkZWZhdWx0U2Vzc2lvbigpLCBkLT5tX3NvdXBNZXNzYWdlLmdldCgpKTsK KyAgICBlbHNlCisgICAgICAgIHNvdXBfc2Vzc2lvbl91bnBhdXNlX21lc3NhZ2UoZGVmYXVsdFNl c3Npb24oKSwgZC0+bV9zb3VwTWVzc2FnZS5nZXQoKSk7CiB9CiAKIGJvb2wgUmVzb3VyY2VIYW5k bGU6OmxvYWRzQmxvY2tlZCgpCi0tIAoxLjcuMi4z 71176 2010-10-19 09:07:59 -0700 2010-11-23 08:17:09 -0800 updated patch updated-patch.patch text/plain 3076 pnormand RnJvbSA5NmZiOTViMWM2OGI3Yzg2MWNkNjI0ZTIzZmM3ZjVhNmNmODY2MDI2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBUdWUsIDE5IE9jdCAyMDEwIDE4OjA5OjA1ICswMjAwClN1YmplY3Q6IFtQQVRDSF0g dXBkYXRlZCBwYXRjaAoKLS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB8ICAgMTEgKysrKysrKwogLi4uL3BsYXRmb3JtL25ldHdvcmsvc291cC9S ZXNvdXJjZUhhbmRsZVNvdXAuY3BwICAgfCAgIDMwICsrKysrKysrKysrKysrKysrLS0KIDIgZmls ZXMgY2hhbmdlZCwgMzcgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDlmYjFlNTQuLjI5 NGNiNWIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDgtMTggIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9y bWFuZEBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFtzb3VwXSBpbXBsZW1lbnQgUmVzb3VyY2VIYW5kbGU6OnBsYXRmb3JtU2V0RGVm ZXJzTG9hZGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NDQxNTgKKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRs ZVNvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OnBsYXRmb3JtU2V0 RGVmZXJzTG9hZGluZyk6IEltcGxlbWVudGVkCisgICAgICAgIHVzaW5nIHRoZSBzb3VwX3Nlc3Np b25feyx1bn1wYXVzZV9tZXNzYWdlIEFQSXMuCisKIDIwMTAtMTAtMTkgIFBoaWxpcHBlIE5vcm1h bmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFhhbiBMb3Bl ei4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFu ZGxlU291cC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRs ZVNvdXAuY3BwCmluZGV4IDA1YzY1OWYuLmE4NWVhODcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKKysrIGIvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcApAQCAtNjU0LDggKzY1 NCwxMSBAQCBzdGF0aWMgYm9vbCBzdGFydEh0dHAoUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSkKICAg ICBpZiAoIXNvdXBfbWVzc2FnZV9oZWFkZXJzX2dldF9vbmUoc291cE1lc3NhZ2UtPnJlcXVlc3Rf aGVhZGVycywgIkFjY2VwdCIpKQogICAgICAgICBzb3VwX21lc3NhZ2VfaGVhZGVyc19hcHBlbmQo c291cE1lc3NhZ2UtPnJlcXVlc3RfaGVhZGVycywgIkFjY2VwdCIsICIqLyoiKTsKIAotICAgIGQt Pm1fY2FuY2VsbGFibGUgPSBhZG9wdFBsYXRmb3JtUmVmKGdfY2FuY2VsbGFibGVfbmV3KCkpOwot ICAgIHdlYmtpdF9zb3VwX3JlcXVlc3Rfc2VuZF9hc3luYyhkLT5tX3NvdXBSZXF1ZXN0LmdldCgp LCBkLT5tX2NhbmNlbGxhYmxlLmdldCgpLCBzZW5kUmVxdWVzdENhbGxiYWNrLCAwKTsKKyAgICAv LyBTZW5kIHRoZSByZXF1ZXN0IG9ubHkgaWYgaXQncyBub3QgYmVlbiBleHBsaWNpdGVseSBkZWZl cnJlZC4KKyAgICBpZiAoIWQtPm1fZGVmZXJzTG9hZGluZykgeworICAgICAgICBkLT5tX2NhbmNl bGxhYmxlID0gYWRvcHRQbGF0Zm9ybVJlZihnX2NhbmNlbGxhYmxlX25ldygpKTsKKyAgICAgICAg d2Via2l0X3NvdXBfcmVxdWVzdF9zZW5kX2FzeW5jKGQtPm1fc291cFJlcXVlc3QuZ2V0KCksIGQt Pm1fY2FuY2VsbGFibGUuZ2V0KCksIHNlbmRSZXF1ZXN0Q2FsbGJhY2ssIDApOworICAgIH0KIAog ICAgIHJldHVybiB0cnVlOwogfQpAQCAtNzE5LDkgKzcyMiwyOCBAQCBib29sIFJlc291cmNlSGFu ZGxlOjpzdXBwb3J0c0J1ZmZlcmVkRGF0YSgpCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi12b2lk IFJlc291cmNlSGFuZGxlOjpwbGF0Zm9ybVNldERlZmVyc0xvYWRpbmcoYm9vbCkKK3ZvaWQgUmVz b3VyY2VIYW5kbGU6OnBsYXRmb3JtU2V0RGVmZXJzTG9hZGluZyhib29sIGRlZmVyc0xvYWRpbmcp CiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAvLyBJbml0aWFsIGltcGxlbWVudGF0aW9u IG9mIHRoaXMgbWV0aG9kIHdhcyByZXF1aXJlZCBmb3IgYnVnICM0NDE1Ny4KKworICAgIGlmIChk LT5tX2NhbmNlbGxlZCkKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKCFkZWZlcnNMb2FkaW5n ICYmICFkLT5tX2NhbmNlbGxhYmxlICYmIGQtPm1fc291cFJlcXVlc3QuZ2V0KCkpIHsKKyAgICAg ICAgZC0+bV9jYW5jZWxsYWJsZSA9IGFkb3B0UGxhdGZvcm1SZWYoZ19jYW5jZWxsYWJsZV9uZXco KSk7CisgICAgICAgIHdlYmtpdF9zb3VwX3JlcXVlc3Rfc2VuZF9hc3luYyhkLT5tX3NvdXBSZXF1 ZXN0LmdldCgpLCBkLT5tX2NhbmNlbGxhYmxlLmdldCgpLCBzZW5kUmVxdWVzdENhbGxiYWNrLCAw KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIC8vIE9ubHkgc3VwcG9ydGVkIGZvciBo dHRwKHMpIHRyYW5zZmVycy4gU29tZXRoaW5nIHNpbWlsYXIgd291bGQKKyAgICAvLyBwcm9iYWJs eSBiZSBuZWVkZWQgZm9yIGRhdGEgdHJhbnNmZXJzIGRvbmUgd2l0aCBHSU8uCisgICAgaWYgKCFk LT5tX3NvdXBNZXNzYWdlKQorICAgICAgICByZXR1cm47CisKKyAgICBpZiAoZGVmZXJzTG9hZGlu ZykKKyAgICAgICAgc291cF9zZXNzaW9uX3BhdXNlX21lc3NhZ2UoZGVmYXVsdFNlc3Npb24oKSwg ZC0+bV9zb3VwTWVzc2FnZS5nZXQoKSk7CisgICAgZWxzZQorICAgICAgICBzb3VwX3Nlc3Npb25f dW5wYXVzZV9tZXNzYWdlKGRlZmF1bHRTZXNzaW9uKCksIGQtPm1fc291cE1lc3NhZ2UuZ2V0KCkp OwogfQogCiBib29sIFJlc291cmNlSGFuZGxlOjpsb2Fkc0Jsb2NrZWQoKQotLSAKMS43LjIuMw== 74669 2010-11-23 08:17:09 -0800 2010-12-06 03:38:36 -0800 updated patch updated-patch.patch text/plain 3495 pnormand RnJvbSA2MDJmYTJiMDc0ZWFiN2QyYWYzZTViMGI2NzI1MjBiNDNkOGYyNmZiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBUdWUsIDE5IE9jdCAyMDEwIDE4OjA5OjA1ICswMjAwClN1YmplY3Q6IFtQQVRDSF0g dXBkYXRlZCBwYXRjaAoKLS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB8ICAgMTEgKysrKysrCiAuLi4vcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jl c291cmNlSGFuZGxlU291cC5jcHAgICB8ICAgMzMgKysrKysrKysrKysrKysrKystLQogMiBmaWxl cyBjaGFuZ2VkLCA0MCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTFmNzJhOC4uZWU0 NWE3NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0xMS0yMyAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3Jt YW5kQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW3NvdXBdIGltcGxlbWVudCBSZXNvdXJjZUhhbmRsZTo6cGxhdGZvcm1TZXREZWZl cnNMb2FkaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00NDE1OAorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxl U291cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6cGxhdGZvcm1TZXRE ZWZlcnNMb2FkaW5nKTogSW1wbGVtZW50ZWQKKyAgICAgICAgdXNpbmcgdGhlIHNvdXBfc2Vzc2lv bl97LHVufXBhdXNlX21lc3NhZ2UgQVBJcy4KKwogMjAxMC0xMS0yMyAgSmVyZW15IE9ybG93ICA8 am9ybG93QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBTdGV2ZSBCbG9jay4K ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxl U291cC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNv dXAuY3BwCmluZGV4IDBmOTc4NjcuLjdhMTA4NGUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcApAQCAtNTQ1LDYgKzU0NSw5 IEBAIHN0YXRpYyB2b2lkIHNlbmRSZXF1ZXN0Q2FsbGJhY2soR09iamVjdCogc291cmNlLCBHQXN5 bmNSZXN1bHQqIHJlcywgZ3BvaW50ZXIgdXNlCiAgICAgICAgIH0KICAgICB9CiAKKyAgICBpZiAo ZC0+bV9kZWZlcnNMb2FkaW5nKQorICAgICAgICAgc291cF9zZXNzaW9uX3BhdXNlX21lc3NhZ2Uo aGFuZGxlLT5kZWZhdWx0U2Vzc2lvbigpLCBkLT5tX3NvdXBNZXNzYWdlLmdldCgpKTsKKwogICAg IGdfaW5wdXRfc3RyZWFtX3JlYWRfYXN5bmMoZC0+bV9pbnB1dFN0cmVhbS5nZXQoKSwgZC0+bV9i dWZmZXIsIFJFQURfQlVGRkVSX1NJWkUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBH X1BSSU9SSVRZX0RFRkFVTFQsIGQtPm1fY2FuY2VsbGFibGUuZ2V0KCksIHJlYWRDYWxsYmFjaywg MCk7CiB9CkBAIC02NTQsOCArNjU3LDExIEBAIHN0YXRpYyBib29sIHN0YXJ0SHR0cChSZXNvdXJj ZUhhbmRsZSogaGFuZGxlKQogICAgIGlmICghc291cF9tZXNzYWdlX2hlYWRlcnNfZ2V0X29uZShz b3VwTWVzc2FnZS0+cmVxdWVzdF9oZWFkZXJzLCAiQWNjZXB0IikpCiAgICAgICAgIHNvdXBfbWVz c2FnZV9oZWFkZXJzX2FwcGVuZChzb3VwTWVzc2FnZS0+cmVxdWVzdF9oZWFkZXJzLCAiQWNjZXB0 IiwgIiovKiIpOwogCi0gICAgZC0+bV9jYW5jZWxsYWJsZSA9IGFkb3B0UGxhdGZvcm1SZWYoZ19j YW5jZWxsYWJsZV9uZXcoKSk7Ci0gICAgd2Via2l0X3NvdXBfcmVxdWVzdF9zZW5kX2FzeW5jKGQt Pm1fc291cFJlcXVlc3QuZ2V0KCksIGQtPm1fY2FuY2VsbGFibGUuZ2V0KCksIHNlbmRSZXF1ZXN0 Q2FsbGJhY2ssIDApOworICAgIC8vIFNlbmQgdGhlIHJlcXVlc3Qgb25seSBpZiBpdCdzIG5vdCBi ZWVuIGV4cGxpY2l0ZWx5IGRlZmVycmVkLgorICAgIGlmICghZC0+bV9kZWZlcnNMb2FkaW5nKSB7 CisgICAgICAgIGQtPm1fY2FuY2VsbGFibGUgPSBhZG9wdFBsYXRmb3JtUmVmKGdfY2FuY2VsbGFi bGVfbmV3KCkpOworICAgICAgICB3ZWJraXRfc291cF9yZXF1ZXN0X3NlbmRfYXN5bmMoZC0+bV9z b3VwUmVxdWVzdC5nZXQoKSwgZC0+bV9jYW5jZWxsYWJsZS5nZXQoKSwgc2VuZFJlcXVlc3RDYWxs YmFjaywgMCk7CisgICAgfQogCiAgICAgcmV0dXJuIHRydWU7CiB9CkBAIC03MjgsOSArNzM0LDI4 IEBAIGJvb2wgUmVzb3VyY2VIYW5kbGU6OnN1cHBvcnRzQnVmZmVyZWREYXRhKCkKICAgICByZXR1 cm4gZmFsc2U7CiB9CiAKLXZvaWQgUmVzb3VyY2VIYW5kbGU6OnBsYXRmb3JtU2V0RGVmZXJzTG9h ZGluZyhib29sKQordm9pZCBSZXNvdXJjZUhhbmRsZTo6cGxhdGZvcm1TZXREZWZlcnNMb2FkaW5n KGJvb2wgZGVmZXJzTG9hZGluZykKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIC8vIElu aXRpYWwgaW1wbGVtZW50YXRpb24gb2YgdGhpcyBtZXRob2Qgd2FzIHJlcXVpcmVkIGZvciBidWcg IzQ0MTU3LgorCisgICAgaWYgKGQtPm1fY2FuY2VsbGVkKQorICAgICAgICByZXR1cm47CisKKyAg ICBpZiAoIWRlZmVyc0xvYWRpbmcgJiYgIWQtPm1fY2FuY2VsbGFibGUgJiYgZC0+bV9zb3VwUmVx dWVzdC5nZXQoKSkgeworICAgICAgICBkLT5tX2NhbmNlbGxhYmxlID0gYWRvcHRQbGF0Zm9ybVJl ZihnX2NhbmNlbGxhYmxlX25ldygpKTsKKyAgICAgICAgd2Via2l0X3NvdXBfcmVxdWVzdF9zZW5k X2FzeW5jKGQtPm1fc291cFJlcXVlc3QuZ2V0KCksIGQtPm1fY2FuY2VsbGFibGUuZ2V0KCksIHNl bmRSZXF1ZXN0Q2FsbGJhY2ssIDApOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgLy8g T25seSBzdXBwb3J0ZWQgZm9yIGh0dHAocykgdHJhbnNmZXJzLiBTb21ldGhpbmcgc2ltaWxhciB3 b3VsZAorICAgIC8vIHByb2JhYmx5IGJlIG5lZWRlZCBmb3IgZGF0YSB0cmFuc2ZlcnMgZG9uZSB3 aXRoIEdJTy4KKyAgICBpZiAoIWQtPm1fc291cE1lc3NhZ2UpCisgICAgICAgIHJldHVybjsKKwor ICAgIGlmIChkZWZlcnNMb2FkaW5nKQorICAgICAgICBzb3VwX3Nlc3Npb25fcGF1c2VfbWVzc2Fn ZShkZWZhdWx0U2Vzc2lvbigpLCBkLT5tX3NvdXBNZXNzYWdlLmdldCgpKTsKKyAgICBlbHNlCisg ICAgICAgIHNvdXBfc2Vzc2lvbl91bnBhdXNlX21lc3NhZ2UoZGVmYXVsdFNlc3Npb24oKSwgZC0+ bV9zb3VwTWVzc2FnZS5nZXQoKSk7CiB9CiAKIGJvb2wgUmVzb3VyY2VIYW5kbGU6OmxvYWRzQmxv Y2tlZCgpCi0tIAoxLjcuMi4z 75664 2010-12-06 03:38:36 -0800 2010-12-06 04:25:16 -0800 updated patch updated-patch.patch text/plain 4092 pnormand RnJvbSAwMzBkMTliNWRlZDM0NGZkYWM2ODhkZDE2NDBlYmJjNGMyMmM2Yjk3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBNb24sIDYgRGVjIDIwMTAgMTI6Mzc6MDUgKzAxMDAKU3ViamVjdDogW1BBVENIXSB1 cGRhdGVkIHBhdGNoCgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHwgICAxMSArKysrKysKIC4uLi9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVz b3VyY2VIYW5kbGVTb3VwLmNwcCAgIHwgICAzNSArKysrKysrKysrKysrKysrKy0tLQogMiBmaWxl cyBjaGFuZ2VkLCA0MSBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjA4OGQ5Yi4uZjQx MDJiNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0xMi0wNiAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3Jt YW5kQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTWFydGluIFJvYmluc29uLgor CisgICAgICAgIFtzb3VwXSBpbXBsZW1lbnQgUmVzb3VyY2VIYW5kbGU6OnBsYXRmb3JtU2V0RGVm ZXJzTG9hZGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NDQxNTgKKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRs ZVNvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OnBsYXRmb3JtU2V0 RGVmZXJzTG9hZGluZyk6IEltcGxlbWVudGVkCisgICAgICAgIHVzaW5nIHRoZSBzb3VwX3Nlc3Np b25feyx1bn1wYXVzZV9tZXNzYWdlIEFQSXMuCisKIDIwMTAtMTItMDUgIEtlbnQgVGFtdXJhICA8 dGtlbnRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIFJ1biBzb3J0LVhjb2Rl LXByb2plY3QtZmlsZS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3Vw L1Jlc291cmNlSGFuZGxlU291cC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9S ZXNvdXJjZUhhbmRsZVNvdXAuY3BwCmluZGV4IGEzZmZlYjIuLjA5ZTFlYmUgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKKysr IGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcApA QCAtNTUwLDYgKzU1MCw5IEBAIHN0YXRpYyB2b2lkIHNlbmRSZXF1ZXN0Q2FsbGJhY2soR09iamVj dCogc291cmNlLCBHQXN5bmNSZXN1bHQqIHJlcywgZ3BvaW50ZXIgdXNlCiAgICAgICAgIH0KICAg ICB9CiAKKyAgICBpZiAoZC0+bV9kZWZlcnNMb2FkaW5nKQorICAgICAgICAgc291cF9zZXNzaW9u X3BhdXNlX21lc3NhZ2UoaGFuZGxlLT5kZWZhdWx0U2Vzc2lvbigpLCBkLT5tX3NvdXBNZXNzYWdl LmdldCgpKTsKKwogICAgIGdfaW5wdXRfc3RyZWFtX3JlYWRfYXN5bmMoZC0+bV9pbnB1dFN0cmVh bS5nZXQoKSwgZC0+bV9idWZmZXIsIFJFQURfQlVGRkVSX1NJWkUsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBHX1BSSU9SSVRZX0RFRkFVTFQsIGQtPm1fY2FuY2VsbGFibGUuZ2V0KCks IHJlYWRDYWxsYmFjaywgMCk7CiB9CkBAIC02NjAsOCArNjYzLDExIEBAIHN0YXRpYyBib29sIHN0 YXJ0SHR0cChSZXNvdXJjZUhhbmRsZSogaGFuZGxlKQogICAgIGlmICghc291cF9tZXNzYWdlX2hl YWRlcnNfZ2V0X29uZShzb3VwTWVzc2FnZS0+cmVxdWVzdF9oZWFkZXJzLCAiQWNjZXB0IikpCiAg ICAgICAgIHNvdXBfbWVzc2FnZV9oZWFkZXJzX2FwcGVuZChzb3VwTWVzc2FnZS0+cmVxdWVzdF9o ZWFkZXJzLCAiQWNjZXB0IiwgIiovKiIpOwogCi0gICAgZC0+bV9jYW5jZWxsYWJsZSA9IGFkb3B0 UGxhdGZvcm1SZWYoZ19jYW5jZWxsYWJsZV9uZXcoKSk7Ci0gICAgd2Via2l0X3NvdXBfcmVxdWVz dF9zZW5kX2FzeW5jKGQtPm1fc291cFJlcXVlc3QuZ2V0KCksIGQtPm1fY2FuY2VsbGFibGUuZ2V0 KCksIHNlbmRSZXF1ZXN0Q2FsbGJhY2ssIDApOworICAgIC8vIFNlbmQgdGhlIHJlcXVlc3Qgb25s eSBpZiBpdCdzIG5vdCBiZWVuIGV4cGxpY2l0ZWx5IGRlZmVycmVkLgorICAgIGlmICghZC0+bV9k ZWZlcnNMb2FkaW5nKSB7CisgICAgICAgIGQtPm1fY2FuY2VsbGFibGUgPSBhZG9wdFBsYXRmb3Jt UmVmKGdfY2FuY2VsbGFibGVfbmV3KCkpOworICAgICAgICB3ZWJraXRfc291cF9yZXF1ZXN0X3Nl bmRfYXN5bmMoZC0+bV9zb3VwUmVxdWVzdC5nZXQoKSwgZC0+bV9jYW5jZWxsYWJsZS5nZXQoKSwg c2VuZFJlcXVlc3RDYWxsYmFjaywgMCk7CisgICAgfQogCiAgICAgcmV0dXJuIHRydWU7CiB9CkBA IC03MzQsOSArNzQwLDI4IEBAIGJvb2wgUmVzb3VyY2VIYW5kbGU6OnN1cHBvcnRzQnVmZmVyZWRE YXRhKCkKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXZvaWQgUmVzb3VyY2VIYW5kbGU6OnBsYXRm b3JtU2V0RGVmZXJzTG9hZGluZyhib29sKQordm9pZCBSZXNvdXJjZUhhbmRsZTo6cGxhdGZvcm1T ZXREZWZlcnNMb2FkaW5nKGJvb2wgZGVmZXJzTG9hZGluZykKIHsKLSAgICBub3RJbXBsZW1lbnRl ZCgpOworICAgIC8vIEluaXRpYWwgaW1wbGVtZW50YXRpb24gb2YgdGhpcyBtZXRob2Qgd2FzIHJl cXVpcmVkIGZvciBidWcgIzQ0MTU3LgorCisgICAgaWYgKGQtPm1fY2FuY2VsbGVkKQorICAgICAg ICByZXR1cm47CisKKyAgICBpZiAoIWRlZmVyc0xvYWRpbmcgJiYgIWQtPm1fY2FuY2VsbGFibGUg JiYgZC0+bV9zb3VwUmVxdWVzdC5nZXQoKSkgeworICAgICAgICBkLT5tX2NhbmNlbGxhYmxlID0g YWRvcHRQbGF0Zm9ybVJlZihnX2NhbmNlbGxhYmxlX25ldygpKTsKKyAgICAgICAgd2Via2l0X3Nv dXBfcmVxdWVzdF9zZW5kX2FzeW5jKGQtPm1fc291cFJlcXVlc3QuZ2V0KCksIGQtPm1fY2FuY2Vs bGFibGUuZ2V0KCksIHNlbmRSZXF1ZXN0Q2FsbGJhY2ssIDApOworICAgICAgICByZXR1cm47Cisg ICAgfQorCisgICAgLy8gT25seSBzdXBwb3J0ZWQgZm9yIGh0dHAocykgdHJhbnNmZXJzLiBTb21l dGhpbmcgc2ltaWxhciB3b3VsZAorICAgIC8vIHByb2JhYmx5IGJlIG5lZWRlZCBmb3IgZGF0YSB0 cmFuc2ZlcnMgZG9uZSB3aXRoIEdJTy4KKyAgICBpZiAoIWQtPm1fc291cE1lc3NhZ2UpCisgICAg ICAgIHJldHVybjsKKworICAgIGlmIChkZWZlcnNMb2FkaW5nKQorICAgICAgICBzb3VwX3Nlc3Np b25fcGF1c2VfbWVzc2FnZShkZWZhdWx0U2Vzc2lvbigpLCBkLT5tX3NvdXBNZXNzYWdlLmdldCgp KTsKKyAgICBlbHNlCisgICAgICAgIHNvdXBfc2Vzc2lvbl91bnBhdXNlX21lc3NhZ2UoZGVmYXVs dFNlc3Npb24oKSwgZC0+bV9zb3VwTWVzc2FnZS5nZXQoKSk7CiB9CiAKIGJvb2wgUmVzb3VyY2VI YW5kbGU6OmxvYWRzQmxvY2tlZCgpCkBAIC03NTgsNyArNzgzLDcgQEAgdm9pZCBSZXNvdXJjZUhh bmRsZTo6bG9hZFJlc291cmNlU3luY2hyb25vdXNseShOZXR3b3JraW5nQ29udGV4dCogY29udGV4 dCwgY29uc3QKICAgICAvLyBGSVhNRTogd2Ugc2hvdWxkIHVzZSB0aGUgUmVzb3VyY2VIYW5kbGU6 OmNyZWF0ZSBtZXRob2QgaGVyZSwKICAgICAvLyBidXQgaXQgbWFrZXMgdXMgdGltZW91dCBpbiBh IGNvdXBsZSBvZiB0ZXN0cy4gU2VlCiAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTQxODIzCi0gICAgUmVmUHRyPFJlc291cmNlSGFuZGxlPiBoYW5kbGUgPSBh ZG9wdFJlZihuZXcgUmVzb3VyY2VIYW5kbGUocmVxdWVzdCwgJnN5bmNMb2FkZXIsIHRydWUsIGZh bHNlKSk7CisgICAgUmVmUHRyPFJlc291cmNlSGFuZGxlPiBoYW5kbGUgPSBhZG9wdFJlZihuZXcg UmVzb3VyY2VIYW5kbGUocmVxdWVzdCwgJnN5bmNMb2FkZXIsIGZhbHNlIC8qZGVmZXJzTG9hZGlu ZyovLCBmYWxzZSAvKnNob3VsZENvbnRlbnRTbmlmZiovKSk7CiAgICAgaGFuZGxlLT5zdGFydChj b250ZXh0KTsKIAogICAgIHN5bmNMb2FkZXIucnVuKCk7Ci0tIAoxLjcuMy4z