You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2010/04/24 01:16:29 UTC
svn commit: r937549 - in
/incubator/trafficserver/traffic/branches/2.0.x/libinktomi++:
ink_res_init.cc ink_res_mkquery.cc ink_resolver.h
Author: jplevyak
Date: Fri Apr 23 23:16:29 2010
New Revision: 937549
URL: http://svn.apache.org/viewvc?rev=937549&view=rev
Log:
update BSD license as per: ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
Modified:
incubator/trafficserver/traffic/branches/2.0.x/libinktomi++/ink_res_init.cc
incubator/trafficserver/traffic/branches/2.0.x/libinktomi++/ink_res_mkquery.cc
incubator/trafficserver/traffic/branches/2.0.x/libinktomi++/ink_resolver.h
Modified: incubator/trafficserver/traffic/branches/2.0.x/libinktomi++/ink_res_init.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/libinktomi%2B%2B/ink_res_init.cc?rev=937549&r1=937548&r2=937549&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/libinktomi++/ink_res_init.cc (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/libinktomi++/ink_res_init.cc Fri Apr 23 23:16:29 2010
@@ -10,11 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -71,7 +67,6 @@
#if !defined (_WIN32)
#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93";
#endif /* LIBC_SCCS and not lint */
Modified: incubator/trafficserver/traffic/branches/2.0.x/libinktomi++/ink_res_mkquery.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/libinktomi%2B%2B/ink_res_mkquery.cc?rev=937549&r1=937548&r2=937549&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/libinktomi++/ink_res_mkquery.cc (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/libinktomi++/ink_res_mkquery.cc Fri Apr 23 23:16:29 2010
@@ -10,11 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -69,10 +65,6 @@
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_mkquery.c 8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_mkquery.c,v 1.6.672.1 2008/04/03 02:12:21 marka Exp $";
-#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
Modified: incubator/trafficserver/traffic/branches/2.0.x/libinktomi++/ink_resolver.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/libinktomi%2B%2B/ink_resolver.h?rev=937549&r1=937548&r2=937549&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/libinktomi++/ink_resolver.h (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/libinktomi++/ink_resolver.h Fri Apr 23 23:16:29 2010
@@ -10,11 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*