You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by fa...@apache.org on 2023/06/21 07:58:29 UTC
[incubator-pekko-http] branch main updated: add utf8-decoder license (#198)
This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-http.git
The following commit(s) were added to refs/heads/main by this push:
new aa539c130 add utf8-decoder license (#198)
aa539c130 is described below
commit aa539c130019c237046943c3d4ad8413e0ebd656
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Wed Jun 21 08:58:23 2023 +0100
add utf8-decoder license (#198)
---
LICENSE | 22 +++++++++++++++
.../pekko/http/impl/engine/ws/Utf8Decoder.scala | 33 +++++++++++-----------
2 files changed, 38 insertions(+), 17 deletions(-)
diff --git a/LICENSE b/LICENSE
index 7443648d1..457f3455b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -214,3 +214,25 @@ pekko-http-core contains code from scala-collection-compat in the `org.apache.pe
distributed under the Apache 2.0 license.
Copyright (c) 2002-2023 EPFL
Copyright (c) 2011-2023 Lightbend, Inc.
+
+---------------
+
+pekko-http-core contains code from https://bjoern.hoehrmann.de/utf-8/decoder/dfa/
+in `org.apache.pekko.http.impl.engine.ws.Utf8Decoder.scala` that was distributed under a MIT license.
+
+Copyright (c) 2008-2009 Bjoern Hoehrmann <bj...@hoehrmann.de>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+associated documentation files (the "Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/ws/Utf8Decoder.scala b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/ws/Utf8Decoder.scala
index e9e35da7e..622d9c9db 100644
--- a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/ws/Utf8Decoder.scala
+++ b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/ws/Utf8Decoder.scala
@@ -11,23 +11,7 @@
* Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
*/
-package org.apache.pekko.http.impl.engine.ws
-
-import org.apache.pekko
-import pekko.annotation.InternalApi
-import pekko.util.ByteString
-
-import scala.util.Try
-
-/**
- * A Utf8 -> Utf16 (= Java char) decoder.
- *
- * This decoder is based on the one of Bjoern Hoehrmann from
- *
- * http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
- *
- * which is licensed under this license:
- *
+/*
* Copyright (C) 2008-2017 Bjoern Hoehrmann <bj...@hoehrmann.de>
*
* Permission is hereby granted, free of charge, to any person obtaining a
@@ -46,6 +30,21 @@ import scala.util.Try
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package org.apache.pekko.http.impl.engine.ws
+
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.util.ByteString
+
+import scala.util.Try
+
+/**
+ * A Utf8 -> Utf16 (= Java char) decoder.
+ *
+ * This decoder is based on the one of Bjoern Hoehrmann from
+ * https://bjoern.hoehrmann.de/utf-8/decoder/dfa/ (MIT License).
*
* INTERNAL API
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org