Skip to content

Commit a9765d1

Browse files
committed
[ci skip] Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: [ci skip] Fix phpGH-9918: License information for xxHash is not included in README.REDIST.BINS file
2 parents 12e2610 + af68beb commit a9765d1

File tree

2 files changed

+39
-0
lines changed

2 files changed

+39
-0
lines changed

NEWS

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ PHP NEWS
55
- Core:
66
. Fixed bug GH-9905 (constant() behaves inconsistent when class is undefined).
77
(cmb)
8+
. Fixed bug GH-9918 (License information for xxHash is not included in
9+
README.REDIST.BINS file). (Akama Hitoshi)
810

911
27 Nov 2022, PHP 8.2.0
1012

README.REDIST.BINS

+37
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
16. libbcmath (ext/bcmath) see ext/bcmath/libbcmath/LICENSE
1717
17. ext/mbstring/ucgendat portions based on the ucgendat.c from the OpenLDAP
1818
18. avifinfo (ext/standard/libavifinfo) see ext/standard/libavifinfo/LICENSE
19+
19. xxHash (ext/hash/xxhash)
1920

2021

2122
3. pcre2lib (ext/pcre)
@@ -641,3 +642,39 @@ OpenLDAP is a registered trademark of the OpenLDAP Foundation.
641642
Copyright 1999-2003 The OpenLDAP Foundation, Redwood City,
642643
California, USA. All Rights Reserved. Permission to copy and
643644
distribute verbatim copies of this document is granted.
645+
646+
647+
19. xxHash
648+
649+
xxHash - Extremely Fast Hash algorithm
650+
Header File
651+
Copyright (C) 2012-2020 Yann Collet
652+
653+
BSD 2-Clause License (https://www.opensource.org/licenses/bsd-license.php)
654+
655+
Redistribution and use in source and binary forms, with or without
656+
modification, are permitted provided that the following conditions are
657+
met:
658+
659+
* Redistributions of source code must retain the above copyright
660+
notice, this list of conditions and the following disclaimer.
661+
* Redistributions in binary form must reproduce the above
662+
copyright notice, this list of conditions and the following disclaimer
663+
in the documentation and/or other materials provided with the
664+
distribution.
665+
666+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
667+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
668+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
669+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
670+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
671+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
672+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
673+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
674+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
675+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
676+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
677+
678+
You can contact the author at:
679+
- xxHash homepage: https://www.xxhash.com
680+
- xxHash source repository: https://github.com/Cyan4973/xxHash

0 commit comments

Comments
 (0)