15825 2007-11-04 00:18:01 -0700 [GTK] curl - slow dns causing hangs 2007-12-09 13:53:17 -0800 1 1 1 Unclassified WebKit WebKitGTK 523.x (Safari 3) All Linux RESOLVED FIXED Curl, Gtk P2 Normal --- 0 iwkse webkit-unassigned oldest_to_newest 60218 0 iwkse 2007-11-04 00:18:01 -0700 Loading this url http://www.osnews.com/story.php?news_id=18873 63286 1 17706 lethalman88 2007-12-04 15:02:59 -0800 Created attachment 17706 limit to 5 connections globally The problem is that there's no way to limit curl to a specific number of connections. This patch solves the problem. However, we need to work more on that, because the limitation is globally and not per domain. I suggest to land this patch which is useful for other purposes (for example working on wysiwyg, which are really heavy if the issue remains). 63321 2 17713 lethalman88 2007-12-05 01:24:18 -0800 Created attachment 17713 fix curl I tested the patch by browsing several websites that before had this problem due to bad cURL management. The new patch is complete of ChangeLog. I also added a FIXME to create a separate stack of jobs per domain. 63322 3 17714 lethalman88 2007-12-05 01:29:08 -0800 Created attachment 17714 fix curl forgot header file 63684 4 17789 lethalman88 2007-12-08 13:18:21 -0800 Created attachment 17789 put jobs in the right queue Using a list, all requests were satisfied with the wrong order. Now a queue class has been added to do this work. 63710 5 17789 alp 2007-12-08 17:58:26 -0800 Comment on attachment 17789 put jobs in the right queue So, this solves a lot of problems. Pages load faster, fewer resources used. r- though due to the crasher when jobs are cancelled. 63734 6 17799 lethalman88 2007-12-09 00:59:49 -0800 Created attachment 17799 do not crash on job cancel The previous patch crashed when a job was canceled. This one instead has the same behavior of the original code. Notice how using the queue most of the code in the manager has been collapsed and therefore cleaned. Still missing a separate stack of connections per domain, but this is another bug yet. 63750 7 17804 lethalman88 2007-12-09 07:19:59 -0800 Created attachment 17804 alternative using vectors 63760 8 17799 alp 2007-12-09 13:46:12 -0800 Comment on attachment 17799 do not crash on job cancel Clearing review flag in favour of the Vector-based patch. 63761 9 17804 alp 2007-12-09 13:47:49 -0800 Comment on attachment 17804 alternative using vectors r=me with the changes to the positioning of m_runningJobs increment/decrement we discussed. 63762 10 alp 2007-12-09 13:53:17 -0800 Landed in r28573. 17706 2007-12-04 15:02:59 -0800 2007-12-05 01:24:18 -0800 limit to 5 connections globally curl.patch text/plain 1873 lethalman88 SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdl ci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3Vy Y2VIYW5kbGVNYW5hZ2VyLmNwcAkocmV2aXNpb24gMjgzODgpCisrKyBXZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC00NCwxMCArNDQsMTIgQEAKIAogY29uc3QgaW50IHNlbGVjdFRpbWVvdXRNUyA9IDU7CiBjb25z dCBkb3VibGUgcG9sbFRpbWVTZWNvbmRzID0gMC4wNTsKK2NvbnN0IGludCBtYXhSdW5uaW5nSm9i cyA9IDU7CiAKIFJlc291cmNlSGFuZGxlTWFuYWdlcjo6UmVzb3VyY2VIYW5kbGVNYW5hZ2VyKCkK ICAgICA6IG1fZG93bmxvYWRUaW1lcih0aGlzLCAmUmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjpkb3du bG9hZFRpbWVyQ2FsbGJhY2spCiAgICAgLCBtX2Nvb2tpZUphckZpbGVOYW1lKDApCisgICAgLCBt X3J1bm5pbmdKb2JzKDApCiAgICAgLCBtX3Jlc291cmNlSGFuZGxlTGlzdEhlYWQoMCkKIHsKICAg ICBjdXJsX2dsb2JhbF9pbml0KENVUkxfR0xPQkFMX0FMTCk7CkBAIC0yNDksNiArMjUxLDcgQEAK IHZvaWQgUmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjpyZW1vdmVGcm9tQ3VybChSZXNvdXJjZUhhbmRs ZSogam9iKQogewogICAgIFJlc291cmNlSGFuZGxlSW50ZXJuYWwqIGQgPSBqb2ItPmdldEludGVy bmFsKCk7CisgICAgbV9ydW5uaW5nSm9icy0tOwogICAgIEFTU0VSVChkLT5tX2hhbmRsZSk7CiAg ICAgaWYgKCFkLT5tX2hhbmRsZSkKICAgICAgICAgcmV0dXJuOwpAQCAtMzMwLDE2ICszMzMsMTcg QEAKIHsKICAgICBib29sIHN0YXJ0ZWQgPSBmYWxzZTsKICAgICBSZXNvdXJjZUhhbmRsZUxpc3Qq IG5vZGUgPSBtX3Jlc291cmNlSGFuZGxlTGlzdEhlYWQ7Ci0gICAgd2hpbGUgKG5vZGUpIHsKKyAg ICB3aGlsZSAobm9kZSAmJiBtX3J1bm5pbmdKb2JzIDwgbWF4UnVubmluZ0pvYnMpIHsKICAgICAg ICAgUmVzb3VyY2VIYW5kbGVMaXN0KiBuZXh0ID0gbm9kZS0+bmV4dCgpOwogICAgICAgICBpZiAo IW5vZGUtPnJlbW92ZWQoKSkgewogICAgICAgICAgICAgc3RhcnRKb2Iobm9kZS0+am9iKCkpOwog ICAgICAgICAgICAgc3RhcnRlZCA9IHRydWU7CisgICAgICAgICAgICBtX3J1bm5pbmdKb2JzKys7 CiAgICAgICAgIH0KICAgICAgICAgZGVsZXRlIG5vZGU7CiAgICAgICAgIG5vZGUgPSBuZXh0Owog ICAgIH0KLSAgICBtX3Jlc291cmNlSGFuZGxlTGlzdEhlYWQgPSAwOworICAgIG1fcmVzb3VyY2VI YW5kbGVMaXN0SGVhZCA9IG5vZGU7CiAgICAgcmV0dXJuIHN0YXJ0ZWQ7CiB9CiAKSW5kZXg6IFdl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFu YWdlci5oCShyZXZpc2lvbiAyODM4OCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJs L1Jlc291cmNlSGFuZGxlTWFuYWdlci5oCSh3b3JraW5nIGNvcHkpCkBAIC03OCw2ICs3OCw3IEBA CiAgICAgY2hhciogbV9jb29raWVKYXJGaWxlTmFtZTsKICAgICBjaGFyIG1fY3VybEVycm9yQnVm ZmVyW0NVUkxfRVJST1JfU0laRV07CiAgICAgUmVzb3VyY2VIYW5kbGVMaXN0KiBtX3Jlc291cmNl SGFuZGxlTGlzdEhlYWQ7CisgICAgaW50IG1fcnVubmluZ0pvYnM7CiB9OwogCiB9Cg== 17713 2007-12-05 01:24:18 -0800 2007-12-05 01:29:08 -0800 fix curl curl.patch text/plain 2055 lethalman88 SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyODQzNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMDctMTItMDUgIEx1Y2EgQnJ1bm8gIDxsZXRoYWxtYW44OEBnbWFp bC5jb20+CisKKwlSZXZpZXdlZCBieSBBbHAgVG9rZXIuCisKKwlGaXhlcyBpc3N1ZSAjMTU4MjUu IExpbWl0IHRoZSBudW1iZXIgb2YKKwljb25uZWN0aW9ucyBjVVJMIGhhbmRsZXMuCisKKwkqIHBs YXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIuY3BwOgorCShSZXNvdXJj ZUhhbmRsZU1hbmFnZXI6OlJlc291cmNlSGFuZGxlTWFuYWdlcik6CisJKFJlc291cmNlSGFuZGxl TWFuYWdlcjo6cmVtb3ZlRnJvbUN1cmwpOgorCShSZXNvdXJjZUhhbmRsZU1hbmFnZXI6OnN0YXJ0 U2NoZWR1bGVkSm9icyk6CisKIDIwMDctMTItMDQgIEFscCBUb2tlciAgPGFscEBhdG9rZXIuY29t PgogCiAgICAgICAgIFBvdGVudGlhbCBHVEsrIGJ1aWxkIGZpeCBmb3IgdGhlIGdsaWItZ2VubWFy c2hhbCBpc3N1ZS4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNl SGFuZGxlTWFuYWdlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcAkocmV2aXNpb24gMjg0MzYpCisrKyBXZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC00NCwxMCArNDQsMTIgQEAKIAogY29uc3QgaW50IHNlbGVjdFRpbWVvdXRN UyA9IDU7CiBjb25zdCBkb3VibGUgcG9sbFRpbWVTZWNvbmRzID0gMC4wNTsKK2NvbnN0IGludCBt YXhSdW5uaW5nSm9icyA9IDU7CiAKIFJlc291cmNlSGFuZGxlTWFuYWdlcjo6UmVzb3VyY2VIYW5k bGVNYW5hZ2VyKCkKICAgICA6IG1fZG93bmxvYWRUaW1lcih0aGlzLCAmUmVzb3VyY2VIYW5kbGVN YW5hZ2VyOjpkb3dubG9hZFRpbWVyQ2FsbGJhY2spCiAgICAgLCBtX2Nvb2tpZUphckZpbGVOYW1l KDApCisgICAgLCBtX3J1bm5pbmdKb2JzKDApCiAgICAgLCBtX3Jlc291cmNlSGFuZGxlTGlzdEhl YWQoMCkKIHsKICAgICBjdXJsX2dsb2JhbF9pbml0KENVUkxfR0xPQkFMX0FMTCk7CkBAIC0yNDks NiArMjUxLDcgQEAKIHZvaWQgUmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjpyZW1vdmVGcm9tQ3VybChS ZXNvdXJjZUhhbmRsZSogam9iKQogewogICAgIFJlc291cmNlSGFuZGxlSW50ZXJuYWwqIGQgPSBq b2ItPmdldEludGVybmFsKCk7CisgICAgbV9ydW5uaW5nSm9icy0tOwogICAgIEFTU0VSVChkLT5t X2hhbmRsZSk7CiAgICAgaWYgKCFkLT5tX2hhbmRsZSkKICAgICAgICAgcmV0dXJuOwpAQCAtMzMw LDE2ICszMzMsMTcgQEAKIHsKICAgICBib29sIHN0YXJ0ZWQgPSBmYWxzZTsKICAgICBSZXNvdXJj ZUhhbmRsZUxpc3QqIG5vZGUgPSBtX3Jlc291cmNlSGFuZGxlTGlzdEhlYWQ7Ci0gICAgd2hpbGUg KG5vZGUpIHsKKyAgICB3aGlsZSAobm9kZSAmJiBtX3J1bm5pbmdKb2JzIDwgbWF4UnVubmluZ0pv YnMpIHsKICAgICAgICAgUmVzb3VyY2VIYW5kbGVMaXN0KiBuZXh0ID0gbm9kZS0+bmV4dCgpOwog ICAgICAgICBpZiAoIW5vZGUtPnJlbW92ZWQoKSkgewogICAgICAgICAgICAgc3RhcnRKb2Iobm9k ZS0+am9iKCkpOwogICAgICAgICAgICAgc3RhcnRlZCA9IHRydWU7CisgICAgICAgICAgICBtX3J1 bm5pbmdKb2JzKys7CiAgICAgICAgIH0KICAgICAgICAgZGVsZXRlIG5vZGU7CiAgICAgICAgIG5v ZGUgPSBuZXh0OwogICAgIH0KLSAgICBtX3Jlc291cmNlSGFuZGxlTGlzdEhlYWQgPSAwOworICAg IG1fcmVzb3VyY2VIYW5kbGVMaXN0SGVhZCA9IG5vZGU7CiAgICAgcmV0dXJuIHN0YXJ0ZWQ7CiB9 CiAK 17714 2007-12-05 01:29:08 -0800 2007-12-08 13:18:21 -0800 fix curl curl.patch text/plain 2730 lethalman88 SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyODQzNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDctMTItMDUgIEx1Y2EgQnJ1bm8gIDxsZXRoYWxtYW44OEBnbWFp bC5jb20+CisKKwlSZXZpZXdlZCBieSBBbHAgVG9rZXIuCisKKwlGaXhlcyBpc3N1ZSAjMTU4MjUu IExpbWl0IHRoZSBudW1iZXIgb2YKKwljb25uZWN0aW9ucyBjVVJMIGhhbmRsZXMuCisKKwkqIHBs YXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIuY3BwOgorCShSZXNvdXJj ZUhhbmRsZU1hbmFnZXI6OlJlc291cmNlSGFuZGxlTWFuYWdlcik6CisJKFJlc291cmNlSGFuZGxl TWFuYWdlcjo6cmVtb3ZlRnJvbUN1cmwpOgorCShSZXNvdXJjZUhhbmRsZU1hbmFnZXI6OnN0YXJ0 U2NoZWR1bGVkSm9icyk6CisKKwkqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRs ZU1hbmFnZXIuaDoKKwkoUmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjptX3J1bm5pbmdKb2JzKTogYWRk ZWQKKwogMjAwNy0xMi0wNCAgQWxwIFRva2VyICA8YWxwQGF0b2tlci5jb20+CiAKICAgICAgICAg UG90ZW50aWFsIEdUSysgYnVpbGQgZml4IGZvciB0aGUgZ2xpYi1nZW5tYXJzaGFsIGlzc3VlLgpJ bmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2Vy LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJj ZUhhbmRsZU1hbmFnZXIuY3BwCShyZXZpc2lvbiAyODQzNikKKysrIFdlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTQ0LDEwICs0NCwxMiBAQAogCiBjb25zdCBpbnQgc2VsZWN0VGltZW91dE1TID0gNTsKIGNvbnN0 IGRvdWJsZSBwb2xsVGltZVNlY29uZHMgPSAwLjA1OworY29uc3QgaW50IG1heFJ1bm5pbmdKb2Jz ID0gNTsKIAogUmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjpSZXNvdXJjZUhhbmRsZU1hbmFnZXIoKQog ICAgIDogbV9kb3dubG9hZFRpbWVyKHRoaXMsICZSZXNvdXJjZUhhbmRsZU1hbmFnZXI6OmRvd25s b2FkVGltZXJDYWxsYmFjaykKICAgICAsIG1fY29va2llSmFyRmlsZU5hbWUoMCkKKyAgICAsIG1f cnVubmluZ0pvYnMoMCkKICAgICAsIG1fcmVzb3VyY2VIYW5kbGVMaXN0SGVhZCgwKQogewogICAg IGN1cmxfZ2xvYmFsX2luaXQoQ1VSTF9HTE9CQUxfQUxMKTsKQEAgLTI0OSw2ICsyNTEsNyBAQAog dm9pZCBSZXNvdXJjZUhhbmRsZU1hbmFnZXI6OnJlbW92ZUZyb21DdXJsKFJlc291cmNlSGFuZGxl KiBqb2IpCiB7CiAgICAgUmVzb3VyY2VIYW5kbGVJbnRlcm5hbCogZCA9IGpvYi0+Z2V0SW50ZXJu YWwoKTsKKyAgICBtX3J1bm5pbmdKb2JzLS07CiAgICAgQVNTRVJUKGQtPm1faGFuZGxlKTsKICAg ICBpZiAoIWQtPm1faGFuZGxlKQogICAgICAgICByZXR1cm47CkBAIC0zMjgsMTggKzMzMSwyMSBA QAogCiBib29sIFJlc291cmNlSGFuZGxlTWFuYWdlcjo6c3RhcnRTY2hlZHVsZWRKb2JzKCkKIHsK KyAgICAvLyBGSVhNRTogQ3JlYXRlIGEgc2VwYXJhdGUgc3RhY2sgb2Ygam9icyBmb3IgZWFjaCBk b21haW4KKwogICAgIGJvb2wgc3RhcnRlZCA9IGZhbHNlOwogICAgIFJlc291cmNlSGFuZGxlTGlz dCogbm9kZSA9IG1fcmVzb3VyY2VIYW5kbGVMaXN0SGVhZDsKLSAgICB3aGlsZSAobm9kZSkgewor ICAgIHdoaWxlIChub2RlICYmIG1fcnVubmluZ0pvYnMgPCBtYXhSdW5uaW5nSm9icykgewogICAg ICAgICBSZXNvdXJjZUhhbmRsZUxpc3QqIG5leHQgPSBub2RlLT5uZXh0KCk7CiAgICAgICAgIGlm ICghbm9kZS0+cmVtb3ZlZCgpKSB7CiAgICAgICAgICAgICBzdGFydEpvYihub2RlLT5qb2IoKSk7 CiAgICAgICAgICAgICBzdGFydGVkID0gdHJ1ZTsKKyAgICAgICAgICAgIG1fcnVubmluZ0pvYnMr KzsKICAgICAgICAgfQogICAgICAgICBkZWxldGUgbm9kZTsKICAgICAgICAgbm9kZSA9IG5leHQ7 CiAgICAgfQotICAgIG1fcmVzb3VyY2VIYW5kbGVMaXN0SGVhZCA9IDA7CisgICAgbV9yZXNvdXJj ZUhhbmRsZUxpc3RIZWFkID0gbm9kZTsKICAgICByZXR1cm4gc3RhcnRlZDsKIH0KIApJbmRleDog V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVN YW5hZ2VyLmgJKHJldmlzaW9uIDI4NDM2KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1 cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmgJKHdvcmtpbmcgY29weSkKQEAgLTc4LDYgKzc4LDcg QEAKICAgICBjaGFyKiBtX2Nvb2tpZUphckZpbGVOYW1lOwogICAgIGNoYXIgbV9jdXJsRXJyb3JC dWZmZXJbQ1VSTF9FUlJPUl9TSVpFXTsKICAgICBSZXNvdXJjZUhhbmRsZUxpc3QqIG1fcmVzb3Vy Y2VIYW5kbGVMaXN0SGVhZDsKKyAgICBpbnQgbV9ydW5uaW5nSm9iczsKIH07CiAKIH0K 17789 2007-12-08 13:18:21 -0800 2007-12-09 00:59:49 -0800 put jobs in the right queue curl.patch text/plain 7647 lethalman88 SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyODU2NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzEgQEAKKzIwMDctMTItMDUgIEx1Y2EgQnJ1bm8gIDxsZXRoYWxtYW44OEBnbWFp bC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZLgorCisgICAgICAgIGh0dHA6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODI1CisgICAgICAgIFtHVEtdIGN1cmwg LSBzbG93IGRucyBjYXVzaW5nIGhhbmdzLgorCisgICAgICAgIENyZWF0ZSBhIHF1ZXVlIG9mIGpv YnMsIHRvIHNhdGlzZnkgcmVxdWVzdHMgaW4gdGhlIHJpZ2h0IG9yZGVyLgorCisgICAgICAgICog cGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjptYXhSdW5uaW5nSm9icyk6IGFkZGVkCisgICAgICAgIChXZWJDb3JlOjpSZXNv dXJjZUhhbmRsZVF1ZXVlOjpSZXNvdXJjZUhhbmRsZVF1ZXVlTm9kZTo6UmVzb3VyY2VIYW5kbGVR dWV1ZU5vZGUpOiBhZGRlZAorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVRdWV1ZTo6 flJlc291cmNlSGFuZGxlUXVldWUpOiBhZGRlZAorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VI YW5kbGVRdWV1ZTo6ZW5xdWV1ZSk6IGFkZGVkCisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhh bmRsZVF1ZXVlOjpkZXF1ZXVlKTogYWRkZWQKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFu ZGxlUXVldWU6Om1ha2VFbXB0eSk6IGFkZGVkCisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhh bmRsZU1hbmFnZXI6OlJlc291cmNlSGFuZGxlTWFuYWdlcik6CisgICAgICAgIChXZWJDb3JlOjpS ZXNvdXJjZUhhbmRsZU1hbmFnZXI6OnJlbW92ZUZyb21DdXJsKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlc291cmNlSGFuZGxlTWFuYWdlcjo6c3RhcnRTY2hlZHVsZWRKb2JzKToKKworICAgICAgICAq IHBsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIuaDoKKyAgICAgICAg KFdlYkNvcmU6OlJlc291cmNlSGFuZGxlTGlzdCk6IHJlbW92ZWQKKyAgICAgICAgKFdlYkNvcmU6 OlJlc291cmNlSGFuZGxlUXVldWUpOiBhZGRlZAorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VI YW5kbGVRdWV1ZU5vZGUpOiBhZGRlZAorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVN YW5hZ2VyOjptX3J1bm5pbmdKb2JzKTogYWRkZWQKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNl SGFuZGxlTWFuYWdlcjo6bV9yZXNvdXJjZUhhbmRsZUxpc3RIZWFkKTogcmVtb3ZlZAorICAgICAg ICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjptX3Jlc291cmNlSGFuZGxlUXVldWUp OiBhZGRlZAorCiAyMDA3LTEyLTA4ICBSb2IgQnVpcyAgPGJ1aXNAa2RlLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBEYXJpbi4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJs L1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcAkocmV2aXNpb24gMjg1NjQp CisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NCwxMSArNDQsNzAgQEAKIAogY29uc3QgaW50IHNlbGVj dFRpbWVvdXRNUyA9IDU7CiBjb25zdCBkb3VibGUgcG9sbFRpbWVTZWNvbmRzID0gMC4wNTsKK2Nv bnN0IGludCBtYXhSdW5uaW5nSm9icyA9IDg7CiAKK1Jlc291cmNlSGFuZGxlUXVldWU6OlJlc291 cmNlSGFuZGxlUXVldWVOb2RlOjpSZXNvdXJjZUhhbmRsZVF1ZXVlTm9kZShSZXNvdXJjZUhhbmRs ZSogcmVzb3VyY2VIYW5kbGUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUmVzb3VyY2VIYW5kbGVRdWV1ZU5vZGUg KmJhY2tOb2RlKQorICAgIDogam9iKHJlc291cmNlSGFuZGxlKQorICAgICwgbmV4dChOVUxMKQor eworICAgIGlmIChiYWNrTm9kZSkKKyAgICAgICAgYmFja05vZGUtPm5leHQgPSB0aGlzOworfQor CitSZXNvdXJjZUhhbmRsZVF1ZXVlOjp+UmVzb3VyY2VIYW5kbGVRdWV1ZSgpIHsKKyAgICBtYWtl RW1wdHkoKTsKK30KKwordm9pZCBSZXNvdXJjZUhhbmRsZVF1ZXVlOjplbnF1ZXVlKFJlc291cmNl SGFuZGxlKiBqb2IpIHsKKyAgICBpZiAoaXNFbXB0eSgpKQorICAgICAgICBtX2JhY2tOb2RlID0g bV9mcm9udE5vZGUgPSBuZXcgUmVzb3VyY2VIYW5kbGVRdWV1ZU5vZGUoam9iKTsKKyAgICBlbHNl CisgICAgICAgIG1fYmFja05vZGUgPSBuZXcgUmVzb3VyY2VIYW5kbGVRdWV1ZU5vZGUoam9iLCBt X2JhY2tOb2RlKTsKK30KKworUmVzb3VyY2VIYW5kbGUqIFJlc291cmNlSGFuZGxlUXVldWU6OmRl cXVldWUoKSB7CisgICAgQVNTRVJUKG1fZnJvbnROb2RlKTsKKyAgICBSZXNvdXJjZUhhbmRsZSog am9iID0gZnJvbnQoKTsKKyAgICBSZXNvdXJjZUhhbmRsZVF1ZXVlTm9kZSogb2xkID0gbV9mcm9u dE5vZGU7CisgICAgbV9mcm9udE5vZGUgPSBtX2Zyb250Tm9kZS0+bmV4dDsKKyAgICBkZWxldGUg b2xkOworICAgIHJldHVybiBqb2I7Cit9CisKK2Jvb2wgUmVzb3VyY2VIYW5kbGVRdWV1ZTo6ZGVx dWV1ZShSZXNvdXJjZUhhbmRsZSogam9iKSB7CisgICAgQVNTRVJUKG1fZnJvbnROb2RlKTsKKyAg ICBpZiAoam9iID09IG1fZnJvbnROb2RlLT5qb2IpIHsKKyAgICAgICAgZGVxdWV1ZSgpOworICAg ICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKKyAgICBSZXNvdXJjZUhhbmRsZVF1ZXVlTm9kZSog ZnJvbnROb2RlID0gbV9mcm9udE5vZGU7ICAgIAorICAgIHdoaWxlKGZyb250Tm9kZSkgeworICAg ICAgICBSZXNvdXJjZUhhbmRsZVF1ZXVlTm9kZSogbm9kZSA9IGZyb250Tm9kZS0+bmV4dDsKKyAg ICAgICAgaWYgKG5vZGUtPmpvYiA9PSBqb2IpIHsKKyAgICAgICAgICAgIGZyb250Tm9kZS0+bmV4 dCA9IG5vZGUtPm5leHQ7CisgICAgICAgICAgICBkZWxldGUgbm9kZTsKKyAgICAgICAgICAgIHJl dHVybiB0cnVlOworICAgICAgICB9CisgICAgICAgIGZyb250Tm9kZSA9IG5vZGU7CisgICAgfQor CisgICAgcmV0dXJuIGZhbHNlOworfQorCit2b2lkIFJlc291cmNlSGFuZGxlUXVldWU6Om1ha2VF bXB0eSgpIHsKKyAgICB3aGlsZSAoIWlzRW1wdHkoKSkKKyAgICAgICAgZGVxdWV1ZSgpOworfQor CisKKy8qIFJlc291cmNlSGFuZGxlTWFuYWdlciAqLworCiBSZXNvdXJjZUhhbmRsZU1hbmFnZXI6 OlJlc291cmNlSGFuZGxlTWFuYWdlcigpCiAgICAgOiBtX2Rvd25sb2FkVGltZXIodGhpcywgJlJl c291cmNlSGFuZGxlTWFuYWdlcjo6ZG93bmxvYWRUaW1lckNhbGxiYWNrKQogICAgICwgbV9jb29r aWVKYXJGaWxlTmFtZSgwKQotICAgICwgbV9yZXNvdXJjZUhhbmRsZUxpc3RIZWFkKDApCisgICAg LCBtX3J1bm5pbmdKb2JzKDApCiB7CiAgICAgY3VybF9nbG9iYWxfaW5pdChDVVJMX0dMT0JBTF9B TEwpOwogICAgIG1fY3VybE11bHRpSGFuZGxlID0gY3VybF9tdWx0aV9pbml0KCk7CkBAIC0yNDks NiArMzA4LDcgQEAKIHZvaWQgUmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjpyZW1vdmVGcm9tQ3VybChS ZXNvdXJjZUhhbmRsZSogam9iKQogewogICAgIFJlc291cmNlSGFuZGxlSW50ZXJuYWwqIGQgPSBq b2ItPmdldEludGVybmFsKCk7CisgICAgbV9ydW5uaW5nSm9icy0tOwogICAgIEFTU0VSVChkLT5t X2hhbmRsZSk7CiAgICAgaWYgKCFkLT5tX2hhbmRsZSkKICAgICAgICAgcmV0dXJuOwpAQCAtMjY1 LDcgKzMyNSw3IEBACiB2b2lkIFJlc291cmNlSGFuZGxlTWFuYWdlcjo6c2V0dXBQT1NUKFJlc291 cmNlSGFuZGxlKiBqb2IpCiB7CiAgICAgUmVzb3VyY2VIYW5kbGVJbnRlcm5hbCogZCA9IGpvYi0+ Z2V0SW50ZXJuYWwoKTsKLQorICAgIAogICAgIGN1cmxfZWFzeV9zZXRvcHQoZC0+bV9oYW5kbGUs IENVUkxPUFRfUE9TVCwgVFJVRSk7CiAKICAgICBqb2ItPnJlcXVlc3QoKS5odHRwQm9keSgpLT5m bGF0dGVuKGQtPm1fcG9zdEJ5dGVzKTsKQEAgLTMwNywzOSArMzY3LDI2IEBACiB7CiAgICAgLy8g d2UgY2FuIGJlIGNhbGxlZCBmcm9tIHdpdGhpbiBjdXJsLCBzbyB0byBhdm9pZCByZS1lbnRyYW5j eSBpc3N1ZXMKICAgICAvLyBzY2hlZHVsZSB0aGlzIGpvYiB0byBiZSBhZGRlZCB0aGUgbmV4dCB0 aW1lIHdlIGVudGVyIGN1cmwgZG93bmxvYWQgbG9vcAotICAgIG1fcmVzb3VyY2VIYW5kbGVMaXN0 SGVhZCA9IG5ldyBSZXNvdXJjZUhhbmRsZUxpc3Qoam9iLCBtX3Jlc291cmNlSGFuZGxlTGlzdEhl YWQpOworICAgIG1fcmVzb3VyY2VIYW5kbGVRdWV1ZS5lbnF1ZXVlKGpvYik7CiAgICAgaWYgKCFt X2Rvd25sb2FkVGltZXIuaXNBY3RpdmUoKSkKICAgICAgICAgbV9kb3dubG9hZFRpbWVyLnN0YXJ0 T25lU2hvdChwb2xsVGltZVNlY29uZHMpOwogfQogCiBib29sIFJlc291cmNlSGFuZGxlTWFuYWdl cjo6cmVtb3ZlU2NoZWR1bGVkSm9iKFJlc291cmNlSGFuZGxlKiBqb2IpCiB7Ci0gICAgUmVzb3Vy Y2VIYW5kbGVMaXN0KiBub2RlID0gbV9yZXNvdXJjZUhhbmRsZUxpc3RIZWFkOwotICAgIHdoaWxl IChub2RlKSB7Ci0gICAgICAgIFJlc291cmNlSGFuZGxlTGlzdCogbmV4dCA9IG5vZGUtPm5leHQo KTsKLSAgICAgICAgaWYgKGpvYiA9PSBub2RlLT5qb2IoKSkgewotICAgICAgICAgICAgbm9kZS0+ c2V0UmVtb3ZlZCh0cnVlKTsKLSAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICB9Ci0g ICAgICAgIG5vZGUgPSBuZXh0OwotICAgIH0KLSAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJu IG1fcmVzb3VyY2VIYW5kbGVRdWV1ZS5kZXF1ZXVlKGpvYik7CiB9CiAKIGJvb2wgUmVzb3VyY2VI YW5kbGVNYW5hZ2VyOjpzdGFydFNjaGVkdWxlZEpvYnMoKQogeworICAgIC8vIEZJWE1FOiBDcmVh dGUgYSBzZXBhcmF0ZSBzdGFjayBvZiBqb2JzIGZvciBlYWNoIGRvbWFpbgorCiAgICAgYm9vbCBz dGFydGVkID0gZmFsc2U7Ci0gICAgUmVzb3VyY2VIYW5kbGVMaXN0KiBub2RlID0gbV9yZXNvdXJj ZUhhbmRsZUxpc3RIZWFkOwotICAgIHdoaWxlIChub2RlKSB7Ci0gICAgICAgIFJlc291cmNlSGFu ZGxlTGlzdCogbmV4dCA9IG5vZGUtPm5leHQoKTsKLSAgICAgICAgaWYgKCFub2RlLT5yZW1vdmVk KCkpIHsKLSAgICAgICAgICAgIHN0YXJ0Sm9iKG5vZGUtPmpvYigpKTsKLSAgICAgICAgICAgIHN0 YXJ0ZWQgPSB0cnVlOwotICAgICAgICB9Ci0gICAgICAgIGRlbGV0ZSBub2RlOwotICAgICAgICBu b2RlID0gbmV4dDsKKyAgICB3aGlsZSAoIW1fcmVzb3VyY2VIYW5kbGVRdWV1ZS5pc0VtcHR5KCkg JiYgbV9ydW5uaW5nSm9icyA8IG1heFJ1bm5pbmdKb2JzKSB7CisgICAgICAgIHN0YXJ0Sm9iKG1f cmVzb3VyY2VIYW5kbGVRdWV1ZS5kZXF1ZXVlKCkpOworICAgICAgICBzdGFydGVkID0gdHJ1ZTsK KyAgICAgICAgbV9ydW5uaW5nSm9icysrOwogICAgIH0KLSAgICBtX3Jlc291cmNlSGFuZGxlTGlz dEhlYWQgPSAwOwogICAgIHJldHVybiBzdGFydGVkOwogfQogCkluZGV4OiBXZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIuaAkocmV2 aXNpb24gMjg1NjQpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhh bmRsZU1hbmFnZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMzUsMjIgKzM1LDMzIEBACiAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAotY2xhc3MgUmVzb3VyY2VIYW5kbGVMaXN0IHsKK2NsYXNzIFJlc291 cmNlSGFuZGxlUXVldWUgeworcHJpdmF0ZToKKyAgICBzdHJ1Y3QgUmVzb3VyY2VIYW5kbGVRdWV1 ZU5vZGUKKyAgICB7CisgICAgICAgIFJlc291cmNlSGFuZGxlUXVldWVOb2RlKFJlc291cmNlSGFu ZGxlKiByZXNvdXJjZUhhbmRsZSwgUmVzb3VyY2VIYW5kbGVRdWV1ZU5vZGUgKmJhY2tOb2RlID0g TlVMTCk7CisKKyAgICAgICAgUmVzb3VyY2VIYW5kbGUqIGpvYjsKKyAgICAgICAgUmVzb3VyY2VI YW5kbGVRdWV1ZU5vZGUqIG5leHQ7CisgICAgfTsKKworICAgIFJlc291cmNlSGFuZGxlUXVldWVO b2RlICptX2Zyb250Tm9kZTsKKyAgICBSZXNvdXJjZUhhbmRsZVF1ZXVlTm9kZSAqbV9iYWNrTm9k ZTsKKwogcHVibGljOgotICAgIFJlc291cmNlSGFuZGxlTGlzdChSZXNvdXJjZUhhbmRsZSogam9i LCBSZXNvdXJjZUhhbmRsZUxpc3QqIG5leHQpCi0gICAgICAgIDogbV9qb2Ioam9iKQotICAgICAg ICAsIG1fbmV4dChuZXh0KQotICAgICAgICAsIG1fcmVtb3ZlZChmYWxzZSkKKyAgICBSZXNvdXJj ZUhhbmRsZVF1ZXVlKCkKKyAgICAgICAgOiBtX2Zyb250Tm9kZShOVUxMKQorICAgICAgICAsIG1f YmFja05vZGUoTlVMTCkKICAgICB7fQotICAgIFJlc291cmNlSGFuZGxlTGlzdCogbmV4dCgpIGNv bnN0IHsgcmV0dXJuIG1fbmV4dDsgfQotICAgIFJlc291cmNlSGFuZGxlKiBqb2IoKSBjb25zdCB7 IHJldHVybiBtX2pvYjsgfQotICAgIHZvaWQgc2V0UmVtb3ZlZChib29sIHJlbW92ZWQpIHsgbV9y ZW1vdmVkID0gcmVtb3ZlZDsgfQotICAgIGJvb2wgcmVtb3ZlZCgpIGNvbnN0IHsgcmV0dXJuIG1f cmVtb3ZlZDsgfQorICAgIH5SZXNvdXJjZUhhbmRsZVF1ZXVlKCk7CisgICAgUmVzb3VyY2VIYW5k bGUqIGZyb250KCkgY29uc3QgeyByZXR1cm4gbV9mcm9udE5vZGUtPmpvYjsgfQorICAgIFJlc291 cmNlSGFuZGxlKiBiYWNrKCkgY29uc3QgeyByZXR1cm4gbV9iYWNrTm9kZS0+am9iOyB9CisgICAg dm9pZCBlbnF1ZXVlKFJlc291cmNlSGFuZGxlKiBqb2IpOworICAgIFJlc291cmNlSGFuZGxlKiBk ZXF1ZXVlKCk7CisgICAgYm9vbCBkZXF1ZXVlKFJlc291cmNlSGFuZGxlKiBqb2IpOwogCi1wcml2 YXRlOgotICAgIFJlc291cmNlSGFuZGxlKiBtX2pvYjsKLSAgICBSZXNvdXJjZUhhbmRsZUxpc3Qq IG1fbmV4dDsKLSAgICBib29sIG1fcmVtb3ZlZDsKKyAgICB2b2lkIG1ha2VFbXB0eSgpOworICAg IGJvb2wgaXNFbXB0eSgpIGNvbnN0IHsgcmV0dXJuIG1fZnJvbnROb2RlID09IE5VTEw7IH0KIH07 CiAKIGNsYXNzIFJlc291cmNlSGFuZGxlTWFuYWdlciB7CkBAIC03Nyw3ICs4OCw4IEBACiAgICAg Q1VSTFNIKiBtX2N1cmxTaGFyZUhhbmRsZTsKICAgICBjaGFyKiBtX2Nvb2tpZUphckZpbGVOYW1l OwogICAgIGNoYXIgbV9jdXJsRXJyb3JCdWZmZXJbQ1VSTF9FUlJPUl9TSVpFXTsKLSAgICBSZXNv dXJjZUhhbmRsZUxpc3QqIG1fcmVzb3VyY2VIYW5kbGVMaXN0SGVhZDsKKyAgICBSZXNvdXJjZUhh bmRsZVF1ZXVlIG1fcmVzb3VyY2VIYW5kbGVRdWV1ZTsKKyAgICBpbnQgbV9ydW5uaW5nSm9iczsK IH07CiAKIH0K 17799 2007-12-09 00:59:49 -0800 2007-12-09 13:46:12 -0800 do not crash on job cancel curl.patch text/plain 7716 lethalman88 SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyODU2NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzMgQEAKKzIwMDctMTItMDUgIEx1Y2EgQnJ1bm8gIDxsZXRoYWxtYW44OEBnbWFp bC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZLgorCisgICAgICAgIGh0dHA6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODI1CisgICAgICAgIFtHVEtdIGN1cmwg LSBzbG93IGRucyBjYXVzaW5nIGhhbmdzLgorCisgICAgICAgIENyZWF0ZSBhIHF1ZXVlIG9mIGpv YnMsIHRvIHNhdGlzZnkgcmVxdWVzdHMgaW4gdGhlIHJpZ2h0IG9yZGVyLgorICAgICAgICBTZXQg YSBsaW1pdCB0byB0aGUgbnVtYmVyIG9mIHNpbXVsdGFuZW91cyBjb25uZWN0aW9ucy4KKworICAg ICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6bWF4UnVubmluZ0pvYnMpOiBhZGRlZAorICAgICAgICAoV2ViQ29y ZTo6UmVzb3VyY2VIYW5kbGVRdWV1ZTo6UmVzb3VyY2VIYW5kbGVRdWV1ZU5vZGU6OlJlc291cmNl SGFuZGxlUXVldWVOb2RlKTogYWRkZWQKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxl UXVldWU6On5SZXNvdXJjZUhhbmRsZVF1ZXVlKTogYWRkZWQKKyAgICAgICAgKFdlYkNvcmU6OlJl c291cmNlSGFuZGxlUXVldWU6OmVucXVldWUpOiBhZGRlZAorICAgICAgICAoV2ViQ29yZTo6UmVz b3VyY2VIYW5kbGVRdWV1ZTo6ZGVxdWV1ZSk6IGFkZGVkCisgICAgICAgIChXZWJDb3JlOjpSZXNv dXJjZUhhbmRsZVF1ZXVlOjp3aWxsUmVtb3ZlKTogYWRkZWQJCisgICAgICAgIChXZWJDb3JlOjpS ZXNvdXJjZUhhbmRsZVF1ZXVlOjptYWtlRW1wdHkpOiBhZGRlZAorICAgICAgICAoV2ViQ29yZTo6 UmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjpSZXNvdXJjZUhhbmRsZU1hbmFnZXIpOgorICAgICAgICAo V2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjpyZW1vdmVGcm9tQ3VybCk6CisgICAgICAg IChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZU1hbmFnZXI6OnN0YXJ0U2NoZWR1bGVkSm9icyk6CisK KyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmg6 CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZUxpc3QpOiByZW1vdmVkCisgICAgICAg IChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZVF1ZXVlKTogYWRkZWQKKyAgICAgICAgKFdlYkNvcmU6 OlJlc291cmNlSGFuZGxlUXVldWVOb2RlKTogYWRkZWQKKyAgICAgICAgKFdlYkNvcmU6OlJlc291 cmNlSGFuZGxlTWFuYWdlcjo6bV9ydW5uaW5nSm9icyk6IGFkZGVkCisgICAgICAgIChXZWJDb3Jl OjpSZXNvdXJjZUhhbmRsZU1hbmFnZXI6Om1fcmVzb3VyY2VIYW5kbGVMaXN0SGVhZCk6IHJlbW92 ZWQKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlTWFuYWdlcjo6bV9yZXNvdXJjZUhh bmRsZVF1ZXVlKTogYWRkZWQKKwogMjAwNy0xMi0wOCAgUm9iIEJ1aXMgIDxidWlzQGtkZS5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4uCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHAJKHJldmlz aW9uIDI4NTY0KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5k bGVNYW5hZ2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQsMTEgKzQ0LDY3IEBACiAKIGNvbnN0 IGludCBzZWxlY3RUaW1lb3V0TVMgPSA1OwogY29uc3QgZG91YmxlIHBvbGxUaW1lU2Vjb25kcyA9 IDAuMDU7Citjb25zdCBpbnQgbWF4UnVubmluZ0pvYnMgPSA1OwogCitSZXNvdXJjZUhhbmRsZVF1 ZXVlOjpSZXNvdXJjZUhhbmRsZVF1ZXVlTm9kZTo6UmVzb3VyY2VIYW5kbGVRdWV1ZU5vZGUoUmVz b3VyY2VIYW5kbGUqIHJlc291cmNlSGFuZGxlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFJlc291cmNlSGFuZGxl UXVldWVOb2RlICpiYWNrTm9kZSkKKyAgICA6IGpvYihyZXNvdXJjZUhhbmRsZSkKKyAgICAsIG5l eHQoTlVMTCkKKyAgICAsIHJlbW92ZWQoZmFsc2UpCit7CisgICAgaWYgKGJhY2tOb2RlKQorICAg ICAgICBiYWNrTm9kZS0+bmV4dCA9IHRoaXM7Cit9CisKK1Jlc291cmNlSGFuZGxlUXVldWU6On5S ZXNvdXJjZUhhbmRsZVF1ZXVlKCkgeworICAgIG1ha2VFbXB0eSgpOworfQorCit2b2lkIFJlc291 cmNlSGFuZGxlUXVldWU6OmVucXVldWUoUmVzb3VyY2VIYW5kbGUqIGpvYikgeworICAgIGlmIChp c0VtcHR5KCkpCisgICAgICAgIG1fYmFja05vZGUgPSBtX2Zyb250Tm9kZSA9IG5ldyBSZXNvdXJj ZUhhbmRsZVF1ZXVlTm9kZShqb2IpOworICAgIGVsc2UKKyAgICAgICAgbV9iYWNrTm9kZSA9IG5l dyBSZXNvdXJjZUhhbmRsZVF1ZXVlTm9kZShqb2IsIG1fYmFja05vZGUpOworfQorCitSZXNvdXJj ZUhhbmRsZSogUmVzb3VyY2VIYW5kbGVRdWV1ZTo6ZGVxdWV1ZSgpIHsKKyAgICBBU1NFUlQobV9m cm9udE5vZGUpOworICAgIFJlc291cmNlSGFuZGxlKiBqb2IgPSBmcm9udCgpOworICAgIFJlc291 cmNlSGFuZGxlUXVldWVOb2RlKiBvbGQgPSBtX2Zyb250Tm9kZTsKKyAgICBib29sIHJlbW92ZWQg PSBvbGQtPnJlbW92ZWQ7CisgICAgbV9mcm9udE5vZGUgPSBtX2Zyb250Tm9kZS0+bmV4dDsKKyAg ICBkZWxldGUgb2xkOworCisgICAgaWYgKHJlbW92ZWQpCisgICAgICAgIHJldHVybiBkZXF1ZXVl KCk7CisgICAgcmV0dXJuIGpvYjsKK30KKworYm9vbCBSZXNvdXJjZUhhbmRsZVF1ZXVlOjp3aWxs UmVtb3ZlKFJlc291cmNlSGFuZGxlKiBqb2IpIHsKKyAgICBBU1NFUlQobV9mcm9udE5vZGUpOwor ICAgIFJlc291cmNlSGFuZGxlUXVldWVOb2RlKiBub2RlID0gbV9mcm9udE5vZGU7ICAgIAorICAg IHdoaWxlKG5vZGUpIHsKKyAgICAgICAgaWYgKG5vZGUtPmpvYiA9PSBqb2IpIHsKKyAgICAgICAg ICAgIG5vZGUtPnJlbW92ZWQgPSB0cnVlOworICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAg ICAgIH0KKyAgICAgICAgbm9kZSA9IG5vZGUtPm5leHQ7CisgICAgfQorICAgIHJldHVybiBmYWxz ZTsKK30KKwordm9pZCBSZXNvdXJjZUhhbmRsZVF1ZXVlOjptYWtlRW1wdHkoKSB7CisgICAgd2hp bGUgKCFpc0VtcHR5KCkpCisgICAgICAgIGRlcXVldWUoKTsKK30KKworCisvKiBSZXNvdXJjZUhh bmRsZU1hbmFnZXIgKi8KKwogUmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjpSZXNvdXJjZUhhbmRsZU1h bmFnZXIoKQogICAgIDogbV9kb3dubG9hZFRpbWVyKHRoaXMsICZSZXNvdXJjZUhhbmRsZU1hbmFn ZXI6OmRvd25sb2FkVGltZXJDYWxsYmFjaykKICAgICAsIG1fY29va2llSmFyRmlsZU5hbWUoMCkK LSAgICAsIG1fcmVzb3VyY2VIYW5kbGVMaXN0SGVhZCgwKQorICAgICwgbV9ydW5uaW5nSm9icygw KQogewogICAgIGN1cmxfZ2xvYmFsX2luaXQoQ1VSTF9HTE9CQUxfQUxMKTsKICAgICBtX2N1cmxN dWx0aUhhbmRsZSA9IGN1cmxfbXVsdGlfaW5pdCgpOwpAQCAtMjQ5LDYgKzMwNSw3IEBACiB2b2lk IFJlc291cmNlSGFuZGxlTWFuYWdlcjo6cmVtb3ZlRnJvbUN1cmwoUmVzb3VyY2VIYW5kbGUqIGpv YikKIHsKICAgICBSZXNvdXJjZUhhbmRsZUludGVybmFsKiBkID0gam9iLT5nZXRJbnRlcm5hbCgp OworICAgIG1fcnVubmluZ0pvYnMtLTsKICAgICBBU1NFUlQoZC0+bV9oYW5kbGUpOwogICAgIGlm ICghZC0+bV9oYW5kbGUpCiAgICAgICAgIHJldHVybjsKQEAgLTI2NSw3ICszMjIsNyBAQAogdm9p ZCBSZXNvdXJjZUhhbmRsZU1hbmFnZXI6OnNldHVwUE9TVChSZXNvdXJjZUhhbmRsZSogam9iKQog ewogICAgIFJlc291cmNlSGFuZGxlSW50ZXJuYWwqIGQgPSBqb2ItPmdldEludGVybmFsKCk7Ci0K KyAgICAKICAgICBjdXJsX2Vhc3lfc2V0b3B0KGQtPm1faGFuZGxlLCBDVVJMT1BUX1BPU1QsIFRS VUUpOwogCiAgICAgam9iLT5yZXF1ZXN0KCkuaHR0cEJvZHkoKS0+ZmxhdHRlbihkLT5tX3Bvc3RC eXRlcyk7CkBAIC0zMDcsMzkgKzM2NCwyNiBAQAogewogICAgIC8vIHdlIGNhbiBiZSBjYWxsZWQg ZnJvbSB3aXRoaW4gY3VybCwgc28gdG8gYXZvaWQgcmUtZW50cmFuY3kgaXNzdWVzCiAgICAgLy8g c2NoZWR1bGUgdGhpcyBqb2IgdG8gYmUgYWRkZWQgdGhlIG5leHQgdGltZSB3ZSBlbnRlciBjdXJs IGRvd25sb2FkIGxvb3AKLSAgICBtX3Jlc291cmNlSGFuZGxlTGlzdEhlYWQgPSBuZXcgUmVzb3Vy Y2VIYW5kbGVMaXN0KGpvYiwgbV9yZXNvdXJjZUhhbmRsZUxpc3RIZWFkKTsKKyAgICBtX3Jlc291 cmNlSGFuZGxlUXVldWUuZW5xdWV1ZShqb2IpOwogICAgIGlmICghbV9kb3dubG9hZFRpbWVyLmlz QWN0aXZlKCkpCiAgICAgICAgIG1fZG93bmxvYWRUaW1lci5zdGFydE9uZVNob3QocG9sbFRpbWVT ZWNvbmRzKTsKIH0KIAogYm9vbCBSZXNvdXJjZUhhbmRsZU1hbmFnZXI6OnJlbW92ZVNjaGVkdWxl ZEpvYihSZXNvdXJjZUhhbmRsZSogam9iKQogewotICAgIFJlc291cmNlSGFuZGxlTGlzdCogbm9k ZSA9IG1fcmVzb3VyY2VIYW5kbGVMaXN0SGVhZDsKLSAgICB3aGlsZSAobm9kZSkgewotICAgICAg ICBSZXNvdXJjZUhhbmRsZUxpc3QqIG5leHQgPSBub2RlLT5uZXh0KCk7Ci0gICAgICAgIGlmIChq b2IgPT0gbm9kZS0+am9iKCkpIHsKLSAgICAgICAgICAgIG5vZGUtPnNldFJlbW92ZWQodHJ1ZSk7 Ci0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgfQotICAgICAgICBub2RlID0gbmV4 dDsKLSAgICB9Ci0gICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiBtX3Jlc291cmNlSGFuZGxl UXVldWUud2lsbFJlbW92ZShqb2IpOwogfQogCiBib29sIFJlc291cmNlSGFuZGxlTWFuYWdlcjo6 c3RhcnRTY2hlZHVsZWRKb2JzKCkKIHsKKyAgICAvLyBGSVhNRTogQ3JlYXRlIGEgc2VwYXJhdGUg c3RhY2sgb2Ygam9icyBmb3IgZWFjaCBkb21haW4KKwogICAgIGJvb2wgc3RhcnRlZCA9IGZhbHNl OwotICAgIFJlc291cmNlSGFuZGxlTGlzdCogbm9kZSA9IG1fcmVzb3VyY2VIYW5kbGVMaXN0SGVh ZDsKLSAgICB3aGlsZSAobm9kZSkgewotICAgICAgICBSZXNvdXJjZUhhbmRsZUxpc3QqIG5leHQg PSBub2RlLT5uZXh0KCk7Ci0gICAgICAgIGlmICghbm9kZS0+cmVtb3ZlZCgpKSB7Ci0gICAgICAg ICAgICBzdGFydEpvYihub2RlLT5qb2IoKSk7Ci0gICAgICAgICAgICBzdGFydGVkID0gdHJ1ZTsK LSAgICAgICAgfQotICAgICAgICBkZWxldGUgbm9kZTsKLSAgICAgICAgbm9kZSA9IG5leHQ7Cisg ICAgd2hpbGUgKCFtX3Jlc291cmNlSGFuZGxlUXVldWUuaXNFbXB0eSgpICYmIG1fcnVubmluZ0pv YnMgPCBtYXhSdW5uaW5nSm9icykgeworICAgICAgICBzdGFydEpvYihtX3Jlc291cmNlSGFuZGxl UXVldWUuZGVxdWV1ZSgpKTsKKyAgICAgICAgc3RhcnRlZCA9IHRydWU7CisgICAgICAgIG1fcnVu bmluZ0pvYnMrKzsKICAgICB9Ci0gICAgbV9yZXNvdXJjZUhhbmRsZUxpc3RIZWFkID0gMDsKICAg ICByZXR1cm4gc3RhcnRlZDsKIH0KIApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1 cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmgJKHJldmlzaW9uIDI4NTY0KQor KysgV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmgJ KHdvcmtpbmcgY29weSkKQEAgLTM1LDIyICszNSwzNCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKLWNsYXNzIFJlc291cmNlSGFuZGxlTGlzdCB7CitjbGFzcyBSZXNvdXJjZUhhbmRsZVF1ZXVl IHsKK3ByaXZhdGU6CisgICAgc3RydWN0IFJlc291cmNlSGFuZGxlUXVldWVOb2RlCisgICAgewor ICAgICAgICBSZXNvdXJjZUhhbmRsZVF1ZXVlTm9kZShSZXNvdXJjZUhhbmRsZSogcmVzb3VyY2VI YW5kbGUsIFJlc291cmNlSGFuZGxlUXVldWVOb2RlICpiYWNrTm9kZSA9IE5VTEwpOworCisgICAg ICAgIFJlc291cmNlSGFuZGxlKiBqb2I7CisgICAgICAgIFJlc291cmNlSGFuZGxlUXVldWVOb2Rl KiBuZXh0OworICAgICAgICBib29sIHJlbW92ZWQ7CisgICAgfTsKKworICAgIFJlc291cmNlSGFu ZGxlUXVldWVOb2RlICptX2Zyb250Tm9kZTsKKyAgICBSZXNvdXJjZUhhbmRsZVF1ZXVlTm9kZSAq bV9iYWNrTm9kZTsKKwogcHVibGljOgotICAgIFJlc291cmNlSGFuZGxlTGlzdChSZXNvdXJjZUhh bmRsZSogam9iLCBSZXNvdXJjZUhhbmRsZUxpc3QqIG5leHQpCi0gICAgICAgIDogbV9qb2Ioam9i KQotICAgICAgICAsIG1fbmV4dChuZXh0KQotICAgICAgICAsIG1fcmVtb3ZlZChmYWxzZSkKKyAg ICBSZXNvdXJjZUhhbmRsZVF1ZXVlKCkKKyAgICAgICAgOiBtX2Zyb250Tm9kZShOVUxMKQorICAg ICAgICAsIG1fYmFja05vZGUoTlVMTCkKICAgICB7fQotICAgIFJlc291cmNlSGFuZGxlTGlzdCog bmV4dCgpIGNvbnN0IHsgcmV0dXJuIG1fbmV4dDsgfQotICAgIFJlc291cmNlSGFuZGxlKiBqb2Io KSBjb25zdCB7IHJldHVybiBtX2pvYjsgfQotICAgIHZvaWQgc2V0UmVtb3ZlZChib29sIHJlbW92 ZWQpIHsgbV9yZW1vdmVkID0gcmVtb3ZlZDsgfQotICAgIGJvb2wgcmVtb3ZlZCgpIGNvbnN0IHsg cmV0dXJuIG1fcmVtb3ZlZDsgfQorICAgIH5SZXNvdXJjZUhhbmRsZVF1ZXVlKCk7CisgICAgUmVz b3VyY2VIYW5kbGUqIGZyb250KCkgY29uc3QgeyByZXR1cm4gbV9mcm9udE5vZGUtPmpvYjsgfQor ICAgIFJlc291cmNlSGFuZGxlKiBiYWNrKCkgY29uc3QgeyByZXR1cm4gbV9iYWNrTm9kZS0+am9i OyB9CisgICAgdm9pZCBlbnF1ZXVlKFJlc291cmNlSGFuZGxlKiBqb2IpOworICAgIFJlc291cmNl SGFuZGxlKiBkZXF1ZXVlKCk7CisgICAgYm9vbCB3aWxsUmVtb3ZlKFJlc291cmNlSGFuZGxlKiBq b2IpOwogCi1wcml2YXRlOgotICAgIFJlc291cmNlSGFuZGxlKiBtX2pvYjsKLSAgICBSZXNvdXJj ZUhhbmRsZUxpc3QqIG1fbmV4dDsKLSAgICBib29sIG1fcmVtb3ZlZDsKKyAgICB2b2lkIG1ha2VF bXB0eSgpOworICAgIGJvb2wgaXNFbXB0eSgpIGNvbnN0IHsgcmV0dXJuIG1fZnJvbnROb2RlID09 IE5VTEw7IH0KIH07CiAKIGNsYXNzIFJlc291cmNlSGFuZGxlTWFuYWdlciB7CkBAIC03Nyw3ICs4 OSw4IEBACiAgICAgQ1VSTFNIKiBtX2N1cmxTaGFyZUhhbmRsZTsKICAgICBjaGFyKiBtX2Nvb2tp ZUphckZpbGVOYW1lOwogICAgIGNoYXIgbV9jdXJsRXJyb3JCdWZmZXJbQ1VSTF9FUlJPUl9TSVpF XTsKLSAgICBSZXNvdXJjZUhhbmRsZUxpc3QqIG1fcmVzb3VyY2VIYW5kbGVMaXN0SGVhZDsKKyAg ICBSZXNvdXJjZUhhbmRsZVF1ZXVlIG1fcmVzb3VyY2VIYW5kbGVRdWV1ZTsKKyAgICBpbnQgbV9y dW5uaW5nSm9iczsKIH07CiAKIH0K 17804 2007-12-09 07:19:59 -0800 2007-12-09 13:47:49 -0800 alternative using vectors curl.patch text/plain 5411 lethalman88 SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyODU2NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMDctMTItMDUgIEx1Y2EgQnJ1bm8gIDxsZXRoYWxtYW44OEBnbWFp bC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZLgorCisgICAgICAgIGh0dHA6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODI1CisgICAgICAgIFtHVEtdIGN1cmwg LSBzbG93IGRucyBjYXVzaW5nIGhhbmdzLgorCisgICAgICAgIENyZWF0ZSBhIHZlY3RvciBvZiBq b2JzLCB0byBzYXRpc2Z5IHJlcXVlc3RzIGluIHRoZSByaWdodCBvcmRlci4KKyAgICAgICAgU2V0 IGEgbGltaXQgdG8gdGhlIG51bWJlciBvZiBzaW11bHRhbmVvdXMgY29ubmVjdGlvbnMuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Om1heFJ1bm5pbmdKb2JzKTogYWRkZWQKKyAgICAgICAgKFdlYkNv cmU6OlJlc291cmNlSGFuZGxlTWFuYWdlcjo6UmVzb3VyY2VIYW5kbGVNYW5hZ2VyKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlTWFuYWdlcjo6cmVtb3ZlRnJvbUN1cmwpOgorICAg ICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjpzdGFydFNjaGVkdWxlZEpvYnMp OgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdl ci5oOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVMaXN0KTogcmVtb3ZlZAorICAg ICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjptX3J1bm5pbmdKb2JzKTogYWRk ZWQKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlTWFuYWdlcjo6bV9yZXNvdXJjZUhh bmRsZUxpc3RIZWFkKTogcmVtb3ZlZAorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVN YW5hZ2VyOjptX3Jlc291cmNlSGFuZGxlTGlzdCk6IGFkZGVkCisKIDIwMDctMTItMDggIFJvYiBC dWlzICA8YnVpc0BrZGUub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluLgpJbmRleDog V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRs ZU1hbmFnZXIuY3BwCShyZXZpc2lvbiAyODU2NCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDEx ICs0NCwxMiBAQAogCiBjb25zdCBpbnQgc2VsZWN0VGltZW91dE1TID0gNTsKIGNvbnN0IGRvdWJs ZSBwb2xsVGltZVNlY29uZHMgPSAwLjA1OworY29uc3QgaW50IG1heFJ1bm5pbmdKb2JzID0gNTsK IAogUmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjpSZXNvdXJjZUhhbmRsZU1hbmFnZXIoKQogICAgIDog bV9kb3dubG9hZFRpbWVyKHRoaXMsICZSZXNvdXJjZUhhbmRsZU1hbmFnZXI6OmRvd25sb2FkVGlt ZXJDYWxsYmFjaykKICAgICAsIG1fY29va2llSmFyRmlsZU5hbWUoMCkKLSAgICAsIG1fcmVzb3Vy Y2VIYW5kbGVMaXN0SGVhZCgwKQorICAgICwgbV9ydW5uaW5nSm9icygwKQogewogICAgIGN1cmxf Z2xvYmFsX2luaXQoQ1VSTF9HTE9CQUxfQUxMKTsKICAgICBtX2N1cmxNdWx0aUhhbmRsZSA9IGN1 cmxfbXVsdGlfaW5pdCgpOwpAQCAtMjQ5LDYgKzI1MCw3IEBACiB2b2lkIFJlc291cmNlSGFuZGxl TWFuYWdlcjo6cmVtb3ZlRnJvbUN1cmwoUmVzb3VyY2VIYW5kbGUqIGpvYikKIHsKICAgICBSZXNv dXJjZUhhbmRsZUludGVybmFsKiBkID0gam9iLT5nZXRJbnRlcm5hbCgpOworICAgIG1fcnVubmlu Z0pvYnMtLTsKICAgICBBU1NFUlQoZC0+bV9oYW5kbGUpOwogICAgIGlmICghZC0+bV9oYW5kbGUp CiAgICAgICAgIHJldHVybjsKQEAgLTI2NSw3ICsyNjcsNyBAQAogdm9pZCBSZXNvdXJjZUhhbmRs ZU1hbmFnZXI6OnNldHVwUE9TVChSZXNvdXJjZUhhbmRsZSogam9iKQogewogICAgIFJlc291cmNl SGFuZGxlSW50ZXJuYWwqIGQgPSBqb2ItPmdldEludGVybmFsKCk7Ci0KKyAgICAKICAgICBjdXJs X2Vhc3lfc2V0b3B0KGQtPm1faGFuZGxlLCBDVVJMT1BUX1BPU1QsIFRSVUUpOwogCiAgICAgam9i LT5yZXF1ZXN0KCkuaHR0cEJvZHkoKS0+ZmxhdHRlbihkLT5tX3Bvc3RCeXRlcyk7CkBAIC0zMDcs MzkgKzMwOSwzNSBAQAogewogICAgIC8vIHdlIGNhbiBiZSBjYWxsZWQgZnJvbSB3aXRoaW4gY3Vy bCwgc28gdG8gYXZvaWQgcmUtZW50cmFuY3kgaXNzdWVzCiAgICAgLy8gc2NoZWR1bGUgdGhpcyBq b2IgdG8gYmUgYWRkZWQgdGhlIG5leHQgdGltZSB3ZSBlbnRlciBjdXJsIGRvd25sb2FkIGxvb3AK LSAgICBtX3Jlc291cmNlSGFuZGxlTGlzdEhlYWQgPSBuZXcgUmVzb3VyY2VIYW5kbGVMaXN0KGpv YiwgbV9yZXNvdXJjZUhhbmRsZUxpc3RIZWFkKTsKKyAgICBtX3Jlc291cmNlSGFuZGxlTGlzdC5h cHBlbmQoam9iKTsKICAgICBpZiAoIW1fZG93bmxvYWRUaW1lci5pc0FjdGl2ZSgpKQogICAgICAg ICBtX2Rvd25sb2FkVGltZXIuc3RhcnRPbmVTaG90KHBvbGxUaW1lU2Vjb25kcyk7CiB9CiAKIGJv b2wgUmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjpyZW1vdmVTY2hlZHVsZWRKb2IoUmVzb3VyY2VIYW5k bGUqIGpvYikKIHsKLSAgICBSZXNvdXJjZUhhbmRsZUxpc3QqIG5vZGUgPSBtX3Jlc291cmNlSGFu ZGxlTGlzdEhlYWQ7Ci0gICAgd2hpbGUgKG5vZGUpIHsKLSAgICAgICAgUmVzb3VyY2VIYW5kbGVM aXN0KiBuZXh0ID0gbm9kZS0+bmV4dCgpOwotICAgICAgICBpZiAoam9iID09IG5vZGUtPmpvYigp KSB7Ci0gICAgICAgICAgICBub2RlLT5zZXRSZW1vdmVkKHRydWUpOworICAgIGludCBzaXplID0g bV9yZXNvdXJjZUhhbmRsZUxpc3Quc2l6ZSgpOworICAgIGZvciAoaW50IGk9MDsgaSA8IHNpemU7 IGkrKykgeworICAgICAgICBpZiAoam9iID09IG1fcmVzb3VyY2VIYW5kbGVMaXN0W2ldKSB7Cisg ICAgICAgICAgICBtX3Jlc291cmNlSGFuZGxlTGlzdC5yZW1vdmUoaSk7CiAgICAgICAgICAgICBy ZXR1cm4gdHJ1ZTsKICAgICAgICAgfQotICAgICAgICBub2RlID0gbmV4dDsKICAgICB9CiAgICAg cmV0dXJuIGZhbHNlOwogfQogCiBib29sIFJlc291cmNlSGFuZGxlTWFuYWdlcjo6c3RhcnRTY2hl ZHVsZWRKb2JzKCkKIHsKKyAgICAvLyBGSVhNRTogQ3JlYXRlIGEgc2VwYXJhdGUgc3RhY2sgb2Yg am9icyBmb3IgZWFjaCBkb21haW4KKwogICAgIGJvb2wgc3RhcnRlZCA9IGZhbHNlOwotICAgIFJl c291cmNlSGFuZGxlTGlzdCogbm9kZSA9IG1fcmVzb3VyY2VIYW5kbGVMaXN0SGVhZDsKLSAgICB3 aGlsZSAobm9kZSkgewotICAgICAgICBSZXNvdXJjZUhhbmRsZUxpc3QqIG5leHQgPSBub2RlLT5u ZXh0KCk7Ci0gICAgICAgIGlmICghbm9kZS0+cmVtb3ZlZCgpKSB7Ci0gICAgICAgICAgICBzdGFy dEpvYihub2RlLT5qb2IoKSk7Ci0gICAgICAgICAgICBzdGFydGVkID0gdHJ1ZTsKLSAgICAgICAg fQotICAgICAgICBkZWxldGUgbm9kZTsKLSAgICAgICAgbm9kZSA9IG5leHQ7CisgICAgd2hpbGUg KCFtX3Jlc291cmNlSGFuZGxlTGlzdC5pc0VtcHR5KCkgJiYgbV9ydW5uaW5nSm9icyA8IG1heFJ1 bm5pbmdKb2JzKSB7CisgICAgICAgIFJlc291cmNlSGFuZGxlKiBqb2IgPSBtX3Jlc291cmNlSGFu ZGxlTGlzdFswXTsKKyAgICAgICAgc3RhcnRKb2Ioam9iKTsKKyAgICAgICAgbV9yZXNvdXJjZUhh bmRsZUxpc3QucmVtb3ZlKDApOworICAgICAgICBzdGFydGVkID0gdHJ1ZTsKKyAgICAgICAgbV9y dW5uaW5nSm9icysrOwogICAgIH0KLSAgICBtX3Jlc291cmNlSGFuZGxlTGlzdEhlYWQgPSAwOwog ICAgIHJldHVybiBzdGFydGVkOwogfQogCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv Y3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIuaAkocmV2aXNpb24gMjg1NjQp CisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIu aAkod29ya2luZyBjb3B5KQpAQCAtMjksMzAgKzI5LDEzIEBACiAjZGVmaW5lIFJlc291cmNlSGFu ZGxlTWFuYWdlcl9oCiAKICNpbmNsdWRlICJGcmFtZS5oIgorI2luY2x1ZGUgIlZlY3Rvci5oIgog I2luY2x1ZGUgIlRpbWVyLmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VIYW5kbGVDbGllbnQuaCIKICNp bmNsdWRlIDxjdXJsL2N1cmwuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1jbGFzcyBSZXNv dXJjZUhhbmRsZUxpc3QgewotcHVibGljOgotICAgIFJlc291cmNlSGFuZGxlTGlzdChSZXNvdXJj ZUhhbmRsZSogam9iLCBSZXNvdXJjZUhhbmRsZUxpc3QqIG5leHQpCi0gICAgICAgIDogbV9qb2Io am9iKQotICAgICAgICAsIG1fbmV4dChuZXh0KQotICAgICAgICAsIG1fcmVtb3ZlZChmYWxzZSkK LSAgICB7fQotICAgIFJlc291cmNlSGFuZGxlTGlzdCogbmV4dCgpIGNvbnN0IHsgcmV0dXJuIG1f bmV4dDsgfQotICAgIFJlc291cmNlSGFuZGxlKiBqb2IoKSBjb25zdCB7IHJldHVybiBtX2pvYjsg fQotICAgIHZvaWQgc2V0UmVtb3ZlZChib29sIHJlbW92ZWQpIHsgbV9yZW1vdmVkID0gcmVtb3Zl ZDsgfQotICAgIGJvb2wgcmVtb3ZlZCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVtb3ZlZDsgfQotCi1w cml2YXRlOgotICAgIFJlc291cmNlSGFuZGxlKiBtX2pvYjsKLSAgICBSZXNvdXJjZUhhbmRsZUxp c3QqIG1fbmV4dDsKLSAgICBib29sIG1fcmVtb3ZlZDsKLX07Ci0KIGNsYXNzIFJlc291cmNlSGFu ZGxlTWFuYWdlciB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFJlc291cmNlSGFuZGxlTWFuYWdlciog c2hhcmVkSW5zdGFuY2UoKTsKQEAgLTc3LDcgKzYwLDggQEAKICAgICBDVVJMU0gqIG1fY3VybFNo YXJlSGFuZGxlOwogICAgIGNoYXIqIG1fY29va2llSmFyRmlsZU5hbWU7CiAgICAgY2hhciBtX2N1 cmxFcnJvckJ1ZmZlcltDVVJMX0VSUk9SX1NJWkVdOwotICAgIFJlc291cmNlSGFuZGxlTGlzdCog bV9yZXNvdXJjZUhhbmRsZUxpc3RIZWFkOworICAgIFZlY3RvcjxSZXNvdXJjZUhhbmRsZSo+IG1f cmVzb3VyY2VIYW5kbGVMaXN0OworICAgIGludCBtX3J1bm5pbmdKb2JzOwogfTsKIAogfQo=