diff -r -N -u ffproxy-1.3/ChangeLog ffproxy-1.3p1/ChangeLog --- ffproxy-1.3/ChangeLog Thu Jul 25 12:06:03 2002 +++ ffproxy-1.3p1/ChangeLog Mon Aug 5 19:23:10 2002 @@ -1,3 +1,20 @@ +Version 1.3p1 +============= + +* off by one error (reported by Oliver Kurth) + [ r->header[i] = (char *) my_alloc(len); + in request.c ] + +* (hopefully) fixed compiling issues under + linux (take a look at Makefile) + +-------------------------------------------------- + Forgot sample.config in tar.gz for version 1.3, + fixed the tar.gz after report from Oliver Kurth + and uploaded the fixed one instead of the old + under the same file name on Fri, 2 Aug 2002 +-------------------------------------------------- + Version 1.3 =========== diff -r -N -u ffproxy-1.3/Makefile ffproxy-1.3p1/Makefile --- ffproxy-1.3/Makefile Thu Jul 25 12:12:31 2002 +++ ffproxy-1.3p1/Makefile Mon Aug 5 19:43:20 2002 @@ -11,10 +11,16 @@ install: install -c ffproxy ${PREFIX}/bin/ffproxy install -d ${PREFIX}/man/man8 - install -c ffproxy.8 ${PREFIX}/man/man1/ffproxy.8 + install -c ffproxy.8 ${PREFIX}/man/man8/ffproxy.8 +# +# change the following lines to fit your needs +# #CC = gcc -DDEBUG #CFLAGS = -W -Wall -Werror -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wbad-function-cast -ansi -pedantic-errors -O2 +# +# remove the # in front of the next line if you're using linux +#CFLAGS = -DLINUX proxy: $(OBJS) ${CC} ${CFLAGS} -o ffproxy $(OBJS) diff -r -N -u ffproxy-1.3/cache.c ffproxy-1.3p1/cache.c --- ffproxy-1.3/cache.c Thu Jul 25 12:59:15 2002 +++ ffproxy-1.3p1/cache.c Mon Aug 5 19:38:20 2002 @@ -1,7 +1,7 @@ /* * ffproxy (c) 2002 Niklas Olmes http://faith.eu.org * - * $Id: cache.c,v 1.4 2002/07/25 12:24:10 niklas Exp $ + * $Id: cache.c,v 1.5 2002/08/05 19:25:31 niklas Exp $ * * 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 @@ -24,6 +24,9 @@ #include #include #include +#ifdef LINUX +#define __USE_GNU 1 +#endif #include #include #include diff -r -N -u ffproxy-1.3/db.c ffproxy-1.3p1/db.c --- ffproxy-1.3/db.c Thu Jul 25 12:59:16 2002 +++ ffproxy-1.3p1/db.c Mon Aug 5 19:38:20 2002 @@ -1,7 +1,7 @@ /* * ffproxy (c) 2002 Niklas Olmes http://faith.eu.org * - * $Id: db.c,v 1.14 2002/07/25 12:59:15 niklas Exp niklas $ + * $Id: db.c,v 1.14 2002/07/25 12:59:15 niklas Exp $ * * 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 diff -r -N -u ffproxy-1.3/main.c ffproxy-1.3p1/main.c --- ffproxy-1.3/main.c Thu Jul 25 12:59:16 2002 +++ ffproxy-1.3p1/main.c Mon Aug 5 19:38:20 2002 @@ -1,7 +1,7 @@ /* * ffproxy (c) 2002 Niklas Olmes http://faith.eu.org * - * $Id: main.c,v 1.15 2002/07/25 12:32:30 niklas Exp $ + * $Id: main.c,v 1.16 2002/08/05 19:28:30 niklas Exp $ * * 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 @@ -37,8 +37,8 @@ static void usage(void); static void drop_privileges(void); -static const char version[] = "1.3"; -static const char rcsid[] = "$Id: main.c,v 1.15 2002/07/25 12:32:30 niklas Exp $"; +static const char version[] = "1.3p1"; +static const char rcsid[] = "$Id: main.c,v 1.16 2002/08/05 19:28:30 niklas Exp $"; char loop_header[100]; struct cfg config; diff -r -N -u ffproxy-1.3/request.c ffproxy-1.3p1/request.c --- ffproxy-1.3/request.c Thu Jul 25 12:59:16 2002 +++ ffproxy-1.3p1/request.c Mon Aug 5 19:38:21 2002 @@ -1,7 +1,7 @@ /* * ffproxy (c) 2002 Niklas Olmes http://faith.eu.org * - * $Id: request.c,v 1.17 2002/07/25 12:24:10 niklas Exp $ + * $Id: request.c,v 1.19 2002/08/05 19:27:33 niklas Exp $ * * 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 @@ -176,7 +176,11 @@ #include #include +#ifdef LINUX +#include +#else #include +#endif #include #include @@ -321,7 +325,7 @@ i = 0; while ((len = getline(s, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) { debug("do_request() => got remote header line: (%s)", buf); - r->header[i] = (char *) my_alloc(len); + r->header[i] = (char *) my_alloc(len + 1); (void) strcpy(r->header[i++], buf); } r->header[i] = NULL; diff -r -N -u ffproxy-1.3/socket.c ffproxy-1.3p1/socket.c --- ffproxy-1.3/socket.c Thu Jul 25 12:59:16 2002 +++ ffproxy-1.3p1/socket.c Mon Aug 5 19:38:21 2002 @@ -1,7 +1,7 @@ /* * ffproxy (c) 2002 Niklas Olmes http://faith.eu.org * - * $Id: socket.c,v 1.8 2002/07/25 12:24:10 niklas Exp $ + * $Id: socket.c,v 1.9 2002/08/05 19:27:33 niklas Exp $ * * 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 @@ -21,7 +21,11 @@ #include #include #include +#ifdef LINUX +#include +#else #include +#endif #include #include