116152 2013-05-15 07:17:40 -0700 [curl] Remove version #if guards 2013-05-15 09:21:44 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 galpeter webkit-unassigned bfulgham commit-queue oldest_to_newest 889270 0 galpeter 2013-05-15 07:17:40 -0700 There are a few #ifdefs in the curl codeparts to guard for the version > 7.18.0 (which was released in 2008). I think it's time to remove them no one should use such old curl version. 889273 1 201826 galpeter 2013-05-15 07:22:05 -0700 Created attachment 201826 version check removal This patch should remove all LIBCURL_VERSION_NUM related #if guards. 889274 2 201827 galpeter 2013-05-15 07:23:52 -0700 Created attachment 201827 fixed bug's name 889275 3 201828 galpeter 2013-05-15 07:25:25 -0700 Created attachment 201828 try again And again the bug's name is incorrect fixed the changelog. so.. this isn't my day it seems (sorry for the noise) 889298 4 201828 bfulgham 2013-05-15 08:09:12 -0700 Comment on attachment 201828 try again Looks good to me. R=me. 889333 5 201828 commit-queue 2013-05-15 09:21:42 -0700 Comment on attachment 201828 try again Clearing flags on attachment: 201828 Committed r150118: <http://trac.webkit.org/changeset/150118> 889334 6 commit-queue 2013-05-15 09:21:44 -0700 All reviewed patches have been landed. Closing bug. 201826 2013-05-15 07:22:05 -0700 2013-05-15 07:23:52 -0700 version check removal curl_version_ifdefs.patch text/plain 4225 galpeter ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2OGRkNTIyLi4yNjgxYjI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTMtMDUtMTUgIFBldGVyIEdhbCAgPGdhbHBldGVyQGluZi51LXN6ZWdlZC5odT4KKwor ICAgICAgICBbY3VybF0gUmVtb3ZlIHZlcnNpb24gaWZkZWZzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYxNTIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyB0ZXN0cyByZXF1aXJlZC4KKworICAgICAg ICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZUN1cmwuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OnBsYXRmb3JtU2V0RGVmZXJzTG9hZGluZyk6IFJl bW92ZWQgdmVyc2lvbiBndWFyZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVz b3VyY2VIYW5kbGVNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OndyaXRlQ2FsbGJhY2sp OiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OmhlYWRlckNhbGxiYWNrKTogRGl0dG8uCisgICAg ICAgIChXZWJDb3JlOjpyZWFkQ2FsbGJhY2spOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlJl c291cmNlSGFuZGxlTWFuYWdlcjo6ZGlzcGF0Y2hTeW5jaHJvbm91c0pvYik6IERpdHRvLgorICAg ICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjppbml0aWFsaXplSGFuZGxlKTog RGl0dG8uCisKIDIwMTMtMDUtMTUgIFJhZHUgU3RhdmlsYSAgPHN0YXZpbGFAYWRvYmUuY29tPgog CiAgICAgICAgIFtDU1NSZWdpb25zXSBJbXBsZW1lbnQgb2Zmc2V0UGFyZW50IGZvciBlbGVtZW50 cyBpbnNpZGUgbmFtZWQgZmxvdwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlQ3VybC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVDdXJsLmNwcAppbmRleCAzNDkxOWNjLi5j NTMyNjQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwv UmVzb3VyY2VIYW5kbGVDdXJsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVDdXJsLmNwcApAQCAtMTQ2LDcgKzE0Niw2IEBAIHZvaWQg UmVzb3VyY2VIYW5kbGU6OnNldENsaWVudENlcnRpZmljYXRlKGNvbnN0IFN0cmluZyYgaG9zdCwg Q0ZEYXRhUmVmIGNlcnQpCiAKIHZvaWQgUmVzb3VyY2VIYW5kbGU6OnBsYXRmb3JtU2V0RGVmZXJz TG9hZGluZyhib29sIGRlZmVycykKIHsKLSNpZiBMSUJDVVJMX1ZFUlNJT05fTlVNID4gMHgwNzEy MDAKICAgICBpZiAoIWQtPm1faGFuZGxlKQogICAgICAgICByZXR1cm47CiAKQEAgLTE2MSw5ICsx NjAsNiBAQCB2b2lkIFJlc291cmNlSGFuZGxlOjpwbGF0Zm9ybVNldERlZmVyc0xvYWRpbmcoYm9v bCBkZWZlcnMpCiAgICAgICAgICAgICAvLyBSZXN0YXJ0aW5nIHRoZSBoYW5kbGUgaGFzIGZhaWxl ZCBzbyBqdXN0IGNhbmNlbCBpdC4KICAgICAgICAgICAgIGNhbmNlbCgpOwogICAgIH0KLSNlbHNl Ci0gICAgTE9HX0VSUk9SKCJEZWZlcnJlZCBsb2FkaW5nIGlzIGltcGxlbWVudGVkIGlmIGxpYmNV UkwgdmVyc2lvbiBpcyBhYm92ZSA3LjE4LjAiKTsKLSNlbmRpZgogfQogCiBib29sIFJlc291cmNl SGFuZGxlOjpsb2Fkc0Jsb2NrZWQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcAppbmRleCAy YjI2Njc3Li42NjY1YTQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcApAQCAtMjEwLDEw ICsyMTAsOCBAQCBzdGF0aWMgc2l6ZV90IHdyaXRlQ2FsbGJhY2sodm9pZCogcHRyLCBzaXplX3Qg c2l6ZSwgc2l6ZV90IG5tZW1iLCB2b2lkKiBkYXRhKQogICAgIGlmIChkLT5tX2NhbmNlbGxlZCkK ICAgICAgICAgcmV0dXJuIDA7CiAKLSNpZiBMSUJDVVJMX1ZFUlNJT05fTlVNID4gMHgwNzEyMDAK ICAgICAvLyBXZSBzaG91bGQgbmV2ZXIgYmUgY2FsbGVkIHdoZW4gZGVmZXJyZWQgbG9hZGluZyBp cyBhY3RpdmF0ZWQuCiAgICAgQVNTRVJUKCFkLT5tX2RlZmVyc0xvYWRpbmcpOwotI2VuZGlmCiAK ICAgICBzaXplX3QgdG90YWxTaXplID0gc2l6ZSAqIG5tZW1iOwogCkBAIC0yNTMsMTAgKzI1MSw4 IEBAIHN0YXRpYyBzaXplX3QgaGVhZGVyQ2FsbGJhY2soY2hhciogcHRyLCBzaXplX3Qgc2l6ZSwg c2l6ZV90IG5tZW1iLCB2b2lkKiBkYXRhKQogICAgIGlmIChkLT5tX2NhbmNlbGxlZCkKICAgICAg ICAgcmV0dXJuIDA7CiAKLSNpZiBMSUJDVVJMX1ZFUlNJT05fTlVNID4gMHgwNzEyMDAKICAgICAv LyBXZSBzaG91bGQgbmV2ZXIgYmUgY2FsbGVkIHdoZW4gZGVmZXJyZWQgbG9hZGluZyBpcyBhY3Rp dmF0ZWQuCiAgICAgQVNTRVJUKCFkLT5tX2RlZmVyc0xvYWRpbmcpOwotI2VuZGlmCiAKICAgICBz aXplX3QgdG90YWxTaXplID0gc2l6ZSAqIG5tZW1iOwogICAgIFJlc291cmNlSGFuZGxlQ2xpZW50 KiBjbGllbnQgPSBkLT5jbGllbnQoKTsKQEAgLTMzOCwxMCArMzM0LDggQEAgc2l6ZV90IHJlYWRD YWxsYmFjayh2b2lkKiBwdHIsIHNpemVfdCBzaXplLCBzaXplX3Qgbm1lbWIsIHZvaWQqIGRhdGEp CiAgICAgaWYgKGQtPm1fY2FuY2VsbGVkKQogICAgICAgICByZXR1cm4gMDsKIAotI2lmIExJQkNV UkxfVkVSU0lPTl9OVU0gPiAweDA3MTIwMAogICAgIC8vIFdlIHNob3VsZCBuZXZlciBiZSBjYWxs ZWQgd2hlbiBkZWZlcnJlZCBsb2FkaW5nIGlzIGFjdGl2YXRlZC4KICAgICBBU1NFUlQoIWQtPm1f ZGVmZXJzTG9hZGluZyk7Ci0jZW5kaWYKIAogICAgIGlmICghc2l6ZSB8fCAhbm1lbWIpCiAgICAg ICAgIHJldHVybiAwOwpAQCAtNjE5LDEyICs2MTMsMTAgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZU1h bmFnZXI6OmRpc3BhdGNoU3luY2hyb25vdXNKb2IoUmVzb3VyY2VIYW5kbGUqIGpvYikKIAogICAg IFJlc291cmNlSGFuZGxlSW50ZXJuYWwqIGhhbmRsZSA9IGpvYi0+Z2V0SW50ZXJuYWwoKTsKIAot I2lmIExJQkNVUkxfVkVSU0lPTl9OVU0gPiAweDA3MTIwMAogICAgIC8vIElmIGRlZmVyc0xvYWRp bmcgaXMgdHJ1ZSBhbmQgd2UgY2FsbCBjdXJsX2Vhc3lfcGVyZm9ybQogICAgIC8vIG9uIGEgcGF1 c2VkIGhhbmRsZSwgbGliY1VSTCB3b3VsZCBkbyB0aGUgdHJhbnNmZXJ0IGFueXdheQogICAgIC8v IGFuZCB3ZSB3b3VsZCBhc3NlcnQgc28gZm9yY2UgZGVmZXJzTG9hZGluZyB0byBiZSBmYWxzZS4K ICAgICBoYW5kbGUtPm1fZGVmZXJzTG9hZGluZyA9IGZhbHNlOwotI2VuZGlmCiAKICAgICBpbml0 aWFsaXplSGFuZGxlKGpvYik7CiAKQEAgLTY4NywxNCArNjc5LDEyIEBAIHZvaWQgUmVzb3VyY2VI YW5kbGVNYW5hZ2VyOjppbml0aWFsaXplSGFuZGxlKFJlc291cmNlSGFuZGxlKiBqb2IpCiAKICAg ICBkLT5tX2hhbmRsZSA9IGN1cmxfZWFzeV9pbml0KCk7CiAKLSNpZiBMSUJDVVJMX1ZFUlNJT05f TlVNID4gMHgwNzEyMDAKICAgICBpZiAoZC0+bV9kZWZlcnNMb2FkaW5nKSB7CiAgICAgICAgIENV Ukxjb2RlIGVycm9yID0gY3VybF9lYXN5X3BhdXNlKGQtPm1faGFuZGxlLCBDVVJMUEFVU0VfQUxM KTsKICAgICAgICAgLy8gSWYgd2UgZGlkIG5vdCBwYXVzZSB0aGUgaGFuZGxlLCB3ZSB3b3VsZCBB U1NFUlQgaW4gdGhlCiAgICAgICAgIC8vIGhlYWRlciBjYWxsYmFjay4gU28ganVzdCBhc3NlcnQg aGVyZS4KICAgICAgICAgQVNTRVJUX1VOVVNFRChlcnJvciwgZXJyb3IgPT0gQ1VSTEVfT0spOwog ICAgIH0KLSNlbmRpZgogI2lmbmRlZiBOREVCVUcKICAgICBpZiAoZ2V0ZW52KCJERUJVR19DVVJM IikpCiAgICAgICAgIGN1cmxfZWFzeV9zZXRvcHQoZC0+bV9oYW5kbGUsIENVUkxPUFRfVkVSQk9T RSwgMSk7Cg== 201827 2013-05-15 07:23:52 -0700 2013-05-15 07:25:25 -0700 fixed bug's name curl_version_ifdefs.patch text/plain 4237 galpeter ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2OGRkNTIyLi4wZmM0MDEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTMtMDUtMTUgIFBldGVyIEdhbCAgPGdhbHBldGVyQGluZi51LXN6ZWdlZC5odT4KKwor ICAgICAgICBbY3VybF0gUmVtb3ZlIHZlcnNpb24gdmVyc2lvbiAjaWYgZ3VhcmRzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYxNTIKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyB0ZXN0cyByZXF1aXJl ZC4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZUN1cmwu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OnBsYXRmb3JtU2V0RGVmZXJz TG9hZGluZyk6IFJlbW92ZWQgdmVyc2lvbiBndWFyZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3 b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ondy aXRlQ2FsbGJhY2spOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OmhlYWRlckNhbGxiYWNrKTog RGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpyZWFkQ2FsbGJhY2spOiBEaXR0by4KKyAgICAgICAg KFdlYkNvcmU6OlJlc291cmNlSGFuZGxlTWFuYWdlcjo6ZGlzcGF0Y2hTeW5jaHJvbm91c0pvYik6 IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjppbml0aWFs aXplSGFuZGxlKTogRGl0dG8uCisKIDIwMTMtMDUtMTUgIFJhZHUgU3RhdmlsYSAgPHN0YXZpbGFA YWRvYmUuY29tPgogCiAgICAgICAgIFtDU1NSZWdpb25zXSBJbXBsZW1lbnQgb2Zmc2V0UGFyZW50 IGZvciBlbGVtZW50cyBpbnNpZGUgbmFtZWQgZmxvdwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlQ3VybC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVDdXJsLmNwcAppbmRl eCAzNDkxOWNjLi5jNTMyNjQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVDdXJsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVDdXJsLmNwcApAQCAtMTQ2LDcgKzE0 Niw2IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6OnNldENsaWVudENlcnRpZmljYXRlKGNvbnN0IFN0 cmluZyYgaG9zdCwgQ0ZEYXRhUmVmIGNlcnQpCiAKIHZvaWQgUmVzb3VyY2VIYW5kbGU6OnBsYXRm b3JtU2V0RGVmZXJzTG9hZGluZyhib29sIGRlZmVycykKIHsKLSNpZiBMSUJDVVJMX1ZFUlNJT05f TlVNID4gMHgwNzEyMDAKICAgICBpZiAoIWQtPm1faGFuZGxlKQogICAgICAgICByZXR1cm47CiAK QEAgLTE2MSw5ICsxNjAsNiBAQCB2b2lkIFJlc291cmNlSGFuZGxlOjpwbGF0Zm9ybVNldERlZmVy c0xvYWRpbmcoYm9vbCBkZWZlcnMpCiAgICAgICAgICAgICAvLyBSZXN0YXJ0aW5nIHRoZSBoYW5k bGUgaGFzIGZhaWxlZCBzbyBqdXN0IGNhbmNlbCBpdC4KICAgICAgICAgICAgIGNhbmNlbCgpOwog ICAgIH0KLSNlbHNlCi0gICAgTE9HX0VSUk9SKCJEZWZlcnJlZCBsb2FkaW5nIGlzIGltcGxlbWVu dGVkIGlmIGxpYmNVUkwgdmVyc2lvbiBpcyBhYm92ZSA3LjE4LjAiKTsKLSNlbmRpZgogfQogCiBi b29sIFJlc291cmNlSGFuZGxlOjpsb2Fkc0Jsb2NrZWQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2Vy LmNwcAppbmRleCAyYjI2Njc3Li42NjY1YTQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNw cApAQCAtMjEwLDEwICsyMTAsOCBAQCBzdGF0aWMgc2l6ZV90IHdyaXRlQ2FsbGJhY2sodm9pZCog cHRyLCBzaXplX3Qgc2l6ZSwgc2l6ZV90IG5tZW1iLCB2b2lkKiBkYXRhKQogICAgIGlmIChkLT5t X2NhbmNlbGxlZCkKICAgICAgICAgcmV0dXJuIDA7CiAKLSNpZiBMSUJDVVJMX1ZFUlNJT05fTlVN ID4gMHgwNzEyMDAKICAgICAvLyBXZSBzaG91bGQgbmV2ZXIgYmUgY2FsbGVkIHdoZW4gZGVmZXJy ZWQgbG9hZGluZyBpcyBhY3RpdmF0ZWQuCiAgICAgQVNTRVJUKCFkLT5tX2RlZmVyc0xvYWRpbmcp OwotI2VuZGlmCiAKICAgICBzaXplX3QgdG90YWxTaXplID0gc2l6ZSAqIG5tZW1iOwogCkBAIC0y NTMsMTAgKzI1MSw4IEBAIHN0YXRpYyBzaXplX3QgaGVhZGVyQ2FsbGJhY2soY2hhciogcHRyLCBz aXplX3Qgc2l6ZSwgc2l6ZV90IG5tZW1iLCB2b2lkKiBkYXRhKQogICAgIGlmIChkLT5tX2NhbmNl bGxlZCkKICAgICAgICAgcmV0dXJuIDA7CiAKLSNpZiBMSUJDVVJMX1ZFUlNJT05fTlVNID4gMHgw NzEyMDAKICAgICAvLyBXZSBzaG91bGQgbmV2ZXIgYmUgY2FsbGVkIHdoZW4gZGVmZXJyZWQgbG9h ZGluZyBpcyBhY3RpdmF0ZWQuCiAgICAgQVNTRVJUKCFkLT5tX2RlZmVyc0xvYWRpbmcpOwotI2Vu ZGlmCiAKICAgICBzaXplX3QgdG90YWxTaXplID0gc2l6ZSAqIG5tZW1iOwogICAgIFJlc291cmNl SGFuZGxlQ2xpZW50KiBjbGllbnQgPSBkLT5jbGllbnQoKTsKQEAgLTMzOCwxMCArMzM0LDggQEAg c2l6ZV90IHJlYWRDYWxsYmFjayh2b2lkKiBwdHIsIHNpemVfdCBzaXplLCBzaXplX3Qgbm1lbWIs IHZvaWQqIGRhdGEpCiAgICAgaWYgKGQtPm1fY2FuY2VsbGVkKQogICAgICAgICByZXR1cm4gMDsK IAotI2lmIExJQkNVUkxfVkVSU0lPTl9OVU0gPiAweDA3MTIwMAogICAgIC8vIFdlIHNob3VsZCBu ZXZlciBiZSBjYWxsZWQgd2hlbiBkZWZlcnJlZCBsb2FkaW5nIGlzIGFjdGl2YXRlZC4KICAgICBB U1NFUlQoIWQtPm1fZGVmZXJzTG9hZGluZyk7Ci0jZW5kaWYKIAogICAgIGlmICghc2l6ZSB8fCAh bm1lbWIpCiAgICAgICAgIHJldHVybiAwOwpAQCAtNjE5LDEyICs2MTMsMTAgQEAgdm9pZCBSZXNv dXJjZUhhbmRsZU1hbmFnZXI6OmRpc3BhdGNoU3luY2hyb25vdXNKb2IoUmVzb3VyY2VIYW5kbGUq IGpvYikKIAogICAgIFJlc291cmNlSGFuZGxlSW50ZXJuYWwqIGhhbmRsZSA9IGpvYi0+Z2V0SW50 ZXJuYWwoKTsKIAotI2lmIExJQkNVUkxfVkVSU0lPTl9OVU0gPiAweDA3MTIwMAogICAgIC8vIElm IGRlZmVyc0xvYWRpbmcgaXMgdHJ1ZSBhbmQgd2UgY2FsbCBjdXJsX2Vhc3lfcGVyZm9ybQogICAg IC8vIG9uIGEgcGF1c2VkIGhhbmRsZSwgbGliY1VSTCB3b3VsZCBkbyB0aGUgdHJhbnNmZXJ0IGFu eXdheQogICAgIC8vIGFuZCB3ZSB3b3VsZCBhc3NlcnQgc28gZm9yY2UgZGVmZXJzTG9hZGluZyB0 byBiZSBmYWxzZS4KICAgICBoYW5kbGUtPm1fZGVmZXJzTG9hZGluZyA9IGZhbHNlOwotI2VuZGlm CiAKICAgICBpbml0aWFsaXplSGFuZGxlKGpvYik7CiAKQEAgLTY4NywxNCArNjc5LDEyIEBAIHZv aWQgUmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjppbml0aWFsaXplSGFuZGxlKFJlc291cmNlSGFuZGxl KiBqb2IpCiAKICAgICBkLT5tX2hhbmRsZSA9IGN1cmxfZWFzeV9pbml0KCk7CiAKLSNpZiBMSUJD VVJMX1ZFUlNJT05fTlVNID4gMHgwNzEyMDAKICAgICBpZiAoZC0+bV9kZWZlcnNMb2FkaW5nKSB7 CiAgICAgICAgIENVUkxjb2RlIGVycm9yID0gY3VybF9lYXN5X3BhdXNlKGQtPm1faGFuZGxlLCBD VVJMUEFVU0VfQUxMKTsKICAgICAgICAgLy8gSWYgd2UgZGlkIG5vdCBwYXVzZSB0aGUgaGFuZGxl LCB3ZSB3b3VsZCBBU1NFUlQgaW4gdGhlCiAgICAgICAgIC8vIGhlYWRlciBjYWxsYmFjay4gU28g anVzdCBhc3NlcnQgaGVyZS4KICAgICAgICAgQVNTRVJUX1VOVVNFRChlcnJvciwgZXJyb3IgPT0g Q1VSTEVfT0spOwogICAgIH0KLSNlbmRpZgogI2lmbmRlZiBOREVCVUcKICAgICBpZiAoZ2V0ZW52 KCJERUJVR19DVVJMIikpCiAgICAgICAgIGN1cmxfZWFzeV9zZXRvcHQoZC0+bV9oYW5kbGUsIENV UkxPUFRfVkVSQk9TRSwgMSk7Cg== 201828 2013-05-15 07:25:25 -0700 2013-05-15 09:21:42 -0700 try again curl_version_ifdefs.patch text/plain 4229 galpeter ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2OGRkNTIyLi4wMTI5ZTE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTMtMDUtMTUgIFBldGVyIEdhbCAgPGdhbHBldGVyQGluZi51LXN6ZWdlZC5odT4KKwor ICAgICAgICBbY3VybF0gUmVtb3ZlIHZlcnNpb24gI2lmIGd1YXJkcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2MTUyCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gdGVzdHMgcmVxdWlyZWQuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVDdXJsLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlOjpwbGF0Zm9ybVNldERlZmVyc0xvYWRpbmcp OiBSZW1vdmVkIHZlcnNpb24gZ3VhcmQuCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJs L1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjp3cml0ZUNhbGxi YWNrKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpoZWFkZXJDYWxsYmFjayk6IERpdHRvLgor ICAgICAgICAoV2ViQ29yZTo6cmVhZENhbGxiYWNrKTogRGl0dG8uCisgICAgICAgIChXZWJDb3Jl OjpSZXNvdXJjZUhhbmRsZU1hbmFnZXI6OmRpc3BhdGNoU3luY2hyb25vdXNKb2IpOiBEaXR0by4K KyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlTWFuYWdlcjo6aW5pdGlhbGl6ZUhhbmRs ZSk6IERpdHRvLgorCiAyMDEzLTA1LTE1ICBSYWR1IFN0YXZpbGEgIDxzdGF2aWxhQGFkb2JlLmNv bT4KIAogICAgICAgICBbQ1NTUmVnaW9uc10gSW1wbGVtZW50IG9mZnNldFBhcmVudCBmb3IgZWxl bWVudHMgaW5zaWRlIG5hbWVkIGZsb3cKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZUN1cmwuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlQ3VybC5jcHAKaW5kZXggMzQ5MTlj Yy4uYzUzMjY0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9j dXJsL1Jlc291cmNlSGFuZGxlQ3VybC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlQ3VybC5jcHAKQEAgLTE0Niw3ICsxNDYsNiBAQCB2 b2lkIFJlc291cmNlSGFuZGxlOjpzZXRDbGllbnRDZXJ0aWZpY2F0ZShjb25zdCBTdHJpbmcmIGhv c3QsIENGRGF0YVJlZiBjZXJ0KQogCiB2b2lkIFJlc291cmNlSGFuZGxlOjpwbGF0Zm9ybVNldERl ZmVyc0xvYWRpbmcoYm9vbCBkZWZlcnMpCiB7Ci0jaWYgTElCQ1VSTF9WRVJTSU9OX05VTSA+IDB4 MDcxMjAwCiAgICAgaWYgKCFkLT5tX2hhbmRsZSkKICAgICAgICAgcmV0dXJuOwogCkBAIC0xNjEs OSArMTYwLDYgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZTo6cGxhdGZvcm1TZXREZWZlcnNMb2FkaW5n KGJvb2wgZGVmZXJzKQogICAgICAgICAgICAgLy8gUmVzdGFydGluZyB0aGUgaGFuZGxlIGhhcyBm YWlsZWQgc28ganVzdCBjYW5jZWwgaXQuCiAgICAgICAgICAgICBjYW5jZWwoKTsKICAgICB9Ci0j ZWxzZQotICAgIExPR19FUlJPUigiRGVmZXJyZWQgbG9hZGluZyBpcyBpbXBsZW1lbnRlZCBpZiBs aWJjVVJMIHZlcnNpb24gaXMgYWJvdmUgNy4xOC4wIik7Ci0jZW5kaWYKIH0KIAogYm9vbCBSZXNv dXJjZUhhbmRsZTo6bG9hZHNCbG9ja2VkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHAKaW5k ZXggMmIyNjY3Ny4uNjY2NWE0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHAKQEAgLTIx MCwxMCArMjEwLDggQEAgc3RhdGljIHNpemVfdCB3cml0ZUNhbGxiYWNrKHZvaWQqIHB0ciwgc2l6 ZV90IHNpemUsIHNpemVfdCBubWVtYiwgdm9pZCogZGF0YSkKICAgICBpZiAoZC0+bV9jYW5jZWxs ZWQpCiAgICAgICAgIHJldHVybiAwOwogCi0jaWYgTElCQ1VSTF9WRVJTSU9OX05VTSA+IDB4MDcx MjAwCiAgICAgLy8gV2Ugc2hvdWxkIG5ldmVyIGJlIGNhbGxlZCB3aGVuIGRlZmVycmVkIGxvYWRp bmcgaXMgYWN0aXZhdGVkLgogICAgIEFTU0VSVCghZC0+bV9kZWZlcnNMb2FkaW5nKTsKLSNlbmRp ZgogCiAgICAgc2l6ZV90IHRvdGFsU2l6ZSA9IHNpemUgKiBubWVtYjsKIApAQCAtMjUzLDEwICsy NTEsOCBAQCBzdGF0aWMgc2l6ZV90IGhlYWRlckNhbGxiYWNrKGNoYXIqIHB0ciwgc2l6ZV90IHNp emUsIHNpemVfdCBubWVtYiwgdm9pZCogZGF0YSkKICAgICBpZiAoZC0+bV9jYW5jZWxsZWQpCiAg ICAgICAgIHJldHVybiAwOwogCi0jaWYgTElCQ1VSTF9WRVJTSU9OX05VTSA+IDB4MDcxMjAwCiAg ICAgLy8gV2Ugc2hvdWxkIG5ldmVyIGJlIGNhbGxlZCB3aGVuIGRlZmVycmVkIGxvYWRpbmcgaXMg YWN0aXZhdGVkLgogICAgIEFTU0VSVCghZC0+bV9kZWZlcnNMb2FkaW5nKTsKLSNlbmRpZgogCiAg ICAgc2l6ZV90IHRvdGFsU2l6ZSA9IHNpemUgKiBubWVtYjsKICAgICBSZXNvdXJjZUhhbmRsZUNs aWVudCogY2xpZW50ID0gZC0+Y2xpZW50KCk7CkBAIC0zMzgsMTAgKzMzNCw4IEBAIHNpemVfdCBy ZWFkQ2FsbGJhY2sodm9pZCogcHRyLCBzaXplX3Qgc2l6ZSwgc2l6ZV90IG5tZW1iLCB2b2lkKiBk YXRhKQogICAgIGlmIChkLT5tX2NhbmNlbGxlZCkKICAgICAgICAgcmV0dXJuIDA7CiAKLSNpZiBM SUJDVVJMX1ZFUlNJT05fTlVNID4gMHgwNzEyMDAKICAgICAvLyBXZSBzaG91bGQgbmV2ZXIgYmUg Y2FsbGVkIHdoZW4gZGVmZXJyZWQgbG9hZGluZyBpcyBhY3RpdmF0ZWQuCiAgICAgQVNTRVJUKCFk LT5tX2RlZmVyc0xvYWRpbmcpOwotI2VuZGlmCiAKICAgICBpZiAoIXNpemUgfHwgIW5tZW1iKQog ICAgICAgICByZXR1cm4gMDsKQEAgLTYxOSwxMiArNjEzLDEwIEBAIHZvaWQgUmVzb3VyY2VIYW5k bGVNYW5hZ2VyOjpkaXNwYXRjaFN5bmNocm9ub3VzSm9iKFJlc291cmNlSGFuZGxlKiBqb2IpCiAK ICAgICBSZXNvdXJjZUhhbmRsZUludGVybmFsKiBoYW5kbGUgPSBqb2ItPmdldEludGVybmFsKCk7 CiAKLSNpZiBMSUJDVVJMX1ZFUlNJT05fTlVNID4gMHgwNzEyMDAKICAgICAvLyBJZiBkZWZlcnNM b2FkaW5nIGlzIHRydWUgYW5kIHdlIGNhbGwgY3VybF9lYXN5X3BlcmZvcm0KICAgICAvLyBvbiBh IHBhdXNlZCBoYW5kbGUsIGxpYmNVUkwgd291bGQgZG8gdGhlIHRyYW5zZmVydCBhbnl3YXkKICAg ICAvLyBhbmQgd2Ugd291bGQgYXNzZXJ0IHNvIGZvcmNlIGRlZmVyc0xvYWRpbmcgdG8gYmUgZmFs c2UuCiAgICAgaGFuZGxlLT5tX2RlZmVyc0xvYWRpbmcgPSBmYWxzZTsKLSNlbmRpZgogCiAgICAg aW5pdGlhbGl6ZUhhbmRsZShqb2IpOwogCkBAIC02ODcsMTQgKzY3OSwxMiBAQCB2b2lkIFJlc291 cmNlSGFuZGxlTWFuYWdlcjo6aW5pdGlhbGl6ZUhhbmRsZShSZXNvdXJjZUhhbmRsZSogam9iKQog CiAgICAgZC0+bV9oYW5kbGUgPSBjdXJsX2Vhc3lfaW5pdCgpOwogCi0jaWYgTElCQ1VSTF9WRVJT SU9OX05VTSA+IDB4MDcxMjAwCiAgICAgaWYgKGQtPm1fZGVmZXJzTG9hZGluZykgewogICAgICAg ICBDVVJMY29kZSBlcnJvciA9IGN1cmxfZWFzeV9wYXVzZShkLT5tX2hhbmRsZSwgQ1VSTFBBVVNF X0FMTCk7CiAgICAgICAgIC8vIElmIHdlIGRpZCBub3QgcGF1c2UgdGhlIGhhbmRsZSwgd2Ugd291 bGQgQVNTRVJUIGluIHRoZQogICAgICAgICAvLyBoZWFkZXIgY2FsbGJhY2suIFNvIGp1c3QgYXNz ZXJ0IGhlcmUuCiAgICAgICAgIEFTU0VSVF9VTlVTRUQoZXJyb3IsIGVycm9yID09IENVUkxFX09L KTsKICAgICB9Ci0jZW5kaWYKICNpZm5kZWYgTkRFQlVHCiAgICAgaWYgKGdldGVudigiREVCVUdf Q1VSTCIpKQogICAgICAgICBjdXJsX2Vhc3lfc2V0b3B0KGQtPm1faGFuZGxlLCBDVVJMT1BUX1ZF UkJPU0UsIDEpOwo=