summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorJim Jagielski <jim@apache.org>2012-11-19 14:11:38 +0000
committerJim Jagielski <jim@apache.org>2012-11-19 14:11:38 +0000
commit2b7363557acfb4fe1589b09b212cef7d8de6ab53 (patch)
tree78341c3ebf7491439249d12f7f3f9e47742258f3 /LICENSE
parent68bf694f8723948fbe19ac35d75f7103cd9a157f (diff)
downloadhttpd-2b7363557acfb4fe1589b09b212cef7d8de6ab53.tar.gz
Merge branch 'skiplist'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1411190 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE20
1 files changed, 20 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index c7aa5ffdc3..0e44295f13 100644
--- a/LICENSE
+++ b/LICENSE
@@ -544,4 +544,24 @@ 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.
+for the server/mpm/eventopt/skiplist.? component:
+
+/* ======================================================================
+ * Copyright (c) 2000,2006 Theo Schlossnagle
+ * All rights reserved.
+ * The following code was written by Theo Schlossnagle for use in the
+ * Backhand project at The Center for Networking and Distributed Systems
+ * at The Johns Hopkins University.
+ *
+ * This is a skiplist implementation to be used for abstract structures
+ * and is release under the LGPL license version 2.1 or later. A copy
+ * of this license can be found file LGPL.
+ *
+ * Alternatively, this file may be licensed under the new BSD license.
+ * A copy of this license can be found file BSD.
+ *
+ * ======================================================================
+ */
+
+
====================================================================