Skip to content

Commit 2789fa7

Browse files
cnaurothsteveloughran
authored andcommitted
HDFS-17754. Add uriparser2 to notices (#7481)
Contributed by Chris Nauroth
1 parent 474f534 commit 2789fa7

File tree

3 files changed

+28
-1
lines changed

3 files changed

+28
-1
lines changed

NOTICE-binary

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@ This product includes software developed by Apache
809809
PureJavaCrc32C from apache-hadoop-common http://hadoop.apache.org/
810810
(Apache 2.0 license)
811811

812-
This library containd statically linked libstdc++. This inclusion is allowed by
812+
This library contains statically linked libstdc++. This inclusion is allowed by
813813
"GCC RUntime Library Exception"
814814
http://gcc.gnu.org/onlinedocs/libstdc++/manual/license.html
815815

@@ -825,3 +825,10 @@ Copyright 2009-2018 The Apache Software Foundation
825825

826826
This product includes software developed at
827827
The Apache Software Foundation (http://www.apache.org/).
828+
829+
This product includes code from uriparser2, a C and C++ library for URI parsing.
830+
831+
* LICENSE:
832+
* license/LICENSE-uriparser2.txt (MIT License)
833+
* HOMEPAGE:
834+
* https://github.com/bnoordhuis/uriparser2

hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/third_party/uriparser2/uriparser2/uriparser/UriQuery.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ int URI_FUNC(ComposeQueryEngine)(URI_CHAR * dest,
219219

220220
/* Copy key */
221221
if (firstItem == URI_TRUE) {
222+
ampersandLen = 1;
222223
firstItem = URI_FALSE;
223224
} else {
224225
write[0] = _UT('&');
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Copyright (c) 2010 Ben Noordhuis
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy
4+
of this software and associated documentation files (the "Software"), to deal
5+
in the Software without restriction, including without limitation the rights
6+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
copies of the Software, and to permit persons to whom the Software is
8+
furnished to do so, subject to the following conditions:
9+
10+
The above copyright notice and this permission notice shall be included in
11+
all copies or substantial portions of the Software.
12+
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19+
THE SOFTWARE.

0 commit comments

Comments
 (0)