Skip to content

Commit 249d4b7

Browse files
muksmuks
committed
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.
1 parent b441485 commit 249d4b7

45 files changed

Lines changed: 736 additions & 604 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/acl.c‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
1-
/* $Id: acl.c,v 1.22 2005-08-15 03:54:31 rjkaes Exp $
1+
/* tinyproxy - A fast light-weight HTTP proxy
2+
* Copyright (C) 2000, 2002 Robert James Kaes <rjkaes@users.sourceforge.net>
23
*
3-
* This system handles Access Control for use of this daemon. A list of
4-
* domains, or IP addresses (including IP blocks) are stored in a list
5-
* which is then used to compare incoming connections.
4+
* This program is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
68
*
7-
* Copyright (C) 2000,2002 Robert James Kaes (rjkaes@users.sourceforge.net)
9+
* This program is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
813
*
9-
* This program is free software; you can redistribute it and/or modify it
10-
* under the terms of the GNU General Public License as published by the
11-
* Free Software Foundation; either version 2, or (at your option) any
12-
* later version.
13-
*
14-
* This program is distributed in the hope that it will be useful, but
15-
* WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17-
* General Public License for more details.
14+
* You should have received a copy of the GNU General Public License along
15+
* with this program; if not, write to the Free Software Foundation, Inc.,
16+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
*/
18+
19+
/* This system handles Access Control for use of this daemon. A list of
20+
* domains, or IP addresses (including IP blocks) are stored in a list
21+
* which is then used to compare incoming connections.
1822
*/
1923

2024
#include "tinyproxy.h"

‎src/acl.h‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1-
/* $Id: acl.h,v 1.5 2005-08-15 03:54:31 rjkaes Exp $
1+
/* tinyproxy - A fast light-weight HTTP proxy
2+
* Copyright (C) 2000 Robert James Kaes <rjkaes@users.sourceforge.net>
23
*
3-
* See 'acl.c' for detailed information.
4+
* This program is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
48
*
5-
* Copyright (C) 2000 Robert James Kaes (rjkaes@users.sourceforge.net)
9+
* This program is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
613
*
7-
* This program is free software; you can redistribute it and/or modify it
8-
* under the terms of the GNU General Public License as published by the
9-
* Free Software Foundation; either version 2, or (at your option) any
10-
* later version.
11-
*
12-
* This program is distributed in the hope that it will be useful, but
13-
* WITHOUT ANY WARRANTY; without even the implied warranty of
14-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15-
* General Public License for more details.
14+
* You should have received a copy of the GNU General Public License along
15+
* with this program; if not, write to the Free Software Foundation, Inc.,
16+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1617
*/
1718

19+
/* See 'acl.c' for detailed information. */
20+
1821
#ifndef TINYPROXY_ACL_H
1922
#define TINYPROXY_ACL_H
2023

‎src/anonymous.c‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
1-
/* $Id: anonymous.c,v 1.16 2005-08-15 03:54:31 rjkaes Exp $
1+
/* tinyproxy - A fast light-weight HTTP proxy
2+
* Copyright (C) 2000 Robert James Kaes <rjkaes@users.sourceforge.net>
23
*
3-
* Handles insertion and searches for headers which should be let through when
4-
* the anonymous feature is turned on.
4+
* This program is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
58
*
6-
* Copyright (C) 2000 Robert James Kaes (rjkaes@users.sourceforge.net)
9+
* This program is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
713
*
8-
* This program is free software; you can redistribute it and/or modify it
9-
* under the terms of the GNU General Public License as published by the
10-
* Free Software Foundation; either version 2, or (at your option) any
11-
* later version.
12-
*
13-
* This program is distributed in the hope that it will be useful, but
14-
* WITHOUT ANY WARRANTY; without even the implied warranty of
15-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16-
* General Public License for more details.
14+
* You should have received a copy of the GNU General Public License along
15+
* with this program; if not, write to the Free Software Foundation, Inc.,
16+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
*/
18+
19+
/* Handles insertion and searches for headers which should be let through
20+
* when the anonymous feature is turned on.
1721
*/
1822

1923
#include "tinyproxy.h"

‎src/anonymous.h‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1-
/* $Id: anonymous.h,v 1.7 2005-07-12 17:39:43 rjkaes Exp $
1+
/* tinyproxy - A fast light-weight HTTP proxy
2+
* Copyright (C) 2000 Robert James Kaes <rjkaes@users.sourceforge.net>
23
*
3-
* See 'anonymous.c' for a detailed description.
4+
* This program is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
48
*
5-
* Copyright (C) 2000 Robert James Kaes (rjkaes@users.sourceforge.net)
9+
* This program is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
613
*
7-
* This program is free software; you can redistribute it and/or modify it
8-
* under the terms of the GNU General Public License as published by the
9-
* Free Software Foundation; either version 2, or (at your option) any
10-
* later version.
11-
*
12-
* This program is distributed in the hope that it will be useful, but
13-
* WITHOUT ANY WARRANTY; without even the implied warranty of
14-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15-
* General Public License for more details.
14+
* You should have received a copy of the GNU General Public License along
15+
* with this program; if not, write to the Free Software Foundation, Inc.,
16+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1617
*/
1718

19+
/* See 'anonymous.c' for detailed information. */
20+
1821
#ifndef _TINYPROXY_ANONYMOUS_H_
1922
#define _TINYPROXY_ANONYMOUS_H_
2023

‎src/buffer.c‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
1-
/* $Id: buffer.c,v 1.25 2005-08-15 03:54:31 rjkaes Exp $
1+
/* tinyproxy - A fast light-weight HTTP proxy
2+
* Copyright (C) 1999, 2001 Robert James Kaes <rjkaes@users.sourceforge.net>
23
*
3-
* The buffer used in each connection is a linked list of lines. As the lines
4+
* This program is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* This program is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License along
15+
* with this program; if not, write to the Free Software Foundation, Inc.,
16+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
*/
18+
19+
/* The buffer used in each connection is a linked list of lines. As the lines
420
* are read in and written out the buffer expands and contracts. Basically,
521
* by using this method we can increase the buffer size dynamically. However,
622
* we have a hard limit of 64 KB for the size of the buffer. The buffer can be
723
* thought of as a queue were we act on both the head and tail. The various
824
* functions act on each end (the names are taken from what Perl uses to act on
925
* the ends of an array. :)
10-
*
11-
* Copyright (C) 1999,2001 Robert James Kaes (rjkaes@users.sourceforge.net)
12-
*
13-
* This program is free software; you can redistribute it and/or modify it
14-
* under the terms of the GNU General Public License as published by the
15-
* Free Software Foundation; either version 2, or (at your option) any
16-
* later version.
17-
*
18-
* This program is distributed in the hope that it will be useful, but
19-
* WITHOUT ANY WARRANTY; without even the implied warranty of
20-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
21-
* General Public License for more details.
2226
*/
2327

2428
#include "tinyproxy.h"

‎src/buffer.h‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1-
/* $Id: buffer.h,v 1.10 2005-08-15 03:54:31 rjkaes Exp $
1+
/* tinyproxy - A fast light-weight HTTP proxy
2+
* Copyright (C) 1999 Robert James Kaes <rjkaes@users.sourceforge.net>
23
*
3-
* See 'buffer.c' for a detailed description.
4+
* This program is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
48
*
5-
* Copyright (C) 1999 Robert James Kaes (rjkaes@users.sourceforge.net)
9+
* This program is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
613
*
7-
* This program is free software; you can redistribute it and/or modify it
8-
* under the terms of the GNU General Public License as published by the
9-
* Free Software Foundation; either version 2, or (at your option) any
10-
* later version.
11-
*
12-
* This program is distributed in the hope that it will be useful, but
13-
* WITHOUT ANY WARRANTY; without even the implied warranty of
14-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15-
* General Public License for more details.
14+
* You should have received a copy of the GNU General Public License along
15+
* with this program; if not, write to the Free Software Foundation, Inc.,
16+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1617
*/
1718

19+
/* See 'buffer.c' for detailed information. */
20+
1821
#ifndef _TINYPROXY_BUFFER_H_
1922
#define _TINYPROXY_BUFFER_H_
2023

‎src/child.c‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
1-
/* $Id: child.c,v 1.18 2005-08-15 03:54:31 rjkaes Exp $
1+
/* tinyproxy - A fast light-weight HTTP proxy
2+
* Copyright (C) 2000 Robert James Kaes <rjkaes@users.sourceforge.net>
23
*
3-
* Handles the creation/destruction of the various children required for
4-
* processing incoming connections.
5-
*
6-
* Copyright (C) 2000 Robert James Kaes (rjkaes@users.sourceforge.net)
4+
* This program is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
78
*
8-
* This program is free software; you can redistribute it and/or modify it
9-
* under the terms of the GNU General Public License as published by the
10-
* Free Software Foundation; either version 2, or (at your option) any
11-
* later version.
9+
* This program is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
1213
*
13-
* This program is distributed in the hope that it will be useful, but
14-
* WITHOUT ANY WARRANTY; without even the implied warranty of
15-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16-
* General Public License for more details.
14+
* You should have received a copy of the GNU General Public License along
15+
* with this program; if not, write to the Free Software Foundation, Inc.,
16+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
*/
18+
19+
/* Handles the creation/destruction of the various children required for
20+
* processing incoming connections.
1721
*/
1822

1923
#include "tinyproxy.h"

‎src/child.h‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1-
/* $Id: child.h,v 1.4 2005-08-15 03:54:31 rjkaes Exp $
1+
/* tinyproxy - A fast light-weight HTTP proxy
2+
* Copyright (C) 2002 Robert James Kaes <rjkaes@users.sourceforge.net>
23
*
3-
* See 'child.c' for more information.
4+
* This program is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
48
*
5-
* Copyright (C) 2002 Robert James Kaes (rjkaes@users.sourceforge.net)
9+
* This program is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
613
*
7-
* This program is free software; you can redistribute it and/or modify it
8-
* under the terms of the GNU General Public License as published by the
9-
* Free Software Foundation; either version 2, or (at your option) any
10-
* later version.
11-
*
12-
* This program is distributed in the hope that it will be useful, but
13-
* WITHOUT ANY WARRANTY; without even the implied warranty of
14-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15-
* General Public License for more details.
14+
* You should have received a copy of the GNU General Public License along
15+
* with this program; if not, write to the Free Software Foundation, Inc.,
16+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1617
*/
1718

19+
/* See 'child.c' for detailed information. */
20+
1821
#ifndef TINYPROXY_CHILD_H
1922
#define TINYPROXY_CHILD_H
2023

‎src/common.h‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1-
/* $Id: common.h,v 1.9 2005-08-15 03:54:31 rjkaes Exp $
1+
/* tinyproxy - A fast light-weight HTTP proxy
2+
* Copyright (C) 2002 Robert James Kaes <rjkaes@users.sourceforge.net>
23
*
3-
* This file groups all the headers required throughout the tinyproxy
4+
* This program is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* This program is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License along
15+
* with this program; if not, write to the Free Software Foundation, Inc.,
16+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
*/
18+
19+
/* This file groups all the headers required throughout the tinyproxy
420
* system. All this information use to be in the "tinyproxy.h" header,
521
* but various other "libraries" in the program need the same information,
622
* without the tinyproxy specific defines.
7-
*
8-
* Copyright (C) 2002 Robert James Kaes (rjkaes@users.sourceforge.net)
9-
*
10-
* This program is free software; you can redistribute it and/or modify it
11-
* under the terms of the GNU General Public License as published by the
12-
* Free Software Foundation; either version 2, or (at your option) any
13-
* later version.
14-
*
15-
* This program is distributed in the hope that it will be useful, but
16-
* WITHOUT ANY WARRANTY; without even the implied warranty of
17-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18-
* General Public License for more details.
1923
*/
2024

2125
#ifndef COMMON_HEADER_H

‎src/conffile.c‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1-
/* $Id: conffile.c,v 1.9 2005-11-04 05:15:47 rjkaes Exp $
1+
/* tinyproxy - A fast light-weight HTTP proxy
2+
* Copyright (C) 2004 Robert James Kaes <rjkaes@users.sourceforge.net>
23
*
3-
* Parses the configuration file and sets up the config_s structure for
4+
* This program is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* This program is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License along
15+
* with this program; if not, write to the Free Software Foundation, Inc.,
16+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
*/
18+
19+
/* Parses the configuration file and sets up the config_s structure for
420
* use by the application. This file replaces the old grammar.y and
521
* scanner.l files. It takes up less space and _I_ think is easier to
622
* add new directives to. Who knows if I'm right though.
7-
*
8-
* Copyright (C) 2004 Robert James Kaes (rjkaes@users.sourceforge.net)
9-
*
10-
* This program is free software; you can redistribute it and/or modify it
11-
* under the terms of the GNU General Public License as published by the
12-
* Free Software Foundation; either version 2, or (at your option) any
13-
* later version.
14-
*
15-
* This program is distributed in the hope that it will be useful, but
16-
* WITHOUT ANY WARRANTY; without even the implied warranty of
17-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18-
* General Public License for more details.
1923
*/
2024

2125
#include "tinyproxy.h"
@@ -773,7 +777,7 @@ HANDLE_FUNC(handle_upstream)
773777
}
774778

775779
safefree(ip);
776-
780+
777781
return 0;
778782
}
779783

@@ -784,7 +788,7 @@ HANDLE_FUNC(handle_upstream_no)
784788

785789
domain = get_string_arg(line, &match[2]);
786790
if (!domain) return -1;
787-
791+
788792
upstream_add(NULL, 0, domain);
789793
safefree(domain);
790794

0 commit comments

Comments
 (0)