Skip to content

Commit a3b7a46

Browse files
committed
ET#66748 Updating License file for C/CPP 8.0.21 release branch
1 parent e448601 commit a3b7a46

File tree

1 file changed

+33
-28
lines changed

1 file changed

+33
-28
lines changed

LICENSE.txt

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Introduction
1010
third-party software which may be included in this distribution of
1111
MySQL Connector/C++ 8.0.
1212

13-
Last updated: March 2020
13+
Last updated: April 2020
1414

1515
Licensing Information
1616

@@ -921,33 +921,38 @@ zlib
921921
Oracle gratefully acknowledges the contributions of Jean-loup Gailly
922922
and Mark Adler in creating the zlib general purpose compression library
923923
which is used in this product.
924-
zlib.h -- interface of the 'zlib' general purpose compression library
925-
Copyright (C) 1995-2004 Jean-loup Gailly and Mark Adler
926-
927-
zlib.h -- interface of the 'zlib' general purpose compression library
928-
version 1.2.3, July 18th, 2005
929-
Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
930-
931-
zlib.h -- interface of the 'zlib' general purpose compression library
932-
version 1.2.5, April 19th, 2010
933-
Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
934-
935-
This software is provided 'as-is', without any express or implied warranty.
936-
In no event will the authors be held liable for any damages arising from the
937-
use of this software. Permission is granted to anyone to use this software
938-
for any purpose,including commercial applications, and to alter it and
939-
redistribute it freely, subject to the following restrictions:
940-
941-
1. The origin of this software must not be misrepresented; you must not
942-
claim that you wrote the original software. If you use this software
943-
in a product, an acknowledgment in the product documentation would
944-
be appreciated but is not required.
945-
2. Altered source versions must be plainly marked as such, and must not
946-
be misrepresented as being the original software.
947-
3. This notice may not be removed or altered from any source distribution.
948-
949-
Jean-loup Gailly [email protected]
950-
924+
(C) 1995-2017 Jean-loup Gailly and Mark Adler
925+
926+
This software is provided 'as-is', without any express or implied
927+
warranty. In no event will the authors be held liable for any damages
928+
arising from the use of this software.
929+
930+
Permission is granted to anyone to use this software for any purpose,
931+
including commercial applications, and to alter it and redistribute it
932+
freely, subject to the following restrictions:
933+
934+
935+
1. The origin of this software must not be misrepresented; you must not
936+
claim that you wrote the original software. If you use this software
937+
in a product, an acknowledgment in the product documentation would be
938+
appreciated but is not required.
939+
940+
2. Altered source versions must be plainly marked as such, and must not be
941+
misrepresented as being the original software.
942+
943+
3. This notice may not be removed or altered from any source distribution.
944+
945+
Jean-loup Gailly Mark Adler
946+
947+
948+
If you use the zlib library in a product, we would appreciate *not* receiving
949+
lengthy legal documents to sign. The sources are provided for free but without
950+
warranty of any kind. The library has been entirely written by Jean-loup
951+
Gailly and Mark Adler; it does not include third-party code.
952+
953+
If you redistribute modified sources, we would appreciate that you include in
954+
the file ChangeLog history information documenting your changes. Please read
955+
the FAQ for more information on the distribution of modified source versions.
951956

952957
ZSTD
953958

0 commit comments

Comments
 (0)