From 249d4b7f3355236e1e1490d2cffe6eccb95d1a42 Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Sat, 24 May 2008 13:35:49 +0530 Subject: 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. --- src/conffile.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) (limited to 'src/conffile.c') 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 * - * 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); -- cgit v1.2.3