Updated copyright, license notices in source code

The notices have been changed to a more GNU look. Documentation
comments have been separated from the copyright header. I've tried to
keep all copyright notices intact. Some author contact details have
been updated.

45 files changed, 736 insertions, 604 deletions

diff --git a/src/acl.c b/src/acl.c
index bbfacc7..3e13b96 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -1,20 +1,24 @@
-/* $Id: acl.c,v 1.22 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2000, 2002 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * This system handles Access Control for use of this daemon. A list of
- * domains, or IP addresses (including IP blocks) are stored in a list
- * which is then used to compare incoming connections.
+ * 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.
  *
- * Copyright (C) 2000,2002  Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* This system handles Access Control for use of this daemon. A list of
+ * domains, or IP addresses (including IP blocks) are stored in a list
+ * which is then used to compare incoming connections.
  */
 
 #include "tinyproxy.h"
diff --git a/src/acl.h b/src/acl.h
index 3d693d4..0722ec0 100644
--- a/src/acl.h
+++ b/src/acl.h
@@ -1,20 +1,23 @@
-/* $Id: acl.h,v 1.5 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2000 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * See 'acl.c' for detailed information.
+ * 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.
  *
- * Copyright (C) 2000  Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* See 'acl.c' for detailed information. */
+
 #ifndef TINYPROXY_ACL_H
 #define TINYPROXY_ACL_H
 
diff --git a/src/anonymous.c b/src/anonymous.c
index 3c40a3a..488d278 100644
--- a/src/anonymous.c
+++ b/src/anonymous.c
@@ -1,19 +1,23 @@
-/* $Id: anonymous.c,v 1.16 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2000 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * Handles insertion and searches for headers which should be let through when
- * the anonymous feature is turned on.
+ * 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.
  *
- * Copyright (C) 2000  Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* Handles insertion and searches for headers which should be let through
+ * when the anonymous feature is turned on.
  */
 
 #include "tinyproxy.h"
diff --git a/src/anonymous.h b/src/anonymous.h
index 764144d..c3a01be 100644
--- a/src/anonymous.h
+++ b/src/anonymous.h
@@ -1,20 +1,23 @@
-/* $Id: anonymous.h,v 1.7 2005-07-12 17:39:43 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2000 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * See 'anonymous.c' for a detailed description.
+ * 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.
  *
- * Copyright (C) 2000  Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* See 'anonymous.c' for detailed information. */
+
 #ifndef _TINYPROXY_ANONYMOUS_H_
 #define _TINYPROXY_ANONYMOUS_H_
 
diff --git a/src/buffer.c b/src/buffer.c
index a29cfbc..008c0cb 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1,24 +1,28 @@
-/* $Id: buffer.c,v 1.25 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 1999, 2001 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * The buffer used in each connection is a linked list of lines. As the lines
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* The buffer used in each connection is a linked list of lines. As the lines
  * are read in and written out the buffer expands and contracts. Basically,
  * by using this method we can increase the buffer size dynamically. However,
  * we have a hard limit of 64 KB for the size of the buffer. The buffer can be
  * thought of as a queue were we act on both the head and tail. The various
  * functions act on each end (the names are taken from what Perl uses to act on
  * the ends of an array. :)
- *
- * Copyright (C) 1999,2001  Robert James Kaes (rjkaes@users.sourceforge.net)
- *
- * 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, 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.
  */
 
 #include "tinyproxy.h"
diff --git a/src/buffer.h b/src/buffer.h
index 706743e..cb4d245 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -1,20 +1,23 @@
-/* $Id: buffer.h,v 1.10 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 1999 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * See 'buffer.c' for a detailed description.
+ * 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.
  *
- * Copyright (C) 1999  Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* See 'buffer.c' for detailed information. */
+
 #ifndef _TINYPROXY_BUFFER_H_
 #define _TINYPROXY_BUFFER_H_
 
diff --git a/src/child.c b/src/child.c
index eb29a78..f8f56cb 100644
--- a/src/child.c
+++ b/src/child.c
@@ -1,19 +1,23 @@
-/* $Id: child.c,v 1.18 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2000 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * Handles the creation/destruction of the various children required for
- * processing incoming connections.
- *
- * Copyright (C) 2000 Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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 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, 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.
  *
- * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* Handles the creation/destruction of the various children required for
+ * processing incoming connections.
  */
 
 #include "tinyproxy.h"
diff --git a/src/child.h b/src/child.h
index 41210f3..65fbb9f 100644
--- a/src/child.h
+++ b/src/child.h
@@ -1,20 +1,23 @@
-/* $Id: child.h,v 1.4 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2002 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * See 'child.c' for more information.
+ * 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.
  *
- * Copyright (C) 2002 Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* See 'child.c' for detailed information. */
+
 #ifndef TINYPROXY_CHILD_H
 #define TINYPROXY_CHILD_H
 
diff --git a/src/common.h b/src/common.h
index 5100bcc..78d964e 100644
--- a/src/common.h
+++ b/src/common.h
@@ -1,21 +1,25 @@
-/* $Id: common.h,v 1.9 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2002 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * This file groups all the headers required throughout the tinyproxy
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* This file groups all the headers required throughout the tinyproxy
  * system.  All this information use to be in the "tinyproxy.h" header,
  * but various other "libraries" in the program need the same information,
  * without the tinyproxy specific defines.
- *
- * Copyright (C) 2002  Robert James Kaes (rjkaes@users.sourceforge.net)
- *
- * 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, 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.
  */
 
 #ifndef COMMON_HEADER_H
diff --git a/src/conffile.c b/src/conffile.c
index 3c64603..8aef348 100644
--- a/src/conffile.c
+++ b/src/conffile.c
@@ -1,21 +1,25 @@
-/* $Id: conffile.c,v 1.9 2005-11-04 05:15:47 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2004 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * Parses the configuration file and sets up the config_s structure for
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* Parses the configuration file and sets up the config_s structure for
  * use by the application.  This file replaces the old grammar.y and
  * scanner.l files.  It takes up less space and _I_ think is easier to
  * add new directives to.  Who knows if I'm right though.
- *
- * Copyright (C) 2004  Robert James Kaes (rjkaes@users.sourceforge.net)
- *
- * 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, 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.
  */
 
 #include "tinyproxy.h"
@@ -773,7 +777,7 @@ HANDLE_FUNC(handle_upstream)
         }
 
         safefree(ip);
-        
+
         return 0;
 }
 
@@ -784,7 +788,7 @@ HANDLE_FUNC(handle_upstream_no)
 
         domain = get_string_arg(line, &match[2]);
         if (!domain) return -1;
-        
+
         upstream_add(NULL, 0, domain);
         safefree(domain);
 
diff --git a/src/conffile.h b/src/conffile.h
index 5aef2ca..6393141 100644
--- a/src/conffile.h
+++ b/src/conffile.h
@@ -1,20 +1,23 @@
-/* $Id: conffile.h,v 1.2 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2004 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * See 'conffile.c' for more 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.
  *
- * Copyright (C) 2004  Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* See 'conffile.c' for detailed information. */
+
 #ifndef TINYPROXY_CONFFILE_H
 #define TINYPROXY_CONFFILE_H
 
diff --git a/src/conns.c b/src/conns.c
index 627a00c..860d7c3 100644
--- a/src/conns.c
+++ b/src/conns.c
@@ -1,21 +1,25 @@
-/* $Id: conns.c,v 1.25 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2001 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * Create and free the connection structure. One day there could be
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* Create and free the connection structure. One day there could be
  * other connection related tasks put here, but for now the header
  * file and this file are only used for create/free functions and the
  * connection structure definition.
- *
- * Copyright (C) 2001  Robert James Kaes (rjkaes@users.sourceforge.net)
- *
- * 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, 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.
  */
 
 #include "tinyproxy.h"
diff --git a/src/conns.h b/src/conns.h
index 1c4c9a1..1e1bf45 100644
--- a/src/conns.h
+++ b/src/conns.h
@@ -1,20 +1,23 @@
-/* $Id: conns.h,v 1.20 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2001 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * See 'conns.c' for a detailed description.
+ * 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.
  *
- * Copyright (C) 2001  Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* See 'conns.c' for detailed information. */
+
 #ifndef TINYPROXY_CONNS_H
 #define TINYPROXY_CONNS_H
 
diff --git a/src/daemon.c b/src/daemon.c
index c408620..4d4aedc 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -1,20 +1,24 @@
-/* $Id: daemon.c,v 1.6 2005-08-15 18:35:09 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2002 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * This file contains functions which are useful when writing a
- * daemon process.  The functions include a "makedaemon" function and
- * a function to portably set a signal handler.
+ * 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.
  *
- * Copyright (C) 2002  Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* This file contains functions which are useful when writing a
+ * daemon process.  The functions include a "makedaemon" function and
+ * a function to portably set a signal handler.
  */
 
 #include "tinyproxy.h"
diff --git a/src/daemon.h b/src/daemon.h
index 7636406..e6d33b1 100644
--- a/src/daemon.h
+++ b/src/daemon.h
@@ -1,20 +1,23 @@
-/* $Id: daemon.h,v 1.4 2005-08-15 18:35:09 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2002 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * See 'daemon.c' for a detailed description.
+ * 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.
  *
- * Copyright (C) 2002  Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* See 'daemon.c' for detailed information. */
+
 #ifndef TINYPROXY_DAEMON_H
 #define TINYPROXY_DAEMON_H
 
diff --git a/src/filter.c b/src/filter.c
index 4f25c74..81d274b 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -1,21 +1,25 @@
-/* $Id: filter.c,v 1.22 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 1999 George Talusan <gstalusan@uwaterloo.ca>
+ * Copyright (C) 2002 James E. Flemer <jflemer@acm.jhu.edu>
+ * Copyright (C) 2002 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * Copyright (c) 1999  George Talusan (gstalusan@uwaterloo.ca)
- * Copyright (c) 2002  James E. Flemer (jflemer@acm.jhu.edu)
- * Copyright (c) 2002  Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * A substring of the domain to be filtered goes into the file
- * pointed at by DEFAULT_FILTER.
- *
- * 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, 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.
  *
- * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* A substring of the domain to be filtered goes into the file
+ * pointed at by DEFAULT_FILTER.
  */
 
 #include "tinyproxy.h"
diff --git a/src/filter.h b/src/filter.h
index 6db806f..7c5fcad 100644
--- a/src/filter.h
+++ b/src/filter.h
@@ -1,20 +1,23 @@
-/* $Id: filter.h,v 1.6 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 1999 George Talusan <gstalusan@uwaterloo.ca>
  *
- * See 'filter.c' for a detailed description.
+ * 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.
  *
- * Copyright (c) 1999  George Talusan (gstalusan@uwaterloo.ca)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* See 'filter.c' for detailed information. */
+
 #ifndef _TINYPROXY_FILTER_H_
 #define _TINYPROXY_FILTER_H_
 
diff --git a/src/hashmap.c b/src/hashmap.c
index c060c60..6185dcf 100644
--- a/src/hashmap.c
+++ b/src/hashmap.c
@@ -1,14 +1,5 @@
-/* $Id: hashmap.c,v 1.17 2005-08-15 03:54:31 rjkaes Exp $
- *
- * A hashmap implementation.  The keys are case-insensitive NULL terminated
- * strings, and the data is arbitrary lumps of data.  Copies of both the
- * key and the data in the hashmap itself, so you must free the original
- * key and data to avoid a memory leak.  The hashmap returns a pointer
- * to the data when a key is searched for, so take care in modifying the
- * data as it's modifying the data stored in the hashmap.  (In other words,
- * don't try to free the data, or realloc the memory. :)
- *
- * Copyright (C) 2002  Robert James Kaes (rjkaes@users.sourceforge.net)
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2002 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
  * 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
@@ -20,9 +11,18 @@
  * 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-1307  USA
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* A hashmap implementation.  The keys are case-insensitive NULL terminated
+ * strings, and the data is arbitrary lumps of data.  Copies of both the
+ * key and the data in the hashmap itself, so you must free the original
+ * key and data to avoid a memory leak.  The hashmap returns a pointer
+ * to the data when a key is searched for, so take care in modifying the
+ * data as it's modifying the data stored in the hashmap.  (In other words,
+ * don't try to free the data, or realloc the memory. :)
  */
 
 #include "tinyproxy.h"
@@ -377,7 +377,7 @@ hashmap_return_entry(hashmap_t map, hashmap_iter iter, char **key, void **data)
 
 /*
  * Searches for _any_ occurrences of "key" within the hashmap.
- * 
+ *
  * Returns: negative upon an error
  *          zero if no key is found
  *          count found
diff --git a/src/hashmap.h b/src/hashmap.h
index aa376d4..0bde82c 100644
--- a/src/hashmap.h
+++ b/src/hashmap.h
@@ -1,14 +1,5 @@
-/* $Id: hashmap.h,v 1.4 2005-08-15 03:54:31 rjkaes Exp $
- *
- * A hashmap implementation.  The keys are case-insensitive NULL terminated
- * strings, and the data is arbitrary lumps of data.  Copies of both the
- * key and the data in the hashmap itself, so you must free the original
- * key and data to avoid a memory leak.  The hashmap returns a pointer
- * to the data when a key is searched for, so take care in modifying the
- * data as it's modifying the data stored in the hashmap.  (In other words,
- * don't try to free the data, or realloc the memory. :)
- *
- * Copyright (C) 2002  Robert James Kaes (rjkaes@users.sourceforge.net)
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2002 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
  * 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
@@ -20,11 +11,13 @@
  * 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-1307  USA
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* See 'hashmap.c' for detailed information. */
+
 #ifndef _HASHMAP_H
 #define _HASHMAP_H
 
@@ -110,7 +103,7 @@ extern "C" {
 /*
  * Searches for _any_ occurrances of "key" within the hashmap and returns the
  * number of matching entries.
- * 
+ *
  * Returns: negative upon an error
  *          zero if no key is found
  *          count found (positive value)
diff --git a/src/heap.c b/src/heap.c
index a39207c..e6b2353 100644
--- a/src/heap.c
+++ b/src/heap.c
@@ -1,22 +1,26 @@
-/* $Id: heap.c,v 1.10 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2002 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * Debugging versions of various heap related functions are combined
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* Debugging versions of various heap related functions are combined
  * here.  The debugging versions include assertions and also print
  * (to standard error) the function called along with the amount
  * of memory allocated, and where the memory is pointing.  The
  * format of the log message is standardized.
- *
- * Copyright (C) 2002  Robert James Kaes (rjkaes@users.sourceforge.net)
- *
- * 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, 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.
  */
 
 #include "tinyproxy.h"
diff --git a/src/heap.h b/src/heap.h
index 292d989..2bb0297 100644
--- a/src/heap.h
+++ b/src/heap.h
@@ -1,20 +1,23 @@
-/* $Id: heap.h,v 1.6 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2002 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * See 'heap.c' for a detailed description.
+ * 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.
  *
- * Copyright (C) 2002  Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* See 'heap.c' for detailed information. */
+
 #ifndef TINYPROXY_HEAP_H
 #define TINYPROXY_HEAP_H
 
diff --git a/src/htmlerror.c b/src/htmlerror.c
index afc1e63..84bb912 100644
--- a/src/htmlerror.c
+++ b/src/htmlerror.c
@@ -1,19 +1,23 @@
-/* $Id: htmlerror.c,v 1.8 2005-08-15 03:54:31 rjkaes Exp $
- * 
- * This file contains source code for the handling and display of
- * HTML error pages with variable substitution.
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2003 Steven Young <sdyoung@miranda.org>
  *
- * Copyright (C) 2003  Steven Young <sdyoung@well.com>
+ * 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 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, 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.
  *
- * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* This file contains source code for the handling and display of
+ * HTML error pages with variable substitution.
  */
 
 #include "tinyproxy.h"
@@ -213,7 +217,7 @@ send_http_error_message(struct conn_s *connptr)
         return (ret);
 }
 
-/* 
+/*
  * Add a key -> value mapping for HTML file substitution.
  */
 
diff --git a/src/htmlerror.h b/src/htmlerror.h
index 1dca430..a1b35d8 100644
--- a/src/htmlerror.h
+++ b/src/htmlerror.h
@@ -1,21 +1,23 @@
-/* $Id: htmlerror.h,v 1.3 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2003 Steven Young <sdyoung@miranda.org>
  *
- * Contains header declarations for the HTML error functions in
- * htmlerror.c
+ * 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.
  *
- * Copyright (C) 2003  Steven Young <sdyoung@well.com>
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* See 'htmlerror.c' for detailed information. */
+
 #ifndef TINYPROXY_HTMLERROR_H
 #define TINYPROXY_HTMLERROR_H
 
diff --git a/src/http-message.c b/src/http-message.c
index 2ffdb6a..eadf37f 100644
--- a/src/http-message.c
+++ b/src/http-message.c
@@ -1,20 +1,23 @@
-/* $Id: http-message.c,v 1.6 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2003 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * See 'http-message.h' for a detailed description.
+ * 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.
  *
- * Copyright (C) 2003  Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* See 'http-message.h' for detailed information. */
+
 #include "common.h"
 #include "heap.h"
 #include "http-message.h"
diff --git a/src/http-message.h b/src/http-message.h
index 0423384..36c5cc3 100644
--- a/src/http-message.h
+++ b/src/http-message.h
@@ -1,6 +1,22 @@
-/* $Id: http-message.h,v 1.3 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2003 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * HTTP Message API
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* HTTP Message API
  * ----------------
  * The idea behind this application programming interface (API) is to
  * represent an HTTP response message as a concrete entity.  The API
@@ -26,18 +42,6 @@
  * http_message_t out of the calling function since the stack
  * allocated memory referenced by the http_message_t will no long
  * exist.)
- *
- * Copyright (C) 2003 Robert James Kaes (rjkaes@users.sourceforge.net)
- *
- * 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, 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.
  */
 
 #ifndef _TINYPROXY_HTTP_MESSAGE_H_
diff --git a/src/log.c b/src/log.c
index 01b4256..5cd3a4d 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1,20 +1,24 @@
-/* $Id: log.c,v 1.31 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 1998 Steven Young <sdyoung@miranda.org>
+ * Copyright (C) 1999 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * Logs the various messages which tinyproxy produces to either a log file or
- * the syslog daemon. Not much to it...
+ * 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.
  *
- * Copyright (C) 1998  Steven Young
- * Copyright (C) 1999  Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* Logs the various messages which tinyproxy produces to either a log file
+ * or the syslog daemon. Not much to it...
  */
 
 #include "tinyproxy.h"
diff --git a/src/log.h b/src/log.h
index fdd8ad0..118f6f3 100644
--- a/src/log.h
+++ b/src/log.h
@@ -1,21 +1,24 @@
-/* $Id: log.h,v 1.13 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 1998 Steven Young <sdyoung@miranda.org>
+ * Copyright (C) 1999 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * See 'log.c' for a detailed description.
+ * 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.
  *
- * Copyright (C) 1998  Steven Young
- * Copyright (C) 1999  Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* See 'log.c' for detailed information. */
+
 #ifndef TINYPROXY_LOG_H
 #define TINYPROXY_LOG_H
 
@@ -29,7 +32,7 @@
  * can see them below and I'll describe what each level should be for.
  * Hopefully tinyproxy will remain consistent with these levels.
  *	-- rjkaes
- * Sorry but I had to destroy the hope ;-) There was a need to log 
+ * Sorry but I had to destroy the hope ;-) There was a need to log
  * connections without the INFO stuff and not to have them as NOTICE.
  *	-- hgb
  *
@@ -59,7 +62,7 @@
  *		now it is used for actions like creating/destroying children,
  *		unauthorized access, signal handling, etc.
  *
- * LOG_CONN	This additional level is for logging connections only, so 
+ * LOG_CONN	This additional level is for logging connections only, so
  *		it is easy to control only the requests in the logfile.
  *		If we log through syslog, this is set to LOG_INFO.
  *			-- hgb
diff --git a/src/network.c b/src/network.c
index 5a78a42..42feac3 100644
--- a/src/network.c
+++ b/src/network.c
@@ -1,22 +1,26 @@
-/* $Id: network.c,v 1.5 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2002, 2004 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * The functions found here are used for communicating across a
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* The functions found here are used for communicating across a
  * network.  They include both safe reading and writing (which are
  * the basic building blocks) along with two functions for
  * easily reading a line of text from the network, and a function
  * to write an arbitrary amount of data to the network.
- *
- * Copyright (C) 2002,2004  Robert James Kaes (rjkaes@users.sourceforge.net)
- *
- * 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, 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.
  */
 
 #include "tinyproxy.h"
diff --git a/src/network.h b/src/network.h
index a1d44bd..3ba7d6a 100644
--- a/src/network.h
+++ b/src/network.h
@@ -1,20 +1,23 @@
-/* $Id: network.h,v 1.3 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2002, 2004 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * See 'network.c' for a detailed description.
+ * 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.
  *
- * Copyright (C) 2002,2004  Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* See 'network.c' for detailed information. */
+
 #ifndef TINYPROXY_NETWORK_H
 #define TINYPROXY_NETWORK_H
 
diff --git a/src/reqs.c b/src/reqs.c
index e1a3b99..72ff1e2 100644
--- a/src/reqs.c
+++ b/src/reqs.c
@@ -1,24 +1,28 @@
-/* $Id: reqs.c,v 1.121 2005-08-16 04:03:19 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 1998 Steven Young <sdyoung@miranda.org>
+ * Copyright (C) 1999-2005 Robert James Kaes <rjkaes@users.sourceforge.net>
+ * Copyright (C) 2000 Chris Lightfoot <chris@ex-parrot.com>
+ * Copyright (C) 2002 Petr Lampa <lampa@fit.vutbr.cz>
  *
- * This is where all the work in tinyproxy is actually done. Incoming
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* This is where all the work in tinyproxy is actually done. Incoming
  * connections have a new child created for them. The child then
  * processes the headers from the client, the response from the server,
  * and then relays the bytes between the two.
- *
- * Copyright (C) 1998	    Steven Young
- * Copyright (C) 1999-2005  Robert James Kaes (rjkaes@users.sourceforge.net)
- * Copyright (C) 2000       Chris Lightfoot (chris@ex-parrot.com)
- * Copyright (C) 2002       Petr Lampa (lampa@fit.vutbr.cz)
- *
- * 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, 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.
  */
 
 #include "tinyproxy.h"
diff --git a/src/reqs.h b/src/reqs.h
index 35061be..2748bab 100644
--- a/src/reqs.h
+++ b/src/reqs.h
@@ -1,21 +1,24 @@
-/* $Id: reqs.h,v 1.7 2005-08-16 04:03:19 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 1998 Steven Young <sdyoung@miranda.org>
+ * Copyright (C) 1999 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * See 'reqs.c' for a detailed description.
+ * 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.
  *
- * Copyright (C) 1998  Steven Young
- * Copyright (C) 1999  Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* See 'reqs.c' for detailed information. */
+
 #ifndef _TINYPROXY_REQS_H_
 #define _TINYPROXY_REQS_H_
 
diff --git a/src/reverse-proxy.c b/src/reverse-proxy.c
index a89db0d..814c3ff 100644
--- a/src/reverse-proxy.c
+++ b/src/reverse-proxy.c
@@ -1,20 +1,23 @@
-/* $Id: reverse-proxy.c,v 1.1 2005-08-16 04:03:19 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 1999-2005 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * Allow tinyproxy to be used as a reverse proxy.
+ * 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.
  *
- * Copyright (C) 1999-2005  Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* Allow tinyproxy to be used as a reverse proxy. */
+
 #include "tinyproxy.h"
 #include "reverse-proxy.h"
 
diff --git a/src/reverse-proxy.h b/src/reverse-proxy.h
index 05d7236..2ad8522 100644
--- a/src/reverse-proxy.h
+++ b/src/reverse-proxy.h
@@ -1,20 +1,23 @@
-/* $Id: reverse-proxy.h,v 1.1 2005-08-16 04:03:19 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2005 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * See 'reverse-proxy.c' for a detailed description.
+ * 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.
  *
- * Copyright (C) 2005  Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* See 'reverse-proxy.c' for detailed information. */
+
 #ifndef TINYPROXY_REVERSE_PROXY_H
 #define TINYPROXY_REVERSE_PROXY_H
 
diff --git a/src/sock.c b/src/sock.c
index 56af3cd..d4e961c 100644
--- a/src/sock.c
+++ b/src/sock.c
@@ -1,24 +1,28 @@
-/* $Id: sock.c,v 1.43 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 1998 Steven Young <sdyoung@miranda.org>
+ * Copyright (C) 1999, 2004 Robert James Kaes <rjkaes@users.sourceforge.net>
+ * Copyright (C) 2000 Chris Lightfoot <chris@ex-parrot.com>
  *
- * Sockets are created and destroyed here. When a new connection comes in from
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* Sockets are created and destroyed here. When a new connection comes in from
  * a client, we need to copy the socket and the create a second socket to the
  * remote server the client is trying to connect to. Also, the listening
  * socket is created and destroyed here. Sounds more impressive than it
  * actually is.
- *
- * Copyright (C) 1998  Steven Young
- * Copyright (C) 1999,2004  Robert James Kaes (rjkaes@users.sourceforge.net)
- * Copyright (C) 2000  Chris Lightfoot (chris@ex-parrot.com)
- *
- * 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, 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.
  */
 
 #include "tinyproxy.h"
diff --git a/src/sock.h b/src/sock.h
index 0b5d08a..3a0f967 100644
--- a/src/sock.h
+++ b/src/sock.h
@@ -1,21 +1,24 @@
-/* $Id: sock.h,v 1.14 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 1998 Steven Young <sdyoung@miranda.org>
+ * Copyright (C) 1999, 2004 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * See 'sock.c' for a detailed description.
+ * 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.
  *
- * Copyright (C) 1998  Steven Young
- * Copyright (C) 1999,2004  Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* See 'sock.c' for detailed information. */
+
 #ifndef TINYPROXY_SOCK_H
 #define TINYPROXY_SOCK_H
 
diff --git a/src/stats.c b/src/stats.c
index 1ffeaff..83b3709 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -1,24 +1,28 @@
-/* $Id: stats.c,v 1.18 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2000 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * This module handles the statistics for tinyproxy. There are only two
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* This module handles the statistics for tinyproxy. There are only two
  * public API functions. The reason for the functions, rather than just a
  * external structure is that tinyproxy is now multi-threaded and we can
  * not allow more than one child to access the statistics at the same
  * time. This is prevented by a mutex. If there is a need for more
  * statistics in the future, just add to the structure, enum (in the header),
  * and the switch statement in update_stats().
- *
- * Copyright (C) 2000  Robert James Kaes (rjkaes@users.sourceforge.net)
- *
- * 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, 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.
  */
 
 #include "tinyproxy.h"
diff --git a/src/stats.h b/src/stats.h
index 773f30a..b7a8218 100644
--- a/src/stats.h
+++ b/src/stats.h
@@ -1,20 +1,23 @@
-/* $Id: stats.h,v 1.6 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2000 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * See 'stats.h' for a detailed description.
+ * 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.
  *
- * Copyright (C) 2000  Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* See 'stats.c' for detailed information. */
+
 #ifndef _TINYPROXY_STATS_H_
 #define _TINYPROXY_STATS_H_
 
diff --git a/src/text.c b/src/text.c
index f520090..e091e00 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1,21 +1,25 @@
-/* $Id: text.c,v 1.5 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2002 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * The functions included here are useful for text manipulation.  They
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* The functions included here are useful for text manipulation.  They
  * replace or augment the standard C string library.  These functions
  * are either safer replacements, or they provide services not included
  * with the standard C string library.
- *
- * Copyright (C) 2002  Robert James Kaes (rjkaes@users.sourceforge.net)
- *
- * 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, 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.
  */
 
 #include "tinyproxy.h"
diff --git a/src/text.h b/src/text.h
index 49e6492..4074efa 100644
--- a/src/text.h
+++ b/src/text.h
@@ -1,20 +1,23 @@
-/* $Id: text.h,v 1.4 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2002 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * See 'text.c' for a detailed description.
+ * 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.
  *
- * Copyright (C) 2002  Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* See 'text.c' for detailed information. */
+
 #ifndef TINYPROXY_TEXT_H
 #define TINYPROXY_TEXT_H
 
diff --git a/src/tinyproxy.c b/src/tinyproxy.c
index 1d4cff0..d185d51 100644
--- a/src/tinyproxy.c
+++ b/src/tinyproxy.c
@@ -1,25 +1,29 @@
-/* $Id: tinyproxy.c,v 1.52 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 1998 Steven Young <sdyoung@miranda.org>
+ * Copyright (C) 1998-2002 Robert James Kaes <rjkaes@users.sourceforge.net>
+ * Copyright (C) 2000 Chris Lightfoot <chris@ex-parrot.com>
  *
- * The initialize routine. Basically sets up all the initial stuff (logfile,
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* The initialize routine. Basically sets up all the initial stuff (logfile,
  * listening socket, config options, etc.) and then sits there and loops
  * over the new connections until the daemon is closed. Also has additional
  * functions to handle the "user friendly" aspects of a program (usage,
  * stats, etc.) Like any good program, most of the work is actually done
  * elsewhere.
- *
- * Copyright (C) 1998       Steven Young
- * Copyright (C) 1998-2002  Robert James Kaes (rjkaes@users.sourceforge.net)
- * Copyright (C) 2000       Chris Lightfoot (chris@ex-parrot.com>
- *
- * 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, 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.
  */
 
 #include "tinyproxy.h"
@@ -39,7 +43,7 @@
 
 RETSIGTYPE takesig(int sig);
 
-/* 
+/*
  * Global Structures
  */
 struct config_s config;
diff --git a/src/tinyproxy.h b/src/tinyproxy.h
index 5e14857..a418a02 100644
--- a/src/tinyproxy.h
+++ b/src/tinyproxy.h
@@ -1,21 +1,24 @@
-/* $Id: tinyproxy.h,v 1.48 2005-08-16 04:03:19 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 1998 Steven Young <sdyoung@miranda.org>
+ * Copyright (C) 1999 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * See 'tinyproxy.c' for a detailed description.
+ * 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.
  *
- * Copyright (C) 1998  Steven Young
- * Copyright (C) 1999  Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* See 'tinyproxy.c' for detailed information. */
+
 #ifndef TINYPROXY_TINYPROXY_H
 #define TINYPROXY_TINYPROXY_H
 
@@ -79,19 +82,19 @@ struct config_s {
          */
         char *via_proxy_name;
 
-        /* 
+        /*
          * Error page support.  Map error numbers to file paths.
          */
         hashmap_t errorpages;
 
-        /* 
+        /*
          * Error page to be displayed if appropriate page cannot be located
          * in the errorpages structure.
          */
         char *errorpage_undef;
 
-        /* 
-         * The HTML statistics page. 
+        /*
+         * The HTML statistics page.
          */
         char *statpage;
 };
diff --git a/src/utils.c b/src/utils.c
index b2ede8d..0f4acaa 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,22 +1,26 @@
-/* $Id: utils.c,v 1.40 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 1998 Steven Young <sdyoung@miranda.org>
+ * Copyright (C) 1999-2003 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * Misc. routines which are used by the various functions to handle strings
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* Misc. routines which are used by the various functions to handle strings
  * and memory allocation and pretty much anything else we can think of. Also,
  * the load cutoff routine is in here. Could not think of a better place for
  * it, so it's in here.
- *
- * Copyright (C) 1998       Steven Young
- * Copyright (C) 1999-2003  Robert James Kaes (rjkaes@users.sourceforge.net)
- *
- * 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, 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.
  */
 
 #include "tinyproxy.h"
diff --git a/src/utils.h b/src/utils.h
index 395c46e..81172e2 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,21 +1,24 @@
-/* $Id: utils.h,v 1.25 2005-08-15 03:54:31 rjkaes Exp $
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 1998 Steven Young <sdyoung@miranda.org>
+ * Copyright (C) 1999 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
- * See 'utils.h' for a detailed description.
+ * 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.
  *
- * Copyright (C) 1998  Steven Young
- * Copyright (C) 1999  Robert James Kaes (rjkaes@users.sourceforge.net)
+ * 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.
  *
- * 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, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* See 'utils.c' for detailed information. */
+
 #ifndef TINYPROXY_UTILS_H
 #define TINYPROXY_UTILS_H
 
diff --git a/src/vector.c b/src/vector.c
index 984198f..d5ca69e 100644
--- a/src/vector.c
+++ b/src/vector.c
@@ -1,10 +1,5 @@
-/* $Id: vector.c,v 1.13 2005-08-15 03:54:31 rjkaes Exp $
- *
- * A vector implementation.  The vector can be of an arbitrary length, and
- * the data for each entry is an lump of data (the size is stored in the
- * vector.)
- *
- * Copyright (C) 2002  Robert James Kaes (rjkaes@users.sourceforge.net)
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2002 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
  * 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
@@ -16,9 +11,14 @@
  * 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-1307  USA
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* A vector implementation.  The vector can be of an arbitrary length, and
+ * the data for each entry is an lump of data (the size is stored in the
+ * vector.)
  */
 
 #include "tinyproxy.h"
diff --git a/src/vector.h b/src/vector.h
index 3db694d..ad40bf0 100644
--- a/src/vector.h
+++ b/src/vector.h
@@ -1,10 +1,5 @@
-/* $Id: vector.h,v 1.7 2005-08-15 03:54:31 rjkaes Exp $
- *
- * A vector implementation.  The vector can be of an arbritrary length, and
- * the data for each entry is an lump of data (the size is stored in the
- * vector.)
- *
- * Copyright (C) 2002  Robert James Kaes (rjkaes@users.sourceforge.net)
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2002 Robert James Kaes <rjkaes@users.sourceforge.net>
  *
  * 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
@@ -16,11 +11,13 @@
  * 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-1307  USA
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* See 'vector.c' for detailed information. */
+
 #ifndef _VECTOR_H
 #define _VECTOR_H