Skip to content

Commit aa539c1

Browse files
authored
add utf8-decoder license (#198)
1 parent 835347a commit aa539c1

File tree

2 files changed

+38
-17
lines changed

2 files changed

+38
-17
lines changed

LICENSE

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,3 +214,25 @@ pekko-http-core contains code from scala-collection-compat in the `org.apache.pe
214214
distributed under the Apache 2.0 license.
215215
Copyright (c) 2002-2023 EPFL
216216
Copyright (c) 2011-2023 Lightbend, Inc.
217+
218+
---------------
219+
220+
pekko-http-core contains code from https://bjoern.hoehrmann.de/utf-8/decoder/dfa/
221+
in `org.apache.pekko.http.impl.engine.ws.Utf8Decoder.scala` that was distributed under a MIT license.
222+
223+
Copyright (c) 2008-2009 Bjoern Hoehrmann <[email protected]>
224+
225+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
226+
associated documentation files (the "Software"), to deal in the Software without restriction, including
227+
without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
228+
copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to
229+
the following conditions:
230+
231+
The above copyright notice and this permission notice shall be included in all copies or substantial
232+
portions of the Software.
233+
234+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
235+
LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
236+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
237+
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
238+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

http-core/src/main/scala/org/apache/pekko/http/impl/engine/ws/Utf8Decoder.scala

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,7 @@
1111
* Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
1212
*/
1313

14-
package org.apache.pekko.http.impl.engine.ws
15-
16-
import org.apache.pekko
17-
import pekko.annotation.InternalApi
18-
import pekko.util.ByteString
19-
20-
import scala.util.Try
21-
22-
/**
23-
* A Utf8 -> Utf16 (= Java char) decoder.
24-
*
25-
* This decoder is based on the one of Bjoern Hoehrmann from
26-
*
27-
* http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
28-
*
29-
* which is licensed under this license:
30-
*
14+
/*
3115
* Copyright (C) 2008-2017 Bjoern Hoehrmann <[email protected]>
3216
*
3317
* Permission is hereby granted, free of charge, to any person obtaining a
@@ -46,6 +30,21 @@ import scala.util.Try
4630
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
4731
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
4832
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
33+
*/
34+
35+
package org.apache.pekko.http.impl.engine.ws
36+
37+
import org.apache.pekko
38+
import pekko.annotation.InternalApi
39+
import pekko.util.ByteString
40+
41+
import scala.util.Try
42+
43+
/**
44+
* A Utf8 -> Utf16 (= Java char) decoder.
45+
*
46+
* This decoder is based on the one of Bjoern Hoehrmann from
47+
* https://bjoern.hoehrmann.de/utf-8/decoder/dfa/ (MIT License).
4948
*
5049
* INTERNAL API
5150
*/

0 commit comments

Comments
 (0)