You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by mt...@apache.org on 2010/05/28 19:50:17 UTC
svn commit: r949241 - in /trafficserver/traffic/trunk: LICENSE
libinktomi++/ink_string.cc
Author: mturk
Date: Fri May 28 17:50:17 2010
New Revision: 949241
URL: http://svn.apache.org/viewvc?rev=949241&view=rev
Log:
TS-369: Upadate LICENSE file instead poluting source with dual license
Modified:
trafficserver/traffic/trunk/LICENSE
trafficserver/traffic/trunk/libinktomi++/ink_string.cc
Modified: trafficserver/traffic/trunk/LICENSE
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/LICENSE?rev=949241&r1=949240&r2=949241&view=diff
==============================================================================
--- trafficserver/traffic/trunk/LICENSE (original)
+++ trafficserver/traffic/trunk/LICENSE Fri May 28 17:50:17 2010
@@ -384,3 +384,21 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE F
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 strlcat, strlcpy in inktomi++/ink_string.cc:
+
+Copyright (c) 1998 Todd C. Miller <To...@courtesan.com>
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
Modified: trafficserver/traffic/trunk/libinktomi++/ink_string.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_string.cc?rev=949241&r1=949240&r2=949241&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_string.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_string.cc Fri May 28 17:50:17 2010
@@ -409,24 +409,6 @@ ink_strndup(const char *str, size_t n)
}
#endif
-/*
- strlcat and strlcpy are derived from Todd C. Millers's code.
-
-
- Copyright (c) 1998 Todd C. Miller <To...@courtesan.com>
-
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
-
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
#if !ATS_HAS_STRLCPY
size_t
ink_strlcpy(char *dst, const char *src, size_t siz)