From 961d455618726984ad94c71920dc3ef4a1700d70 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 9 Jun 2009 14:18:25 +0200 Subject: [PATCH] Add license file with Mongrel's license. --- LICENSE | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++ http_parser.h | 7 ++--- http_parser.rl | 4 +-- 3 files changed, 83 insertions(+), 7 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..7fb7fcd --- /dev/null +++ b/LICENSE @@ -0,0 +1,79 @@ +Copyright 2009, Ryan Lienhart Dahl. All rights reserved. +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. + + + + +http_parser is based on Zed Shaw's Mongrel. Mongrel's license is as follows. + +-- CUT ---- CUT ---- CUT ---- CUT ---- CUT ---- CUT ---- CUT ---- CUT -- +Mongrel Web Server (Mongrel) is copyrighted free software by Zed A. Shaw + and contributors. You can redistribute it +and/or modify it under either the terms of the GPL2 or the conditions below: + +1. You may make and give away verbatim copies of the source form of the + software without restriction, provided that you duplicate all of the + original copyright notices and associated disclaimers. + +2. You may modify your copy of the software in any way, provided that + you do at least ONE of the following: + + a) place your modifications in the Public Domain or otherwise make them + Freely Available, such as by posting said modifications to Usenet or an + equivalent medium, or by allowing the author to include your + modifications in the software. + + b) use the modified software only within your corporation or + organization. + + c) rename any non-standard executables so the names do not conflict with + standard executables, which must also be provided. + + d) make other distribution arrangements with the author. + +3. You may distribute the software in object code or executable + form, provided that you do at least ONE of the following: + + a) distribute the executables and library files of the software, + together with instructions (in the manual page or equivalent) on where + to get the original distribution. + + b) accompany the distribution with the machine-readable source of the + software. + + c) give non-standard executables non-standard names, with + instructions on where to get the original software distribution. + + d) make other distribution arrangements with the author. + +4. You may modify and include the part of the software into any other + software (possibly commercial). But some files in the distribution + are not written by the author, so that they are not under this terms. + +5. The scripts and library files supplied as input to or produced as + output from the software do not automatically fall under the + copyright of the software, but belong to whomever generated them, + and may be sold commercially, and may be aggregated with this + software. + +6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. +-- CUT ---- CUT ---- CUT ---- CUT ---- CUT ---- CUT ---- CUT ---- CUT -- diff --git a/http_parser.h b/http_parser.h index d41580e..c83a319 100644 --- a/http_parser.h +++ b/http_parser.h @@ -1,8 +1,7 @@ -/* Copyright (c) 2008 Ryan Dahl (ry@tinyclouds.org) - * All rights reserved. +/* Copyright (c) 2008, 2009 Ryan Dahl (ry@tinyclouds.org) + * Based on Zed Shaw's Mongrel, copyright (c) Zed A. Shaw * - * This parser is based on code from Zed Shaw's Mongrel. - * Copyright (c) 2005 Zed A. Shaw + * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the diff --git a/http_parser.rl b/http_parser.rl index 3b4700f..7e13f1e 100644 --- a/http_parser.rl +++ b/http_parser.rl @@ -1,7 +1,5 @@ /* Copyright (c) 2008, 2009 Ryan Dahl (ry@tinyclouds.org) - * - * Based on Zed Shaw's Mongrel. - * Copyright (c) 2005 Zed A. Shaw + * Based on Zed Shaw's Mongrel, copyright (c) Zed A. Shaw * * All rights reserved. *