diff options
| author | Viktor Szakats <vszakats@users.noreply.github.com> | 2015-06-15 11:32:39 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2015-06-15 11:37:55 +0200 |
| commit | 496e96c242e80b206fb8b326e2b8e990b60e9be2 (patch) | |
| tree | 03d0c5452e415482bcfd20cb79241aabb90ea057 | |
| parent | bb5b29ec14e81097b22382f879ee39174914e621 (diff) | |
LICENSE-MIXING: update URLs
* use SSL/TLS where available
* follow permanent redirects
| -rw-r--r-- | docs/LICENSE-MIXING | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/docs/LICENSE-MIXING b/docs/LICENSE-MIXING index d70fa8492..ccb6ada32 100644 --- a/docs/LICENSE-MIXING +++ b/docs/LICENSE-MIXING @@ -23,7 +23,7 @@ libcurl http://curl.haxx.se/docs/copyright.html Uses an MIT (or Modified BSD)-style license that is as liberal as possible. -OpenSSL http://www.openssl.org/source/license.html +OpenSSL https://www.openssl.org/source/license.html (May be used for SSL/TLS support) Uses an Original BSD-style license with an announcement clause that makes it "incompatible" with GPL. You @@ -39,13 +39,13 @@ GnuTLS http://www.gnutls.org/ GnuTLS itself depends on and uses other libs (libgcrypt and libgpg-error) and they too are LGPL- or GPL-licensed. -WolfSSL http://www.wolfssl.com/ +WolfSSL https://www.wolfssl.com/ (May be used for SSL/TLS support) Uses the GPL[1] license or a propietary license. If this is a problem for you, consider using another TLS library. -NSS http://www.mozilla.org/projects/security/pki/nss/ +NSS https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS (May be used for SSL/TLS support) Is covered by the MPL[4] license, the GPL[1] license and the LGPL[3] license. You may choose to license @@ -79,7 +79,7 @@ c-ares http://daniel.haxx.se/projects/c-ares/license.html liberal and imposes no restrictions on any other library or part you may link with. -zlib http://www.gzip.org/zlib/zlib_license.html +zlib http://www.zlib.net/zlib_license.html (Used for compressed Transfer-Encoding support) Uses an MIT-style license that shouldn't collide with any other library. @@ -89,12 +89,12 @@ MIT Kerberos http://web.mit.edu/kerberos/www/dist/ (May be used for GSS support) MIT licensed, that shouldn't collide with any other parts. -Heimdal http://www.pdc.kth.se/heimdal/ +Heimdal http://www.h5l.org (May be used for GSS support) Heimdal is Original BSD licensed with the announcement clause. -GNU GSS http://www.gnu.org/software/gss/ +GNU GSS https://www.gnu.org/software/gss/ (May be used for GSS support) GNU GSS is GPL licensed. Note that you may not distribute binary curl packages that uses this if you build @@ -121,10 +121,10 @@ libssh2 http://www.libssh2.org/ (Used for scp and sftp support) libssh2 uses a Modified BSD-style license. -[1] = GPL - GNU General Public License: http://www.gnu.org/licenses/gpl.html -[2] = http://www.fsf.org/licenses/gpl-faq.html#GPLIncompatibleLibs details on +[1] = GPL - GNU General Public License: https://www.gnu.org/licenses/gpl.html +[2] = https://www.gnu.org/licenses/gpl-faq.html#GPLIncompatibleLibs details on how to write such an exception to the GPL [3] = LGPL - GNU Lesser General Public License: - http://www.gnu.org/licenses/lgpl.html + https://www.gnu.org/licenses/lgpl.html [4] = MPL - Mozilla Public License: - http://www.mozilla.org/MPL/ + https://www.mozilla.org/MPL/ |