Updated Windows related copyrigth notice

diff --git a/include/squid_mswin.h b/include/squid_mswin.h
index 33c8cee850ed99e532c5af2915afabb578d06e5a..46cb15c84d38ba400e0f8bdc8d55cd74388a6cce 100755 (executable)
--- a/include/squid_mswin.h
+++ b/include/squid_mswin.h
@@ -1,7 +1,8 @@
 /*
- * $Id: squid_mswin.h,v 1.1 2006/09/02 13:30:54 serassio Exp $
+ * $Id: squid_mswin.h,v 1.2 2006/09/09 15:29:59 serassio Exp $
  *
- * AUTHOR: Guido Serassio & Andrey Shorin
+ * AUTHOR: Andrey Shorin <tolsty@tushino.com>
+ * AUTHOR: Guido Serassio <serassio@squid-cache.org>
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------

diff --git a/include/squid_windows.h b/include/squid_windows.h
index 7d5378860306b5c9b636662c1f9f23c613aa0c90..1c726d6f0f3e54f50b27629afe045cc790bca4e8 100644 (file)
--- a/include/squid_windows.h
+++ b/include/squid_windows.h
@@ -1,7 +1,7 @@
 /*
- * $Id: squid_windows.h,v 1.1 2005/08/21 18:54:23 serassio Exp $
+ * $Id: squid_windows.h,v 1.2 2006/09/09 15:29:59 serassio Exp $
  *
- * AUTHOR: Guido Serassio
+ * AUTHOR: Guido Serassio <serassio@squid-cache.org>
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------

diff --git a/include/sspwin32.h b/include/sspwin32.h
index e96609b0811a0b040d0bbfe76120d523309b287c..55b6ec2a6181b6e968838c4763348a001a48cb89 100755 (executable)
--- a/include/sspwin32.h
+++ b/include/sspwin32.h
@@ -1,18 +1,36 @@
+
 /*
- * (C) 2002 Guido Serassio <serassio@libero.it>
+ * $Id: sspwin32.h,v 1.2 2006/09/09 15:29:59 serassio Exp $
+ *
+ * AUTHOR: Guido Serassio <serassio@squid-cache.org>
  * Based on previous work of Francesco Chemolli, Robert Collins and Andrew Doran
  *
- * Distributed freely under the terms of the GNU General Public License,
- * version 2. See the file COPYING for licensing details
+ * SQUID Web Proxy Cache          http://www.squid-cache.org/
+ * ----------------------------------------------------------
+ *
+ *  Squid is the result of efforts by numerous individuals from
+ *  the Internet community; see the CONTRIBUTORS file for full
+ *  details.   Many organizations have provided support for Squid's
+ *  development; see the SPONSORS file for full details.  Squid is
+ *  Copyrighted (C) 2001 by the Regents of the University of
+ *  California; see the COPYRIGHT file for full details.  Squid
+ *  incorporates software developed and/or copyrighted by other
+ *  sources; see the CREDITS file for full details.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  */
 
 #ifndef _LIBSSPWIN32_H_

diff --git a/lib/sspwin32.c b/lib/sspwin32.c
index 86b69b7b8caed6f0fdb93763cf40771be21f4680..733ead55d6ba137f5ec41fb887f9924f3a91a6fe 100755 (executable)
--- a/lib/sspwin32.c
+++ b/lib/sspwin32.c
@@ -1,18 +1,36 @@
+
 /*
- * (C) 2002 Guido Serassio <serassio@libero.it>
- * Based on previous work of Francesco Chemolli, Robert Collins
+ * $Id: sspwin32.c,v 1.2 2006/09/09 15:29:59 serassio Exp $
+ *
+ * AUTHOR: Guido Serassio <serassio@squid-cache.org>
+ * inspired by previous work by Robert Collins, Francesco Chemolli.
+ *
+ * SQUID Web Proxy Cache          http://www.squid-cache.org/
+ * ----------------------------------------------------------
+ *
+ *  Squid is the result of efforts by numerous individuals from
+ *  the Internet community; see the CONTRIBUTORS file for full
+ *  details.   Many organizations have provided support for Squid's
+ *  development; see the SPONSORS file for full details.  Squid is
+ *  Copyrighted (C) 2001 by the Regents of the University of
+ *  California; see the COPYRIGHT file for full details.  Squid
+ *  incorporates software developed and/or copyrighted by other
+ *  sources; see the CREDITS file for full details.
  *
- * Distributed freely under the terms of the GNU General Public License,
- * version 2. See the file COPYING for licensing details
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  */
 
 #include "util.h"

diff --git a/lib/win32lib.c b/lib/win32lib.c
index 4d881d91e87225cb3f2ca87fe1de35f2a9c4917a..a8b21305605edbb26e45cb032d49e07b476bc030 100755 (executable)
--- a/lib/win32lib.c
+++ b/lib/win32lib.c
@@ -1,10 +1,10 @@
+
 /*
- * $Id: win32lib.c,v 1.1 2006/09/02 13:48:53 serassio Exp $
- *
- * * * * * * * * Legal stuff * * * * * * *
+ * $Id: win32lib.c,v 1.2 2006/09/09 15:29:59 serassio Exp $
  *
- * (C) 2001 Guido Serassio <serassio@libero.it>,
- *   inspired by previous work by Romeo Anghelache & Eric Stern.
+ * Windows support
+ * AUTHOR: Guido Serassio <serassio@squid-cache.org>
+ * inspired by previous work by Romeo Anghelache & Eric Stern.
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------

diff --git a/src/DiskIO/AIO/aio_win32.cc b/src/DiskIO/AIO/aio_win32.cc
index e9c0946d756372727015195e4e98247912542c6d..8cb3cb623b67da964cb01dea2eab38800b7ba570 100755 (executable)
--- a/src/DiskIO/AIO/aio_win32.cc
+++ b/src/DiskIO/AIO/aio_win32.cc
@@ -1,9 +1,9 @@
 
 /*
- * $Id: aio_win32.cc,v 1.1 2006/09/04 20:15:22 serassio Exp $
+ * $Id: aio_win32.cc,v 1.2 2006/09/09 15:29:59 serassio Exp $
  *
  * DEBUG: section 81    aio_xxx() POSIX emulation on Windows
- * AUTHOR: Guido Serassio
+ * AUTHOR: Guido Serassio <serassio@squid-cache.org>
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------

diff --git a/src/DiskIO/AIO/aio_win32.h b/src/DiskIO/AIO/aio_win32.h
index 733e3c3a043c63fc9e2b2409767623a8fe801a8e..bd6d2dae8cf0f72b4332bba4238b005aca9099e0 100755 (executable)
--- a/src/DiskIO/AIO/aio_win32.h
+++ b/src/DiskIO/AIO/aio_win32.h
@@ -1,3 +1,37 @@
+
+/*
+ * $Id: aio_win32.h,v 1.2 2006/09/09 15:29:59 serassio Exp $
+ *
+ * AUTHOR: Guido Serassio <serassio@squid-cache.org>
+ *
+ * SQUID Web Proxy Cache          http://www.squid-cache.org/
+ * ----------------------------------------------------------
+ *
+ *  Squid is the result of efforts by numerous individuals from
+ *  the Internet community; see the CONTRIBUTORS file for full
+ *  details.   Many organizations have provided support for Squid's
+ *  development; see the SPONSORS file for full details.  Squid is
+ *  Copyrighted (C) 2001 by the Regents of the University of
+ *  California; see the COPYRIGHT file for full details.  Squid
+ *  incorporates software developed and/or copyrighted by other
+ *  sources; see the CREDITS file for full details.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ *
+ */
+
 #ifndef __WIN32_AIO_H__
 #define __WIN32_AIO_H__
 

diff --git a/src/DiskIO/DiskThreads/aiops_win32.cc b/src/DiskIO/DiskThreads/aiops_win32.cc
index 0b9621395dd768035d994b8d826cf2d0d07bd725..dd4e4c3b677611f45f64757d421723390c158a63 100755 (executable)
--- a/src/DiskIO/DiskThreads/aiops_win32.cc
+++ b/src/DiskIO/DiskThreads/aiops_win32.cc
@@ -1,8 +1,10 @@
 /*
- * $Id: aiops_win32.cc,v 1.1 2006/09/06 19:36:42 serassio Exp $
+ * $Id: aiops_win32.cc,v 1.2 2006/09/09 15:29:59 serassio Exp $
  *
- * DEBUG: section 43    AIOPS
+ * DEBUG: section 43    Windows AIOPS
  * AUTHOR: Stewart Forster <slf@connect.com.au>
+ * AUTHOR: Robert Collins <robertc@squid-cache.org>
+ * AUTHOR: Guido Serassio <serassio@squid-cache.org>
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------

diff --git a/src/ipc_win32.cc b/src/ipc_win32.cc
index b38f4fd8108ba1040e289499f9dd44bcfa9046a3..0f195f65a81b4a3fc826baf4a4d91d23223e8145 100755 (executable)
--- a/src/ipc_win32.cc
+++ b/src/ipc_win32.cc
@@ -1,9 +1,10 @@
 
 /*
- * $Id: ipc_win32.cc,v 1.1 2006/09/03 18:47:18 serassio Exp $
+ * $Id: ipc_win32.cc,v 1.2 2006/09/09 15:29:59 serassio Exp $
  *
  * DEBUG: section 54    Windows Interprocess Communication
- * AUTHOR: Andrey Shorin & Guido Serassio
+ * AUTHOR: Andrey Shorin <tolsty@tushino.com>
+ * AUTHOR: Guido Serassio <serassio@squid-cache.org>
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------

diff --git a/src/win32.cc b/src/win32.cc
index 08374321fb273ae8f6387d262a79933d1ce90752..3fa8fc8528dbafa63bdcf9afc949908c3f534d92 100644 (file)
--- a/src/win32.cc
+++ b/src/win32.cc
@@ -1,11 +1,10 @@
 
 /*
- * $Id: win32.cc,v 1.23 2006/09/03 18:47:18 serassio Exp $
+ * $Id: win32.cc,v 1.24 2006/09/09 15:29:59 serassio Exp $
  *
- * * * * * * * * Legal stuff * * * * * * *
- *
- * (C) 2001 Guido Serassio <serassio@libero.it>,
- *   inspired by previous work by Romeo Anghelache & Eric Stern.
+ * Windows support
+ * AUTHOR: Guido Serassio <serassio@squid-cache.org>
+ * inspired by previous work by Romeo Anghelache & Eric Stern.
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
@@ -28,14 +27,13 @@
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *
+ *  
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  *
  */
 
-#ifndef WIN32_C
 #define WIN32_C
 
 #include "squid.h"
@@ -1143,4 +1141,3 @@ void WIN32_ExceptionHandlerCleanup()
 }
 
 #endif /* SQUID_MSWIN_ */
-#endif /* WIN32_C */