28171 2009-08-10 23:46:12 -0700 [cURL] Support https protocol in cURL builds 2009-08-11 16:15:49 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham oldest_to_newest 138911 0 bfulgham 2009-08-10 23:46:12 -0700 The WinCairo port of WebKit does not currently support the https protocol. The attached patch corrects this problem (thanks to the work of the Appcelerator team). 138912 1 34542 bfulgham 2009-08-10 23:52:15 -0700 Created attachment 34542 Activates SSL support if cURL build supports it. 138913 2 bfulgham 2009-08-10 23:53:10 -0700 Note: This might resolve Bug 19146, as the certificates were never being specified, so no SSL-supporting cURL would have been able to negotiate the HTTPS protocol. 139083 3 34588 bfulgham 2009-08-11 13:49:18 -0700 Created attachment 34588 Enable SSL support in cURL builds with SSL enabled. 139085 4 34589 bfulgham 2009-08-11 13:53:26 -0700 Created attachment 34589 Small revision to ChangeLog to point to the right bug. 139104 5 34589 gustavo 2009-08-11 14:31:01 -0700 Comment on attachment 34589 Small revision to ChangeLog to point to the right bug. Notice that I don't really know CF enough to review this properly. The patch looks straight-forward enough though, and I can see no obvious problems, so rs=me that. 139127 6 34603 bfulgham 2009-08-11 15:20:11 -0700 Created attachment 34603 Revised to improve efficiency and thread safety. Modified based on suggestions from ap and aroben. 139135 7 34603 aroben 2009-08-11 15:26:37 -0700 Comment on attachment 34603 Revised to improve efficiency and thread safety. > +static CString certificateBundlePath() "certificateBundlePath" is a little confusing. This doesn't return a path to a "certificate bundle"; it returns a path to a certificate within the WebKit bundle. I think "certificatePath" would be clearer. > +{ > +#if PLATFORM(CF) > + CFBundleRef webKitBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebKit")); > + RetainPtr<CFURLRef> certURLRef(AdoptCF, CFBundleCopyResourceURL(webKitBundle, CFSTR("cacert"), CFSTR("pem"), CFSTR("certificates"))); > + if (certURLRef) { > + char path[MAX_PATH]; > + CFURLGetFileSystemRepresentation(certURLRef.get(), false, (UInt8*)path, MAX_PATH); reinterpret_cast is preferred to a C-style cast. > + , m_certPath (certificateBundlePath()) You have an extra space after "m_certPath". > + if (!m_certPath.isNull()) > + curl_easy_setopt(d->m_handle, CURLOPT_CAINFO, m_certPath.data()); Checking isEmpty() seems a bit better than checking isNull(). > + const CString m_certPath; m_certificatePath seems a little clearer. I don't think the abbreviation adds anything here. r=me 139156 8 bfulgham 2009-08-11 16:15:49 -0700 Landed in http://trac.webkit.org/changeset/47071. 34542 2009-08-10 23:52:15 -0700 2009-08-11 13:49:18 -0700 Activates SSL support if cURL build supports it. curl_ssl.patch text/plain 3372 bfulgham SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NzAyNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzggQEAKKzIwMDktMDgtMTAgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUB3ZWJr aXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IENhaXJvLWJhc2VkIFdpbmRvd3MgcG9ydCBkb2VzIG5vdCBoYW5kbGUgY29va2llcyBwcm9wZXJs eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc0MTQK KworICAgICAgICBObyBuZXcgdGVzdHMgbmVlZGVkLiAgRXhpc3RpbmcgaHR0cHMgdGVzdHMgc2hv dyB0aGlzIGZhaWx1cmUKKyAgICAgICAgZm9yIFdpbkNhaXJvIGJ1aWxkcy4KKworICAgICAgICAq IFdlYkNvcmUudmNwcm9qL1dlYkNvcmVDVVJMLnZzcHJvcHM6IEFkZCBhIGZldyBwcmVwcm9jZXNz b3IKKyAgICAgICAgICBkZWZpbml0aW9ucyBmb3IgU1NMIHN1cHBvcnQgaW4gY1VSTC4KKyAgICAg ICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OmNlcnRpZmljYXRlQnVuZGxlUGF0aCk6IE5ldyBtZXRob2QgdG8gcmV0 cmlldmUgdGhlCisgICAgICAgICAgcHJvcGVyIGNlcnRpZmljYXRlIHJlc291cmNlIGJ1bmRsZSBw YXRoLgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjppbml0aWFsaXpl SGFuZGxlKTogQ2hlY2sgZm9yCisgICAgICAgICAgdGhlIHJlc291cmNlIGJ1bmRsZSBhbmQgdXNl IGlmIGF2YWlsYWJsZSB0byBhY3RpdmF0ZSBTU0wKKyAgICAgICAgICBzdXBwb3J0LgorCiAyMDA5 LTA4LTA3ICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgU2FtIFdlaW5pZwpJbmRleDogV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlQ1VS TC52c3Byb3BzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZUNV UkwudnNwcm9wcwkocmV2aXNpb24gNDcwMjcpCisrKyBXZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dl YkNvcmVDVVJMLnZzcHJvcHMJKHdvcmtpbmcgY29weSkKQEAgLTcsNSArNyw2IEBACiAJPFRvb2wN CiAJCU5hbWU9IlZDQ0xDb21waWxlclRvb2wiDQogCQlBZGRpdGlvbmFsSW5jbHVkZURpcmVjdG9y aWVzPSIkKFByb2plY3REaXIpLi5ccGxhdGZvcm1cbmV0d29ya1xjdXJsIg0KKwkJUHJlcHJvY2Vz c29yRGVmaW5pdGlvbnM9IlVTRV9XSU5ET1dTX1NTUEk7VVNFX1NTTEVBWTtIQVZFX1pMSUIiDQog CS8+DQogPC9WaXN1YWxTdHVkaW9Qcm9wZXJ0eVNoZWV0Pg0KSW5kZXg6IFdlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcAko cmV2aXNpb24gNDcwMjcpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJj ZUhhbmRsZU1hbmFnZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01LDYgKzUsNyBAQAogICogQ29w eXJpZ2h0IChDKSAyMDA3IEhvbGdlciBIYW5zIFBldGVyIEZyZXl0aGVyCiAgKiBDb3B5cmlnaHQg KEMpIDIwMDggQ29sbGFib3JhIEx0ZC4KICAqIENvcHlyaWdodCAoQykgMjAwOCBOdWFudGkgTHRk LgorICogQ29weXJpZ2h0IChDKSAyMDA5IEFwcGNlbGVyYXRvciBJbmMuCiAgKiBBbGwgcmlnaHRz IHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBi aW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dApAQCAtNTc3LDYgKzU3OCwyNCBAQCB2b2lkIFJl c291cmNlSGFuZGxlTWFuYWdlcjo6c3RhcnRKb2IoUmVzCiAgICAgfQogfQogCitzdGF0aWMgY29u c3QgY2hhciogY2VydGlmaWNhdGVCdW5kbGVQYXRoKCkKK3sKKyNpZiBQTEFURk9STShDRikKKyAg ICBjaGFyIGJ1bmRsZV9wYXRoW01BWF9QQVRIXTsKKyAgICBtZW1zZXQgKCZidW5kbGVfcGF0aCwg MHgwMCwgTUFYX1BBVEgpOworCisgICAgQ0ZCdW5kbGVSZWYgd2ViS2l0QnVuZGxlID0gQ0ZCdW5k bGVHZXRCdW5kbGVXaXRoSWRlbnRpZmllcihDRlNUUigiY29tLmFwcGxlLldlYktpdCIpKTsKKyAg ICBSZXRhaW5QdHI8Q0ZVUkxSZWY+IGNlcnRVUkxSZWYoQWRvcHRDRiwgQ0ZCdW5kbGVDb3B5UmVz b3VyY2VVUkwod2ViS2l0QnVuZGxlLCBDRlNUUigiY2FjZXJ0IiksIENGU1RSKCJwZW0iKSwgQ0ZT VFIoImNlcnRpZmljYXRlcyIpKSk7CisgICAgaWYgKGNlcnRVUkxSZWYpCisgICAgICAgIENGVVJM R2V0RmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKGNlcnRVUkxSZWYuZ2V0KCksIGZhbHNlLCAoVUlu dDggKilidW5kbGVfcGF0aCwgTUFYX1BBVEgpOworCisgICAgaWYgKGJ1bmRsZV9wYXRoKQorICAg ICAgICByZXR1cm4gYnVuZGxlX3BhdGg7CisjZW5kaWYKKyAgICByZXR1cm4gZ2V0ZW52KCJDVVJM X0NBX0JVTkRMRV9QQVRIIik7Cit9CisKKwogdm9pZCBSZXNvdXJjZUhhbmRsZU1hbmFnZXI6Omlu aXRpYWxpemVIYW5kbGUoUmVzb3VyY2VIYW5kbGUqIGpvYikKIHsKICAgICBLVVJMIGt1cmwgPSBq b2ItPnJlcXVlc3QoKS51cmwoKTsKQEAgLTYyOSw2ICs2NDgsMTEgQEAgdm9pZCBSZXNvdXJjZUhh bmRsZU1hbmFnZXI6OmluaXRpYWxpemVIYQogICAgIC8vIGFuZC9vciByZXBvcnRpbmcgU1NMIGVy cm9ycyB0byB0aGUgdXNlci4KICAgICBpZiAoaWdub3JlU1NMRXJyb3JzKQogICAgICAgICBjdXJs X2Vhc3lfc2V0b3B0KGQtPm1faGFuZGxlLCBDVVJMT1BUX1NTTF9WRVJJRllQRUVSLCBmYWxzZSk7 CisKKyAgICBjb25zdCBjaGFyKiBjdXJsX2NhX2J1bmRsZV9wYXRoID0gY2VydGlmaWNhdGVCdW5k bGVQYXRoICgpOworICAgIGlmIChjdXJsX2NhX2J1bmRsZV9wYXRoKQorICAgICAgICBjdXJsX2Vh c3lfc2V0b3B0KGQtPm1faGFuZGxlLCBDVVJMT1BUX0NBSU5GTywgY3VybF9jYV9idW5kbGVfcGF0 aCk7CisKICAgICAvLyBlbmFibGUgZ3ppcCBhbmQgZGVmbGF0ZSB0aHJvdWdoIEFjY2VwdC1FbmNv ZGluZzoKICAgICBjdXJsX2Vhc3lfc2V0b3B0KGQtPm1faGFuZGxlLCBDVVJMT1BUX0VOQ09ESU5H LCAiIik7CiAK 34588 2009-08-11 13:49:18 -0700 2009-08-11 13:53:26 -0700 Enable SSL support in cURL builds with SSL enabled. cairo_ssl.patch text/plain 3515 bfulgham SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NzA1NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDktMDgtMTAgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUB3ZWJr aXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IENhaXJvLWJhc2VkIFdpbmRvd3MgcG9ydCBkb2VzIG5vdCBoYW5kbGUgY29va2llcyBwcm9wZXJs eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc0MTQK KworICAgICAgICBObyBuZXcgdGVzdHMgbmVlZGVkLiAgRXhpc3RpbmcgaHR0cHMgdGVzdHMgc2hv dyB0aGlzIGZhaWx1cmUKKyAgICAgICAgZm9yIFdpbkNhaXJvIGJ1aWxkcy4KKworICAgICAgICAq IFdlYkNvcmUudmNwcm9qL1dlYkNvcmVDVVJMLnZzcHJvcHM6IEFkZCBhIGZldyBwcmVwcm9jZXNz b3IKKyAgICAgICAgICBkZWZpbml0aW9ucyBmb3IgU1NMIHN1cHBvcnQgaW4gY1VSTC4KKyAgICAg ICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OmNlcnRpZmljYXRlQnVuZGxlUGF0aCk6IE5ldyBtZXRob2QgdG8gcmV0 cmlldmUgdGhlCisgICAgICAgICAgcHJvcGVyIGNlcnRpZmljYXRlIHJlc291cmNlIGJ1bmRsZSBw YXRoLgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjppbml0aWFsaXpl SGFuZGxlKTogQ2hlY2sgZm9yCisgICAgICAgICAgdGhlIHJlc291cmNlIGJ1bmRsZSBhbmQgdXNl IGlmIGF2YWlsYWJsZSB0byBhY3RpdmF0ZSBTU0wKKyAgICAgICAgICBzdXBwb3J0LgorCiAyMDA5 LTA4LTExICBKb2huIEdyZWdnICA8am9obm55Z0Bnb29nbGUuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IE1hY2llaiBTdGFjaG93aWFrLgpJbmRleDogV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9X ZWJDb3JlQ1VSTC52c3Byb3BzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvV2ViQ29yZS52Y3Byb2ov V2ViQ29yZUNVUkwudnNwcm9wcwkocmV2aXNpb24gNDcwNTcpCisrKyBXZWJDb3JlL1dlYkNvcmUu dmNwcm9qL1dlYkNvcmVDVVJMLnZzcHJvcHMJKHdvcmtpbmcgY29weSkKQEAgLTcsNSArNyw2IEBA CiAJPFRvb2wNCiAJCU5hbWU9IlZDQ0xDb21waWxlclRvb2wiDQogCQlBZGRpdGlvbmFsSW5jbHVk ZURpcmVjdG9yaWVzPSIkKFByb2plY3REaXIpLi5ccGxhdGZvcm1cbmV0d29ya1xjdXJsIg0KKwkJ UHJlcHJvY2Vzc29yRGVmaW5pdGlvbnM9IlVTRV9XSU5ET1dTX1NTUEk7VVNFX1NTTEVBWTtIQVZF X1pMSUIiDQogCS8+DQogPC9WaXN1YWxTdHVkaW9Qcm9wZXJ0eVNoZWV0Pg0KSW5kZXg6IFdlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5h Z2VyLmNwcAkocmV2aXNpb24gNDcwNTcpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3Vy bC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01LDYgKzUsOCBA QAogICogQ29weXJpZ2h0IChDKSAyMDA3IEhvbGdlciBIYW5zIFBldGVyIEZyZXl0aGVyCiAgKiBD b3B5cmlnaHQgKEMpIDIwMDggQ29sbGFib3JhIEx0ZC4KICAqIENvcHlyaWdodCAoQykgMjAwOCBO dWFudGkgTHRkLgorICogQ29weXJpZ2h0IChDKSAyMDA5IEFwcGNlbGVyYXRvciBJbmMuCisgKiBD b3B5cmlnaHQgKEMpIDIwMDkgQnJlbnQgRnVsZ2hhbSA8YmZ1bGdoYW1Ad2Via2l0Lm9yZz4KICAq IEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBz b3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CkBAIC01NCw2ICs1NiwyMCBA QCBjb25zdCBpbnQgbWF4UnVubmluZ0pvYnMgPSA1OwogCiBzdGF0aWMgY29uc3QgYm9vbCBpZ25v cmVTU0xFcnJvcnMgPSBnZXRlbnYoIldFQktJVF9JR05PUkVfU1NMX0VSUk9SUyIpOwogCitzdGF0 aWMgQ1N0cmluZyBjZXJ0aWZpY2F0ZUJ1bmRsZVBhdGgoKQoreworI2lmIFBMQVRGT1JNKENGKQor ICAgIENGQnVuZGxlUmVmIHdlYktpdEJ1bmRsZSA9IENGQnVuZGxlR2V0QnVuZGxlV2l0aElkZW50 aWZpZXIoQ0ZTVFIoImNvbS5hcHBsZS5XZWJLaXQiKSk7CisgICAgUmV0YWluUHRyPENGVVJMUmVm PiBjZXJ0VVJMUmVmKEFkb3B0Q0YsIENGQnVuZGxlQ29weVJlc291cmNlVVJMKHdlYktpdEJ1bmRs ZSwgQ0ZTVFIoImNhY2VydCIpLCBDRlNUUigicGVtIiksIENGU1RSKCJjZXJ0aWZpY2F0ZXMiKSkp OworICAgIGlmIChjZXJ0VVJMUmVmKSB7CisgICAgICAgIGNoYXIgcGF0aFtNQVhfUEFUSF07Cisg ICAgICAgIENGVVJMR2V0RmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKGNlcnRVUkxSZWYuZ2V0KCks IGZhbHNlLCAoVUludDgqKXBhdGgsIE1BWF9QQVRIKTsKKyAgICAgICAgcmV0dXJuIHBhdGg7Cisg ICAgfQorI2VuZGlmCisgICAgcmV0dXJuIGdldGVudigiQ1VSTF9DQV9CVU5ETEVfUEFUSCIpOwor fQorCiBSZXNvdXJjZUhhbmRsZU1hbmFnZXI6OlJlc291cmNlSGFuZGxlTWFuYWdlcigpCiAgICAg OiBtX2Rvd25sb2FkVGltZXIodGhpcywgJlJlc291cmNlSGFuZGxlTWFuYWdlcjo6ZG93bmxvYWRU aW1lckNhbGxiYWNrKQogICAgICwgbV9jb29raWVKYXJGaWxlTmFtZSgwKQpAQCAtNjI5LDYgKzY0 NSwxNCBAQCB2b2lkIFJlc291cmNlSGFuZGxlTWFuYWdlcjo6aW5pdGlhbGl6ZUhhCiAgICAgLy8g YW5kL29yIHJlcG9ydGluZyBTU0wgZXJyb3JzIHRvIHRoZSB1c2VyLgogICAgIGlmIChpZ25vcmVT U0xFcnJvcnMpCiAgICAgICAgIGN1cmxfZWFzeV9zZXRvcHQoZC0+bV9oYW5kbGUsIENVUkxPUFRf U1NMX1ZFUklGWVBFRVIsIGZhbHNlKTsKKworICAgIHN0YXRpYyBDU3RyaW5nIGN1cmxCdW5kbGVQ YXRoOworICAgIGlmIChjdXJsQnVuZGxlUGF0aC5pc051bGwoKSkKKyAgICAgICBjdXJsQnVuZGxl UGF0aCA9IGNlcnRpZmljYXRlQnVuZGxlUGF0aCgpOworCisgICAgaWYgKCFjdXJsQnVuZGxlUGF0 aC5pc051bGwoKSkKKyAgICAgICBjdXJsX2Vhc3lfc2V0b3B0KGQtPm1faGFuZGxlLCBDVVJMT1BU X0NBSU5GTywgY3VybEJ1bmRsZVBhdGguZGF0YSgpKTsKKwogICAgIC8vIGVuYWJsZSBnemlwIGFu ZCBkZWZsYXRlIHRocm91Z2ggQWNjZXB0LUVuY29kaW5nOgogICAgIGN1cmxfZWFzeV9zZXRvcHQo ZC0+bV9oYW5kbGUsIENVUkxPUFRfRU5DT0RJTkcsICIiKTsKIAo= 34589 2009-08-11 13:53:26 -0700 2009-08-11 15:20:11 -0700 Small revision to ChangeLog to point to the right bug. cairo_ssl.patch text/plain 3520 bfulgham SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NzA1OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDktMDgtMTAgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUB3ZWJr aXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IENhaXJvLWJhc2VkIFdpbmRvd3MgcG9ydCBkb2VzIG5vdCBoYW5kbGUgdGhlIGh0dHBzIHByb3Rv Y29sLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjgx NzEuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIG5lZWRlZC4gIEV4aXN0aW5nIGh0dHBzIHRlc3Rz IHNob3cgdGhpcyBmYWlsdXJlCisgICAgICAgIGZvciBXaW5DYWlybyBidWlsZHMuCisKKyAgICAg ICAgKiBXZWJDb3JlLnZjcHJvai9XZWJDb3JlQ1VSTC52c3Byb3BzOiBBZGQgYSBmZXcgcHJlcHJv Y2Vzc29yCisgICAgICAgICAgZGVmaW5pdGlvbnMgZm9yIFNTTCBzdXBwb3J0IGluIGNVUkwuCisg ICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpjZXJ0aWZpY2F0ZUJ1bmRsZVBhdGgpOiBOZXcgbWV0aG9kIHRv IHJldHJpZXZlIHRoZQorICAgICAgICAgIHByb3BlciBjZXJ0aWZpY2F0ZSByZXNvdXJjZSBidW5k bGUgcGF0aC4KKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlTWFuYWdlcjo6aW5pdGlh bGl6ZUhhbmRsZSk6IENoZWNrIGZvcgorICAgICAgICAgIHRoZSByZXNvdXJjZSBidW5kbGUgYW5k IHVzZSBpZiBhdmFpbGFibGUgdG8gYWN0aXZhdGUgU1NMCisgICAgICAgICAgc3VwcG9ydC4KKwog MjAwOS0wOC0xMSAgSm9obiBHcmVnZyAgPGpvaG5ueWdAZ29vZ2xlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBNYWNpZWogU3RhY2hvd2lhay4KSW5kZXg6IFdlYkNvcmUvV2ViQ29yZS52Y3By b2ovV2ViQ29yZUNVUkwudnNwcm9wcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL1dlYkNvcmUudmNw cm9qL1dlYkNvcmVDVVJMLnZzcHJvcHMJKHJldmlzaW9uIDQ3MDU4KQorKysgV2ViQ29yZS9XZWJD b3JlLnZjcHJvai9XZWJDb3JlQ1VSTC52c3Byb3BzCSh3b3JraW5nIGNvcHkpCkBAIC03LDUgKzcs NiBAQAogCTxUb29sDQogCQlOYW1lPSJWQ0NMQ29tcGlsZXJUb29sIg0KIAkJQWRkaXRpb25hbElu Y2x1ZGVEaXJlY3Rvcmllcz0iJChQcm9qZWN0RGlyKS4uXHBsYXRmb3JtXG5ldHdvcmtcY3VybCIN CisJCVByZXByb2Nlc3NvckRlZmluaXRpb25zPSJVU0VfV0lORE9XU19TU1BJO1VTRV9TU0xFQVk7 SEFWRV9aTElCIg0KIAkvPg0KIDwvVmlzdWFsU3R1ZGlvUHJvcGVydHlTaGVldD4NCkluZGV4OiBX ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxl TWFuYWdlci5jcHAJKHJldmlzaW9uIDQ3MDU4KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNSw2ICs1 LDggQEAKICAqIENvcHlyaWdodCAoQykgMjAwNyBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlcgog ICogQ29weXJpZ2h0IChDKSAyMDA4IENvbGxhYm9yYSBMdGQuCiAgKiBDb3B5cmlnaHQgKEMpIDIw MDggTnVhbnRpIEx0ZC4KKyAqIENvcHlyaWdodCAoQykgMjAwOSBBcHBjZWxlcmF0b3IgSW5jLgor ICogQ29weXJpZ2h0IChDKSAyMDA5IEJyZW50IEZ1bGdoYW0gPGJmdWxnaGFtQHdlYmtpdC5vcmc+ CiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2Ug aW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dApAQCAtNTQsNiArNTYs MjAgQEAgY29uc3QgaW50IG1heFJ1bm5pbmdKb2JzID0gNTsKIAogc3RhdGljIGNvbnN0IGJvb2wg aWdub3JlU1NMRXJyb3JzID0gZ2V0ZW52KCJXRUJLSVRfSUdOT1JFX1NTTF9FUlJPUlMiKTsKIAor c3RhdGljIENTdHJpbmcgY2VydGlmaWNhdGVCdW5kbGVQYXRoKCkKK3sKKyNpZiBQTEFURk9STShD RikKKyAgICBDRkJ1bmRsZVJlZiB3ZWJLaXRCdW5kbGUgPSBDRkJ1bmRsZUdldEJ1bmRsZVdpdGhJ ZGVudGlmaWVyKENGU1RSKCJjb20uYXBwbGUuV2ViS2l0IikpOworICAgIFJldGFpblB0cjxDRlVS TFJlZj4gY2VydFVSTFJlZihBZG9wdENGLCBDRkJ1bmRsZUNvcHlSZXNvdXJjZVVSTCh3ZWJLaXRC dW5kbGUsIENGU1RSKCJjYWNlcnQiKSwgQ0ZTVFIoInBlbSIpLCBDRlNUUigiY2VydGlmaWNhdGVz IikpKTsKKyAgICBpZiAoY2VydFVSTFJlZikgeworICAgICAgICBjaGFyIHBhdGhbTUFYX1BBVEhd OworICAgICAgICBDRlVSTEdldEZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbihjZXJ0VVJMUmVmLmdl dCgpLCBmYWxzZSwgKFVJbnQ4KilwYXRoLCBNQVhfUEFUSCk7CisgICAgICAgIHJldHVybiBwYXRo OworICAgIH0KKyNlbmRpZgorICAgIHJldHVybiBnZXRlbnYoIkNVUkxfQ0FfQlVORExFX1BBVEgi KTsKK30KKwogUmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjpSZXNvdXJjZUhhbmRsZU1hbmFnZXIoKQog ICAgIDogbV9kb3dubG9hZFRpbWVyKHRoaXMsICZSZXNvdXJjZUhhbmRsZU1hbmFnZXI6OmRvd25s b2FkVGltZXJDYWxsYmFjaykKICAgICAsIG1fY29va2llSmFyRmlsZU5hbWUoMCkKQEAgLTYyOSw2 ICs2NDUsMTQgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZU1hbmFnZXI6OmluaXRpYWxpemVIYQogICAg IC8vIGFuZC9vciByZXBvcnRpbmcgU1NMIGVycm9ycyB0byB0aGUgdXNlci4KICAgICBpZiAoaWdu b3JlU1NMRXJyb3JzKQogICAgICAgICBjdXJsX2Vhc3lfc2V0b3B0KGQtPm1faGFuZGxlLCBDVVJM T1BUX1NTTF9WRVJJRllQRUVSLCBmYWxzZSk7CisKKyAgICBzdGF0aWMgQ1N0cmluZyBjdXJsQnVu ZGxlUGF0aDsKKyAgICBpZiAoY3VybEJ1bmRsZVBhdGguaXNOdWxsKCkpCisgICAgICAgY3VybEJ1 bmRsZVBhdGggPSBjZXJ0aWZpY2F0ZUJ1bmRsZVBhdGgoKTsKKworICAgIGlmICghY3VybEJ1bmRs ZVBhdGguaXNOdWxsKCkpCisgICAgICAgY3VybF9lYXN5X3NldG9wdChkLT5tX2hhbmRsZSwgQ1VS TE9QVF9DQUlORk8sIGN1cmxCdW5kbGVQYXRoLmRhdGEoKSk7CisKICAgICAvLyBlbmFibGUgZ3pp cCBhbmQgZGVmbGF0ZSB0aHJvdWdoIEFjY2VwdC1FbmNvZGluZzoKICAgICBjdXJsX2Vhc3lfc2V0 b3B0KGQtPm1faGFuZGxlLCBDVVJMT1BUX0VOQ09ESU5HLCAiIik7CiAKCg== 34603 2009-08-11 15:20:11 -0700 2009-08-11 15:26:36 -0700 Revised to improve efficiency and thread safety. cairo_ssl.patch text/plain 4191 bfulgham SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NzA1OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDktMDgtMTAgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUB3ZWJr aXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IENhaXJvLWJhc2VkIFdpbmRvd3MgcG9ydCBkb2VzIG5vdCBoYW5kbGUgdGhlIGh0dHBzIHByb3Rv Y29sLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjgx NzEuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIG5lZWRlZC4gIEV4aXN0aW5nIGh0dHBzIHRlc3Rz IHNob3cgdGhpcyBmYWlsdXJlCisgICAgICAgIGZvciBXaW5DYWlybyBidWlsZHMuCisKKyAgICAg ICAgKiBXZWJDb3JlLnZjcHJvai9XZWJDb3JlQ1VSTC52c3Byb3BzOiBBZGQgYSBmZXcgcHJlcHJv Y2Vzc29yCisgICAgICAgICAgZGVmaW5pdGlvbnMgZm9yIFNTTCBzdXBwb3J0IGluIGNVUkwuCisg ICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpjZXJ0aWZpY2F0ZUJ1bmRsZVBhdGgpOiBOZXcgbWV0aG9kIHRv IHJldHJpZXZlIHRoZQorICAgICAgICAgIHByb3BlciBjZXJ0aWZpY2F0ZSByZXNvdXJjZSBidW5k bGUgcGF0aC4KKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlTWFuYWdlcjo6aW5pdGlh bGl6ZUhhbmRsZSk6IENoZWNrIGZvcgorICAgICAgICAgIHRoZSByZXNvdXJjZSBidW5kbGUgYW5k IHVzZSBpZiBhdmFpbGFibGUgdG8gYWN0aXZhdGUgU1NMCisgICAgICAgICAgc3VwcG9ydC4KKwog MjAwOS0wOC0xMSAgSm9obiBHcmVnZyAgPGpvaG5ueWdAZ29vZ2xlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBNYWNpZWogU3RhY2hvd2lhay4KSW5kZXg6IFdlYkNvcmUvV2ViQ29yZS52Y3By b2ovV2ViQ29yZUNVUkwudnNwcm9wcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL1dlYkNvcmUudmNw cm9qL1dlYkNvcmVDVVJMLnZzcHJvcHMJKHJldmlzaW9uIDQ3MDU4KQorKysgV2ViQ29yZS9XZWJD b3JlLnZjcHJvai9XZWJDb3JlQ1VSTC52c3Byb3BzCSh3b3JraW5nIGNvcHkpCkBAIC03LDUgKzcs NiBAQAogCTxUb29sDQogCQlOYW1lPSJWQ0NMQ29tcGlsZXJUb29sIg0KIAkJQWRkaXRpb25hbElu Y2x1ZGVEaXJlY3Rvcmllcz0iJChQcm9qZWN0RGlyKS4uXHBsYXRmb3JtXG5ldHdvcmtcY3VybCIN CisJCVByZXByb2Nlc3NvckRlZmluaXRpb25zPSJVU0VfV0lORE9XU19TU1BJO1VTRV9TU0xFQVk7 SEFWRV9aTElCIg0KIAkvPg0KIDwvVmlzdWFsU3R1ZGlvUHJvcGVydHlTaGVldD4NCkluZGV4OiBX ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxl TWFuYWdlci5jcHAJKHJldmlzaW9uIDQ3MDU4KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNSw2ICs1 LDggQEAKICAqIENvcHlyaWdodCAoQykgMjAwNyBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlcgog ICogQ29weXJpZ2h0IChDKSAyMDA4IENvbGxhYm9yYSBMdGQuCiAgKiBDb3B5cmlnaHQgKEMpIDIw MDggTnVhbnRpIEx0ZC4KKyAqIENvcHlyaWdodCAoQykgMjAwOSBBcHBjZWxlcmF0b3IgSW5jLgor ICogQ29weXJpZ2h0IChDKSAyMDA5IEJyZW50IEZ1bGdoYW0gPGJmdWxnaGFtQHdlYmtpdC5vcmc+ CiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2Ug aW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dApAQCAtNTQsMTAgKzU2 LDI1IEBAIGNvbnN0IGludCBtYXhSdW5uaW5nSm9icyA9IDU7CiAKIHN0YXRpYyBjb25zdCBib29s IGlnbm9yZVNTTEVycm9ycyA9IGdldGVudigiV0VCS0lUX0lHTk9SRV9TU0xfRVJST1JTIik7CiAK K3N0YXRpYyBDU3RyaW5nIGNlcnRpZmljYXRlQnVuZGxlUGF0aCgpCit7CisjaWYgUExBVEZPUk0o Q0YpCisgICAgQ0ZCdW5kbGVSZWYgd2ViS2l0QnVuZGxlID0gQ0ZCdW5kbGVHZXRCdW5kbGVXaXRo SWRlbnRpZmllcihDRlNUUigiY29tLmFwcGxlLldlYktpdCIpKTsKKyAgICBSZXRhaW5QdHI8Q0ZV UkxSZWY+IGNlcnRVUkxSZWYoQWRvcHRDRiwgQ0ZCdW5kbGVDb3B5UmVzb3VyY2VVUkwod2ViS2l0 QnVuZGxlLCBDRlNUUigiY2FjZXJ0IiksIENGU1RSKCJwZW0iKSwgQ0ZTVFIoImNlcnRpZmljYXRl cyIpKSk7CisgICAgaWYgKGNlcnRVUkxSZWYpIHsKKyAgICAgICAgY2hhciBwYXRoW01BWF9QQVRI XTsKKyAgICAgICAgQ0ZVUkxHZXRGaWxlU3lzdGVtUmVwcmVzZW50YXRpb24oY2VydFVSTFJlZi5n ZXQoKSwgZmFsc2UsIChVSW50OCopcGF0aCwgTUFYX1BBVEgpOworICAgICAgICByZXR1cm4gcGF0 aDsKKyAgICB9CisjZW5kaWYKKyAgICByZXR1cm4gZ2V0ZW52KCJDVVJMX0NBX0JVTkRMRV9QQVRI Iik7Cit9CisKIFJlc291cmNlSGFuZGxlTWFuYWdlcjo6UmVzb3VyY2VIYW5kbGVNYW5hZ2VyKCkK ICAgICA6IG1fZG93bmxvYWRUaW1lcih0aGlzLCAmUmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjpkb3du bG9hZFRpbWVyQ2FsbGJhY2spCiAgICAgLCBtX2Nvb2tpZUphckZpbGVOYW1lKDApCiAgICAgLCBt X3J1bm5pbmdKb2JzKDApCisgICAgLCBtX2NlcnRQYXRoIChjZXJ0aWZpY2F0ZUJ1bmRsZVBhdGgo KSkKIHsKICAgICBjdXJsX2dsb2JhbF9pbml0KENVUkxfR0xPQkFMX0FMTCk7CiAgICAgbV9jdXJs TXVsdGlIYW5kbGUgPSBjdXJsX211bHRpX2luaXQoKTsKQEAgLTYyOSw2ICs2NDYsMTAgQEAgdm9p ZCBSZXNvdXJjZUhhbmRsZU1hbmFnZXI6OmluaXRpYWxpemVIYQogICAgIC8vIGFuZC9vciByZXBv cnRpbmcgU1NMIGVycm9ycyB0byB0aGUgdXNlci4KICAgICBpZiAoaWdub3JlU1NMRXJyb3JzKQog ICAgICAgICBjdXJsX2Vhc3lfc2V0b3B0KGQtPm1faGFuZGxlLCBDVVJMT1BUX1NTTF9WRVJJRllQ RUVSLCBmYWxzZSk7CisKKyAgICBpZiAoIW1fY2VydFBhdGguaXNOdWxsKCkpCisgICAgICAgY3Vy bF9lYXN5X3NldG9wdChkLT5tX2hhbmRsZSwgQ1VSTE9QVF9DQUlORk8sIG1fY2VydFBhdGguZGF0 YSgpKTsKKwogICAgIC8vIGVuYWJsZSBnemlwIGFuZCBkZWZsYXRlIHRocm91Z2ggQWNjZXB0LUVu Y29kaW5nOgogICAgIGN1cmxfZWFzeV9zZXRvcHQoZC0+bV9oYW5kbGUsIENVUkxPUFRfRU5DT0RJ TkcsICIiKTsKIApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VI YW5kbGVNYW5hZ2VyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1 cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmgJKHJldmlzaW9uIDQ3MDU4KQorKysgV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmgJKHdvcmtpbmcgY29w eSkKQEAgLTI5LDYgKzI5LDcgQEAKICNkZWZpbmUgUmVzb3VyY2VIYW5kbGVNYW5hZ2VyX2gKIAog I2luY2x1ZGUgIkZyYW1lLmgiCisjaW5jbHVkZSAiQ1N0cmluZy5oIgogI2luY2x1ZGUgIlRpbWVy LmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VIYW5kbGVDbGllbnQuaCIKIApAQCAtNzEsNiArNzIsNyBA QCBwcml2YXRlOgogICAgIGNoYXIqIG1fY29va2llSmFyRmlsZU5hbWU7CiAgICAgY2hhciBtX2N1 cmxFcnJvckJ1ZmZlcltDVVJMX0VSUk9SX1NJWkVdOwogICAgIFZlY3RvcjxSZXNvdXJjZUhhbmRs ZSo+IG1fcmVzb3VyY2VIYW5kbGVMaXN0OworICAgIGNvbnN0IENTdHJpbmcgbV9jZXJ0UGF0aDsK ICAgICBpbnQgbV9ydW5uaW5nSm9iczsKIH07CiAK