tinyproxy.conf.5: explain what a site_spec looks like

if tinyproxy serves as a HTTP server (i.e. when serving stats),
use error code 401, else error code 407.

fixes #532

.github/ISSUE_TEMPLATE/new-issue--bug-report--question.md

@@ -0,0 +1,20 @@
+---
+name: New Issue, Bug report, Question
+about: New Issue, Bug report, Question
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+# IMPORTANT NOTICE
+
+Before filing an issue here PLEASE keep in mind that **tinyproxy 1.10.0 and older are no longer supported**.
+Do not report issues with 1.10.0 or older, first try latest release 1.11.0, or even better, git master, and see whether the issue is already fixed.
+
+## Tinyproxy version
+State the tinyproxy version you're using; whether git master or 1.11.0 stable.
+
+## Issue
+Fill in your Issue text here.
+A good issue report is detailed and includes full error messages from tinyproxy's output, not "X doesn't work".

.github/workflows/main.yml

@@ -0,0 +1,36 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - run: ./autogen.sh
+    - run: ./configure
+    - run: make
+    - run: make test
+  test-macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - run: brew install automake
+    - run: ./autogen.sh
+    - run: ./configure
+    - run: make
+  valgrind-test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - run: sudo apt update
+    - run: sudo apt install --assume-yes valgrind
+    - run: ./autogen.sh
+    - run: ./configure --enable-debug --enable-transparent --enable-reverse
+    - run: make
+    - run: make test
+    - run: make valgrind-test

.github/workflows/release_tarball.yml

@@ -0,0 +1,40 @@
+name: Generate Source Tarball
+
+# Trigger whenever a release is created
+on:
+  release:
+    types:
+      - created
+
+jobs:
+  build:
+    name: build
+    runs-on: ubuntu-latest
+    steps:
+
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    - name: archive
+      id: archive
+      run: |
+        sudo apt install -y gperf
+        rm -rf .git
+        autoreconf -i
+        VERSION=$(cat VERSION)
+        PKGNAME="tinyproxy-$VERSION"
+        ./configure
+        make dist
+        echo "tarball_xz=${PKGNAME}.tar.xz" >> "$GITHUB_OUTPUT"
+        echo "tarball_gz=${PKGNAME}.tar.gz" >> "$GITHUB_OUTPUT"
+        echo "tarball_bz2=${PKGNAME}.tar.bz2" >> "$GITHUB_OUTPUT"
+
+    - name: upload tarballs
+      uses: softprops/action-gh-release@v2
+      with:
+        files: |
+          ${{ steps.archive.outputs.tarball_xz }}
+          ${{ steps.archive.outputs.tarball_gz }}
+          ${{ steps.archive.outputs.tarball_bz2 }}
+

.gitignore

@@ -0,0 +1,23 @@
+INSTALL
+Makefile
+Makefile.in
+aclocal.m4
+config.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+missing
+stamp-h1
+autom4te.cache
+cscope.files
+cscope.out
+compile
+*~
+tags

.travis.yml

@@ -0,0 +1,18 @@
+language: C
+dist: trusty
+sudo: true
+
+before_install:
+- sudo apt-get update -qq
+- sudo apt-get install --assume-yes valgrind
+
+script:
+- ./autogen.sh
+- ./configure
+- make
+- make test
+- make clean
+- ./configure --enable-debug --enable-transparent --enable-reverse
+- make
+- make test
+- make valgrind-test

AUTHORS

@@ -1,12 +1,39 @@
-  tinyproxy is a collaborative work between Steven Young
-  <sdyoung@well.com> and Robert James Kaes <rjkaes@flarenet.com>.
-
-  From versions 0-1.1, Steven Young was the primary maintainer.
-  From 1.2 to 1.3.0, Robert James Kaes was the primary maintainer.
-  As of 1.3.1, Steven Young was once again be the primary maintainer.
-
-  But, Robert James Kaes was again the maintainer starting with 1.4.0.
-  Place your bets as to when the maintainer will change again. :) Kidding!
-
-  Please see the ChangeLog for futher details as to who did what. :)
-
+Andrew Stribblehill
+bertliao
+Bob Showalter
+Brian Cain
+cvs2svn
+Daniel Egger
+Daniel M. Drucker
+David Shanks
+Dmitry Semyonov
+dmz-uk
+Drew G. Wallace
+Frank Morgner
+gary-wzl77
+Gaudenz Steinlin
+goba62000374
+Gonzalo Tornaria
+Greg
+Jeremy Hinegardner
+John Spencer
+John van der Kamp
+John Weldon
+Jordi
+Jordi Mallach
+Julien Hartmann
+kikuchan
+Mathew Mrosko
+Matthew Dempsky
+Michael Adam
+Mike Mead
+Mukund Sivaraman
+Pablo Panero
+Peter H. Froehlich
+Robert James Kaes
+rofl0r
+Stephan Leemburg
+Steven Conaway
+Steven Young
+Valen Blanco
+Vladimir Belov

COPYING

@@ -1,8 +1,8 @@
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found.
     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.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.

ChangeLog

@@ -1,842 +1 @@
-2001-11-03  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* src/buffer.c (remove_from_buffer): This function is never
-	called with an empty buffer, so removed some inaccurate code which
-	would have removed an invalid line from the buffer if it was
-	empty. What was I thinking when I wrote that? Good thing is was
-	never called.
-	(add_to_buffer): Add a bit of a sanity check to make sure the
-	buffer structure hasn't been messed up some how.
-
-2001-11-02  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* src/acl.c (insert_acl): Tightened the check regarding whether an
-	ACL is a string or a numeric address.
-
-2001-10-25  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* Moved all the system header included into the tinyproxy.h header
-	and changed all the other files to include it. This should
-	centralise the header dependency issue into one file.
-
-	* src/conns.c: Brought back the conns.{c,h} files which contain
-	the connection structure definition plus the creation/destruction
-	routines.
-
-	* src/reqs.c (process_client_headers): Selectively send headers
-	based on whether we're using an upstream with a CONNECT
-	request. The short answer: all methods work correctly with
-	Upstream proxying and normal proxying.
-
-	* src/tinyproxy.h: Added a upstream flag to the conn_s structure
-	so we can figure out when to send headers and when not to send
-	headers. This is extremely important when trying to do upstream
-	proxying of the CONNECT method.
-
-	* src/reqs.c (relay_connection): Empty the contents of both
-	buffers when either socket is closed. This is more in line with
-	what a tunnel should do. Since either end could close with
-	information still in the buffers.
-	(connect_to_upstream): Cleaned up the code to re-use the
-	establish_http_connection() function.
-
-	* src/buffer.c (readbuff): Changed the memory allocation to 2K
-	from 48K since an Ethernet connection is usually around 1400
-	bytes. There's little point in allocating a huge amount of memory,
-	only to shrink the memory map in the next breath.
-
-2001-10-22  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* src/sock.c (getpeer_string): Added logging in case the
-	gethostbyaddr() function fails.
-
-	* src/reqs.c (free_request_struct): Added a test to return if the
-	pointer is NULL.
-	(handle_connection): Cleaned up the code to better handle the
-	cause where the request is NULL.
-
-	* src/sock.c (getpeer_string):
-	* src/sock.c (getpeer_ip): When the DNS lookup fails, we need to
-	initialized the user's buffer to an empty string; otherwise, the
-	user's buffer will contain garbage and cause a SEGFAULT. Thanks to
-	Jeffrey Wheelhouse for finding this bug.
-
-2001-10-18  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* src/reqs.c (connect_to_upstream): Moved the code needed to
-	rebuild the request line when using the upstream feature into it's
-	own function. Simplifies the handle_connection() function.
-
-	* src/buffer.c (readbuff): Fixed a problem where a full buffer
-	would cause the connection to be closed. Thanks to Jeffrey
-	Wheelhouse for helping me find this problem.
-
-2001-09-29  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* configure.in: Uses any CFLAGS variable passed to the configure
-	script. Also, '-g -Wall' is _not_ enabled unless debugging support
-	is compiled in. Use --enable-static to compile a statically linked
-	tinyproxy.
-
-2001-09-16  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* src/tinyproxy.c (main): Don't allow Tunnel and Upstream
-	directives to be both set in the configuration file.
-
-	* src/reqs.c (handle_connection): Added support for an upstream
-	proxy. What we used to use for our upstream proxy has now become a
-	TCP tunnel. The difference is that the upstream proxy will do
-	domain filtering, anonymous headers, etc. while the TCP tunnel
-	just sends the data without any processing. You can not have both
-	at the same time.
-
-	* src/utils.c (send_http_message): Instead of creating a block of
-	memory with the output message, just send it to the client. We
-	still need to process the various headers from the client, but it
-	will pick up the error when it's done talking to the proxy. Uses
-	less memory.
-
-	* src/sock.c: Moved safe_write() and safe_read() into sock.c since
-	I'm using them in more than just reqs.c.
-
-2001-09-15  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* Removed all the log_message()s which reported that memory could
-	not be allocated. There's little point in reporting a memory
-	shortage since the computer will probably crash soon anyway.
-
-	* src/reqs.c (process_request): Added the code for showing the
-	stats back into the function.
-
-	* src/tinyproxy.c (takesig): When SIGHUP is received the log file
-	is rotated instead of being truncated. The rotated log has ".rot"
-	appended to the file name.
-
-2001-09-14  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* src/uri.c: Removed this file since it's no longer needed.
-
-	* src/reqs.c: Split the process_method() function into separate
-	smaller functions. Added support for tunnel SSL connections.
-
-	* src/tinyproxy.h: Added a field to handle SSL connections.
-
-2001-09-11  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* src/reqs.c (process_method): Fixed a memory leak due to the
-	change to heap allocation if there is an error.
-
-	* src/utils.c (debugging_realloc): Added the debugging version of
-	realloc().
-
-	* src/thread.c (THREAD_STACK_SIZE): Changed a threads stack size
-	to 32KB from 128KB.
-
-	* src/reqs.c (process_method):
-	* src/reqs.c (pull_client_data):
-	* src/reqs.c (process_client_headers):
-	* src/reqs.c (process_server_headers):
-	* src/buffer.c (readbuff): Using heap allocated memory for the
-	buffer rather than stack memory.
-
-	* src/uri.c (explode_uri): Fixed a potential memory leak where the
-	regular expression structure might not be freed if there was an
-	error in the expression.
-
-2001-09-08  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* src/ternary.c (BUFARRAY & BUFSIZE): Lowered the values to help
-	lower memory usage. A ternary tree will now max out at 4MB.
-
-	* src/utils.c: Added debugging_(malloc|calloc|free) to help track
-	down memory leaks.
-
-	* src/dnscache.c (DNS_INSERT_LIMIT): Lower the number of
-	insertions before the ternary tree is rebuilt.
-
-	* src/thread.c (thread_main): Fixed a memory leak.
-
-2001-09-07  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* src/thread.c (thread_pool_create): Explicitly set the detach
-	state for threads to PTHREAD_CREATE_DETACHED.
-
-	* Various error message clean up.
-
-	* src/thread.c (thread_main): Add locking around the
-	servers_waiting thread.
-
-2001-09-06  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* src/thread.c (thread_main): The code which closes a thread
-	doesn't actually work correct so I've moved the test to just after
-	a thread has handled a connection. The code still needs to be
-	cleaned up to handle locking.
-
-	* src/ternary.c (ternary_destroy): Fixed the deletion code as it
-	would cause a segfault if it was every called. Also, lowered the
-	sizes of the arrays for better memory usage.
-
-	* src/dnscache.c: After a certain number of insertions delete the
-	DNS cache and free the memory. The reason for this is that a
-	ternary tree doesn't lend itself to removing individual
-	entries. It's just easier (and cleaner) to simply delete the cache.
-
-2001-09-04  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* src/reqs.c (process_client_headers): Moved the skip header test
-	in front of the compare_header() function.
-
-	* src/ternary.c (ternary_search): Switched to doing case
-	insensitive searching.
-
-	* src/log.c (log_message): Thanks to NeilK for finding and fixing
-	a problem with the syslog code which can lead to a format string
-	attack.
-
-2001-08-30  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* src/dnscache.c: Removed the insert_data() function and replaced
-	the "replace" logic in dns_insert() with a call to
-	ternary_replace(). This fixes the segmentation fault problem which
-	I introduced when I "tried" to fix the memory leak. Also changed
-	the LOCKing to be around the entire dnscache() again since I still
-	need to work out how locking should be done when accessing the
-	ternary tree.
-
-	* src/ternary.c (ternary_insert_replace): Renamed ternary_insert()
-	to ternary_insert_replace() and added a extra argument. The
-	function can now "replace" data already in the tree without
-	causing a memory leak. Added two DEFINES to make coding easier:
-	ternary_insert() and ternary_replace() which both call this
-	function with the right arguments.
-
-	* src/utils.c: Removed xstrstr() since it was only used in one
-	place, and could be safely replaced with strstr. I can't even
-	remember why we had this function to begin with.
-
-	* src/reqs.c (compare_header): Removed the call to xstrstr() since
-	it's been removed from the source.
-
-2001-08-28  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* src/log.c (log_message): Handle a debug enabled compile better.
-
-	* src/dnscache.c (dns_insert): Fixed a memory leak if the same
-	information was inserted into the ternary tree twice.
-
-	* configure.in: Fixed the test regarding the REGEX library. Even
-	if a working REGEX was found on the system, the included REGEX was
-	being compiled in. Double Doh.
-
-	* src/log.c (log_message): Finally got the log levels worked out
-	properly. I've tested all the levels and they now produce the
-	correct output.
-
-2001-08-27  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* src/reqs.c (trim): Moved the trim functionality out of
-	process_request() and added a test to make sure we don't back the
-	pointer past the beginning of the string.
-
-	* src/log.c (log_message): Fixed a problem where the connect
-	messages were not getting through if the log level was set to
-	INFO.
-
-	* src/tinyproxy.h: Moved some of the includes around so that
-	tinyproxy can compile correctly on FreeBSD systems.
-
-	* src/thread.c: Added the pthread_attr_t structure since we're
-	going to be using a non-default sized stack because some OS's have
-	a stack size which is too small.
-
-	* configure.in: Added a test for detecting FreeBSD's -pthread
-	mechanism for telling GCC to use POSIX threading.
-
-	* src/utils.c (httperr): Fixed the MIME type. Should be be
-	text/html, not text/mime. Fix one bug, add two new ones. Sigh.
-
-2001-08-26  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* src/utils.c (httperr): Split the headers from the actual message
-	and include more headers like Date, Server, Content-Length,
-	etc. Also set the type for the error message to const char*.
-
-	* src/reqs.c (process_method): Fixed a SEGV problem if an invalid
-	request was submitted.
-
-	* Makefile.am (EXTRA_DIST): Don't include ./reconf in the
-	tarball.
-
-	* src/log.c (log_message): Fixed a problem with the new LOG_CONN
-	log level.
-
-	* configure.in: The debugging code was being included even on
-	non-debugging builds.
-
-	* src/anonymous.c (anonymous_insert): Moved the creation of the
-	search tree into the anonymous_insert() function. Therefore, the
-	search tree is _not_ created until the first insertion. This
-	should also fix a bug in main() where I was inserting headers
-	before creating the search tree. Doh.
-	(is_anonymous_enabled): Removed the tests for config.anon and
-	replaced it with a function call which returns a BOOL.
-
-	* Spell checked the ChangeLog file! :)
-
-2001-08-25  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* src/thread.c (thread_main): Thanks to Hans-Georg Bork for
-	fixing a problem where the status of the threads was not
-	going back to T_WAITING if MaxRequestsPerChild was 0. Also, fixed
-	a problem with the looping system where the Debian
-	start-stop-daemon script would not stop all the threads if new
-	threads had been created.
-
-	* src/log.h (LOG_CONN): Added the LOG_CONN log level. This is less
-	verbose than LOG_INFO.
-
-	* doc/tinyproxy.8: Added the -l option to the list of command line
-	options.
-
-	* src/anonymous.c (anon_insert): Fixed a bug where anonymous
-	filtering wasn't working even if it was specified in the
-	configuration file.
-
-2001-07-02  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* src/tinyproxy.c (versiondisp): Added George Talusan to the
-	copyright message. Also now include the target system name to the
-	version message.
-
-2001-06-06  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* configure.in: Total reorganization.
-
-2001-06-04  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* configure.in: Remove the --with-* for port, logfile, and user
-	since the configuration file handles this now. Fixed a problem
-	where we were testing for the libraries correctly, but not
-	actually including them in the linking.
-
-2001-06-02  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* doc/tinyproxy.conf: Clarified the LogLevel directive.
-
-	* configure.in: Fixed up the tests for libsocket, libnsl, and
-	libresolv. Also improved the test for the yacc program since I
-	used bison 1.25 to originally write it. Updated the list of
-	headers to look for when configuring. Bumped up the version.
-
-2001-06-01  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* configure.in: Fixed a problem when using the --with-port= config
-
-	* src/tinyproxy.c (main): Change the logging level from LOG_EMERG
-	(which doesn't exist anymore) to LOG_CRIT.
-
-	* src/scanner.l: Added the strings in the data structure to handle
-	the LogLevel switch.
-
-	* src/log.c (set_log_level): Code for handling selective logging.
-
-	* src/grammar.y: Added the tokens and code for handling the
-	LogLevel switch in the configuration file.
-
-	* configure.in: Added a test for the resolv library for the
-	gethostby* functions. Also bumped up the pre-version.
-
-2001-05-26  Robert James Kaes  <rjkaes@flarenet.com>
-
-	* src/tinyproxy.c (main): Added code to stop the creation of core
-	files.
-
-	* src/reqs.c (process_method): Fixed a memory leak.
-	(relay_connection): Cleaned up the code to remove some unneeded
-	variables and removed redundant code.
-
-	* src/log.c (log_message): Renamed "log()" function to
-	log_message().
-
-	* src/dnscache.c (new_dnscache):
-	* src/anonymous.c (new_anonymous): Fixed the return type.
-
-2001-01-15 12:13  rjkaes
-
-	* configure.in: Bumped up the pre version number
-
-2001-01-15 12:11  rjkaes
-
-	* ChangeLog, src/reqs.c, src/stats.c: Fixed more potential overflow
-	bugs.
-
-2001-01-15 12:06  rjkaes
-
-	* ChangeLog, src/utils.c: Fixed a potential security bug in
-	http_err. There was a possibility of a heap overflow exploit.
-
-2001-01-02 14:30  rjkaes
-
-	* src/scanner.l: Fixed a bug where the ':' character was not being
-	properly detected.
-
-2000-12-09 15:03  rjkaes
-
-	* configure.in: Rolling out the first pre to 1.4.0
-
-2000-12-08 21:35  rjkaes
-
-	* src/thread.c: Implemented the MaxRequestsPerChild directive.
-
-2000-12-07 22:35  rjkaes
-
-	* ChangeLog: Updated changelog
-
-2000-12-07 22:35  rjkaes
-
-	* src/: thread.c, tinyproxy.c: Fixed a problem with polling for the
-	number of active threads. No longer polls. :)
-
-2000-11-22 23:49  rjkaes
-
-	* src/ternary.c: Fixed MACRO error.
-
-2000-11-22 23:46  rjkaes
-
-	* src/tinyproxy.c: Fixed spelling mistake.
-
-2000-11-22 23:46  rjkaes
-
-	* src/: filter.c, filter.h, reqs.c: Changed the filter_host command
-	to filter_url.
-
-2000-10-23 17:47  rjkaes
-
-	* ChangeLog: Updated Information.
-
-2000-10-23 17:46  rjkaes
-
-	* src/ternary.c: In the Key Found code, don't display the string in
-	the debug code since it doesn't exist anymore when we display it.
-	Doh!
-
-2000-10-23 17:44  rjkaes
-
-	* src/tinyproxy.c: Added the initialization section for the DNS and
-	Anonymous sub systems.
-
-2000-10-23 17:43  rjkaes
-
-	* src/: anonymous.c, anonymous.h: Added the new_anonymous
-	initialize routine
-
-2000-10-23 17:42  rjkaes
-
-	* src/: dnscache.c, dnscache.h: Added the new_dnscache routine to
-	initialize the Ternary tree. Also, removed the garbage collection
-	routine.
-
-2000-09-26 01:00  rjkaes
-
-	* ChangeLog: Updated documentation.
-
-2000-09-26 00:59  rjkaes
-
-	* src/dnscache.c: Fixed the insert function to handle a failed
-	insert properly.
-
-2000-09-26 00:59  rjkaes
-
-	* src/: ternary.c, ternary.h: Added the TE_EXISTS return code, and
-	cleaned up the ternary_destroy function.
-
-2000-09-26 00:58  rjkaes
-
-	* src/: tinyproxy.h, utils.h: Moved the safefree() macro to the
-	tinyproxy.h header.
-
-2000-09-26 00:57  rjkaes
-
-	* src/: acl.c, reqs.c: Updated the free() calls to the safefree()
-	calls.
-
-2000-09-21 12:58  rjkaes
-
-	* ChangeLog: Updated documentation.
-
-2000-09-21 12:57  rjkaes
-
-	* src/tinyproxy.c: There is no LOG_EMERG level, so changed to
-	LOG_CRIT.
-
-2000-09-21 12:53  rjkaes
-
-	* src/: log.c, log.h: Added the LOG_NOTICE level.
-
-2000-09-15 16:58  rjkaes
-
-	* src/: grammar.c, grammar.h, scanner.c: These are generated by
-	grammar.y and scanner.l respectively, don't include them in the
-	CVS.
-
-2000-09-15 16:57  rjkaes
-
-	* src/stamp-h.in: Automatically generated file.
-
-2000-09-15 16:55  rjkaes
-
-	* src/Makefile.in, doc/Makefile.in: Don't include automatically
-	generated files.
-
-2000-09-15 16:53  rjkaes
-
-	* install-sh, missing, mkinstalldirs: Don't included automatically
-	generated files.
-
-2000-09-15 16:52  rjkaes
-
-	* Makefile.in, config.guess, config.sub, configure: Flipping again.
-	:) Don't include any of the automatically generated stuff.
-
-2000-09-14 12:41  rjkaes
-
-	* ChangeLog, configure.in, src/tinyproxy.h: Need to do a check for
-	the <stdint.h> header since it's not a standard header available on
-	all systems.
-
-2000-09-12 14:10  rjkaes
-
-	* Makefile.in, doc/Makefile.in, src/Makefile.in: Again, needed for
-	configure script. Automatically built by ./reconf
-
-2000-09-11 20:45  rjkaes
-
-	* config.guess, config.sub: Needed for running configure.
-	Automatically built with reconf
-
-2000-09-11 20:43  rjkaes
-
-	* configure: Can be made from configure.in (and should be), but I
-	want to be able to check out the source and immediately configure
-	it.
-
-2000-09-11 20:22  rjkaes
-
-	* doc/tinyproxy.conf: Example tinyproxy configuration file.
-
-2000-09-11 20:21  rjkaes
-
-	* ChangeLog: We all know what this is. :)
-
-2000-09-11 20:20  rjkaes
-
-	* acinclude.m4: A M4 macro for finding the various types on the
-	system (typedefs, etc.)
-
-2000-09-11 20:18  rjkaes
-
-	* Makefile.am, acconfig.h, configure.in: New defaults, and better
-	checking for various features needed by tinyproxy. Looks like fun!
-	:)
-
-2000-09-11 20:16  rjkaes
-
-	* AUTHORS, BUGS, INSTALL, README, THANKS: Just updating the
-	documentation.
-
-2000-09-11 20:12  rjkaes
-
-	* src/: grammar.c, grammar.h, grammar.y, scanner.c, scanner.l:
-	These all handle reading the tinyproxy configuration file.
-
-2000-09-11 20:10  rjkaes
-
-	* src/: ternary.c, ternary.h: Generalized the ternary code which
-	was already being used in anonymous.* now it can be used (and is
-	used) in both anonymous and dnscache
-
-2000-09-11 20:08  rjkaes
-
-	* src/: acl.c, acl.h: Improved access control semantics. Allows
-	for a finger control for allowing and denying hosts.
-
-2000-09-11 20:07  rjkaes
-
-	* src/: thread.c, thread.h: tinyproxy now uses a pool of threads to
-	handle connections. All the work for creating new threads, deleting
-	old thread, and generally managing the pool is done here.
-
-2000-09-11 20:06  rjkaes
-
-	* src/: stats.c, stats.h: This module handles the various stats
-	relating to tinyproxy's functionality.
-
-2000-09-11 20:04  rjkaes
-
-	* src/: reqs.c, reqs.h: MAJOR RE-WRITE! Read the ChangeLog and look
-	at the source. It's shorter than re-documenting the changes here. :)
-
-2000-09-11 20:03  rjkaes
-
-	* src/: tinyproxy.c, tinyproxy.h: Fixed the change user/group
-	ability.  Log when tinyproxy is using default values rather than
-	specific ones.	Cleaned up the command line arguments since
-	tinyproxy now uses a configuration file.  Removed the USR1 signal
-	and added the thread creation code.
-
-2000-09-11 20:01  rjkaes
-
-	* src/: utils.c, utils.h: Removed the xmalloc() and xstrdup()
-	functions.  Added the pidfile_create() function.  Added the OpenBSD
-	style strlcat() and strlcpy() functions.
-
-2000-09-11 19:57  rjkaes
-
-	* src/: uri.c, uri.h: Switched to the new logging style and
-	replaced the xmalloc() with straight malloc().
-
-2000-09-11 19:56  rjkaes
-
-	* src/: sock.c, sock.h: Needed locking in getpeer_string().  Added
-	mutex locking around the dnscache() call.  Removed the global
-	sockaddr and setup_fd variables.  Added the socket_blocking() and
-	socket_nonblocking() functions.  Gutted the readline() function and
-	replaced it with something similar to the 1.0 version. :)
-
-2000-09-11 19:50  rjkaes
-
-	* src/regexp.h: Moved back to the <config.h> for autoconf defines.
-
-2000-09-11 19:47  rjkaes
-
-	* src/: log.c, log.h: Cleaned up the logging format, and also
-	included logging levels (which are similar to the syslogd format.)
-
-2000-09-11 19:46  rjkaes
-
-	* src/gnuregex.c: Not using <defines.h> for autoconf anymore, so
-	move back to the <config.h> format.
-
-2000-09-11 19:43  rjkaes
-
-	* src/: filter.c, filter.h: Just using standard malloc() since the
-	xmalloc() didn't really add anything useful to the command.
-
-2000-09-11 19:42  rjkaes
-
-	* src/: dnscache.c, dnscache.h: Removed the custom hash routines.
-	Using the ternary module instead.
-
-2000-09-11 19:41  rjkaes
-
-	* src/: buffer.c, buffer.h: Cleaned up the source so that the
-	internal structure is no exposed by the buffer.h header.
-
-2000-09-11 19:38  rjkaes
-
-	* src/: anonymous.c, anonymous.h: Removed the ternary tree code
-	from these files and made it a separate module.
-
-2000-09-11 19:37  rjkaes
-
-	* src/Makefile.am: Modified to include all the files needed to
-	build tinyproxy, plus the special targets for building the LEX and
-	YACC files. (Also included the GNU license.)
-
-2000-09-11 19:33  rjkaes
-
-	* doc/tinyproxy.8: Since the tinyproxy program has changed, the
-	manual had to change as well.  Documents all the command line
-	arguments, though I think I need to document the configuration file
-	as well.
-
-2000-09-11 19:32  rjkaes
-
-	* doc/: Makefile.am, TODO: Updated to reflect the new reality of
-	the tinyproxy source code.
-
-2000-09-11 19:31  rjkaes
-
-	* doc/CONFIG: This was the layout for the purposed config file.
-	This is no more.
-
-2000-09-11 19:27  rjkaes
-
-	* INSTALL.configure: This was the generic INSTALL file, but the
-	INSTALL file itself is again the generic file. :)
-
-2000-09-11 19:24  rjkaes
-
-	* src/: config.h, conns.c, conns.h: These files are no longer used
-	within tinyproxy.
-
-2000-06-06 13:58  rjkaes
-
-	* ChangeLog: Reflect changes made in source.
-
-2000-06-06 13:56  rjkaes
-
-	* doc/tinyproxy.8: Fixed the links for finding tinyproxy. Thanks to
-	Simon Baker for pointing this out.
-
-2000-04-26 12:31  rjkaes
-
-	* ChangeLog, src/dnscache.c, src/uri.c: Reorganized (or added) the
-	#include <sys/types.h> line so tinyproxy would compile cleanly on
-	FreeBSD systems.
-
-2000-03-31 17:55  rjkaes
-
-	* ChangeLog, src/reqs.c: Fixed a bug with the path in clientreq. If
-	the path was empty it caused a malformed request to be sent.
-
-2000-03-31 15:15  rjkaes
-
-	* ChangeLog: A whole whack of changes and bug fixes.
-
-2000-03-31 15:14  rjkaes
-
-	* src/Makefile.am: Added a line for the anonymous.* files.
-
-2000-03-31 15:14  rjkaes
-
-	* src/config.h: Changed the socket time out to 10 secs.
-
-2000-03-31 15:13  rjkaes
-
-	* src/reqs.c: Updated the anonheader function to use the new
-	anonymous API. Removed the hack for the POST method in clientreq.
-
-2000-03-31 15:10  rjkaes
-
-	* src/sock.c: Completely rewrote the readline function.
-
-2000-03-31 15:09  rjkaes
-
-	* src/: buffer.c, buffer.h: Added the working_* fields as a scratch
-	pad for readline().
-
-2000-03-31 15:08  rjkaes
-
-	* src/: tinyproxy.c, tinyproxy.h: Removed the allowedhdr_s
-	structure since it is now accessed through anonymous.*
-
-2000-03-31 14:56  rjkaes
-
-	* src/: anonymous.c, anonymous.h: Moved the anonymous header code
-	into it's own file to make it easier to update.
-
-2000-03-29 11:19  rjkaes
-
-	* ChangeLog: Updated to list changes in src/reqs.c and
-	src/dnscache.c
-
-2000-03-29 11:18  rjkaes
-
-	* src/dnscache.c: Included the <sys/types.h> header.
-
-2000-03-29 11:17  rjkaes
-
-	* src/reqs.c: Fixed a bug with the clientreq function which was
-	incorrectly setting the clientheader flag and causing _all_ headers
-	to be sent even in anonymous mode.
-
-2000-03-28 11:44  rjkaes
-
-	* ChangeLog: Updated ChangeLog entry for new fix.
-
-2000-03-28 11:41  rjkaes
-
-	* src/reqs.c: Fixed another NULL bug with the uri->authority. If an
-	badly formed request was made in the form of
-	http:\\www.somewhere.com/ tinyproxy would SEGV.  This has been
-	corrected.
-
-2000-03-28 11:21  rjkaes
-
-	* ChangeLog: Updated to reflect changes in src/reqs.c
-
-2000-03-28 11:19  rjkaes
-
-	* src/reqs.c: Fixed a NULL pointer bug in clientreq. If the SCHEME
-	in the URL was NULL the program would SEGV. This was caused by the
-	error logging code.
-
-2000-03-12 19:56  rjkaes
-
-	* src/config.h: Remove the defines for DEFAULT_* and UPSTREAM
-	(they've been moved into acconfig.h and configure).
-
-2000-03-12 19:55  rjkaes
-
-	* ChangeLog: List all the changes which has occurred on the program.
-
-2000-03-11 15:43  rjkaes
-
-	* acconfig.h: Added the support for the upstream proxy and also
-	made the defaults for the LOGFILE, USER, and PORT.
-
-2000-03-11 15:37  rjkaes
-
-	* src/: dnscache.c, reqs.c, tinyproxy.c, tinyproxy.h: Included the
-	changes needed to re-add the upstream proxy option.
-
-2000-03-11 15:36  rjkaes
-
-	* doc/tinyproxy.8: Updated the manual to reflect all the options,
-	plus provide additional information concerning the changes made to
-	some of the options.
-
-2000-03-11 15:35  rjkaes
-
-	* configure.in: Re-ordered some of the arguments.  Included the
-	support for the Upstream Proxy.
-
-2000-03-11 15:34  rjkaes
-
-	* src/: Makefile.in, defines.h.in: Once again, these files are made
-	automatically, don't include them.
-
-2000-03-11 15:33  rjkaes
-
-	* doc/Makefile.in: Again, the file is generated automatically, so
-	don't include it.
-
-2000-03-11 15:32  rjkaes
-
-	* Makefile.in, aclocal.m4, configure: These files are generated by
-	reconf, so don't include them in the CVS.
-
-2000-02-16 12:32  sdyoung
-
-	* AUTHORS, COPYING, ChangeLog, INSTALL, Makefile.am, Makefile.in,
-	NEWS, README, THANKS, aclocal.m4, BUGS, INSTALL.configure,
-	acconfig.h, configure, configure.in, install-sh, missing,
-	mkinstalldirs, reconf, src/Makefile.am, src/Makefile.in,
-	src/defines.h.in, src/stamp-h.in, src/filter.c, src/buffer.c,
-	src/buffer.h, src/config.h, src/conns.c, src/conns.h,
-	src/dnscache.c, src/dnscache.h, src/gnuregex.c, src/log.c,
-	src/log.h, src/reqs.c, src/reqs.h, src/sock.c, src/sock.h,
-	src/tinyproxy.c, src/tinyproxy.h, src/uri.c, doc/Makefile.am,
-	doc/Makefile.in, doc/TODO, src/filter.h, src/gnuregex.h,
-	src/regexp.h, src/uri.h, src/utils.c, src/utils.h, doc/CONFIG,
-	doc/HTTP_ERROR_CODES, doc/RFC_INFO, doc/report.sh, doc/tinyproxy.8:
-	Initial revision
-
-2000-02-16 12:32  sdyoung
-
-	* AUTHORS, COPYING, ChangeLog, INSTALL, Makefile.am, Makefile.in,
-	NEWS, README, THANKS, aclocal.m4, BUGS, INSTALL.configure,
-	acconfig.h, configure, configure.in, install-sh, missing,
-	mkinstalldirs, reconf, src/Makefile.am, src/Makefile.in,
-	src/defines.h.in, src/stamp-h.in, src/filter.c, src/buffer.c,
-	src/buffer.h, src/config.h, src/conns.c, src/conns.h,
-	src/dnscache.c, src/dnscache.h, src/gnuregex.c, src/log.c,
-	src/log.h, src/reqs.c, src/reqs.h, src/sock.c, src/sock.h,
-	src/tinyproxy.c, src/tinyproxy.h, src/uri.c, doc/Makefile.am,
-	doc/Makefile.in, doc/TODO, src/filter.h, src/gnuregex.h,
-	src/regexp.h, src/uri.h, src/utils.c, src/utils.h, doc/CONFIG,
-	doc/HTTP_ERROR_CODES, doc/RFC_INFO, doc/report.sh, doc/tinyproxy.8:
-	Initial CVS checking of tinyproxy - version 1.3.2.
-
+The ChangeLog is maintained in the git history.

INSTALL

@@ -1,182 +0,0 @@
-Basic Installation
-==================
-
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.

Makefile.am

@@ -1,2 +1,37 @@
-EXTRA_DIST = TODO
-SUBDIRS = src doc
+SUBDIRS = \
+	src \
+	data \
+	etc \
+	docs \
+	m4macros \
+	tests \
+	scripts
+
+# tools want this on a single line
+ACLOCAL_AMFLAGS = -I m4macros
+
+all-local:
+
+dist_doc_DATA = \
+	AUTHORS \
+	NEWS \
+	README \
+	README.md
+
+EXTRA_DIST = \
+	autogen.sh \
+	tinyproxy-indent.sh \
+	TODO \
+	VERSION
+
+test: all
+	./tests/scripts/run_tests.sh
+
+test-wait:
+	TINYPROXY_TESTS_WAIT=yes $(MAKE) test
+
+valgrind-test: all
+	./tests/scripts/run_tests_valgrind.sh
+
+valgrind-test-wait:
+	TINYPROXY_TESTS_WAIT=yes $(MAKE) valgrind-test

NEWS

@@ -1,35 +1 @@
-
- NEWS
- ====
-
- There are a few problems with this version of tinyproxy, but I'm hoping
- the benefits outweigh the negative. For some reason tinyproxy is not
- able to handle requests to *.x10.com sites. (As someone mentioned: "maybe
- this is a feature?" :) There also seem to be a few other random sites
- where tinyproxy is not communicating with the server correctly. If you
- find any such sites, let me know so I can add it to the list of domains
- where tinyproxy is failing. I'll need this information for the regression
- tests I plan on performing on the next release.
-
- As for the next release (1.5.0), I will not be adding new features.
- tinyproxy doesn't currently conform correctly to either the HTTP/1.0
- or the HTTP/1.1 standards. The goal of the 1.5 release therefore is
- to achieve standards compliance with at least HTTP/1.0. If you have
- looked at the tinyproxy code you will have noticed that all the real
- work of the proxy is performed in the reqs.c file. Therefore, other
- than bug fixes in the other files, only reqs.c should be changed in
- the 1.5.0 release. Basically, I'm hoping to just gut and replace the
- reqs.c file with a standards compliant version and release a new version.
-
- Depending on my schedule I should have the new version ready for
- pre-testing sometime next week. If you have any suggestions for improving
- tinyproxy please let me know, but I will not be incorporating them until
- 1.6 (which _hopefully_ should come out fairly quickly after 1.5 has
- stabilised.)
-
- "Thank you" go out to all who have helped find bugs in the 1.4.3
- candidates. You know who you are, and if you don't look in the ChangeLog
- for your name. :)
-
- 	Robert James Kaes
- 	November 21, 2001
+See git log for recent changes in Tinyproxy.

README

@@ -1,106 +1 @@
-
- DESCRIPTION
- -----------
-
- tinyproxy is a small, efficient HTTP proxy daemon.  tinyproxy is very 
- useful in a small network setting, where a larger proxy like Squid
- would either be too resource intensive, or a security risk.  One of
- the key features of tinyproxy is the buffering connection concept.
- In effect, tinyproxy will buffer a high speed response from a server, 
- and then relay it to a client at the highest speed the client will
- accept.  This feature greatly reduces the problems with sluggishness
- on the Internet.  If you are sharing an Internet connection with a
- small network, and you only want to allow HTTP requests to be
- allowed, then tinyproxy is a great tool for the network
- administrator.
-
-
- INSTALLATION
- ------------
-
- To install this package under a Unix derivative, read the INSTALL
- file.  tinyproxy uses a standard GNU configure script (basically you
- should be able to do:
-
-	 ./configure ; make ; make install
-
- in the top level directory to compile and install tinyproxy).  There
- are additional command line arguments you can supply to configure.
- They include:
-
-	--enable-debug		If you would like to turn on full
-				debugging support
-	--enable-socks		This turns on SOCKS support for using
-				tinyproxy across a fire wall.
-	--enable-xtinyproxy	Compile in support for the XTinyproxy
-				header, which is sent to any web
-				server in your domain.
-	--enable-filter		Allows tinyproxy to filter out certain
-				domains and URLs.
-	--enable-tunnel		Provides the option of having
-				tinyproxy act as TCP tunnel, rather
-				than a HTTP proxy.
-	--enable-upstream	Enable support for proxying connections
-				through another proxy server.
-	--enable-static		Compile a static version of tinyproxy
-
-
-     Options for file locations etc.
-        --with-stathost=HOST	Set the default name of the stats host
-	--with-config=FILE	Set the default location of the
-				configuration file
-
- Once you have completed your installation, if you would like to
- report your success please execute the report.sh script in the doc
- directory.  This will send an email to the authors reporting your
- version, and a few bits of information concerning the memory usage of 
- tinyproxy.  Alternatively, you could just send an email stating the
- version, whichever you prefer.
-
-
- SUPPORT
- -------
-
- If you are having problems with tinyproxy, please report the problem
- to either:
-
-	Robert James Kaes	<rjkaes@users.sourceforge.net>
-	Steven Young		<sdyoung@users.sourceforge.net>
-
- You may also wish to subscribe to the tinyproxy-user mailing list. To
- do so please visit:
-
-        http://lists.sourceforge.net/lists/listinfo/tinyproxy-users
-
- for more information on how to subscribe and post messages to the
- list.
-
- Please recompile tinyproxy with full debug support (--enable-debug)
- and include a copy of the log file, and any assert errors reported by
- tinyproxy.  Note that tinyproxy will output memory statistics to
- standard error if compiled with debugging support so you might want
- to redirect the output to a file for later examination.  Also, if you
- feel up to it, try running tinyproxy under your debugger and report
- the error your received and a context listing of the location.  Under
- gdb you would run tinyproxy like so:
-
-	 gdb tinyproxy
-
-	 (gdb) run -c location_of_tinyproxy_conf -d 2>/dev/null
-
- Now access the port tinyproxy is on until you receive a break in the
- gdb. You can now type:
-
-	 (gbd) l
-
- to produce a context listing of the location of the error.  Send a
- copy to the authors.
-
-
- HOW TO CONTRIBUTE TO tinyproxy
- ------------------------------
-
- If you would like to contribute a feature, or a bug fix to the
- tinyproxy source, please send a diff (preferable a unified
- diff. i.e. "diff -u") against the latest release of tinyproxy.  Also, 
- if you could include a brief description of what your patch does.
+see README.md

README.md

@@ -0,0 +1,92 @@
+# Tinyproxy
+
+Tinyproxy is a small, efficient HTTP/SSL proxy daemon released under the
+GNU General Public License.  Tinyproxy is very useful in a small network
+setting, where a larger proxy would either be too resource intensive, or
+a security risk.  One of the key features of Tinyproxy is the buffering
+connection concept.  In effect, Tinyproxy will buffer a high speed
+response from a server, and then relay it to a client at the highest
+speed the client will accept.  This feature greatly reduces the problems
+with sluggishness on the Internet.  If you are sharing an Internet
+connection with a small network, and you only want to allow HTTP
+requests to be allowed, then Tinyproxy is a great tool for the network
+administrator.
+
+For more info, please visit [the Tinyproxy web site](https://tinyproxy.github.io/).
+
+
+## Installation
+
+Tinyproxy uses a standard GNU `configure` script based on the automake
+system.  If compiling from a git checkout, you need to first run
+
+```
+./autogen.sh
+```
+
+from the top level directory to generate the `configure` script.
+The release tarball contains the pre-created `configure` script,
+so when building from a release, you can skip this step.
+Then basically all you need to do is
+
+
+```
+./configure
+make
+make install
+```
+
+in the top level directory to compile and install Tinyproxy. There are
+additional command line arguments you can supply to `configure`. They
+include:
+
+- `--enable-debug`: 
+If you would like to turn on full debugging support.
+
+- `--enable-xtinyproxy`: 
+Compile in support for the XTinyproxy header, which is sent to any
+web server in your domain.
+
+- `--enable-filter`: 
+Allows Tinyproxy to filter out certain domains and URLs.
+
+- `--enable-upstream`: 
+Enable support for proxying connections through another proxy server.
+
+- `--enable-transparent`: 
+Allow Tinyproxy to be used as a transparent proxy daemon.
+Unlike other work modes, transparent proxying doesn't require explicit
+configuration and works automatically when traffic is redirected to
+the proxy using the appropriate firewall rules.
+
+- `--enable-reverse`: 
+Enable reverse proxying.
+
+- `--with-stathost=HOST`: 
+Set the default name of the stats host.
+
+For more information about the build system, read the INSTALL file
+that is generated by `autogen.sh` and comes with the release tar ball.
+
+
+
+## Support
+
+
+If you are having problems with Tinyproxy, please raise an
+[issue on github](https://github.com/tinyproxy/tinyproxy/issues).
+
+
+## Contributing
+
+If you would like to contribute a feature, or a bug fix to the Tinyproxy
+source, please clone the
+[git repository from github](https://github.com/tinyproxy/tinyproxy.git)
+and create a [pull request](https://github.com/tinyproxy/tinyproxy/pulls).
+
+
+## Community
+
+You can meet developers and users to discuss development,
+patches and deployment issues in the `#tinyproxy` IRC channel on
+libera (`irc.libera.chat`).

SECURITY.md

@@ -0,0 +1,28 @@
+# Security Policy
+
+## Supported Versions
+
+| Version   | Supported          |
+| --------- | ------------------ |
+| 1.11.x    | :white_check_mark: |
+| <= 1.10.x | :x:                |
+
+## Reporting a Vulnerability
+
+Open a public issue on github. The issue will most likely be fixed
+within a day, unless all maintainers happen to just be taking a
+vacation at the same time, which is unlikely.
+
+Even then, having the bug publicly known will allow competent people
+to come up with custom patches for distros, most likely quicker
+than black hats can craft a remote execution exploit.
+
+If you really really do not want to make the issue public, come
+to the tinyproxy IRC channel and ask for a maintainer, which you
+can then contact via private messages.
+
+Do not, however, like ["TALOS Intelligence"](https://talosintelligence.com/vulnerability_reports/TALOS-2023-1889)
+pull a random email address out of git log, then send an email
+nobody reads or responds to, and wait for 6 months for publication.
+this only gives black hats plenty time to sell, use and circulate
+zero days and get the best possible ROI.

TODO

@@ -16,10 +16,6 @@ against the current tree and I'll integrate it if possible.
    proxies (ftp, www, etc) they'd like enabled in tinyproxy.h
    Suggested: Tarun Tuli.
 
- * Find a more elegant solution to embedding HTML documents in the
-   source than the current method.  (see httperr() and showstats() for
-   examples of how it's done right now).
-
  * Include a function to rewrite the incoming requests.  Should not be
    much of a problem.  Just need to modify the process_method() code
    to look up the URL and rewrite it.  If we want to go really fancy
@@ -34,10 +30,23 @@ against the current tree and I'll integrate it if possible.
 
  * Enable an option for chroot() jailing tinyproxy.
 
- * Add an option which allows the blocking of connections to certain
-   ports (like 25, 110, etc.) that might be used for "bad" things. :)
-
  * Come up with a more consistent (and elegant) way of logging errors
    for the administrators.  Right now it's more a hodge-podge
    collections of error messages without a _real_ standard.  I would
    prefer a more uniform look.
+
+ * Include user authentication for accessing tinyproxy itself.
+   Administrators should be allowed to selectively allow certain users
+   access to tinyproxy via a user name/password pair.  Check the
+   HTTP/1.1 RFC for more information.
+
+   ==> https://www.banu.com/bugzilla/show_bug.cgi?id=13
+
+ * Remove common.h and fix order of headers
+
+ * Remove memory debugging functions (Valgrind is good enough)
+
+ * Make all functions return from one place (the end of the function)
+
+ * Move TODO items to Banu Bugzilla
+

VERSION

@@ -0,0 +1 @@
+1.11.2

acconfig.h

@@ -1,63 +0,0 @@
-/*
- * Define if you want to have the peer's IP address to be included in a
- * XTinyproxy header sent to the server.
- */
-#undef XTINYPROXY_ENABLE
-
-/*
- * This is the default location of the configuration file
- */
-#define DEFAULT_CONF_FILE "/etc/tinyproxy/tinyproxy.conf"
-
-/*
- * Define if you would like to include filtering code.
- */
-#undef FILTER_ENABLE
-
-/*
- * Define if you want to use the included GNU regex routine
- */
-#undef USE_GNU_REGEX
-
-/*
- * Define if you want to include upstream proxy support
- */
-#undef UPSTREAM_SUPPORT
-
-/*
- * Define if you want to include TCP tunnelling
- */
-#undef TUNNEL_SUPPORT
-
-/*
- * NOTE: for DEFAULT_STATHOST:  this controls remote proxy stats display.
- * for example, the default DEFAULT_STATHOST of "tinyproxy.stats" will
- * mean that when you use the proxy to access http://tinyproxy.stats/",
- * you will be shown the proxy stats.  Set this to something obscure
- * if you don't want random people to be able to see them, or set it to
- * "" to disable.  In the future, I figure maybe some sort of auth
- * might be desirable, but that would involve a major simplicity
- * sacrifice.
- *
- *
- * The "hostname" for getting tinyproxy stats. "" = disabled by default
- */
-#define DEFAULT_STATHOST "tinyproxy.stats"
-
-/*
- * Define the following for the appropriate datatype, if necessary
- */
-#undef uint8_t
-#undef int16_t
-#undef uint16_t
-#undef int32_t
-#undef uint32_t
-#undef in_addr_t 
-#undef size_t
-#undef ssize_t
-#undef socklen_t
-
-/*
- * A string containing the name of the system tinyproxy was built towards.
- */
-#undef TARGET_SYSTEM

acinclude.m4

@@ -1,102 +0,0 @@
-dnl Taken from Unix Network Programming, W. Richard Stevens
-
-dnl ##################################################################
-dnl We cannot use the AC_CHECK_TYPE macros becasue AC_CHECK_TYPE
-dnl #includes only <sys/types.h>, <stdlib.h>, and <stddef.h>.
-dnl Unfortunately, many implementations today hide typedefs in wierd
-dnl locations: Solaris 2.5.1 has uint8_t and uint32_t in <pthread.h>.
-dnl SunOS 4.1.x has int8_t in <sys/bittypes.h>.
-dnl So we define our own macro AC_UNP_CHECK_TYPE that does the same
-dnl #includes as "unp.h", and then looks for the typedef.
-dnl
-dnl This macro should be invoked after all the header checks have been
-dnl performed, since we #include "confdefs.h" below, and then use the
-dnl HAVE_foo_H values that is can #define.
-dnl
-AC_DEFUN(AC_UNP_CHECK_TYPE,
-	[AC_MSG_CHECKING(if $1 defined)
-	AC_CACHE_VAL(ac_cv_type_$1,
-		AC_TRY_COMPILE(
-[
-#include	"confdefs.h"	/* the header built by configure so far */
-#ifdef	HAVE_SYS_TYPES_H
-#  include	<sys/types.h>
-#endif
-#ifdef	HAVE_SYS_SOCKET_H
-#  include	<sys/socket.h>
-#endif
-#ifdef	HAVE_SYS_TIME_H
-#  include	<sys/time.h>
-#endif
-#ifdef	HAVE_NETINET_IN_H
-#  include	<netinet/in.h>
-#endif
-#ifdef	HAVE_ARPA_INET_H
-#  include	<arpa/inet.h>
-#endif
-#ifdef	HAVE_ERRNO_H
-#  include	<errno.h>
-#endif
-#ifdef	HAVE_FCNTL_H
-#  include	<fcntl.h>
-#endif
-#ifdef	HAVE_NETDB_H
-#  include	<netdb.h>
-#endif
-#ifdef	HAVE_SIGNAL_H
-#  include	<signal.h>
-#endif
-#ifdef	HAVE_STDIO_H
-#  include	<stdio.h>
-#endif
-#ifdef	HAVE_STDLIB_H
-#  include	<stdlib.h>
-#endif
-#ifdef	HAVE_STRING_H
-#  include	<string.h>
-#endif
-#ifdef	HAVE_SYS_STAT_H
-#  include	<sys/stat.h>
-#endif
-#ifdef	HAVE_SYS_UIO_H
-#  include	<sys/uio.h>
-#endif
-#ifdef	HAVE_UNISTD_H
-#  include	<unistd.h>
-#endif
-#ifdef	HAVE_SYS_WAIT_H
-#  include	<sys/wait.h>
-#endif
-#ifdef	HAVE_SYS_UN_H
-#  include	<sys/un.h>
-#endif
-#ifdef	HAVE_SYS_SELECT_H
-#  include	<sys/select.h>
-#endif
-#ifdef	HAVE_STRINGS_H
-#  include	<strings.h>
-#endif
-#ifdef	HAVE_SYS_IOCTL_H
-#  include	<sys/ioctl.h>
-#endif
-#ifdef	HAVE_SYS_FILIO_H
-#  include	<sys/filio.h>
-#endif
-#ifdef	HAVE_SYS_SOCKIO_H
-#  include	<sys/sockio.h>
-#endif
-#ifdef	HAVE_PTHREAD_H
-#  include	<pthread.h>
-#endif
-#ifdef  HAVE_STDINT_H
-#  include	<stdint.h>
-#endif
-],
-		[ $1 foo ],
-		ac_cv_type_$1=yes,
-		ac_cv_type_$1=no))
-	AC_MSG_RESULT($ac_cv_type_$1)
-	if test $ac_cv_type_$1 = no ; then
-		AC_DEFINE($1, $2)
-	fi
-])

autogen.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+ORIGDIR=`pwd`
+
+set -x
+
+cd $srcdir
+
+aclocal -I m4macros \
+  && autoheader \
+  && automake --gnu --add-missing \
+  && autoconf
+
+cd $ORIGDIR
+
+set -
+
+echo $srcdir/configure "$@"
+$srcdir/configure "$@"
+RC=$?
+if test $RC -ne 0; then
+  echo
+  echo "Configure failed or did not finish!"
+  exit $RC
+fi
+
+echo
+echo "Now type 'make' to compile Tinyproxy."

configure.ac

@@ -0,0 +1,253 @@
+# Process this file with autoconf to produce a configure script.
+# Portions of this file were adapted from GIMP.
+
+AC_PREREQ(2.54)
+
+m4_define([tinyproxy_version], esyscmd(sh scripts/version.sh | tr -d '\n'))
+
+AC_INIT([Tinyproxy], [tinyproxy_version],
+	[https://tinyproxy.github.io/],
+	[tinyproxy])
+
+tpv=tinyproxy_version
+if test "x$tpv" = "x" ; then
+AC_MSG_ERROR([got empty result from version script!])
+fi
+
+AC_CANONICAL_TARGET
+AM_INIT_AUTOMAKE([dist-bzip2 dist-xz])
+AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_MACRO_DIR([m4macros])
+
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
+dnl Temporarily defined here until we get tinyproxy-version.h
+AC_DEFINE(TINYPROXY_VERSION, "tinyproxy_version", [Tinyproxy version number])
+
+
+dnl Check if we're compiling on a weird platform :)
+AC_USE_SYSTEM_EXTENSIONS
+
+
+dnl Set the domain name for find the statistics of tinyproxy
+AH_TEMPLATE([TINYPROXY_STATHOST],
+	[This controls remote proxy stats display.])
+AC_ARG_WITH(stathost,
+            [AC_HELP_STRING([--with-stathost=HOST], [Default status host])],
+            [AC_DEFINE_UNQUOTED(TINYPROXY_STATHOST, "$withval")
+	     TINYPROXY_STATHOST="$withval"],
+	    [AC_DEFINE_UNQUOTED(TINYPROXY_STATHOST, "tinyproxy.stats")
+	     TINYPROXY_STATHOST="tinyproxy.stats"])
+
+AC_SUBST(TINYPROXY_STATHOST)
+
+dnl Add compiler-specific optimization flags
+TP_ARG_ENABLE(debug,
+              [Enable debugging support code and methods (default is NO)],
+              no)
+
+dnl Check to see if the XTinyproxy header is to be included
+AH_TEMPLATE([XTINYPROXY_ENABLE],
+	    [Define if you want to have the peer's IP address included in a XTinyproxy header sent to the server.])
+TP_ARG_ENABLE(xtinyproxy,
+              [Include the X-Tinyproxy header (default is YES)],
+              yes)
+
+if test x"$xtinyproxy_enabled" = x"yes"; then
+    AC_DEFINE(XTINYPROXY_ENABLE)
+fi
+
+dnl Include filtering for domain/URLs
+AH_TEMPLATE([FILTER_ENABLE],
+	    [Defined if you would like filtering code included.])
+TP_ARG_ENABLE(filter,
+              [Enable filtering of domains/URLS (default is YES)],
+              yes)
+
+if test x"$filter_enabled" = x"yes"; then
+    ADDITIONAL_OBJECTS="$ADDITIONAL_OBJECTS filter.o"
+    AC_DEFINE(FILTER_ENABLE)
+fi
+
+dnl Include support for upstream proxies?
+AH_TEMPLATE([UPSTREAM_SUPPORT],
+            [Include support for connecting to an upstream proxy.])
+TP_ARG_ENABLE(upstream,
+              [Enable upstream proxying (default is YES)],
+              yes)
+if test x"$upstream_enabled" = x"yes"; then
+    AC_DEFINE(UPSTREAM_SUPPORT)
+fi
+
+dnl Include support for reverse proxy?
+AH_TEMPLATE([REVERSE_SUPPORT],
+            [Include support for reverse proxy.])
+TP_ARG_ENABLE(reverse,
+              [Enable reverse proxying (default is YES)],
+              yes)
+if test x"$reverse_enabled" = x"yes"; then
+    ADDITIONAL_OBJECTS="$ADDITIONAL_OBJECTS reverse-proxy.o"
+    AC_DEFINE(REVERSE_SUPPORT)
+fi
+
+dnl Include the transparent proxy support
+AH_TEMPLATE([TRANSPARENT_PROXY],
+	    [Include support for using tinyproxy as a transparent proxy.])
+TP_ARG_ENABLE(transparent,
+              [Enable transparent proxying code (default is YES)],
+              yes)
+if test x"$transparent_enabled" = x"yes"; then
+   ADDITIONAL_OBJECTS="$ADDITIONAL_OBJECTS transparent-proxy.o"
+   AC_DEFINE(TRANSPARENT_PROXY)
+fi
+
+dnl Let user decide whether he wants support for manpages
+dnl Which require either pod2man or a tarball release
+AH_TEMPLATE([MANPAGE_SUPPORT],
+	    [Build manpages with pod2man if they are missing from the distribution.])
+TP_ARG_ENABLE(manpage_support,
+              [Enable support for building manpages (default is YES)],
+              yes)
+AM_CONDITIONAL(HAVE_MANPAGE_INTEREST, test x"$manpage_support_enabled" = x"yes")
+
+# This is required to build test programs below
+AC_PROG_CC
+
+dnl
+dnl Checks for libraries
+dnl
+AC_CHECK_LIB(socket, socket, , [AC_CHECK_LIB(socket, htonl)])
+
+dnl Some systems (OpenServer 5) dislike -lsocket -lnsl, so we try to
+dnl avoid -lnsl checks, if we already have the functions which are
+dnl usually in libnsl
+
+unset ac_cv_func_yp_get_default_domain
+AC_CHECK_FUNC(yp_get_default_domain,
+              tinyproxy_no_nsl_checks=yes,
+              tinyproxy_no_nsl_checks=no)
+unset ac_cv_func_yp_get_default_domain
+
+if test x"$tinyproxy_no_nsl_checks" != x"yes"; then
+    AC_CHECK_LIB(nsl, gethostname, , [AC_CHECK_LIB(nsl, gethostbyaddr)])
+fi
+
+AC_CHECK_LIB(resolv, inet_aton)
+
+dnl
+dnl Checks for headers
+dnl
+AC_HEADER_STDC
+AC_HEADER_TIME
+AC_HEADER_SYS_WAIT
+AC_CHECK_HEADERS([sys/ioctl.h alloca.h memory.h malloc.h sysexits.h \
+		  values.h poll.h])
+
+dnl Checks for libary functions
+AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
+
+AC_CHECK_FUNCS([strlcpy strlcat setgroups])
+
+dnl Enable extra warnings
+DESIRED_FLAGS="-fdiagnostics-show-option -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -Wfloat-equal -Wundef -Wformat=2 -Wlogical-op -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Waggregate-return -Winit-self -Wpacked --std=c89 -ansi -Wno-overlength-strings -Wno-long-long -Wno-overlength-strings -Wdeclaration-after-statement -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-qual -Wcast-align -Wwrite-strings -Wp,-D_FORTIFY_SOURCE=2 -fno-common"
+
+if test -n "${MAINTAINER_MODE_FALSE}"; then
+   DESIRED_FLAGS="-Werror $DESIRED_FLAGS"
+fi
+
+all_desired_work=false
+AS_COMPILER_FLAG([$DESIRED_FLAGS], [all_desired_work=true])
+if $all_desired_work ; then
+    CFLAGS="$CFLAGS $DESIRED_FLAGS"
+else
+for flag in $DESIRED_FLAGS; do
+  AS_COMPILER_FLAG([$flag], [CFLAGS="$CFLAGS $flag"])
+done
+fi
+
+dnl Disable debugging if it's not specified
+if test x"$debug_enabled" != x"yes" ; then
+    CFLAGS="-DNDEBUG $CFLAGS"
+fi
+
+dnl
+dnl Substitute the variables into the various Makefiles
+dnl
+# runstatedir isn't available for Autoconf < 2.70
+AS_IF([test -z "${runstatedir}"], [runstatedir='${localstatedir}/run'])
+AC_SUBST([runstatedir])
+AC_SUBST(CFLAGS)
+AC_SUBST(LDFLAGS)
+AC_SUBST(CPPFLAGS)
+AC_SUBST(LIBS)
+AC_SUBST(ADDITIONAL_OBJECTS)
+
+if test x"$manpage_support_enabled" = x"yes"; then
+AC_PATH_PROG(POD2MAN, pod2man, no)
+
+if test "x$POD2MAN" = "xno" && \
+ ! test -e docs/man5/tinyproxy.conf.5 -a -e docs/man8/tinyproxy.8 ; then
+AC_MSG_ERROR([
+  manpage generation requested, but neither pod2man
+  nor pre-generated manpages found.
+  Use --disable-manpage-support if you want to compile anyway.])
+fi
+fi #manpage_support_enabled
+
+AM_CONDITIONAL(HAVE_POD2MAN, test "x$POD2MAN" != "x" -a "x$POD2MAN" != "xno")
+
+AC_PATH_PROG(GPERF, gperf, no)
+AH_TEMPLATE([HAVE_GPERF],
+	    [Whether you have gperf installed for faster config parsing.])
+
+tmp_gperf=false
+if test "x$GPERF" != "x" -a "x$GPERF" != "xno" ; then
+  AS_ECHO_N(["checking whether gperf is recent enough... "])
+  if "$GPERF" < src/conf-tokens.gperf >/dev/null 2>&1 ; then
+    AS_ECHO("yes")
+    AC_DEFINE(HAVE_GPERF)
+    tmp_gperf=true
+  else
+    AS_ECHO("no")
+  fi
+fi
+AM_CONDITIONAL(HAVE_GPERF, $tmp_gperf)
+
+AC_CONFIG_FILES([
+Makefile
+src/Makefile
+data/Makefile
+data/templates/Makefile
+etc/Makefile
+docs/Makefile
+docs/man5/Makefile
+docs/man5/tinyproxy.conf.txt
+docs/man8/Makefile
+m4macros/Makefile
+tests/Makefile
+tests/scripts/Makefile
+scripts/Makefile
+])
+
+AC_OUTPUT
+
+# the manpages are shipped in the release tarball and we don't want them to
+# get regenerated if pod2man is not available. the intermediate files from
+# AC_CONFIG_FILES are created with config.status, which is created at configure
+# runtime, so we need to touch them after config.status terminated to prevent
+# make from rebuild them.
+
+if test "x$POD2MAN" = "xno" ; then
+  touch docs/man5/tinyproxy.conf.txt
+  touch docs/man8/tinyproxy.txt
+  if test -e docs/man5/tinyproxy.conf.5 ; then
+      touch docs/man5/tinyproxy.conf.5
+  fi
+  if test -e docs/man8/tinyproxy.8 ; then
+      touch docs/man8/tinyproxy.8
+  fi
+fi
+
+if test "x$HAVE_GPERF" = "xno" && test -e src/conf-tokens-gperf.inc ; then
+  touch src/conf-tokens-gperf.inc
+fi

configure.in

@@ -1,326 +0,0 @@
-dnl $Id: configure.in,v 1.35 2001-11-21 19:35:51 rjkaes Exp $
-
-dnl Devlopers, please strive to achieve this order:
-dnl
-dnl 0. Initialization and options processing
-dnl 1. Programs
-dnl 2. Libraries
-dnl 3. Header files
-dnl 4. Types
-dnl 5. Structures
-dnl 6. Compiler characteristics
-dnl 7. Functions, global variables
-dnl 8. System services
-dnl
-dnl Read the Autoconf manual for details.
-
-AC_INIT()
-
-AC_CANONICAL_SYSTEM
-AC_DEFINE_UNQUOTED(TARGET_SYSTEM, "$target")
-
-AM_INIT_AUTOMAKE(tinyproxy,1.4.3)
-AM_CONFIG_HEADER(config.h)
-
-dnl
-dnl Command line options
-dnl
-
-dnl Set the URL name for find the statistics of tinyproxy
-AC_ARG_WITH(stathost, [  --with-stathost=HOST    Default status host],
-            AC_DEFINE_UNQUOTED(DEFAULT_STATHOST, "$withval"))
-
-dnl Set the default configuration file location
-AC_ARG_WITH(config,
-[  --with-config=FILE      Set the default location of the config file],
-	    AC_DEFINE_UNQUOTED(DEFAULT_CONF_FILE, "$withval"))
-
-dnl Add compiler-specific optimization flags
-AC_ARG_ENABLE(debug,
-[  --enable-debug          Disable aggressive optimizations [default=no]],
-              debug_enabled=yes, debug_enabled=no)
-
-dnl Include SOCKS support
-AC_ARG_ENABLE(socks,
-[  --enable-socks          Enable SOCKS support [default=no]],
-              socks_enabled=yes, socks_enabled=no)
-
-dnl Check to see if the XTinyproxy header is to be included
-AC_ARG_ENABLE(xtinyproxy,
-[  --enable-xtinyproxy     Include X-Tinyproxy header [default=yes]],
-              xtinyproxy_enabled=yes, xtinyproxy_enabled=yes)
-if test "$xtinyproxy_enabled" = "yes"; then
-    AC_DEFINE(XTINYPROXY_ENABLE)
-fi
-
-dnl Include filtering for domain/URLs
-AC_ARG_ENABLE(filter,
-[  --enable-filter         Enable filtering of domains/URLs [default=yes]],
-              filter_enabled=yes, filter_enabled=yes)
-if test "$filter_enabled" = "yes"; then
-    LIBOBJS="filter.o $LIBOBJS"
-    AC_DEFINE(FILTER_ENABLE)
-fi
-
-dnl Include support for TCP tunneling
-AC_ARG_ENABLE(tunnel,
-[  --enable-tunnel         Enable support for TCP tunneling [default=yes]],
-              tunnel_enabled=yes, tunnel_enabled=yes)
-if test "$tunnel_enabled" = "yes" ; then
-    AC_DEFINE(TUNNEL_SUPPORT)
-fi
-
-dnl Include support for upstream proxies?
-AC_ARG_ENABLE(upstream,
-[  --enable-upstream       Enable support for upstream proxies [default=yes]],
-              upstream_enabled=yes, upstream_enabled=yes)
-if test "$upstream_enabled" = "yes"; then
-    AC_DEFINE(UPSTREAM_SUPPORT)
-fi
-
-dnl Include support for a statically compiled tinyproxy
-AC_ARG_ENABLE(static,
-[  --enable-static         Statically link tinyproxy [default=no]],
-	[ LDFLAGS="-static $LDFLAGS" ])
-
-dnl
-dnl Checks for programs
-dnl
-
-dnl Save $CFLAGS since AC_PROG_CC likes to insert "-g -O2"
-dnl if $CFLAGS is blank
-cflags_save="$CFLAGS"
-
-AC_PROG_AWK
-AC_PROG_MAKE_SET
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AM_PROG_LEX
-AC_PROG_YACC
-
-CFLAGS="$cflags_save"
-
-dnl Make sure YACC is actually bison
-if test "$YACC" != "bison -y"; then
-    AC_MSG_WARN(You will need bison if you want to regenerate the parser.)
-else
-    AC_MSG_CHECKING(bison version)
-    oldIFS=$IFS; IFS=.
-    set `bison -V | sed -e 's/^GNU Bison version //'`
-    IFS=$oldIFS
-    if test "$1" = "1" -a "$2" -lt "25"; then
-        AC_MSG_WARN(Bison 1.25 or newer needed to regenerate parsers (found $1.$2).)
-    fi
-    AC_MSG_RESULT($1.$2 (ok))
-fi
-
-dnl
-dnl Checks for libraries
-dnl
-AC_CHECK_LIB(pthread, pthread_create)
-if test "$ac_cv_lib_pthread_pthread_create" = "yes"; then
-    CFLAGS="-D_REENTRANT $CFLAGS"
-else
-    AC_CHECK_LIB(pthreads, pthread_create)
-    if test "$ac_cv_lib_pthreads_pthread_create" = "yes"; then
-        CFLAGS="-D_REENTRANT $CFLAGS"
-    else
-        AC_CHECK_LIB(c_r, pthread_create)
-        if test "$ac_cv_lib_c_r_pthread_create" = "yes"; then
-            CFLAGS="-pthread -D_REENTRANT $CFLAGS"
-        else
-	    AC_MSG_ERROR(You must have a POSIX compliant threading library installed)
-        fi
-    fi
-fi
-
-AC_CHECK_LIB(socket, socket, , AC_CHECK_LIB(socket, htonl))
-
-dnl Some systems (OpenServer 5) dislike -lsocket -lnsl, so we try to
-dnl avoid -lnsl checks, if we already have the functions which are
-dnl usually in libnsl
-
-unset ac_cv_func_yp_get_default_domain
-AC_CHECK_FUNC(yp_get_default_domain, [ tinyproxy_no_nsl_checks=yes ], [ ])
-unset ac_cv_func_yp_get_default_domain
-
-if test "$tinyproxy_no_nsl_checks" != "yes"; then
-    AC_CHECK_LIB(nsl, gethostname, , AC_CHECK_LIB(nsl, gethostbyaddr))
-fi
-
-AC_CHECK_LIB(resolv, inet_aton)
-AC_CHECK_LIB(socks, main, socks_library=yes, socks_library=no)
-
-dnl
-dnl Checks for headers
-dnl
-AC_HEADER_STDC
-AC_CHECK_HEADERS(\
-sys/types.h \
-sys/ioctl.h \
-sys/resource.h \
-sys/select.h \
-sys/socket.h \
-sys/stat.h \
-sys/sysctl.h \
-sys/time.h \
-sys/uio.h \
-sys/un.h \
-sys/wait.h \
-arpa/inet.h \
-netinet/in.h \
-alloca.h \
-assert.h \
-ctype.h \
-errno.h \
-fcntl.h \
-grp.h \
-io.h \
-libintl.h \
-malloc.h \
-memory.h \
-netdb.h \
-pthread.h \
-pwd.h \
-regex.h \
-signal.h \
-stdarg.h \
-stddef.h \
-stdint.h \
-stdio.h \
-stdlib.h \
-string.h \
-strings.h \
-sysexits.h \
-syslog.h \
-time.h \
-unistd.h \
-wchar.h \
-wctype.h \
-)
-AC_HEADER_TIME
-AC_CHECK_HEADER(socks.h, socks_header=yes, socks_header=no)
-
-dnl
-dnl Checks for types
-dnl
-AM_C_PROTOTYPES
-AC_C_CONST
-AC_C_INLINE
-AC_UNP_CHECK_TYPE(uint8_t, unsigned char)
-AC_UNP_CHECK_TYPE(int16_t, short)
-AC_UNP_CHECK_TYPE(uint16_t, unsigned short)
-AC_UNP_CHECK_TYPE(int32_t, int)
-AC_UNP_CHECK_TYPE(uint32_t, unsigned int)
-AC_UNP_CHECK_TYPE(size_t, unsigned int)
-AC_UNP_CHECK_TYPE(ssize_t, int)
-AC_UNP_CHECK_TYPE(socklen_t, unsigned int)
-AC_UNP_CHECK_TYPE(in_addr_t, uint32_t)
-AC_TYPE_PID_T
-AC_TYPE_SIGNAL
-
-dnl
-dnl Checks for functions
-dnl
-AC_FUNC_ALLOCA
-AC_FUNC_STRFTIME
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(\
-ftruncate \
-regexec \
-select \
-setrlimit \
-socket \
-strdup \
-strerror \
-strtol \
-vsnprintf \
-vsyslog \
-)
-AC_CHECK_FUNCS(strlcpy strlcat)
-
-if test "$ac_cv_func_vprintf" != "yes"; then
-    AC_CHECK_FUNC(_doprnt, AC_DEFINE(HAVE_DOPRNT))
-fi
-
-dnl
-dnl Compiler characteristics
-dnl
-
-dnl Enable the debugging flags (by checking for the GCC compiler)
-CFLAGS="-O2 $CFLAGS"
-if test "$enable_debug" = "yes" ; then
-    dnl Add the warnings if we have the GCC compiler
-    if test "$ac_cv_prog_gcc" = "yes" ; then
-	CFLAGS="-pg -fprofile-arcs $CFLAGS"
-        CFLAGS="-Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes $CFLAGS"
-        CFLAGS="-Wmissing-prototypes -Wmissing-declarations $CFLAGS"
-        CFLAGS="-Wpointer-arith -Waggregate-return -Wnested-externs $CFLAGS"
-    fi
-    CFLAGS="-Wall -g -DYYDEBUG $CFLAGS"
-    YFLAGS="-v -d"
-else
-    dnl No debugging information, include the optimizations
-    CFLAGS="-DNDEBUG $CFLAGS"
-    YFLAGS="-d"
-fi
-
-dnl
-dnl Make sure we can actually handle the "--with-*" and "--enable-*" stuff.
-dnl
-
-dnl Handle the SOCKS support
-if test "$socks_enabled" = "yes"; then
-    if test "$socks_header" = "yes" -a "$socks_library" = "yes"; then
-        CFLAGS="-I/usr/include/sock.h -DSOCKS $CFLAGS"
-        LIBS="-lsocks $LIBS"
-    else
-        AC_MSG_ERROR([Could not include the SOCKS library or header])
-    fi
-fi
-
-dnl Handle the REGEX library
-if test "$ac_cv_func_regexec" != "yes"; then
-    dnl We don't have a functioning REGEX so include our copy
-    tinyproxy_use_our_regex=yes
-else
-    AC_MSG_CHECKING([whether the system's regex library is broken])
-    AC_CACHE_VAL(tinyproxy_cv_regex_broken,
-                 AC_TRY_RUN([
-# include <unistd.h>
-# include <regex.h>
-int main(void)
-{
-	regex_t blah;
-	return regcomp(&blah, "foo.*bar", REG_NOSUB) || regexec(&blah, "foobar", 0, NULL, 0);
-}
-                            ],
-                            tinyproxy_cv_regex_broken=no,
-                            tinyproxy_cv_regex_broken=yes,
-                            tinyproxy_cv_regex_broken=yes))
-
-    AC_MSG_RESULT($tinyproxy_cv_regex_broken)
-
-    if test "$tinyproxy_cv_regex_broken" = "yes" ; then
-        echo "Using the included GNU regex instead." >&AC_FD_MSG
-        tinyproxy_use_our_regex=yes
-    fi
-fi
-
-if test "$tinyproxy_use_our_regex" = "yes" ; then
-    AC_DEFINE(USE_GNU_REGEX)
-    LIBOBJS="gnuregex.o $LIBOBJS"
-fi
-
-dnl
-dnl Substitute the variables into the various Makefiles
-dnl
-AC_SUBST(CFLAGS)
-AC_SUBST(LDFLAGS)
-AC_SUBST(YFLAGS)
-AC_SUBST(CPPFLAGS)
-AC_SUBST(LIBS)
-AC_SUBST(LIBOBJS)
-
-AC_OUTPUT(Makefile src/Makefile doc/Makefile)

data/Makefile.am

@@ -0,0 +1,2 @@
+SUBDIRS = \
+	templates

data/templates/Makefile.am

@@ -0,0 +1,12 @@
+templatesdir = $(pkgdatadir)
+
+TEMPLATES = \
+	debug.html \
+	default.html \
+	stats.html
+
+templates_DATA = \
+	$(TEMPLATES)
+
+EXTRA_DIST = \
+	$(TEMPLATES)

data/templates/debug.html

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+<head>
+<title>{errno} {cause}</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+
+<body>
+
+<h1>{cause}</h1>
+
+<p>{detail}</p>
+
+<p>Here are the error variables:</p>
+
+<dl>
+
+  <dt>request</dt>
+  <dd>{request}</dd>
+
+  <dt>cause</dt>
+  <dd>{cause}</dd>
+
+  <dt>clientip</dt>
+  <dd>{clientip}</dd>
+
+  <dt>clienthost</dt>
+  <dd>{clienthost}</dd>
+
+  <dt>package</dt>
+  <dd>{package}</dd>
+
+  <dt>date</dt>
+  <dd>{date}</dd>
+
+  <dt>detail</dt>
+  <dd>{detail}</dd>
+
+  <dt>url</dt>
+  <dd>{url}</dd>
+
+</dl>
+
+<hr />
+
+<p><em>Generated by <a href="{website}">{package}</a>.</em></p>
+
+</body>
+
+</html>

data/templates/default.html

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+<head>
+<title>{errno} {cause}</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+
+<body>
+
+<h1>{cause}</h1>
+
+<p>{detail}</p>
+
+<hr />
+
+<p><em>Generated by <a href="{website}">{package}</a>.</em></p>
+
+</body>
+
+</html>

data/templates/stats.html

@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+
+<html lang="en">
+  <head>
+    <title>Stats [{package}]</title>
+    <meta charset="UTF-8" />
+    <style type="text/css">
+      body {
+        color: #eee;
+        background: #110d0d;
+        text-align: center;
+        font: 12pt/1.6 Open Sans, Segoe UI, sans-serif;
+      }
+      #container {
+        position: absolute;
+        top: 0;
+        left: 0;
+        margin: 0;
+        width: 100%;
+        height: 100%;
+        display: table;
+      }
+      #inner {
+        width: 100%;
+        display: table-cell;
+        vertical-align: middle;
+      }
+      table {
+        width: auto;
+        margin: auto;
+        height: auto;
+        background: #222020;
+        border: 1px solid #777373;
+        border-spacing: 3px;
+      }
+      th,
+      td {
+        padding: 6px 18px;
+      }
+      th {
+        font-weight: 700;
+        background: linear-gradient(to bottom, #777373, #555151);
+      }
+      .odd {
+        background: #444040;
+      }
+      .even {
+        background: #555151;
+      }
+      .center {
+        text-align: center;
+      }
+      .right {
+        text-align: right;
+        font-weight: 600;
+      }
+    </style>
+  </head>
+
+  <body>
+    <div id="container">
+      <div id="inner">
+        <table>
+          <tr>
+            <th colspan="2">{package} statistics</th>
+          </tr>
+          <tr class="odd">
+            <td class="right">Open connections</td>
+            <td class="center">{opens}</td>
+          </tr>
+
+          <tr class="even">
+            <td class="right">Bad connections</td>
+            <td class="center">{badconns}</td>
+          </tr>
+
+          <tr class="odd">
+            <td class="right">Denied connections</td>
+            <td class="center">{deniedconns}</td>
+          </tr>
+
+          <tr class="even">
+            <td class="right">Refused (high load)</td>
+            <td class="center">{refusedconns}</td>
+          </tr>
+
+          <tr class="odd">
+            <td class="right">Total requests</td>
+            <td class="center">{reqs}</td>
+          </tr>
+        </table>
+      </div>
+    </div>
+  </body>
+</html>

doc/Makefile.am

@@ -1,2 +0,0 @@
-EXTRA_DIST = tinyproxy.8 tinyproxy.conf HTTP_ERROR_CODES RFC_INFO report.sh
-man_MANS = tinyproxy.8

doc/report.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-(echo "date: "
-date
-echo "uname: "
-uname -a
-echo "ps: "
-ps -auxw | grep '[t]inyproxy' -
-echo "ver: "
-if [ -x /usr/local/bin/tinyproxy ]; then
-   /usr/local/bin/tinyproxy -v
-else
-   echo no ver available.
-fi;) 2>&1 | mail -s 'tinyproxy install report' rjkaes@users.sourceforge.net

doc/tinyproxy.8

@@ -1,60 +0,0 @@
-.\" -*- nroff -*-
-.\"
-.\" tinyproxy.1
-.\"
-.\" Copyright (c) 1998-2000  Steven Young and Robert James Kaes.
-.\" Copyright (c) 2001       Robert James Kaes
-.\"
-.\" This program is distributed under the terms of the GNU General Public
-.\" License. See COPYING for additional information.
-.\"
-.TH tinyproxy 1 .\" "tinyproxy Manual" "August 25, 2001"
-.SH NAME
-tinyproxy - A small HTTP proxy server
-.SH SYNTAX
-\fBtinyproxy\fR [ \fBoptions\fR ]
-.SH VERSION
-This man page documents tinyproxy
-.SH DESCRIPTION
-\fBtinyproxy\fR is an HTTP proxy server designed to consume a minimum of
-system resources. It listens on a given TCP port and handles HTTP proxy
-requests.
-.SH OPTIONS
-.IP "-c config_file"
-Use an alternate configuration file.
-.IP -d
-Don't daemonize; stay in the foreground. Useful for debugging purposes.
-.IP -h
-Display a short help screen of command line arguments and exit.
-.IP -l
-Displays the licensing agreement.
-.IP -v
-Display version information and exit.
-.SH SIGNALS
-In addition to these command line options, there are also several signals
-that can be sent to tinyproxy while it is running to generate debugging
-information and to force certain events.
-.TP 5
-.B SIGHUP
-Force \fBtinyproxy\fR to do a garbage collection on the current connections
-linked list.  This is usually done automatically after a certain number of
-connections have been handled.
-.SH FILES
-.nf
-/etc/tinyproxy/tinyproxy.conf
-/var/run/tinyproxy.pid
-/var/log/tinyproxy.log
-.fi
-.SH AUTHORS
-.nf
-Robert James Kaes (rjkaes@flarenet.com)
-Steven Young (sdyoung@users.sourceforge.net)
-.fi
-.SH COPYRIGHT
-\fBtinyproxy\fR is distributed under the GNU Public License (GPL).  For more
-information on the GPL, please see the file COPYING which should have been
-included in the archive with \fBtinyproxy\fR.  Failing that,
-http://www.fsf.org/ will doubtless have a copy up for you to peruse.  Please
-don't use this software if you don't agree to the terms specified therein.
-.SH AVAILABILITY
-The latest version of \fBtinyproxy\fR can be acquired from: http://tinyproxy.sourceforge.net/

doc/tinyproxy.conf

@@ -1,127 +0,0 @@
-##
-## tinyproxy.conf -- tinyproxy daemon configuration file
-##
-
-#
-# Name of the user the tinyproxy daemon should switch to after the port
-# has been bound.
-#
-User nobody
-Group nogroup
-
-#
-# Port to listen on.
-#
-Port 8888
-
-#
-# If you have multiple interfaces this allows you to bind to only one. If
-# this is commented out, tinyproxy will bind to all interfaces present.
-#
-#Listen 192.168.0.1
-
-#
-# Timeout: The number of seconds of inactivity a connection is allowed to
-# have before it closed by tinyproxy.
-#
-Timeout 600
-
-#
-# Where to log the information. Either LogFile or Syslog should be set,
-# but not both.
-#
-Logfile "/var/log/tinyproxy.log"
-# Syslog On
-
-#
-# Set the logging level. Allowed settings are:
-#	Critical	(least verbose)
-#	Error
-#	Warning
-#	Notice
-#	Connect		(to log connections without Info's noise)
-#	Info		(most verbose)
-# The LogLevel logs from the set level and above. For example, if the LogLevel
-# was set to Warning, than all log messages from Warning to Critical would be
-# output, but Notice and below would be suppressed.
-#
-LogLevel Info
-
-#
-# PidFile: Write the PID of the main tinyproxy thread to this file so it
-# can be used for signalling purposes.
-#
-PidFile "/var/run/tinyproxy.pid"
-
-#
-# Include the X-Tinyproxy header, which has the client's IP address when
-# connecting to the sites listed.
-#
-#XTinyproxy mydomain.com
-
-#
-# Turns tinyproxy into a TCP tunnel which connects the local computer on
-# 'Port' to the remote computer's port. No processing is done when using
-# tinyproxy as a tunnel. If you want to connect to an upstream proxy use
-# the "Upstream" directive below.
-#
-#Tunnel some.remote.computer:port
-
-#
-# Turns on upstream proxy support.
-#
-#Upstream some.remote.proxy:port
-
-#
-# This is the absolute highest number of threads which will be created. In
-# other words, only MaxClients number of clients can be connected at the
-# same time.
-#
-MaxClients 100
-
-#
-# These settings set the upper and lower limit for the number of
-# spare servers which should be available. If the number of spare servers
-# falls below MinSpareServers then new ones will be created. If the number
-# of servers exceeds MaxSpareServers then the extras will be killed off.
-#
-MinSpareServers 5
-MaxSpareServers 20
-
-#
-# Number of servers to start initially.
-#
-StartServers 10
-
-#
-# MaxRequestsPerChild is the number of connections a thread will handle
-# before it is killed. In practice this should be set to 0, which disables
-# thread reaping. If you do notice problems with memory leakage, then set
-# this to something like 10000
-#
-MaxRequestsPerChild 0
-
-#
-# The following is the authorization controls. If there are any access
-# control keywords then the default action is to DENY. Otherwise, the
-# default action is ALLOW.
-#
-# Also the order of the controls are important. The incoming connections
-# are tested against the controls based on order.
-#
-Allow 127.0.0.1
-Allow 192.168.1.0/25
-
-#
-# The location of the filter file.
-#
-#Filter "/etc/tinyproxy/filter"
-
-#
-# If an Anonymous keyword is present, then anonymous proxying is enabled.
-# The headers listed are allowed through, while all others are denied. If
-# no Anonymous keyword is present, then all header are allowed through.
-# You must include quotes around the headers.
-#
-#Anonymous "Host"
-#Anonymous "Authorization"

docs/.gitignore

@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+report.sh

docs/Makefile.am

@@ -0,0 +1,8 @@
+SUBDIRS = \
+	man5 \
+	man8
+
+EXTRA_DIST = \
+	http-error-codes.txt \
+	http-rfcs.txt
+

docs/man5/.gitignore

@@ -0,0 +1,3 @@
+*.5
+*.xml
+*.txt

docs/man5/Makefile.am

@@ -0,0 +1,25 @@
+if HAVE_MANPAGE_INTEREST
+MAN5_FILES  = \
+	tinyproxy.conf.txt
+endif
+
+M_SECTION=5
+M_NAME=TINYPROXY.CONF
+
+man_MANS = \
+	$(MAN5_FILES:.txt=.5)
+
+.txt.5:
+if HAVE_POD2MAN
+	$(AM_V_GEN) $(POD2MAN) --center="Tinyproxy manual" \
+	--section=$(M_SECTION) --name=$(M_NAME) --release="Version @VERSION@" \
+	$< > $@
+else
+	@echo "*** pod2man is required to regenerate $(@) ***"; exit 1;
+endif
+
+MAINTAINERCLEANFILES = \
+	$(MAN5_FILES:.txt=.5)
+
+EXTRA_DIST = \
+	$(MAN5_FILES:.txt=.5)

docs/man5/tinyproxy.conf.txt.in

@@ -0,0 +1,440 @@
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+tinyproxy.conf - Tinyproxy HTTP proxy daemon configuration file
+
+
+=head1 SYNOPSIS
+
+B<tinyproxy.conf>
+
+
+=head1 DESCRIPTION
+
+L<tinyproxy(8)> reads its configuration file, typically stored in
+`/etc/tinyproxy/tinyproxy.conf` (or passed to Tinyproxy with -c on the
+command line). This manpage describes the syntax and contents of the
+configuration file.
+
+The Tinyproxy configuration file contains key-value pairs, one per
+line. Lines starting with `#` and empty lines are comments and are
+ignored. Keywords are case-insensitive, whereas values are
+case-sensitive. Some string values must be enclosed in double
+quotes (") as noted below.
+
+The possible keywords and their descriptions are as follows:
+
+=over 4
+
+=item B<User>
+
+The user which the Tinyproxy process should run as, after the
+initial port-binding has been done as the `root` user. Either the
+user name or the UID may be specified.
+
+=item B<Group>
+
+The group which the Tinyproxy process should run as, after the
+initial port-binding has been done as the `root` user. Either the
+group name or the GID may be specified.
+
+=item B<Port>
+
+The port which the Tinyproxy service will listen on. If the port is
+less than 1024, you will need to start the Tinyproxy process as the
+`root` user.
+
+=item B<Listen>
+
+By default, Tinyproxy listens for connections on all available
+interfaces (i.e. it listens on the wildcard address `0.0.0.0`).
+With this configuration parameter, Tinyproxy can be told to listen
+only on one specific address.
+
+=item B<Bind>
+
+This allows you to specify which address Tinyproxy will bind
+to for outgoing connections.
+This parameter may be specified multiple times, then Tinyproxy
+will try all the specified addresses in order.
+
+=item B<BindSame>
+
+If this boolean parameter is set to `yes`, then Tinyproxy will
+bind the outgoing connection to the IP address of the incoming
+connection that triggered the outgoing request.
+
+=item B<Timeout>
+
+The maximum number of seconds of inactivity a connection is
+allowed to have before it is closed by Tinyproxy.
+
+=item B<ErrorFile>
+
+This parameter controls which HTML file Tinyproxy returns when a
+given HTTP error occurs. It takes two arguments, the error number
+and the location of the HTML error file. Enclose the file location
+in double quotes.
+
+=item B<DefaultErrorFile>
+
+The HTML template file returned when an error occurs for which no
+specific error file has been set. Enclose in double quotes.
+
+=item B<StatHost>
+
+The host name or IP address that is treated as the `stat host`.
+Enclose in double quotes. Whenever Tinyproxy receives a request for
+the `stat host` it returns an internal statistics page instead of
+forwarding the request to that host. The template for this page can be
+configured with the `StatFile` configuration option. The default value
+of `StatHost` is `@TINYPROXY_STATHOST@`.
+
+=item B<StatFile>
+
+The HTML file that Tinyproxy sends in response to a request for the
+`stat host`. Enclose in double quotes. If this parameter is not set,
+Tinyproxy returns a hard-coded basic statistics page. See the STATHOST
+section in the L<tinyproxy(8)> manual page for details.
+
+Note that the StatFile and the error files configured with ErrorFile
+and DefaultErrorFile are template files that can contain a few
+template variables that Tinyproxy expands prior to delivery.
+Examples are "{cause}" for an abbreviated error description and
+"{detail}" for a detailed error message.  The L<tinyproxy(8)>
+manual page contains a description of all template variables.
+
+=item B<LogFile>
+
+The location of the file to which Tinyproxy writes its debug output.
+Enclose in double quotes. Alternatively, Tinyproxy can log to syslog
+-- see the Syslog option.
+
+=item B<Syslog>
+
+When set to `On`, this option tells Tinyproxy to write its
+debug messages to syslog instead of to a log file configured
+with `LogFile`. These two options are mutually exclusive.
+
+=item B<LogLevel>
+
+Sets the log level. Messages from the set level and above are
+logged. For example, if the LogLevel was set to Warning, then all
+log messages from Warning to Critical would be output, but Notice
+and below would be suppressed. Allowed values are:
+
+=over 4
+
+=item * Critical (least verbose)
+
+=item * Error
+
+=item * Warning
+
+=item * Notice
+
+=item * Connect (log connections without Info's noise)
+
+=item * Info (most verbose)
+
+=back
+
+=item B<PidFile>
+
+The location of the file where the main Tinyproxy process stores its
+process ID for signaling purposes. Enclose in double quotes.
+
+=item B<XTinyproxy>
+
+Setting this option to `Yes` tells Tinyproxy to add a header
+`X-Tinyproxy` containing the client's IP address to the request.
+
+=item B<Upstream>
+
+This option allows you to set up a set of rules for deciding
+whether an upstream proxy server is to be used, based on the
+host or domain of the site being accessed. The rules are stored
+in the order encountered in the configuration file and the
+LAST matching rule wins. The following forms for specifying upstream
+rules exist:
+
+=over 4
+
+=item * I<upstream type host:port> turns proxy upstream support on generally.
+
+=item * I<upstream type user:pass@host:port>
+does the same, but uses the supplied credentials for authentication.
+
+=item * I<upstream type host:port "site_spec">
+turns on the upstream proxy for the sites matching `site_spec`.
+
+`type` can be one of `http`, `socks4`, `socks5`, `none`.
+
+a `site_spec` is either a full domain name, a domain name starting with a
+`.`, in which case it is treated as a suffix, or an ip/mask tuple.
+the `site_spec` needs to be double-quoted.
+
+=item * I<upstream none "site_spec">
+turns off upstream support for sites matching `site_spec`, that means the
+connection is done directly.
+
+=back
+
+It's recommended to use raw IP addresses to specify the upstream host, so
+no costly DNS lookup has to be done everytime it is used.
+IPv6 addresses need to be enclosed in square brackets.
+
+The site can be specified in various forms as a hostname, domain
+name or as an IP range:
+
+=over 4
+
+=item * I<name>     matches host exactly
+
+=item * I<.name>    matches any host in domain "name"
+
+=item * I<.>        matches any host with no domain (in 'empty' domain)
+
+=item * I<IP/bits>  matches network/mask
+
+=item * I<IP/mask>  matches network/mask
+
+=back
+
+Note that the upstream directive can also be used to null-route
+a specific target domain/host, e.g.:
+`upstream http 0.0.0.0:0 ".adserver.com"`
+
+=item B<MaxClients>
+
+Tinyproxy creates one thread for each connected client.
+This options specifies the absolute highest number processes that
+will be created. With other words, only MaxClients clients can be
+connected to Tinyproxy simultaneously.
+
+=item B<Allow>
+
+=item B<Deny>
+
+The `Allow` and `Deny` options provide a means to customize
+which clients are allowed to access Tinyproxy. `Allow` and `Deny`
+lines can be specified multiple times to build the access control
+list for Tinyproxy. The order in the config file is important.
+If there are no `Allow` or `Deny` lines, then all clients are
+allowed. Otherwise, the default action is to deny access.
+The argument to `Allow` or `Deny` can be a single IP address
+of a client host, like `127.0.0.1`, an IP address range, like
+`192.168.0.1/24` or a string that will be matched against the
+end of the client host name, i.e, this can be a full host name
+like `host.example.com` or a domain name like `.example.com` or
+even a top level domain name like `.com`.
+Note that by adding a rule using a host or domain name, a costly name
+lookup has to be done for every new connection, which could slow down
+the service considerably.
+
+=item B<BasicAuth>
+
+Configure HTTP "Basic Authentication" username and password
+for accessing the proxy.  If there are any entries specified,
+access is only granted for authenticated users.
+
+    BasicAuth user password
+
+=item B<BasicAuthRealm>
+
+In case "BasicAuth" is configured, the "realm" information.
+"Proxy Authentication Required" status http 407 "error-response" can be
+customized.
+
+- defaults in code to "Tinyproxy" (PACKAGE_NAME), if not configured.
+
+=item B<AddHeader>
+
+Configure one or more HTTP request headers to be added to outgoing
+HTTP requests that Tinyproxy makes. Note that this option will not
+work for HTTPS traffic, as Tinyproxy has no control over what
+headers are exchanged.
+
+    AddHeader "X-My-Header" "Powered by Tinyproxy"
+
+=item B<ViaProxyName>
+
+RFC 2616 requires proxies to add a `Via` header to the HTTP
+requests, but using the real host name can be a security
+concern. If the `ViaProxyname` option is present, then its
+string value will be used as the host name in the Via header.
+Otherwise, the server's host name will be used. Enclose in double
+quotes.
+
+=item B<DisableViaHeader>
+
+When this is set to yes, Tinyproxy does NOT add the `Via` header
+to the requests. This virtually puts Tinyproxy into stealth mode.
+Note that RFC 2616 requires proxies to set the `Via` header, so by
+enabling this option, you break compliance.
+Don't disable the `Via` header unless you know what you are doing...
+
+=item B<Filter>
+
+Tinyproxy supports filtering of web sites based on URLs or
+domains. This option specifies the location of the file
+containing the filter rules, one rule per line.
+
+Rules are specified as POSIX basic regular expressions (BRE), unless
+another FilterType is specified.
+Comment lines start with a `#` character.
+
+Example filter file contents:
+
+ # filter exactly cnn.com
+ ^cnn\.com$
+ 
+ # filter all subdomains of cnn.com, but not cnn.com itself
+ .*\.cnn.com$
+ 
+ # filter any domain that has cnn.com in it, like xcnn.comfy.org
+ cnn\.com
+ 
+ # filter any domain that ends in cnn.com
+ cnn\.com$
+ 
+ # filter any domain that starts with adserver
+ ^adserver
+
+=item B<FilterType>
+
+This option can be set to one of `bre`, `ere`, or `fnmatch`.
+If `bre` is set, the rules specified in the filter file are matched
+using POSIX basic regular expressions, when set to `ere`, using
+POSIX extended regular expressions, and when set to `fnmatch` using
+the `fnmatch` function as specified in the manpage `man 3p fnmatch`.
+`fnmatch` matching is identical to what's used in the shell to match
+filenames, so for example `*.google.com` matches everything that
+ends with `.google.com`.
+If you don't know what regular expressions are or you're using filter
+lists from 3rd party sources, `fnmatch` is probably what you want.
+It's also the fastest matching method of the three.
+
+=item B<FilterURLs>
+
+If this boolean option is set to `Yes` or `On`, filtering is
+performed for URLs rather than for domains. The default is to
+filter based on domains.
+
+Note that filtering for URLs works only in plain HTTP scenarios.
+Since HTTPS has become ubiquitous during the last years, this
+will only work on a tiny fraction of websites, so it is
+recommended not to use this option.
+
+=item B<FilterExtended>
+
+Deprecated. Use `FilterType ere` instead.
+If this boolean option is set to `Yes`, then extended POSIX
+regular expressions are used for matching the filter rules.
+The default is to use basic POSIX regular expressions.
+
+=item B<FilterCaseSensitive>
+
+If this boolean option is set to `Yes`, then the filter rules
+are matched in a case sensitive manner. The default is to
+match case-insensitively, unfortunately.
+If you set this to `Yes`, then your matching will be almost
+twice as fast.
+This setting affects only `bre` and `ere` FilterTypes, fnmatch
+is always case sensitive.
+
+=item B<FilterDefaultDeny>
+
+The default filtering policy is to allow everything that is
+not matched by a filtering rule. Setting `FilterDefaultDeny`
+to `Yes` changes the policy do deny everything but the domains
+or URLs matched by the filtering rules.
+In other words, if set to `No` the Filter list acts as a
+blacklist, if set to `Yes` as a whitelist.
+
+=item B<Anonymous>
+
+If an `Anonymous` keyword is present, then anonymous proxying
+is enabled.  The headers listed with `Anonymous` are allowed
+through, while all others are denied. If no Anonymous keyword
+is present, then all headers are allowed through.  You must
+include double quotes around the headers.
+
+Most sites require cookies to be enabled for them to work correctly, so
+you will need to allow cookies through if you access those sites.
+
+Example:
+
+    Anonymous "Host"
+    Anonymous "Authorization"
+    Anonymous "Cookie"
+
+=item B<ConnectPort>
+
+This option can be used to specify the ports allowed for the
+CONNECT method. If no `ConnectPort` line is found, then all
+ports are allowed. To disable CONNECT altogether, include a
+single ConnectPort line with a value of `0`.
+
+=item B<ReversePath>
+
+Configure one or more ReversePath directives to enable reverse proxy
+support. With reverse proxying it's possible to make a number of
+sites appear as if they were part of a single site.
+
+If you uncomment the following two directives and run Tinyproxy
+on your own computer at port 8888, you can access example.com,
+using http://localhost:8888/example/.
+
+    ReversePath "/example/" "http://www.example.com/"
+
+=item B<ReverseOnly>
+
+When using Tinyproxy as a reverse proxy, it is STRONGLY
+recommended that the normal proxy is turned off by setting
+this boolean option to `Yes`.
+
+=item B<ReverseMagic>
+
+Setting this option to `Yes`, makes Tinyproxy use a cookie to
+track reverse proxy mappings. If you need to reverse proxy
+sites which have absolute links you must use this option.
+
+=item B<ReverseBaseURL>
+
+The URL that is used to access this reverse proxy. The URL is
+used to rewrite HTTP redirects so that they won't escape the
+proxy. If you have a chain of reverse proxies, you'll need to
+put the outermost URL here (the address which the end user
+types into his/her browser).  If this option is not set then
+no rewriting of redirects occurs.
+
+=back
+
+=head1 BUGS
+
+To report bugs in Tinyproxy, please visit
+L<https://tinyproxy.github.io/>.
+
+
+=head1 SEE ALSO
+
+L<tinyproxy(8)>
+
+
+=head1 AUTHOR
+
+This manpage was written by the Tinyproxy project team.
+
+
+=head1 COPYRIGHT
+
+Copyright (c) 1998-2024 the Tinyproxy authors.
+
+This program is distributed under the terms of the GNU General Public
+License version 2 or above. See the COPYING file for additional
+information.
+

docs/man8/.gitignore

@@ -0,0 +1,3 @@
+*.8
+*.xml
+*.txt

docs/man8/Makefile.am

@@ -0,0 +1,36 @@
+if HAVE_MANPAGE_INTEREST
+MAN8_FILES  = \
+	tinyproxy.txt
+endif
+
+M_SECTION=8
+M_NAME=TINYPROXY
+
+man_MANS = \
+	$(MAN8_FILES:.txt=.8)
+
+edit = sed \
+	-e 's|@localstatedir[@]|$(localstatedir)|g' \
+	-e 's|@runstatedir[@]|$(runstatedir)|g' \
+	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
+	-e 's|@TINYPROXY_STATHOST[@]|$(TINYPROXY_STATHOST)|g'
+
+tinyproxy.txt: $(top_srcdir)/docs/man8/tinyproxy.txt.in Makefile
+	@rm -f $@ $@.tmp
+	$(AM_V_GEN) $(edit) $(top_srcdir)/docs/man8/$@.in > $@.tmp
+	@mv $@.tmp $@
+
+.txt.8:
+if HAVE_POD2MAN
+	$(AM_V_GEN) $(POD2MAN) --center="Tinyproxy manual" \
+	--section=$(M_SECTION) --name=$(M_NAME) --release="Version @VERSION@" \
+	$< > $@
+else
+	@echo "*** pod2man is required to regenerate $(@) ***"; exit 1;
+endif
+
+MAINTAINERCLEANFILES = \
+	$(MAN8_FILES:.txt=.8)
+
+EXTRA_DIST = \
+	$(MAN8_FILES:.txt=.8)

docs/man8/tinyproxy.txt.in

@@ -0,0 +1,187 @@
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+tinyproxy - A light-weight HTTP proxy daemon
+
+
+=head1 SYNOPSIS
+
+B<tinyproxy> [-vdch]
+
+
+=head1 DESCRIPTION
+
+B<tinyproxy> is a light-weight HTTP proxy daemon designed to consume a
+minimum amount of system resources. It listens on a given TCP port and
+handles HTTP proxy requests. Designed from the ground up to be fast and
+yet small, it is an ideal solution for use cases such as embedded
+deployments where a full featured HTTP proxy is required, but the system
+resources for a larger proxy are unavailable.
+
+
+=head1 OPTIONS
+
+B<tinyproxy> accepts the following options:
+
+=over 4
+
+=item B<-c <config-file>>
+
+Use an alternate configuration file.
+
+=item B<-d>
+
+Don't daemonize and stay in the foreground. Useful for debugging purposes.
+
+=item B<-h>
+
+Display a short help screen of command line arguments and exit.
+
+=item B<-v>
+
+Display version information and exit.
+
+=back
+
+=head1 SIGNALS
+
+In addition to command-line options, there are also several signals that
+can be sent to B<tinyproxy> while it is running to generate debugging
+information and to force certain events.
+
+=over 4
+
+=item B<SIGHUP>
+
+Force Tinyproxy to do a garbage collection on the current
+connections linked list. This is usually done automatically after a
+certain number of connections have been handled.
+(Daemon mode only)
+
+=item B<SIGUSR1>
+
+Force reload of config file and filter list.
+This is handy to update the configuration if Tinyproxy is running
+in foreground without dropping active connections.
+
+=back
+
+=head1 TEMPLATE FILES
+
+There are two occasions when Tinyproxy delivers HTML pages to
+the client on it's own right:
+
+=over 4
+
+=item * When an error occurred, a corresponding error page is returned.
+
+=item * When a request for the stathost is made, a page summarizing the
+connection statistics is returned. (See STATHOST below.)
+
+=back
+
+The layout of both error pages and the statistics page can be
+controlled via configurable HTML template files that are plain
+HTML files that additionally understand a few template
+variables.
+
+
+=head1 TEMPLATE VARIABLES
+
+There are several standard HTML variables that are available in every
+template file:
+
+=over 4
+
+=item B<request>
+
+The full HTTP request line.
+
+=item B<cause>
+
+The abbreviated cause of the error condition.
+
+=item B<clientip>
+
+The IP address of the client making the request.
+
+=item B<clienthost>
+
+The hostname of the client making the request.
+
+=item B<version>
+
+The version of Tinyproxy.
+
+=item B<package>
+
+The package name. Presently, resolves to 'tinyproxy'.
+
+=item B<date>
+
+The current date/time in HTTP format.
+
+=back
+
+In addition, almost all templates support:
+
+=over 4
+
+=item B<detail>
+
+A detailed, plain English explanation of the error and possible
+causes.
+
+=back
+
+When Tinyproxy finds a variable name enclosed in braces, e.g.
+"{request}", then this is replaced by the value of the corresponding
+variable before delivery of the page.
+
+
+=head1 STATHOST
+
+Tinyproxy returns a HTML page with connection statistics when it
+receives a HTTP request for a certain host -- the stathost.  The
+stathost name defaults to `@TINYPROXY_STATHOST@` and can be changed at
+runtime to any name or IP address with the configuration variable
+`StatHost`.
+
+The stat file template can be changed at runtime through the
+configuration variable `StatFile`.
+
+
+=head1 FILES
+
+F<@sysconfdir@/tinyproxy/tinyproxy.conf>
+
+F<@runstatedir@/tinyproxy/tinyproxy.pid>
+
+F<@localstatedir@/log/tinyproxy/tinyproxy.log>
+
+=head1 BUGS
+
+To report bugs in Tinyproxy, please visit
+L<https://tinyproxy.github.io/>.
+
+
+=head1 SEE ALSO
+
+L<tinyproxy.conf(5)>
+
+
+=head1 AUTHOR
+
+This manpage was written by the Tinyproxy project team.
+
+
+=head1 COPYRIGHT
+
+Copyright (c) 1998-2020 the Tinyproxy authors.
+
+This program is distributed under the terms of the GNU General Public
+License version 2 or above. See the COPYING file for additional
+information.

docs/web/Makefile

@@ -0,0 +1,15 @@
+# test webpage with `python -m SimpleHTTPServer`
+
+all: index.html
+
+tp.html.conf: ../man5/tinyproxy.conf.txt
+	pod2html --noindex < $^ | awk -f podhtml-filter.awk > $@
+
+index.html: tp.html.head tp.html.conf tp.html.foot
+	cat $^ > $@
+
+clean:
+	rm tp.html.conf index.html *.tmp
+
+.PHONY: all clean
+

docs/web/podhtml-filter.awk

@@ -0,0 +1,5 @@
+BEGIN {i=0}
+/<\/{0,1}h1/ {if(!i)i=1; gsub("h1", "h4", $0);}
+#/<\/body>/ {i=0;}
+/BUGS/ {i=-1}
+{if(i==1) print;}

docs/web/stylesheets/stylesheet.css

@@ -0,0 +1,426 @@
+/*******************************************************************************
+Slate Theme for GitHub Pages
+by Jason Costello, @jsncostello
+*******************************************************************************/
+
+@import url(github-light.css);
+
+/*******************************************************************************
+MeyerWeb Reset
+*******************************************************************************/
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font: inherit;
+  vertical-align: baseline;
+}
+
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+  display: block;
+}
+
+ol, ul {
+  list-style: none;
+}
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+/*******************************************************************************
+Theme Styles
+*******************************************************************************/
+
+body {
+  box-sizing: border-box;
+  color:#373737;
+  background: #212121;
+  font-size: 16px;
+  font-family: 'Myriad Pro', Calibri, Helvetica, Arial, sans-serif;
+  line-height: 1.5;
+  -webkit-font-smoothing: antialiased;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  margin: 10px 0;
+  font-weight: 700;
+  color:#222222;
+  font-family: 'Lucida Grande', 'Calibri', Helvetica, Arial, sans-serif;
+  letter-spacing: -1px;
+}
+
+h1 {
+  font-size: 36px;
+  font-weight: 700;
+}
+
+h2 {
+  padding-bottom: 10px;
+  font-size: 32px;
+  background: url('../images/bg_hr.png') repeat-x bottom;
+}
+
+h3 {
+  font-size: 24px;
+}
+
+h4 {
+  font-size: 21px;
+}
+
+h5 {
+  font-size: 18px;
+}
+
+h6 {
+  font-size: 16px;
+}
+
+p {
+  margin: 10px 0 15px 0;
+}
+
+footer p {
+  color: #f2f2f2;
+}
+
+a {
+  text-decoration: none;
+  color: #007edf;
+  text-shadow: none;
+
+  transition: color 0.5s ease;
+  transition: text-shadow 0.5s ease;
+  -webkit-transition: color 0.5s ease;
+  -webkit-transition: text-shadow 0.5s ease;
+  -moz-transition: color 0.5s ease;
+  -moz-transition: text-shadow 0.5s ease;
+  -o-transition: color 0.5s ease;
+  -o-transition: text-shadow 0.5s ease;
+  -ms-transition: color 0.5s ease;
+  -ms-transition: text-shadow 0.5s ease;
+}
+
+a:hover, a:focus {text-decoration: underline;}
+
+footer a {
+  color: #F2F2F2;
+  text-decoration: underline;
+}
+
+em {
+  font-style: italic;
+}
+
+strong {
+  font-weight: bold;
+}
+
+img {
+  position: relative;
+  margin: 0 auto;
+  max-width: 739px;
+  padding: 5px;
+  margin: 10px 0 10px 0;
+  border: 1px solid #ebebeb;
+
+  box-shadow: 0 0 5px #ebebeb;
+  -webkit-box-shadow: 0 0 5px #ebebeb;
+  -moz-box-shadow: 0 0 5px #ebebeb;
+  -o-box-shadow: 0 0 5px #ebebeb;
+  -ms-box-shadow: 0 0 5px #ebebeb;
+}
+
+p img {
+  display: inline;
+  margin: 0;
+  padding: 0;
+  vertical-align: middle;
+  text-align: center;
+  border: none;
+}
+
+pre, code {
+  width: 100%;
+  color: #222;
+  background-color: #fff;
+
+  font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace;
+  font-size: 14px;
+
+  border-radius: 2px;
+  -moz-border-radius: 2px;
+  -webkit-border-radius: 2px;
+}
+
+pre {
+  width: 100%;
+  padding: 10px;
+  margin-bottom: 20px;
+  box-shadow: 0 0 10px rgba(0,0,0,.1);
+  overflow: auto;
+}
+
+code {
+  padding: 3px;
+  margin: 0 3px;
+  box-shadow: 0 0 10px rgba(0,0,0,.1);
+}
+
+pre code {
+  display: block;
+  box-shadow: none;
+}
+
+blockquote {
+  color: #666;
+  margin-bottom: 20px;
+  padding: 0 0 0 20px;
+  border-left: 3px solid #bbb;
+}
+
+
+ul, ol, dl {
+  margin-bottom: 15px
+}
+
+ul {
+  list-style-position: inside;
+  list-style: disc;
+  padding-left: 20px;
+}
+
+ol {
+  list-style-position: inside;
+  list-style: decimal;
+  padding-left: 20px;
+}
+
+dl dt {
+  font-weight: bold;
+}
+
+dl dd {
+  padding-left: 20px;
+/*  font-style: italic; */
+}
+
+dl p {
+  padding-left: 20px;
+/*  font-style: italic; */
+}
+
+hr {
+  height: 1px;
+  margin-bottom: 5px;
+  border: none;
+  background: url('../images/bg_hr.png') repeat-x center;
+}
+
+table {
+  border: 1px solid #373737;
+  margin-bottom: 20px;
+  text-align: left;
+ }
+
+th {
+  font-family: 'Lucida Grande', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  padding: 10px;
+  background: #373737;
+  color: #fff;
+ }
+
+td {
+  padding: 10px;
+  border: 1px solid #373737;
+ }
+
+form {
+  background: #f2f2f2;
+  padding: 20px;
+}
+
+/*******************************************************************************
+Full-Width Styles
+*******************************************************************************/
+
+.outer {
+  width: 100%;
+}
+
+.inner {
+  position: relative;
+  max-width: 640px;
+  padding: 20px 10px;
+  margin: 0 auto;
+}
+
+#forkme_banner {
+  display: block;
+  position: absolute;
+  top:0;
+  right: 10px;
+  z-index: 10;
+  padding: 10px 50px 10px 10px;
+  color: #fff;
+  background: url('../images/blacktocat.png') #0090ff no-repeat 95% 50%;
+  font-weight: 700;
+  box-shadow: 0 0 10px rgba(0,0,0,.5);
+  border-bottom-left-radius: 2px;
+  border-bottom-right-radius: 2px;
+}
+
+#header_wrap {
+  background: #212121;
+  background: -moz-linear-gradient(top, #373737, #212121);
+  background: -webkit-linear-gradient(top, #373737, #212121);
+  background: -ms-linear-gradient(top, #373737, #212121);
+  background: -o-linear-gradient(top, #373737, #212121);
+  background: linear-gradient(top, #373737, #212121);
+}
+
+#header_wrap .inner {
+  padding: 50px 10px 30px 10px;
+}
+
+#project_title {
+  margin: 0;
+  color: #fff;
+  font-size: 42px;
+  font-weight: 700;
+  text-shadow: #111 0px 0px 10px;
+}
+
+#project_tagline {
+  color: #fff;
+  font-size: 24px;
+  font-weight: 300;
+  background: none;
+  text-shadow: #111 0px 0px 10px;
+}
+
+#downloads {
+  position: absolute;
+  width: 210px;
+  z-index: 10;
+  bottom: -40px;
+  right: 0;
+  height: 70px;
+  background: url('../images/icon_download.png') no-repeat 0% 90%;
+}
+
+.zip_download_link {
+  display: block;
+  float: right;
+  width: 90px;
+  height:70px;
+  text-indent: -5000px;
+  overflow: hidden;
+  background: url(../images/sprite_download.png) no-repeat bottom left;
+}
+
+.tar_download_link {
+  display: block;
+  float: right;
+  width: 90px;
+  height:70px;
+  text-indent: -5000px;
+  overflow: hidden;
+  background: url(../images/sprite_download.png) no-repeat bottom right;
+  margin-left: 10px;
+}
+
+.zip_download_link:hover {
+  background: url(../images/sprite_download.png) no-repeat top left;
+}
+
+.tar_download_link:hover {
+  background: url(../images/sprite_download.png) no-repeat top right;
+}
+
+#main_content_wrap {
+  background: #f2f2f2;
+  border-top: 1px solid #111;
+  border-bottom: 1px solid #111;
+}
+
+#main_content {
+  padding-top: 40px;
+}
+
+#footer_wrap {
+  background: #212121;
+}
+
+
+
+/*******************************************************************************
+Small Device Styles
+*******************************************************************************/
+
+@media screen and (max-width: 480px) {
+  body {
+    font-size:14px;
+  }
+
+  #downloads {
+    display: none;
+  }
+
+  .inner {
+    min-width: 320px;
+    max-width: 480px;
+  }
+
+  #project_title {
+  font-size: 32px;
+  }
+
+  h1 {
+    font-size: 28px;
+  }
+
+  h2 {
+    font-size: 24px;
+  }
+
+  h3 {
+    font-size: 21px;
+  }
+
+  h4 {
+    font-size: 18px;
+  }
+
+  h5 {
+    font-size: 14px;
+  }
+
+  h6 {
+    font-size: 12px;
+  }
+
+  code, pre {
+    min-width: 320px;
+    max-width: 480px;
+    font-size: 11px;
+  }
+
+}

docs/web/tp.html.foot

@@ -0,0 +1,21 @@
+<h2>
+<a id="support" class="anchor" href="#support" aria-hidden="true"><span class="octicon octicon-link"></span></a>Support</h2>
+
+<ul>
+<li>Feel free to report a new bug or suggest features via github issues.</li>
+<li>Tinyproxy developers hang out in #tinyproxy on irc.libera.chat.</li>
+</ul>
+      </section>
+    </div>
+
+    <!-- FOOTER  -->
+    <div id="footer_wrap" class="outer">
+      <footer class="inner">
+        <p>Published with <a href="https://pages.github.com">GitHub Pages</a></p>
+      </footer>
+    </div>
+
+    
+
+  </body>
+</html>

docs/web/tp.html.head

@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html>
+
+  <head>
+    <meta charset='utf-8'>
+    <meta http-equiv="X-UA-Compatible" content="chrome=1">
+    <meta name="description" content="Tinyproxy : lightweight http(s) proxy daemon">
+
+    <link rel="stylesheet" type="text/css" media="screen" href="stylesheets/stylesheet.css">
+
+    <title>Tinyproxy</title>
+  </head>
+
+  <body>
+
+    <!-- HEADER -->
+    <div id="header_wrap" class="outer">
+        <header class="inner">
+          <a id="forkme_banner" href="https://github.com/tinyproxy">View on GitHub</a>
+
+          <h1 id="project_title">Tinyproxy</h1>
+          <h2 id="project_tagline">lightweight http(s) proxy daemon</h2>
+
+        </header>
+    </div>
+
+    <!-- MAIN CONTENT -->
+    <div id="main_content_wrap" class="outer">
+      <section id="main_content" class="inner">
+        <h1>
+<a id="tinyproxy" class="anchor" href="#tinyproxy" aria-hidden="true"><span class="octicon octicon-link"></span></a>Tinyproxy</h1>
+
+<p>Tinyproxy is a light-weight HTTP/HTTPS proxy daemon for POSIX operating systems. Designed from the ground up to be fast and yet small, it is an ideal solution for use cases such as embedded deployments where a full featured HTTP proxy is required, but the system resources for a larger proxy are unavailable.</p>
+
+<p>Tinyproxy is distributed using the GNU GPL license (version 2 or above).</p>
+
+<h2>
+<a id="features" class="anchor" href="#features" aria-hidden="true"><span class="octicon octicon-link"></span></a>Features</h2>
+
+<p>Tinyproxy has a <strong>small footprint</strong> and requires very little in the way of system resources. The memory footprint tends to be around 2 MB with glibc, and the CPU load increases linearly with the number of simultaneous connections (depending on the speed of the connection). Thus, Tinyproxy can be run on an older machine, or on a network appliance such as a Linux-based broadband router, without any noticeable impact on performance.</p>
+
+<p>Tinyproxy requires only a <strong>minimal POSIX environment</strong> to build and operate. It can use additional libraries to add functionality though.</p>
+
+<p>Tinyproxy allows forwarding of <strong>HTTPS connections</strong> without modifying traffic in any way through the <code>CONNECT</code> method (see the <code>ConnectPort</code> directive, which you should disable, unless you want to restrict the users).</p>
+
+<p>Tinyproxy supports being configured as a <strong>transparent proxy</strong>, so that a proxy can be used without requiring any client-side configuration. You can also use it as a <strong>reverse proxy</strong> front-end to your websites.</p>
+
+<p>Using the <code>AddHeader</code> directive, you can <strong>add/insert HTTP headers</strong> to outgoing traffic (HTTP only).</p>
+
+<p>If you're looking to build a custom web proxy, Tinyproxy is <strong>easy to modify</strong> to your custom needs. The source is straightforward, adhering to the KISS principle. As such, it can be used as a foundation for anything you may need a web proxy to do.</p>
+
+<p>Tinyproxy has <strong>privacy features</strong> which can let you configure which HTTP headers should be allowed through, and which should be blocked. This allows you to restrict both what data comes to your web browser from the HTTP server (e.g., cookies), and to restrict what data is allowed through from your web browser to the HTTP server (e.g., version information). Note that these features do not affect HTTPS connections.</p>
+
+<p>Using the <strong>remote monitoring</strong> facility, you can access proxy statistics from afar, letting you know exactly how busy the proxy is.</p>
+
+<p>You can configure Tinyproxy to <strong>control access</strong> by only allowing requests from a certain subnet, or from a certain interface, thus ensuring that random, unauthorized people will not be using your proxy.</p>
+
+<p>With a bit of configuration (specifically, making Tinyproxy created files owned by a non-root user and running it on a port greater than 1024), Tinyproxy can be made to run without any special privileges, thus minimizing the chance of system compromise. In fact, it is <b>recommended</b> to run it as a regular/restricted user. Furthermore, it was designed with an eye towards preventing buffer overflows. The simplicity of the code ensures it remains easy to spot such bugs.</p>
+
+<h2>
+<a id="downloads" class="anchor" href="#downloads" aria-hidden="true"><span class="octicon octicon-link"></span></a>Downloads</h2>
+
+<p>Note that many distributions ship horribly outdated versions of tinyproxy, therefore it is recommended to compile it from source.</p>
+
+<ul>
+<li>On Red Hat Enterprise Linux, or its derivatives such as CentOS, install Tinyproxy from the EPEL repository by running yum install tinyproxy.</li>
+<li>On Fedora, install Tinyproxy by running yum install tinyproxy.</li>
+<li>On Debian and derived distributions, run apt-get install tinyproxy to install Tinyproxy.</li>
+<li>For openSUSE run: zypper in tinyproxy</li>
+<li>Arch users can install the Tinyproxy package from the community repository. Run pacman -S tinyproxy to install it.</li>
+<li>FreeBSD, OpenBSD or NetBSD users can use the pkg_add utility to install the tinyproxy package.</li>
+<li>Mac OS X users can check MacPorts to see if the Tinyproxy port there is recent enough.</li>
+</ul>
+
+<p>If you feel that the Tinyproxy binary package in your operating system is not recent (likely), please contact the package maintainer for that particular operating system. If this fails, you can always compile the latest stable, or even better, the latest git master version, from source code.</p>
+
+<p>We distribute Tinyproxy in source code form, and it has to be compiled in order to be used on your system. Please see the INSTALL file in the source code tree for build instructions. The current stable version of Tinyproxy is available on the <a href="https://github.com/tinyproxy/tinyproxy/releases">releases page</a>. The Tinyproxy NEWS file contains the release notes. You can verify the tarball using its PGP signature. You can also browse the older releases of Tinyproxy.</p>
+
+<p>We use Git as the version control system for the Tinyproxy source code repository. To get a copy of the Tinyproxy repository, use the command:</p>
+
+<p>git clone <a href="https://github.com/tinyproxy/tinyproxy.git">https://github.com/tinyproxy/tinyproxy.git</a></p>
+
+<h2>
+<a id="quickstart" class="anchor" href="#quickstart" aria-hidden="true"><span class="octicon octicon-link"></span></a>Quickstart</h2>
+
+<p>The quickest way to get started is using a minimal config file like the below:</p>
+
+<pre><code>
+Port 8888
+Listen 127.0.0.1
+Timeout 600
+Allow 127.0.0.1
+</code></pre>
+
+<p>And then simply run <code>tinyproxy -d -c tinyproxy.conf</code> as your current user. This starts tinyproxy in foreground mode with <code>tinyproxy.conf</code> as its config, while logging to stdout. Now, all programs supporting a HTTP proxy can use 127.0.0.1:8888 as a proxy. You can try it out using <code>http_proxy=127.0.0.1:8888 curl example.com</code>.</p>
+
+<h2>
+<a id="documentation" class="anchor" href="#documentation" aria-hidden="true"><span class="octicon octicon-link"></span></a>Documentation</h2>

etc/.gitignore

@@ -0,0 +1 @@
+tinyproxy.conf

etc/Makefile.am

@@ -0,0 +1,26 @@
+pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
+
+pkgsysconf_DATA = \
+	tinyproxy.conf
+
+EXTRA_DIST = \
+	tinyproxy.conf.in
+
+edit = sed \
+	-e 's|@bindir[@]|$(bindir)|g' \
+	-e 's|@datadir[@]|$(datadir)|g' \
+	-e 's|@datarootdir[@]|$(datarootdir)|g' \
+	-e 's|@pkgsysconfdir[@]|$(pkgsysconfdir)|g' \
+	-e 's|@localstatedir[@]|$(localstatedir)|g' \
+	-e 's|@runstatedir[@]|$(runstatedir)|g' \
+	-e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \
+	-e 's|@prefix[@]|$(prefix)|g' \
+	-e 's|@TINYPROXY_STATHOST[@]|$(TINYPROXY_STATHOST)|g'
+
+tinyproxy.conf: $(top_srcdir)/etc/tinyproxy.conf.in Makefile
+	@rm -f $@ $@.tmp
+	$(AM_V_GEN) $(edit) $(top_srcdir)/etc/$@.in > $@.tmp
+	@mv $@.tmp $@
+
+CLEANFILES = \
+	tinyproxy.conf

etc/tinyproxy.conf.in

@@ -0,0 +1,329 @@
+##
+## tinyproxy.conf -- tinyproxy daemon configuration file
+##
+## This example tinyproxy.conf file contains example settings
+## with explanations in comments. For decriptions of all
+## parameters, see the tinyproxy.conf(5) manual page.
+##
+
+#
+# User/Group: This allows you to set the user and group that will be
+# used for tinyproxy after the initial binding to the port has been done
+# as the root user. Either the user or group name or the UID or GID
+# number may be used.
+#
+User nobody
+Group nobody
+
+#
+# Port: Specify the port which tinyproxy will listen on.  Please note
+# that should you choose to run on a port lower than 1024 you will need
+# to start tinyproxy using root.
+#
+Port 8888
+
+#
+# Listen: If you have multiple interfaces this allows you to bind to
+# only one. If this is commented out, tinyproxy will bind to all
+# interfaces present.
+#
+#Listen 192.168.0.1
+
+#
+# Bind: This allows you to specify which interface will be used for
+# outgoing connections.  This is useful for multi-home'd machines where
+# you want all traffic to appear outgoing from one particular interface.
+#
+#Bind 192.168.0.1
+
+#
+# BindSame: If enabled, tinyproxy will bind the outgoing connection to the
+# ip address of the incoming connection.
+#
+#BindSame yes
+
+#
+# Timeout: The maximum number of seconds of inactivity a connection is
+# allowed to have before it is closed by tinyproxy.
+#
+Timeout 600
+
+#
+# ErrorFile: Defines the HTML file to send when a given HTTP error
+# occurs.  You will probably need to customize the location to your
+# particular install.  The usual locations to check are:
+#   /usr/local/share/tinyproxy
+#   /usr/share/tinyproxy
+#   /etc/tinyproxy
+#
+#ErrorFile 400 "@pkgdatadir@/400.html"
+#ErrorFile 502 "@pkgdatadir@/502.html"
+#ErrorFile 503 "@pkgdatadir@/503.html"
+#ErrorFile 403 "@pkgdatadir@/403.html"
+#ErrorFile 408 "@pkgdatadir@/408.html"
+
+#
+# DefaultErrorFile: The HTML file that gets sent if there is no
+# HTML file defined with an ErrorFile keyword for the HTTP error
+# that has occured.
+#
+DefaultErrorFile "@pkgdatadir@/default.html"
+
+#
+# StatHost: This configures the host name or IP address that is treated
+# as the stat host: Whenever a request for this host is received,
+# Tinyproxy will return an internal statistics page instead of
+# forwarding the request to that host.  The default value of StatHost is
+# @TINYPROXY_STATHOST@.
+#
+#StatHost "@TINYPROXY_STATHOST@"
+#
+
+#
+# StatFile: The HTML file that gets sent when a request is made
+# for the stathost.  If this file doesn't exist a basic page is
+# hardcoded in tinyproxy.
+#
+StatFile "@pkgdatadir@/stats.html"
+
+#
+# LogFile: Allows you to specify the location where information should
+# be logged to.  If you would prefer to log to syslog, then disable this
+# and enable the Syslog directive.  These directives are mutually
+# exclusive. If neither Syslog nor LogFile are specified, output goes
+# to stdout.
+#
+#LogFile "@localstatedir@/log/tinyproxy/tinyproxy.log"
+
+#
+# Syslog: Tell tinyproxy to use syslog instead of a logfile.  This
+# option must not be enabled if the Logfile directive is being used.
+# These two directives are mutually exclusive.
+#
+#Syslog On
+
+#
+# LogLevel: Warning
+#
+# Set the logging level. Allowed settings are:
+#	Critical	(least verbose)
+#	Error
+#	Warning
+#	Notice
+#	Connect		(to log connections without Info's noise)
+#	Info		(most verbose)
+#
+# The LogLevel logs from the set level and above. For example, if the
+# LogLevel was set to Warning, then all log messages from Warning to
+# Critical would be output, but Notice and below would be suppressed.
+#
+LogLevel Info
+
+#
+# PidFile: Write the PID of the main tinyproxy thread to this file so it
+# can be used for signalling purposes.
+# If not specified, no pidfile will be written.
+#
+#PidFile "@runstatedir@/tinyproxy/tinyproxy.pid"
+
+#
+# XTinyproxy: Tell Tinyproxy to include the X-Tinyproxy header, which
+# contains the client's IP address.
+#
+#XTinyproxy Yes
+
+#
+# Upstream:
+#
+# Turns on upstream proxy support.
+#
+# The upstream rules allow you to selectively route upstream connections
+# based on the host/domain of the site being accessed.
+#
+# Syntax: upstream type (user:pass@)ip:port ("domain")
+# Or:     upstream none "domain"
+# The parts in parens are optional.
+# Possible types are http, socks4, socks5, none
+#
+# For example:
+#  # connection to test domain goes through testproxy
+#  upstream http testproxy:8008 ".test.domain.invalid"
+#  upstream http testproxy:8008 ".our_testbed.example.com"
+#  upstream http testproxy:8008 "192.168.128.0/255.255.254.0"
+#
+#  # upstream proxy using basic authentication
+#  upstream http user:pass@testproxy:8008 ".test.domain.invalid"
+#
+#  # no upstream proxy for internal websites and unqualified hosts
+#  upstream none ".internal.example.com"
+#  upstream none "www.example.com"
+#  upstream none "10.0.0.0/8"
+#  upstream none "192.168.0.0/255.255.254.0"
+#  upstream none "."
+#
+#  # connection to these boxes go through their DMZ firewalls
+#  upstream http cust1_firewall:8008 "testbed_for_cust1"
+#  upstream http cust2_firewall:8008 "testbed_for_cust2"
+#
+#  # default upstream is internet firewall
+#  upstream http firewall.internal.example.com:80
+#
+# You may also use SOCKS4/SOCKS5 upstream proxies:
+#  upstream socks4 127.0.0.1:9050
+#  upstream socks5 socksproxy:1080
+#
+# The LAST matching rule wins the route decision.  As you can see, you
+# can use a host, or a domain:
+#  name     matches host exactly
+#  .name    matches any host in domain "name"
+#  .        matches any host with no domain (in 'empty' domain)
+#  IP/bits  matches network/mask
+#  IP/mask  matches network/mask
+#
+#Upstream http some.remote.proxy:port
+
+#
+# MaxClients: This is the absolute highest number of threads which will
+# be created. In other words, only MaxClients number of clients can be
+# connected at the same time.
+#
+MaxClients 100
+
+#
+# Allow: Customization of authorization controls. If there are any
+# access control keywords then the default action is to DENY. Otherwise,
+# the default action is ALLOW.
+#
+# The order of the controls are important. All incoming connections are
+# tested against the controls based on order.
+#
+Allow 127.0.0.1
+Allow ::1
+
+# BasicAuth: HTTP "Basic Authentication" for accessing the proxy.
+# If there are any entries specified, access is only granted for authenticated
+# users.
+#BasicAuth user password
+
+# BasicAuthRealm : In case BasicAuth is configured, the "realm" information.
+# "Proxy Authentication Required" status http 407 "error-response" can be
+# customized.
+#
+# - defaults in code to "Tinyproxy" (PACKAGE_NAME), if not configured.
+#BasicAuthRealm "Tinyproxy"
+
+#
+# AddHeader: Adds the specified headers to outgoing HTTP requests that
+# Tinyproxy makes. Note that this option will not work for HTTPS
+# traffic, as Tinyproxy has no control over what headers are exchanged.
+#
+#AddHeader "X-My-Header" "Powered by Tinyproxy"
+
+#
+# ViaProxyName: The "Via" header is required by the HTTP RFC, but using
+# the real host name is a security concern.  If the following directive
+# is enabled, the string supplied will be used as the host name in the
+# Via header; otherwise, the server's host name will be used.
+#
+ViaProxyName "tinyproxy"
+
+#
+# DisableViaHeader: When this is set to yes, Tinyproxy does NOT add
+# the Via header to the requests. This virtually puts Tinyproxy into
+# stealth mode. Note that RFC 2616 requires proxies to set the Via
+# header, so by enabling this option, you break compliance.
+# Don't disable the Via header unless you know what you are doing...
+#
+#DisableViaHeader Yes
+
+#
+# Filter: This allows you to specify the location of the filter file.
+#
+#Filter "@pkgsysconfdir@/filter"
+
+#
+# FilterURLs: Filter based on URLs rather than domains.
+#
+#FilterURLs On
+
+#
+# FilterType: Use bre (default), ere, or fnmatch for filtering.
+#
+#FilterType fnmatch
+
+#
+# FilterCaseSensitive: Use case sensitive regular expressions.
+#
+#FilterCaseSensitive On
+
+#
+# FilterDefaultDeny: Change the default policy of the filtering system.
+# If this directive is commented out, or is set to "No" then the default
+# policy is to allow everything which is not specifically denied by the
+# filter file.
+#
+# However, by setting this directive to "Yes" the default policy becomes
+# to deny everything which is _not_ specifically allowed by the filter
+# file.
+#
+#FilterDefaultDeny Yes
+
+#
+# Anonymous: If an Anonymous keyword is present, then anonymous proxying
+# is enabled.  The headers listed are allowed through, while all others
+# are denied. If no Anonymous keyword is present, then all headers are
+# allowed through.  You must include quotes around the headers.
+#
+# Most sites require cookies to be enabled for them to work correctly, so
+# you will need to allow Cookies through if you access those sites.
+#
+#Anonymous "Host"
+#Anonymous "Authorization"
+#Anonymous "Cookie"
+
+#
+# ConnectPort: This is a list of ports allowed by tinyproxy when the
+# CONNECT method is used.  To disable the CONNECT method altogether, set
+# the value to 0.  If no ConnectPort line is found, all ports are
+# allowed.
+#
+# The following two ports are used by SSL.
+#
+#ConnectPort 443
+#ConnectPort 563
+
+#
+# Configure one or more ReversePath directives to enable reverse proxy
+# support. With reverse proxying it's possible to make a number of
+# sites appear as if they were part of a single site.
+#
+# If you uncomment the following two directives and run tinyproxy
+# on your own computer at port 8888, you can access Google using
+# http://localhost:8888/google/ and Wired News using
+# http://localhost:8888/wired/news/. Neither will actually work
+# until you uncomment ReverseMagic as they use absolute linking.
+#
+#ReversePath "/google/"	"http://www.google.com/"
+#ReversePath "/wired/"	"http://www.wired.com/"
+
+#
+# When using tinyproxy as a reverse proxy, it is STRONGLY recommended
+# that the normal proxy is turned off by uncommenting the next directive.
+#
+#ReverseOnly Yes
+
+#
+# Use a cookie to track reverse proxy mappings. If you need to reverse
+# proxy sites which have absolute links you must uncomment this.
+#
+#ReverseMagic Yes
+
+#
+# The URL that's used to access this reverse proxy. The URL is used to
+# rewrite HTTP redirects so that they won't escape the proxy. If you
+# have a chain of reverse proxies, you'll need to put the outermost
+# URL here (the address which the end user types into his/her browser).
+#
+# If not set then no rewriting occurs.
+#
+#ReverseBaseURL "http://localhost:8888/"

m4macros/Makefile.am

@@ -0,0 +1,3 @@
+EXTRA_DIST = \
+	as-compiler-flag.m4 \
+	argenable.m4

m4macros/argenable.m4

@@ -0,0 +1,19 @@
+dnl $Id: argenable.m4,v 1.1 2004-08-24 18:40:21 rjkaes Exp $
+dnl
+dnl Define a new AC_ARG_ENABLE like macro which handles invalid inputs
+dnl correctly.  The macro takes three arguments:
+dnl  1) the option name (used like --enable-option)
+dnl  2) the help string
+dnl  3) the default value (either yes or no)
+dnl
+dnl This macro also defines on variable in the form "option_enabled"
+dnl set to either "yes" or "no".
+dnl
+AC_DEFUN([TP_ARG_ENABLE],
+[AC_ARG_ENABLE([$1],
+  AS_HELP_STRING([--enable-$1], [$2]),
+  [case "${enableval}" in
+    yes)  $1_enabled=yes ;;
+    no)   $1_enabled=no ;;
+    *)    AC_MSG_ERROR([bad value ${enableval} for --enable-$1]) ;;
+   esac],[$1_enabled=$3])])

m4macros/as-compiler-flag.m4

@@ -0,0 +1,64 @@
+dnl as-compiler-flag.m4 0.1.0
+
+dnl autostars m4 macro for detection of compiler flags
+
+dnl David Schleef <ds@schleef.org>
+dnl Tim-Philipp Müller <tim centricular net>
+
+dnl AS_COMPILER_FLAG(CFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED])
+dnl Tries to compile with the given CFLAGS.
+dnl Runs ACTION-IF-ACCEPTED if the compiler can compile with the flags,
+dnl and ACTION-IF-NOT-ACCEPTED otherwise.
+
+AC_DEFUN([AS_COMPILER_FLAG],
+[
+  AC_MSG_CHECKING([to see if compiler understands $1])
+
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS $1"
+
+  AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no])
+  CFLAGS="$save_CFLAGS"
+
+  if test "X$flag_ok" = Xyes ; then
+    $2
+    true
+  else
+    $3
+    true
+  fi
+  AC_MSG_RESULT([$flag_ok])
+])
+
+dnl AS_CXX_COMPILER_FLAG(CPPFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED])
+dnl Tries to compile with the given CPPFLAGS.
+dnl Runs ACTION-IF-ACCEPTED if the compiler can compile with the flags,
+dnl and ACTION-IF-NOT-ACCEPTED otherwise.
+
+AC_DEFUN([AS_CXX_COMPILER_FLAG],
+[
+  AC_REQUIRE([AC_PROG_CXX])
+
+  AC_MSG_CHECKING([to see if c++ compiler understands $1])
+
+  save_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $1"
+
+  AC_LANG_PUSH(C++)
+
+  AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no])
+  CPPFLAGS="$save_CPPFLAGS"
+
+  if test "X$flag_ok" = Xyes ; then
+    $2
+    true
+  else
+    $3
+    true
+  fi
+
+  AC_LANG_POP(C++)
+
+  AC_MSG_RESULT([$flag_ok])
+])
+

reconf

@@ -1,11 +0,0 @@
-#!/bin/sh
-rm -f config.cache
-echo "- aclocal."
-aclocal
-echo "- autoconf."
-autoconf
-echo "- autoheader."
-autoheader
-echo "- automake."
-automake -a
-exit

scripts/Makefile.am

@@ -0,0 +1,2 @@
+EXTRA_DIST = \
+	     version.sh

scripts/gen-authors.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+SCRIPT_DIR="$(cd "$(dirname "${0}")" && pwd)"
+BASE_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)"
+AUTHORS_FILE="${BASE_DIR}/AUTHORS"
+
+type git > /dev/null || exit
+test -d "${BASE_DIR}/.git" || exit
+
+git log --all --format='%aN' | sort -u > "${AUTHORS_FILE}"

scripts/version.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+SCRIPT_DIR="$(cd "$(dirname "${0}")" && pwd)"
+GIT_DIR="${SCRIPT_DIR}/../.git"
+
+if test -d "${GIT_DIR}" ; then
+	if type git >/dev/null 2>&1 ; then
+		gitstr=$(git describe --match '[0-9]*.[0-9]*.*' 2>/dev/null)
+		if test "x$?" != x0 ; then
+			sed 's/$/-git/' < VERSION
+		else
+			printf "%s\n" "$gitstr" | sed -e 's/-g/-git-/'
+		fi
+	else
+		sed 's/$/-git/' < VERSION
+	fi
+else
+	cat VERSION
+fi

src/.gitignore

@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+tinyproxy
+*.o
+*.pcno

src/Makefile.am

@@ -1,52 +1,71 @@
-# $Id: Makefile.am,v 1.7 2001-11-05 15:24:01 rjkaes Exp $
+# tinyproxy - A fast light-weight HTTP proxy
+# 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 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.
 #
-# Copyright (C) 2000  Robert James Kaes (rjkaes@flarenet.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.
-#
+# 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.
 
-YFLAGS = @YFLAGS@
-LDFLAGS = @LDFLAGS@
+pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
 
 bin_PROGRAMS = tinyproxy
 
+AM_CPPFLAGS = \
+	-DSYSCONFDIR=\"${pkgsysconfdir}\" \
+	-DLOCALSTATEDIR=\"${localstatedir}\"
+
 tinyproxy_SOURCES = \
-	conns.c conns.h \
+	hostspec.c hostspec.h \
+	acl.c acl.h \
+	anonymous.c anonymous.h \
 	buffer.c buffer.h \
-	dnscache.c dnscache.h \
+	child.c child.h \
+	common.h \
+	conf-tokens.c conf-tokens.h \
+	conf.c conf.h \
+	conns.c conns.h \
+	daemon.c daemon.h \
+	heap.c heap.h \
+	html-error.c html-error.h \
+	http-message.c http-message.h \
 	log.c log.h \
+	network.c network.h \
 	reqs.c reqs.h \
 	sock.c sock.h \
-	tinyproxy.c tinyproxy.h \
-	utils.c utils.h \
-	anonymous.c anonymous.h \
 	stats.c stats.h \
-	thread.c thread.h \
-	grammar.y scanner.l \
-	acl.c acl.h \
-	ternary.c ternary.h \
-	regexp.h
+	text.c text.h \
+	main.c main.h \
+	utils.c utils.h \
+	upstream.c upstream.h \
+	basicauth.c basicauth.h \
+	base64.c base64.h \
+	sblist.c sblist.h \
+	hsearch.c hsearch.h \
+	orderedmap.c orderedmap.h \
+	loop.c loop.h \
+	mypoll.c mypoll.h \
+	connect-ports.c connect-ports.h
 
-tinyproxy_LDADD = @LIBOBJS@
+EXTRA_tinyproxy_SOURCES = filter.c filter.h \
+	reverse-proxy.c reverse-proxy.h \
+	transparent-proxy.c transparent-proxy.h
+tinyproxy_DEPENDENCIES = @ADDITIONAL_OBJECTS@
+tinyproxy_LDADD = @ADDITIONAL_OBJECTS@ -lpthread
 
-EXTRA_DIST = gnuregex.c gnuregex.h \
-	filter.c filter.h
+if HAVE_GPERF
+conf-tokens.c: conf-tokens-gperf.inc
+conf-tokens-gperf.inc: conf-tokens.gperf
+	$(GPERF) $< > $@
+endif
 
-EXTRA_tinyproxy_SOURCES = grammar.h
+EXTRA_DIST = conf-tokens.gperf conf-tokens-gperf.inc
 
-scanner.c: scanner.l grammar.h
-	$(LEX) $(AM_LFLAGS) $(LFLAGS) -i $< && mv $(LEX_OUTPUT_ROOT).c $@
-
-clean:
-	rm -f *.da
-	rm -f gmon.out

src/acl.c

@@ -1,60 +1,62 @@
-/* $Id: acl.c,v 1.10 2001-11-03 06:08:37 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
+ * 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 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.
- *
- * Copyright (C) 2000  Robert James Kaes (rjkaes@flarenet.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"
+#include "main.h"
 
 #include "acl.h"
+#include "heap.h"
 #include "log.h"
+#include "network.h"
 #include "sock.h"
-#include "utils.h"
-
-struct acl_s {
-	acl_access_t acl_access;
-	enum { ACL_STRING, ACL_NUMERIC } type;
-	char *location;
-	int netmask;
-	struct acl_s *next;
-};
-
-static struct acl_s *access_list = NULL;
+#include "sblist.h"
+#include "hostspec.h"
 
 /*
- * Take a netmask number (between 0 and 32) and returns a network ordered
- * value for comparison. Somebody please clean this up. :)
+ * Hold the information about a particular access control.  We store
+ * whether it's an ALLOW or DENY entry, and also whether it's a string
+ * entry (like a domain name) or an IP entry.
  */
-static in_addr_t make_netmask(int netmask_num)
+struct acl_s {
+        acl_access_t access;
+        struct hostspec h;
+};
+
+
+/**
+ * If the access list has not been set up, create it.
+ */
+static int init_access_list(acl_list_t *access_list)
 {
-	static in_addr_t netmasks[] = {
-		0x00000000, 0x80000000, 0xc0000000, 0xe0000000,
-		0xf8000000, 0xfc000000, 0xfe000000, 0xff000000,
-		0xff800000, 0xffc00000, 0xffe00000, 0xfff00000,
-		0xfff00000, 0xfff80000, 0xfffc0000, 0xfffe0000,
-		0xffff0000, 0xffff8000, 0xffffc000, 0xffffe000,
-		0xfffff000, 0xfffff800, 0xfffffc00, 0xfffffe00,
-		0xffffff00, 0xffffff80, 0xffffffc0, 0xffffffe0,
-		0xfffffff0, 0xfffffff8, 0xfffffffc, 0xfffffffe,
-		0xffffffff
-	};
+        if (!*access_list) {
+                *access_list = sblist_new(sizeof(struct acl_s), 16);
+                if (!*access_list) {
+                        log_message (LOG_ERR,
+                                     "Unable to allocate memory for access list");
+                        return -1;
+                }
+        }
 
-	assert(netmask_num >= 0 && netmask_num <= 32);
-
-	return htonl(netmasks[netmask_num]);
+        return 0;
 }
 
 /*
@@ -66,162 +68,229 @@ static in_addr_t make_netmask(int netmask_num)
  *    -1 on failure
  *     0 otherwise.
  */
-int insert_acl(char *location, acl_access_t access_type)
+int
+insert_acl (char *location, acl_access_t access_type, acl_list_t *access_list)
 {
-	size_t i;
-	struct acl_s **rev_acl_ptr, *acl_ptr, *new_acl_ptr;
-	char *nptr;
+        struct acl_s acl;
 
-	assert(location != NULL);
+        assert (location != NULL);
 
-	/*
-	 * First check to see if the location is a string or numeric.
-	 */
-	for (i = 0; location[i] != '\0'; i++) {
-		/*
-		 * Numeric strings can not contain letters, so test on it.
-		 */
-		if (isalpha((unsigned char)location[i])) {
-			break;
-		}
-	}
-
-	/*
-	 * Add a new ACL to the list.
-	 */
-	rev_acl_ptr = &access_list;
-	acl_ptr = access_list;
-	while (acl_ptr) {
-		rev_acl_ptr = &acl_ptr->next;
-		acl_ptr = acl_ptr->next;
-	}
-	new_acl_ptr = safemalloc(sizeof(struct acl_s));
-	if (!new_acl_ptr) {
+        if (init_access_list(access_list) != 0)
                 return -1;
-	}
-	
-	new_acl_ptr->acl_access = access_type;
-	
-	if (location[i] == '\0') {
-		DEBUG2("ACL \"%s\" is a number.", location);
 
         /*
-		 * We did not break early, so this a numeric location.
-		 * Check for a netmask.
+         * Start populating the access control structure.
          */
-		new_acl_ptr->type = ACL_NUMERIC;
-		nptr = strchr(location, '/');
-		if (nptr) {
-			*nptr++ = '\0';
-
-			new_acl_ptr->netmask = strtol(nptr, NULL, 10);
-			if (new_acl_ptr->netmask < 0 || new_acl_ptr->netmask > 32) {
-				safefree(new_acl_ptr);
+        memset (&acl, 0, sizeof (struct acl_s));
+        acl.access = access_type;
+        if(hostspec_parse(location, &acl.h) || acl.h.type == HST_NONE)
                 return -1;
-			}
-		} else {
-			new_acl_ptr->netmask = 32;
-		}
-	} else {
-		DEBUG2("ACL \"%s\" is a string.", location);
-
-		new_acl_ptr->type = ACL_STRING;
-		new_acl_ptr->netmask = 32;
-	}
-
-	new_acl_ptr->location = strdup(location);
-	if (!new_acl_ptr->location) {
-		safefree(new_acl_ptr);
-		return -1;
-	}
-
-	*rev_acl_ptr = new_acl_ptr;
-	new_acl_ptr->next = acl_ptr;
 
+        if(!sblist_add(*access_list, &acl)) return -1;
         return 0;
 }
 
 /*
- * Checks where file descriptor is allowed.
+ * This function is called whenever a "string" access control is found in
+ * the ACL.  From here we do both a text based string comparison, along with
+ * a reverse name lookup comparison of the IP addresses.
+ *
+ * Return: 0 if host is denied
+ *         1 if host is allowed
+ *        -1 if no tests match, so skip
+ */
+static int
+acl_string_processing (struct acl_s *acl, const char *ip_address,
+                       union sockaddr_union *addr, char *string_addr)
+{
+        int match;
+        struct addrinfo hints, *res, *ressave;
+        size_t test_length, match_length;
+        char ipbuf[512];
+
+        assert (acl && acl->h.type == HST_STRING);
+        assert (ip_address && strlen (ip_address) > 0);
+
+        /*
+         * If the first character of the ACL string is a period, we need to
+         * do a string based test only; otherwise, we can do a reverse
+         * lookup test as well.
+         */
+        if (acl->h.address.string[0] != '.') {
+                memset (&hints, 0, sizeof (struct addrinfo));
+                hints.ai_family = AF_UNSPEC;
+                hints.ai_socktype = SOCK_STREAM;
+                if (getaddrinfo (acl->h.address.string, NULL, &hints, &res) != 0)
+                        goto STRING_TEST;
+
+                ressave = res;
+
+                match = FALSE;
+                do {
+                        get_ip_string (res->ai_addr, ipbuf, sizeof (ipbuf));
+                        if (strcmp (ip_address, ipbuf) == 0) {
+                                match = TRUE;
+                                break;
+                        }
+                } while ((res = res->ai_next) != NULL);
+
+                freeaddrinfo (ressave);
+
+                if (match) {
+                        if (acl->access == ACL_DENY)
+                                return 0;
+                        else
+                                return 1;
+                }
+        }
+
+STRING_TEST:
+        if(string_addr[0] == 0) {
+                /* only do costly hostname resolution when it is absolutely needed,
+                   and only once */
+                if(getnameinfo ((void *) addr, sizeof (*addr),
+                                string_addr, HOSTNAME_LENGTH, NULL, 0, 0) != 0)
+                        return -1;
+        }
+
+        test_length = strlen (string_addr);
+        match_length = strlen (acl->h.address.string);
+
+        /*
+         * If the string length is shorter than AC string, return a -1 so
+         * that the "driver" will skip onto the next control in the list.
+         */
+        if (test_length < match_length)
+                return -1;
+
+        if (strcasecmp
+            (string_addr + (test_length - match_length),
+             acl->h.address.string) == 0) {
+                if (acl->access == ACL_DENY)
+                        return 0;
+                else
+                        return 1;
+        }
+
+        /* Indicate that no tests succeeded, so skip to next control. */
+        return -1;
+}
+
+/*
+ * Compare the supplied numeric IP address with the supplied ACL structure.
+ *
+ * Return:
+ *   1  IP address is allowed
+ *   0  IP address is denied
+ *  -1  neither allowed nor denied.
+ */
+static int check_numeric_acl (const struct acl_s *acl, uint8_t addr[IPV6_LEN])
+{
+        uint8_t x, y;
+        int i;
+
+        assert (acl && acl->h.type == HST_NUMERIC);
+
+        for (i = 0; i != IPV6_LEN; ++i) {
+                x = addr[i] & acl->h.address.ip.mask[i];
+                y = acl->h.address.ip.network[i];
+
+                /* If x and y don't match, the IP addresses don't match */
+                if (x != y)
+                        return -1;
+        }
+
+        /* The addresses match, return the permission */
+        return (acl->access == ACL_ALLOW);
+}
+
+/*
+ * Checks whether a connection is allowed.
  *
  * Returns:
  *     1 if allowed
  *     0 if denied
- *    -1 if error
  */
-int check_acl(int fd)
+int check_acl (const char *ip, union sockaddr_union *addr, acl_list_t access_list)
 {
-	struct acl_s *aclptr;
-	char ip_address[PEER_IP_LENGTH];
-	char string_address[PEER_STRING_LENGTH];
+        struct acl_s *acl;
+        int perm = 0, is_numeric_addr;
+        size_t i;
+        char string_addr[HOSTNAME_LENGTH];
+        uint8_t numeric_addr[IPV6_LEN];
 
-	assert(fd >= 0);
+        assert (ip != NULL);
+        assert (addr != NULL);
+
+        string_addr[0] = 0;
 
         /*
          * If there is no access list allow everything.
          */
-	aclptr = access_list;
-	if (!aclptr)
+        if (!access_list)
                 return 1;
 
-	/*
-	 * Get the IP address and the string domain.
-	 */
-	getpeer_ip(fd, ip_address);
-	getpeer_string(fd, string_address);
+        is_numeric_addr = (full_inet_pton (ip, &numeric_addr) > 0);
 
-	while (aclptr) {
-		if (aclptr->type == ACL_STRING) {
-			size_t test_length = strlen(string_address);
-			size_t match_length = strlen(aclptr->location);
+        for (i = 0; i < sblist_getsize (access_list); ++i) {
+                acl = sblist_get (access_list, i);
+                switch (acl->h.type) {
+                case HST_STRING:
+                        perm = acl_string_processing (acl, ip, addr, string_addr);
+                        break;
 
-			if (test_length < match_length) {
-				aclptr = aclptr->next;
+                case HST_NUMERIC:
+                        if (ip[0] == '\0')
                                 continue;
-			}
 
-			if (strcasecmp(string_address + (test_length - match_length), aclptr->location) == 0) {
-				if (aclptr->acl_access == ACL_DENY) {
-					log_message(LOG_NOTICE, "Unauthorized access from \"%s\"", string_address);
-					return 0;
-				} else {
-					return 1;
-				}
-			}
-		} else {
-			struct in_addr test_addr, match_addr;
-			in_addr_t netmask_addr;
+                        perm = is_numeric_addr
+                               ? check_numeric_acl (acl, numeric_addr)
+                               : -1;
+                        break;
 
-			if (ip_address[0] == 0) {
-				aclptr = aclptr->next;
-				continue;
-			}
-
-			inet_aton(ip_address, &test_addr);
-			inet_aton(aclptr->location, &match_addr);
-
-			netmask_addr = make_netmask(aclptr->netmask);
-
-			if ((test_addr.s_addr & netmask_addr) == (match_addr.s_addr & netmask_addr)) {
-				if (aclptr->acl_access == ACL_DENY) {
-					log_message(LOG_NOTICE, "Unauthorized access from [%s].", ip_address);
-					return 0;
-				} else {
-					return 1;
-				}
-			}
+                case HST_NONE:
+                        perm = -1;
+                        break;
                 }
 
                 /*
-		 * Dropped through... go on to the next one.
+                 * Check the return value too see if the IP address is
+                 * allowed or denied.
                  */
-		aclptr = aclptr->next;
+                if (perm == 0)
+                        break;
+                else if (perm == 1)
+                        return perm;
         }
 
-
         /*
          * Deny all connections by default.
          */
-	log_message(LOG_NOTICE, "Unauthorized connection from \"%s\" [%s].", string_address, ip_address);
+        log_message (LOG_NOTICE, "Unauthorized connection from \"%s\".",
+                     ip);
         return 0;
 }
+
+void flush_access_list (acl_list_t access_list)
+{
+        struct acl_s *acl;
+        size_t i;
+
+        if (!access_list) {
+                return;
+        }
+
+        /*
+         * We need to free allocated data hanging off the acl entries
+         * before we can free the acl entries themselves.
+         * A hierarchical memory system would be great...
+         */
+        for (i = 0; i < sblist_getsize (access_list); ++i) {
+                acl = sblist_get (access_list, i);
+                if (acl->h.type == HST_STRING) {
+                        safefree (acl->h.address.string);
+                }
+        }
+
+        sblist_free (access_list);
+}

src/acl.h

@@ -1,26 +1,36 @@
-/* $Id: acl.h,v 1.2 2001-06-02 02:07:34 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@flarenet.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 'acl.c' for detailed information. */
+
 #ifndef TINYPROXY_ACL_H
 #define TINYPROXY_ACL_H
 
-typedef enum { ACL_ALLOW, ACL_DENY } acl_access_t;
+#include "sblist.h"
+#include "sock.h"
 
-extern int insert_acl(char *location, acl_access_t access_type);
-extern int check_acl(int fd);
+typedef enum { ACL_ALLOW, ACL_DENY } acl_access_t;
+typedef sblist* acl_list_t;
+
+extern int insert_acl (char *location, acl_access_t access_type,
+                       acl_list_t *access_list);
+extern int check_acl (const char *ip_address, union sockaddr_union *addr,
+                      acl_list_t access_list);
+extern void flush_access_list (acl_list_t access_list);
 
 #endif

src/anonymous.c

@@ -1,68 +1,71 @@
-/* $Id: anonymous.c,v 1.8 2001-11-05 15:24:42 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. The headers are stored in a Ternary
- * Search Tree. The initial code came from Dr. Dobb's Journal, April 1998
- * "Ternary Search Trees", Jon Bentley and Bob Sedgewick, pg 20-25.
+ * 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@flarenet.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.
  */
 
-#include "tinyproxy.h"
+/* Handles insertion and searches for headers which should be let through
+ * when the anonymous feature is turned on.
+ */
+
+#include "main.h"
 
 #include "anonymous.h"
+#include "hsearch.h"
+#include "heap.h"
 #include "log.h"
-#include "ternary.h"
-#include "tinyproxy.h"
+#include "conf.h"
+
+short int is_anonymous_enabled (struct config_s *conf)
+{
+        return (conf->anonymous_map != NULL) ? 1 : 0;
+}
 
-static TERNARY anonymous_tree = 0;
 /*
- * Keep track of whether the Anonymous filtering is enabled. Off by
- * default.
+ * Search for the header.  This function returns a positive value greater than
+ * zero if the string was found, zero if it wasn't and negative upon error.
  */
-static short int anonymous_is_enabled = 0;
-
-inline short int is_anonymous_enabled(void)
+int anonymous_search (struct config_s *conf, const char *s)
 {
-	return anonymous_is_enabled;
+        assert (s != NULL);
+        assert (conf->anonymous_map != NULL);
+
+        return !!htab_find (conf->anonymous_map, s);
 }
 
-int anonymous_search(char *s)
-{
-	assert(s != NULL);
-	assert(anonymous_is_enabled == 1);
-	assert(anonymous_tree > 0);
-
-	return ternary_search(anonymous_tree, s, NULL);
-}
-
-int anonymous_insert(char *s)
-{
-	assert(s != NULL);
-
-	/*
-	 * If this is the first time we're inserting a word, create the
-	 * search tree.
+/*
+ * Insert a new header.
+ *
+ * Return -1 if there is an error, otherwise a 0 is returned if the insert was
+ * successful.
  */
-	if (!anonymous_is_enabled) {
-		anonymous_tree = ternary_new();
-		if (anonymous_tree < 0)
+int anonymous_insert (struct config_s *conf, char *s)
+{
+        assert (s != NULL);
+
+        if (!conf->anonymous_map) {
+                conf->anonymous_map = htab_create (32);
+                if (!conf->anonymous_map)
                         return -1;
-
-		anonymous_is_enabled = 1;
-
-		DEBUG1("Starting the Anonymous header subsytem.");
         }
 
-	return ternary_insert(anonymous_tree, s, NULL);
+        if (htab_find (conf->anonymous_map, s)) {
+                /* The key was already found. */
+                return 0;
+        }
+
+        /* Insert the new key */
+        return htab_insert (conf->anonymous_map, s, HTV_N(1)) ? 0 : -1;
 }

src/anonymous.h

@@ -1,27 +1,28 @@
-/* $Id: anonymous.h,v 1.5 2001-08-26 21:07:27 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@flarenet.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 'anonymous.c' for detailed information. */
+
 #ifndef _TINYPROXY_ANONYMOUS_H_
 #define _TINYPROXY_ANONYMOUS_H_
 
-#include "ternary.h"
-
-extern short int is_anonymous_enabled(void);
-extern int anonymous_search(char *s);
-extern int anonymous_insert(char *s);
+extern short int is_anonymous_enabled (struct config_s *conf);
+extern int anonymous_search (struct config_s *conf, const char *s);
+extern int anonymous_insert (struct config_s *conf, char *s);
 
 #endif

src/base64.c

@@ -0,0 +1,57 @@
+/* tinyproxy - A fast light-weight HTTP proxy
+ * this file Copyright (C) 2016-2018 rofl0r
+ *
+ * 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.
+ */
+
+#include "base64.h"
+
+static const char base64_tbl[64] =
+	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+/*
+   rofl0r's base64 impl (taken from libulz)
+   takes count bytes from src, writing base64 encoded string into dst.
+   dst needs to be at least BASE64ENC_BYTES(count) + 1 bytes in size.
+   the string in dst will be zero-terminated.
+   */
+void base64enc(char *dst, const void* src, size_t count)
+{
+	unsigned const char *s = src;
+	char* d = dst;
+	while(count) {
+		int i = 0,  n = *s << 16;
+		s++;
+		count--;
+		if(count) {
+			n |= *s << 8;
+			s++;
+			count--;
+			i++;
+		}
+		if(count) {
+			n |= *s;
+			s++;
+			count--;
+			i++;
+		}
+		*d++ = base64_tbl[(n >> 18) & 0x3f];
+		*d++ = base64_tbl[(n >> 12) & 0x3f];
+		*d++ = i ? base64_tbl[(n >> 6) & 0x3f] : '=';
+		*d++ = i == 2 ? base64_tbl[n & 0x3f] : '=';
+	}
+	*d = 0;
+}
+

src/base64.h

@@ -0,0 +1,29 @@
+/* tinyproxy - A fast light-weight HTTP proxy
+ * this file Copyright (C) 2016-2018 rofl0r
+ *
+ * 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.
+ */
+
+#ifndef TINYPROXY_BASE64_H
+#define TINYPROXY_BASE64_H
+
+#include <stddef.h>
+
+/* calculates number of bytes base64-encoded stream of N bytes will take. */
+#define BASE64ENC_BYTES(N) (((N+2)/3)*4)
+void base64enc(char *dst, const void* src, size_t count);
+
+#endif
+

src/basicauth.c

@@ -0,0 +1,97 @@
+/* tinyproxy - A fast light-weight HTTP proxy
+ * This file: Copyright (C) 2016-2017 rofl0r
+ *
+ * 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.
+ */
+
+#include "main.h"
+#include "basicauth.h"
+
+#include "conns.h"
+#include "heap.h"
+#include "html-error.h"
+#include "log.h"
+#include "conf.h"
+#include "base64.h"
+
+/*
+ * Create basic-auth token in buf.
+ * Returns strlen of token on success,
+ * -1 if user/pass missing
+ * 0 if user/pass too long
+ */
+ssize_t basicauth_string(const char *user, const char *pass,
+	char *buf, size_t bufsize)
+{
+	char tmp[256+2];
+	int l;
+	if (!user || !pass) return -1;
+	l = snprintf(tmp, sizeof tmp, "%s:%s", user, pass);
+	if (l < 0 || l >= (ssize_t) sizeof tmp) return 0;
+	if (bufsize < (BASE64ENC_BYTES((unsigned)l) + 1)) return 0;
+	base64enc(buf, tmp, l);
+	return BASE64ENC_BYTES(l);
+}
+
+/*
+ * Add entry to the basicauth list
+ */
+void basicauth_add (sblist *authlist,
+	const char *user, const char *pass)
+{
+	char b[BASE64ENC_BYTES((256+2)-1) + 1], *s;
+	ssize_t ret;
+
+        ret = basicauth_string(user, pass, b, sizeof b);
+        if (ret == -1) {
+                log_message (LOG_WARNING,
+                             "Illegal basicauth rule: missing user or pass");
+                return;
+        } else if (ret == 0) {
+                log_message (LOG_WARNING,
+                             "User / pass in basicauth rule too long");
+                return;
+        }
+
+        if (!(s = safestrdup(b)) || !sblist_add(authlist, &s)) {
+                safefree(s);
+                log_message (LOG_ERR,
+                             "Unable to allocate memory in basicauth_add()");
+                return;
+        }
+
+        log_message (LOG_INFO,
+                     "Added basic auth user : %s", user);
+}
+
+/*
+ * Check if a user/password combination (encoded as base64)
+ * is in the basicauth list.
+ * return 1 on success, 0 on failure.
+ */
+int basicauth_check (sblist *authlist, const char *authstring)
+{
+        size_t i;
+        char** entry;
+
+        if (!authlist) return 0;
+
+        for (i = 0; i < sblist_getsize(authlist); i++) {
+                entry = sblist_get (authlist, i);
+                if (entry && strcmp (authstring, *entry) == 0)
+                        return 1;
+        }
+	return 0;
+}

src/basicauth.h

@@ -0,0 +1,35 @@
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2005 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 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 'basicauth.c' for detailed information. */
+
+#ifndef TINYPROXY_BASICAUTH_H
+#define TINYPROXY_BASICAUTH_H
+
+#include <stddef.h>
+#include "sblist.h"
+
+extern ssize_t basicauth_string(const char *user, const char *pass,
+	char *buf, size_t bufsize);
+
+extern void basicauth_add (sblist *authlist,
+	const char *user, const char *pass);
+
+extern int basicauth_check (sblist *authlist, const char *authstring);
+
+#endif

src/buffer.c

@@ -1,31 +1,35 @@
-/* $Id: buffer.c,v 1.15 2001-11-05 15:23:05 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 dynamicly. However,
+ * 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  Robert James Kaes (rjkaes@flarenet.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"
+#include "main.h"
 
 #include "buffer.h"
+#include "heap.h"
 #include "log.h"
-#include "utils.h"
 
 #define BUFFER_HEAD(x) (x)->head
 #define BUFFER_TAIL(x) (x)->tail
@@ -38,22 +42,39 @@ struct bufline_s {
 };
 
 /*
- * Take a string of data and a length and make a new line which can be added
- * to the buffer. We don't make a copy of the data, but simply copy the
- * pointer into the structure. In other words, when you insert data into the
- * buffer, the buffer becomes responsible for freeing it.
+ * The buffer structure points to the beginning and end of the buffer list
+ * (and includes the total size)
  */
-static struct bufline_s *makenewline(unsigned char *data, size_t length)
+struct buffer_s {
+        struct bufline_s *head; /* top of the buffer */
+        struct bufline_s *tail; /* bottom of the buffer */
+        size_t size;            /* total size of the buffer */
+};
+
+/*
+ * Take a string of data and a length and make a new line which can be added
+ * to the buffer. The data IS copied, so make sure if you allocated your
+ * data buffer on the heap, delete it because you now have TWO copies.
+ */
+static struct bufline_s *makenewline (unsigned char *data, size_t length)
 {
         struct bufline_s *newline;
 
-	assert(data != NULL);
-	assert(length > 0);
+        assert (data != NULL);
+        assert (length > 0);
 
-	if (!(newline = safemalloc(sizeof(struct bufline_s))))
+        newline = (struct bufline_s *) safemalloc (sizeof (struct bufline_s));
+        if (!newline)
                 return NULL;
 
-	newline->string = data;
+        newline->string = (unsigned char *) safemalloc (length);
+        if (!newline->string) {
+                safefree (newline);
+                return NULL;
+        }
+
+        memcpy (newline->string, data, length);
+
         newline->next = NULL;
         newline->length = length;
 
@@ -66,27 +87,28 @@ static struct bufline_s *makenewline(unsigned char *data, size_t length)
 /*
  * Free the allocated buffer line
  */
-static void free_line(struct bufline_s *line)
+static void free_line (struct bufline_s *line)
 {
-	assert(line != NULL);
+        assert (line != NULL);
 
         if (!line)
                 return;
 
         if (line->string)
-		safefree(line->string);
+                safefree (line->string);
 
-	safefree(line);
+        safefree (line);
 }
 
 /*
  * Create a new buffer
  */
-struct buffer_s *new_buffer(void)
+struct buffer_s *new_buffer (void)
 {
         struct buffer_s *buffptr;
 
-	if (!(buffptr = safemalloc(sizeof(struct buffer_s))))
+        buffptr = (struct buffer_s *) safemalloc (sizeof (struct buffer_s));
+        if (!buffptr)
                 return NULL;
 
         /*
@@ -94,8 +116,8 @@ struct buffer_s *new_buffer(void)
          * pointers to NULL since they can't possibly point anywhere at the
          * moment.
          */
-	BUFFER_HEAD(buffptr) = BUFFER_TAIL(buffptr) = NULL;
-	BUFFER_SIZE(buffptr) = 0;
+        BUFFER_HEAD (buffptr) = BUFFER_TAIL (buffptr) = NULL;
+        buffptr->size = 0;
 
         return buffptr;
 }
@@ -103,54 +125,63 @@ struct buffer_s *new_buffer(void)
 /*
  * Delete all the lines in the buffer and the buffer itself
  */
-void delete_buffer(struct buffer_s *buffptr)
+void delete_buffer (struct buffer_s *buffptr)
 {
         struct bufline_s *next;
 
-	assert(buffptr != NULL);
+        assert (buffptr != NULL);
 
-	while (BUFFER_HEAD(buffptr)) {
-		next = BUFFER_HEAD(buffptr)->next;
-		free_line(BUFFER_HEAD(buffptr));
-		BUFFER_HEAD(buffptr) = next;
+        while (BUFFER_HEAD (buffptr)) {
+                next = BUFFER_HEAD (buffptr)->next;
+                free_line (BUFFER_HEAD (buffptr));
+                BUFFER_HEAD (buffptr) = next;
         }
 
-	safefree(buffptr);
+        safefree (buffptr);
 }
 
 /*
- * Push a new line on to the end of the buffer
+ * Return the current size of the buffer.
  */
-static int add_to_buffer(struct buffer_s *buffptr, unsigned char *data,
-			 size_t length)
+size_t buffer_size (struct buffer_s *buffptr)
+{
+        return buffptr->size;
+}
+
+/*
+ * Push a new line on to the end of the buffer.
+ */
+int add_to_buffer (struct buffer_s *buffptr, unsigned char *data, size_t length)
 {
         struct bufline_s *newline;
 
-	assert(buffptr != NULL);
-	assert(data != NULL);
-	assert(length > 0);
+        assert (buffptr != NULL);
+        assert (data != NULL);
+        assert (length > 0);
 
         /*
          * Sanity check here. A buffer with a non-NULL head pointer must
          * have a size greater than zero, and vice-versa.
          */
-	if (BUFFER_HEAD(buffptr) == NULL)
-		assert(BUFFER_SIZE(buffptr) == 0);
+        if (BUFFER_HEAD (buffptr) == NULL)
+                assert (buffptr->size == 0);
         else
-		assert(BUFFER_SIZE(buffptr) > 0);
+                assert (buffptr->size > 0);
 
         /*
          * Make a new line so we can add it to the buffer.
          */
-	if (!(newline = makenewline(data, length)))
+        if (!(newline = makenewline (data, length)))
                 return -1;
 
-	if (BUFFER_SIZE(buffptr) == 0)
-		BUFFER_HEAD(buffptr) = BUFFER_TAIL(buffptr) = newline;
-	else
-		BUFFER_TAIL(buffptr) = (BUFFER_TAIL(buffptr)->next = newline);
+        if (buffptr->size == 0)
+                BUFFER_HEAD (buffptr) = BUFFER_TAIL (buffptr) = newline;
+        else {
+                BUFFER_TAIL (buffptr)->next = newline;
+                BUFFER_TAIL (buffptr) = newline;
+        }
 
-	BUFFER_SIZE(buffptr) += length;
+        buffptr->size += length;
 
         return 0;
 }
@@ -158,15 +189,15 @@ static int add_to_buffer(struct buffer_s *buffptr, unsigned char *data,
 /*
  * Remove the first line from the top of the buffer
  */
-static struct bufline_s *remove_from_buffer(struct buffer_s *buffptr)
+static struct bufline_s *remove_from_buffer (struct buffer_s *buffptr)
 {
         struct bufline_s *line;
 
-	assert(buffptr != NULL);
-	assert(BUFFER_HEAD(buffptr) != NULL);
+        assert (buffptr != NULL);
+        assert (BUFFER_HEAD (buffptr) != NULL);
 
-	line = BUFFER_HEAD(buffptr);
-	BUFFER_HEAD(buffptr) = line->next;
+        line = BUFFER_HEAD (buffptr);
+        BUFFER_HEAD (buffptr) = line->next;
 
         buffptr->size -= line->length;
 
@@ -178,42 +209,36 @@ static struct bufline_s *remove_from_buffer(struct buffer_s *buffptr)
  * Takes a connection and returns the number of bytes read.
  */
 #define READ_BUFFER_SIZE (1024 * 2)
-ssize_t readbuff(int fd, struct buffer_s *buffptr)
+ssize_t read_buffer (int fd, struct buffer_s * buffptr)
 {
         ssize_t bytesin;
         unsigned char *buffer;
-	unsigned char *newbuffer;
 
-	assert(fd >= 0);
-	assert(buffptr != NULL);
+        assert (fd >= 0);
+        assert (buffptr != NULL);
 
-	if (BUFFER_SIZE(buffptr) >= READ_BUFFER_SIZE)
+        /*
+         * Don't allow the buffer to grow larger than MAXBUFFSIZE
+         */
+        if (buffptr->size >= MAXBUFFSIZE)
                 return 0;
 
-	buffer = safemalloc(READ_BUFFER_SIZE);
-	if (!buffer)
-		return 0;
+        buffer = (unsigned char *) safemalloc (READ_BUFFER_SIZE);
+        if (!buffer) {
+                return -ENOMEM;
+        }
 
-	bytesin = read(fd, buffer, READ_BUFFER_SIZE - BUFFER_SIZE(buffptr));
+        bytesin = read (fd, buffer, READ_BUFFER_SIZE);
 
         if (bytesin > 0) {
-		newbuffer = saferealloc(buffer, bytesin);
-		if (!newbuffer) {
-			safefree(buffer);
-			return 0;
+                if (add_to_buffer (buffptr, buffer, bytesin) < 0) {
+                        log_message (LOG_ERR,
+                                     "readbuff: add_to_buffer() error.");
+                        bytesin = -1;
                 }
-
-		if (add_to_buffer(buffptr, newbuffer, bytesin) < 0) {
-			log_message(LOG_ERR, "readbuff: add_to_buffer() error.");
-			return -1;
-		}
-
-		return bytesin;
-	} else {
-		safefree(buffer);
-		if (bytesin == 0) {
+        } else if (bytesin == 0) {
                 /* connection was closed by client */
-			return -1;
+                bytesin = -1;
         } else {
                 switch (errno) {
 #ifdef EWOULDBLOCK
@@ -224,41 +249,49 @@ ssize_t readbuff(int fd, struct buffer_s *buffptr)
 #  endif
 #endif
                 case EINTR:
-				return 0;
+                        bytesin = 0;
+                        break;
                 default:
-				log_message(LOG_ERR, "readbuff: recv() error \"%s\" on file descriptor %d", strerror(errno), fd);
-				return -1;
-			}
+                        log_message (LOG_ERR,
+                                     "read_buffer: read() failed on fd %d: %s",
+                                     fd, strerror(errno));
+                        bytesin = -1;
+                        break;
                 }
         }
+
+        safefree (buffer);
+        return bytesin;
 }
 
 /*
  * Write the bytes in the buffer to the socket.
  * Takes a connection and returns the number of bytes written.
  */
-ssize_t writebuff(int fd, struct buffer_s *buffptr)
+ssize_t write_buffer (int fd, struct buffer_s * buffptr)
 {
         ssize_t bytessent;
         struct bufline_s *line;
 
-	assert(fd >= 0);
-	assert(buffptr != NULL);
+        assert (fd >= 0);
+        assert (buffptr != NULL);
 
-	if (BUFFER_SIZE(buffptr) == 0)
+        if (buffptr->size == 0)
                 return 0;
 
         /* Sanity check. It would be bad to be using a NULL pointer! */
-	assert(BUFFER_HEAD(buffptr) != NULL);
+        assert (BUFFER_HEAD (buffptr) != NULL);
+        line = BUFFER_HEAD (buffptr);
 
-	line = BUFFER_HEAD(buffptr);
-	bytessent = write(fd, line->string + line->pos, line->length - line->pos);
+        bytessent =
+            send (fd, line->string + line->pos, line->length - line->pos,
+                  MSG_NOSIGNAL);
 
         if (bytessent >= 0) {
                 /* bytes sent, adjust buffer */
                 line->pos += bytessent;
                 if (line->pos == line->length)
-			free_line(remove_from_buffer(buffptr));
+                        free_line (remove_from_buffer (buffptr));
                 return bytessent;
         } else {
                 switch (errno) {
@@ -273,10 +306,15 @@ ssize_t writebuff(int fd, struct buffer_s *buffptr)
                         return 0;
                 case ENOBUFS:
                 case ENOMEM:
-			log_message(LOG_ERR, "writebuff: write() error [NOBUFS/NOMEM] \"%s\" on file descriptor %d", strerror(errno), fd);
+                        log_message (LOG_ERR,
+                                     "writebuff: write() error [NOBUFS/NOMEM] \"%s\" on "
+                                     "file descriptor %d", strerror (errno),
+                                     fd);
                         return 0;
                 default:
-			log_message(LOG_ERR, "writebuff: write() error \"%s\" on file descriptor %d", strerror(errno), fd);
+                        log_message (LOG_ERR,
+                                     "writebuff: write() error \"%s\" on file descriptor %d",
+                                     strerror (errno), fd);
                         return -1;
                 }
         }

src/buffer.h

@@ -1,42 +1,40 @@
-/* $Id: buffer.h,v 1.5 2001-11-05 15:23:05 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@flarenet.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 'buffer.c' for detailed information. */
+
 #ifndef _TINYPROXY_BUFFER_H_
 #define _TINYPROXY_BUFFER_H_
 
-/*
- * This structure contains the total size of a buffer, plus pointers to the
- * head and tail of the buffer.
- */
-struct buffer_s {
-	struct bufline_s *head;	/* top of the buffer */
-	struct bufline_s *tail;	/* bottom of the buffer */
-	size_t size;	/* total size of the buffer */
-};
+/* Forward declaration */
+struct buffer_s;
+
+extern struct buffer_s *new_buffer (void);
+extern void delete_buffer (struct buffer_s *buffptr);
+extern size_t buffer_size (struct buffer_s *buffptr);
 
 /*
- * Return the size of a buffer (pass a pointer to a buffer_s structure.)
+ * Add a new line to the given buffer. The data IS copied into the structure.
  */
-#define BUFFER_SIZE(x) (x)->size
+extern int add_to_buffer (struct buffer_s *buffptr, unsigned char *data,
+                          size_t length);
 
-extern struct buffer_s *new_buffer(void);
-extern void delete_buffer(struct buffer_s *buffptr);
-
-extern ssize_t readbuff(int fd, struct buffer_s *buffptr);
-extern ssize_t writebuff(int fd, struct buffer_s *buffptr);
+extern ssize_t read_buffer (int fd, struct buffer_s *buffptr);
+extern ssize_t write_buffer (int fd, struct buffer_s *buffptr);
 
 #endif /* __BUFFER_H_ */

src/child.c

@@ -0,0 +1,316 @@
+/* tinyproxy - A fast light-weight HTTP proxy
+ * 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 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 "main.h"
+
+#include "child.h"
+#include "daemon.h"
+#include "filter.h"
+#include "heap.h"
+#include "log.h"
+#include "reqs.h"
+#include "sock.h"
+#include "utils.h"
+#include "conf.h"
+#include "sblist.h"
+#include "loop.h"
+#include "conns.h"
+#include "mypoll.h"
+#include <pthread.h>
+
+static sblist* listen_fds;
+
+struct client {
+        union sockaddr_union addr;
+};
+
+struct child {
+	pthread_t thread;
+	struct client client;
+	struct conn_s conn;
+	volatile int done;
+};
+
+static void* child_thread(void* data)
+{
+	struct child *c = data;
+	handle_connection (&c->conn, &c->client.addr);
+	c->done = 1;
+	return NULL;
+}
+
+static sblist *childs;
+
+static void collect_threads(void)
+{
+	size_t i;
+	for (i = 0; i < sblist_getsize(childs); ) {
+		struct child *c = *((struct child**)sblist_get(childs, i));
+		if (c->done) {
+			pthread_join(c->thread, 0);
+			sblist_delete(childs, i);
+			safefree(c);
+		} else i++;
+	}
+}
+
+/*
+ * This is the main loop accepting new connections.
+ */
+void child_main_loop (void)
+{
+        int connfd;
+        union sockaddr_union cliaddr_storage;
+        struct sockaddr *cliaddr = (void*) &cliaddr_storage;
+        socklen_t clilen;
+        int nfds = sblist_getsize(listen_fds);
+        pollfd_struct *fds = safecalloc(nfds, sizeof *fds);
+        ssize_t i;
+        int ret, listenfd, was_full = 0;
+        pthread_attr_t *attrp, attr;
+        struct child *child;
+
+        childs = sblist_new(sizeof (struct child*), config->maxclients);
+
+        for (i = 0; i < nfds; i++) {
+                int *fd = sblist_get(listen_fds, i);
+                fds[i].fd = *fd;
+                fds[i].events |= MYPOLL_READ;
+        }
+
+        /*
+         * We have to wait for connections on multiple fds,
+         * so use select/poll/whatever.
+         */
+        while (!config->quit) {
+
+                collect_threads();
+
+                if (sblist_getsize(childs) >= config->maxclients) {
+                        if (!was_full)
+                                log_message (LOG_WARNING,
+                                             "Maximum number of connections reached. "
+                                             "Refusing new connections.");
+                        was_full = 1;
+                        usleep(16);
+                        continue;
+                }
+
+                was_full = 0;
+                listenfd = -1;
+
+                /* Handle log rotation if it was requested */
+                if (received_sighup) {
+
+                        reload_config (1);
+
+#ifdef FILTER_ENABLE
+                        filter_reload ();
+#endif /* FILTER_ENABLE */
+
+                        received_sighup = FALSE;
+                }
+
+                ret = mypoll(fds, nfds, -1);
+
+                if (ret == -1) {
+                        if (errno == EINTR) {
+                                continue;
+                        }
+                        log_message (LOG_ERR, "error calling " SELECT_OR_POLL ": %s",
+                                     strerror(errno));
+                        continue;
+                } else if (ret == 0) {
+                        log_message (LOG_WARNING, "Strange: " SELECT_OR_POLL " returned 0 "
+                                     "but we did not specify a timeout...");
+                        continue;
+                }
+
+                for (i = 0; i < nfds; i++) {
+                        if (fds[i].revents & MYPOLL_READ) {
+                                /*
+                                 * only accept the connection on the first
+                                 * fd that we find readable. - fair?
+                                 */
+                                listenfd = fds[i].fd;
+                                break;
+                        }
+                }
+
+                if (listenfd == -1) {
+                        log_message(LOG_WARNING, "Strange: None of our listen "
+                                    "fds was readable after " SELECT_OR_POLL);
+                        continue;
+                }
+
+                /*
+                 * We have a socket that is readable.
+                 * Continue handling this connection.
+                 */
+
+                clilen = sizeof(cliaddr_storage);
+                connfd = accept (listenfd, cliaddr, &clilen);
+
+
+                /*
+                 * Make sure no error occurred...
+                 */
+                if (connfd < 0) {
+                        log_message (LOG_ERR,
+                                     "Accept returned an error (%s) ... retrying.",
+                                     strerror (errno));
+                        continue;
+                }
+
+                child = safecalloc(1, sizeof(struct child));
+                if (!child) {
+oom:
+                        close(connfd);
+                        log_message (LOG_CRIT,
+                                     "Could not allocate memory for child.");
+                        usleep(16); /* prevent 100% CPU usage in OOM situation */
+                        continue;
+                }
+
+                child->done = 0;
+
+                if (!sblist_add(childs, &child)) {
+                        free(child);
+                        goto oom;
+                }
+
+                conn_struct_init(&child->conn);
+                child->conn.client_fd = connfd;
+
+                memcpy(&child->client.addr, &cliaddr_storage, sizeof(cliaddr_storage));
+
+                attrp = 0;
+                if (pthread_attr_init(&attr) == 0) {
+                        attrp = &attr;
+                        pthread_attr_setstacksize(attrp, 256*1024);
+                }
+
+                if (pthread_create(&child->thread, attrp, child_thread, child) != 0) {
+                        sblist_delete(childs, sblist_getsize(childs) -1);
+                        free(child);
+                        goto oom;
+		}
+        }
+	safefree(fds);
+}
+
+/*
+ * Go through all the non-empty children and cancel them.
+ */
+void child_kill_children (int sig)
+{
+	size_t i, tries = 0;
+
+	if (sig != SIGTERM) return;
+	log_message (LOG_INFO,
+	             "trying to bring down %zu threads...",
+	             sblist_getsize(childs)
+	);
+
+
+again:
+	for (i = 0; i < sblist_getsize(childs); i++) {
+		struct child *c = *((struct child**)sblist_get(childs, i));
+		if (!c->done) pthread_kill(c->thread, SIGCHLD);
+	}
+	usleep(8192);
+	collect_threads();
+	if (sblist_getsize(childs) != 0)
+		if(tries++ < 8) goto again;
+	if (sblist_getsize(childs) != 0)
+		log_message (LOG_CRIT,
+		             "child_kill_children: %zu threads still alive!",
+		             sblist_getsize(childs)
+		);
+}
+
+void child_free_children(void) {
+	sblist_free(childs);
+	childs = 0;
+}
+
+/**
+ * Listen on the various configured interfaces
+ */
+int child_listening_sockets(sblist *listen_addrs, uint16_t port)
+{
+        int ret;
+        size_t i;
+
+        assert (port > 0);
+
+        if (listen_fds == NULL) {
+                listen_fds = sblist_new(sizeof(int), 16);
+                if (listen_fds == NULL) {
+                        log_message (LOG_ERR, "Could not create the list "
+                                     "of listening fds");
+                        return -1;
+                }
+        }
+
+        if (!listen_addrs || !sblist_getsize(listen_addrs))
+        {
+                /*
+                 * no Listen directive:
+                 * listen on the wildcard address(es)
+                 */
+                ret = listen_sock(NULL, port, listen_fds);
+                return ret;
+        }
+
+        for (i = 0; i < sblist_getsize(listen_addrs); i++) {
+                char **addr;
+
+                addr = sblist_get(listen_addrs, i);
+                if (!addr || !*addr) {
+                        log_message(LOG_WARNING,
+                                    "got NULL from listen_addrs - skipping");
+                        continue;
+                }
+
+                ret = listen_sock(*addr, port, listen_fds);
+                if (ret != 0) {
+                        return ret;
+                }
+        }
+
+        return 0;
+}
+
+void child_close_sock (void)
+{
+        size_t i;
+
+        for (i = 0; i < sblist_getsize(listen_fds); i++) {
+                int *fd = sblist_get(listen_fds, i);
+                close (*fd);
+        }
+
+        sblist_free(listen_fds);
+
+        listen_fds = NULL;
+}

src/child.h

@@ -0,0 +1,43 @@
+/* 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
+ * 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.
+ */
+
+/* See 'child.c' for detailed information. */
+
+#ifndef TINYPROXY_CHILD_H
+#define TINYPROXY_CHILD_H
+
+#include "sblist.h"
+
+typedef enum {
+        CHILD_MAXCLIENTS,
+        CHILD_MAXSPARESERVERS,
+        CHILD_MINSPARESERVERS,
+        CHILD_STARTSERVERS,
+        CHILD_MAXREQUESTSPERCHILD
+} child_config_t;
+
+extern short int child_pool_create (void);
+extern int child_listening_sockets (sblist *listen_addrs, uint16_t port);
+extern void child_close_sock (void);
+extern void child_main_loop (void);
+extern void child_kill_children (int sig);
+extern void child_free_children(void);
+
+extern short int child_configure (child_config_t type, unsigned int val);
+
+#endif

src/common.h

@@ -0,0 +1,133 @@
+/* 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
+ * 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 "main.h" header,
+ * but various other "libraries" in the program need the same information,
+ * without the tinyproxy specific defines.
+ */
+
+#ifndef COMMON_HEADER_H
+#define COMMON_HEADER_H
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+/*
+ * Include standard headers which are used through-out tinyproxy
+ */
+
+/* standard C headers - we can safely assume they exist. */
+#include	<stddef.h>
+#include	<stdint.h>
+#include	<ctype.h>
+#include	<stdio.h>
+#include	<stdlib.h>
+#include	<string.h>
+#include	<unistd.h>
+/* standard POSIX headers - they need to be there as well. */
+#  include	<errno.h>
+#  include	<fcntl.h>
+#  include	<netdb.h>
+#  include      <signal.h>
+#  include      <stdarg.h>
+#  include	<strings.h>
+#  include      <syslog.h>
+#  include	<wchar.h>
+#  include	<wctype.h>
+#  include      <sys/mman.h>
+#  include	<sys/select.h>
+#  include	<sys/socket.h>
+#  include	<sys/stat.h>
+#  include      <sys/types.h>
+#  include	<sys/wait.h>
+#  include	<sys/uio.h>
+#  include	<sys/un.h>
+#  include	<sys/time.h>
+#  include	<time.h>
+#  include	<inttypes.h>
+#  include      <sys/resource.h>
+#  include	<netinet/in.h>
+#  include      <assert.h>
+#  include	<arpa/inet.h>
+#  include	<grp.h>
+#  include	<pwd.h>
+#  include	<limits.h>
+
+/* rest - some oddball headers */
+#ifdef HAVE_VALUES_H
+#  include      <values.h>
+#endif
+
+#ifdef HAVE_SYS_IOCTL_H
+#  include	<sys/ioctl.h>
+#endif
+
+#ifdef HAVE_ALLOCA_H
+#  include	<alloca.h>
+#endif
+
+#ifdef HAVE_MEMORY_H
+#  include	<memory.h>
+#endif
+
+#ifdef HAVE_MALLOC_H
+#  include	<malloc.h>
+#endif
+
+#ifdef HAVE_SYSEXITS_H
+#  include	<sysexits.h>
+#endif
+
+/*
+ * If MSG_NOSIGNAL is not defined, define it to be zero so that it doesn't
+ * cause any problems.
+ */
+#ifndef MSG_NOSIGNAL
+#  define MSG_NOSIGNAL (0)
+#endif
+
+#ifndef SHUT_RD                 /* these three Posix.1g names are quite new */
+#  define SHUT_RD	0       /* shutdown for reading */
+#  define SHUT_WR	1       /* shutdown for writing */
+#  define SHUT_RDWR	2       /* shutdown for reading and writing */
+#endif
+
+#define MAXLISTEN	1024    /* Max number of connections */
+
+/*
+ * SunOS doesn't have INADDR_NONE defined.
+ */
+#ifndef INADDR_NONE
+#  define INADDR_NONE -1
+#endif
+
+/* Define boolean values */
+#ifndef FALSE
+# define FALSE 0
+# define TRUE (!FALSE)
+#endif
+
+/* Useful function macros */
+#if !defined(min) || !defined(max)
+#  define min(a,b)	((a) < (b) ? (a) : (b))
+#  define max(a,b)	((a) > (b) ? (a) : (b))
+#endif
+
+#endif

src/conf-tokens.c

@@ -0,0 +1,72 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+#include <stdlib.h>
+#include "conf-tokens.h"
+
+#ifdef HAVE_GPERF
+#include "conf-tokens-gperf.inc"
+#else
+
+#include <strings.h>
+
+const struct config_directive_entry *
+config_directive_find (register const char *str, register size_t len)
+{
+  size_t i;
+  static const struct config_directive_entry wordlist[] =
+    {
+      {"",CD_NIL}, {"",CD_NIL},
+      {"allow", CD_allow},
+      {"stathost", CD_stathost},
+      {"listen", CD_listen},
+      {"timeout", CD_timeout},
+      {"statfile", CD_statfile},
+      {"pidfile", CD_pidfile},
+      {"bindsame", CD_bindsame},
+      {"reversebaseurl", CD_reversebaseurl},
+      {"viaproxyname", CD_viaproxyname},
+      {"upstream", CD_upstream},
+      {"anonymous", CD_anonymous},
+      {"group", CD_group},
+      {"defaulterrorfile", CD_defaulterrorfile},
+      {"startservers", CD_startservers},
+      {"filtercasesensitive", CD_filtercasesensitive},
+      {"filtertype", CD_filtertype},
+      {"filterurls", CD_filterurls},
+      {"filter", CD_filter},
+      {"reversemagic", CD_reversemagic},
+      {"errorfile", CD_errorfile},
+      {"minspareservers", CD_minspareservers},
+      {"user", CD_user},
+      {"disableviaheader", CD_disableviaheader},
+      {"deny", CD_deny},
+      {"xtinyproxy", CD_xtinyproxy},
+      {"reversepath", CD_reversepath},
+      {"bind", CD_bind},
+      {"maxclients", CD_maxclients},
+      {"reverseonly", CD_reverseonly},
+      {"port", CD_port},
+      {"maxspareservers", CD_maxspareservers},
+      {"syslog", CD_syslog},
+      {"filterdefaultdeny", CD_filterdefaultdeny},
+      {"loglevel", CD_loglevel},
+      {"filterextended", CD_filterextended},
+      {"connectport", CD_connectport},
+      {"logfile", CD_logfile},
+      {"basicauth", CD_basicauth},
+      {"basicauthrealm", CD_basicauthrealm},
+      {"addheader", CD_addheader},
+      {"maxrequestsperchild", CD_maxrequestsperchild}
+    };
+
+	for(i=0;i<sizeof(wordlist)/sizeof(wordlist[0]);++i) {
+		if(!strcasecmp(str, wordlist[i].name))
+			return &wordlist[i];
+	}
+	return 0;
+}
+
+#endif

src/conf-tokens.gperf

@@ -0,0 +1,63 @@
+%{
+#include <string.h>
+#include <stdlib.h>
+#include "conf-tokens.h"
+%}
+
+struct config_directive_entry { const char* name; enum config_directive value; };
+
+%struct-type
+%define slot-name name
+%define initializer-suffix ,CD_NIL
+%define lookup-function-name config_directive_find
+%ignore-case
+%7bit
+%compare-lengths
+%readonly-tables
+%define constants-prefix CDS_
+%omit-struct-type
+
+%%
+logfile, CD_logfile
+pidfile, CD_pidfile
+anonymous, CD_anonymous
+viaproxyname, CD_viaproxyname
+defaulterrorfile, CD_defaulterrorfile
+statfile, CD_statfile
+stathost, CD_stathost
+xtinyproxy, CD_xtinyproxy
+syslog, CD_syslog
+bindsame, CD_bindsame
+disableviaheader, CD_disableviaheader
+port, CD_port
+maxclients, CD_maxclients
+maxspareservers, CD_maxspareservers
+minspareservers, CD_minspareservers
+startservers, CD_startservers
+maxrequestsperchild, CD_maxrequestsperchild
+timeout, CD_timeout
+connectport, CD_connectport
+user, CD_user
+group, CD_group
+listen, CD_listen
+allow, CD_allow
+deny, CD_deny
+bind, CD_bind
+basicauth, CD_basicauth
+basicauthrealm, CD_basicauthrealm
+errorfile, CD_errorfile
+addheader, CD_addheader
+filter, CD_filter
+filterurls, CD_filterurls
+filterextended, CD_filterextended
+filterdefaultdeny, CD_filterdefaultdeny
+filtercasesensitive, CD_filtercasesensitive
+filtertype, CD_filtertype
+reversebaseurl, CD_reversebaseurl
+reverseonly, CD_reverseonly
+reversemagic, CD_reversemagic
+reversepath, CD_reversepath
+upstream, CD_upstream
+loglevel, CD_loglevel
+%%
+

src/conf-tokens.h

@@ -0,0 +1,55 @@
+#ifndef CONF_TOKENS_H
+#define CONF_TOKENS_H
+
+enum config_directive {
+CD_NIL = 0,
+CD_logfile,
+CD_pidfile,
+CD_anonymous,
+CD_viaproxyname,
+CD_defaulterrorfile,
+CD_statfile,
+CD_stathost,
+CD_xtinyproxy,
+CD_syslog,
+CD_bindsame,
+CD_disableviaheader,
+CD_port,
+CD_maxclients,
+CD_maxspareservers,
+CD_minspareservers,
+CD_startservers,
+CD_maxrequestsperchild,
+CD_timeout,
+CD_connectport,
+CD_user,
+CD_group,
+CD_listen,
+CD_allow,
+CD_deny,
+CD_bind,
+CD_basicauth,
+CD_basicauthrealm,
+CD_errorfile,
+CD_addheader,
+CD_filter,
+CD_filterurls,
+CD_filtertype,
+CD_filterextended,
+CD_filterdefaultdeny,
+CD_filtercasesensitive,
+CD_reversebaseurl,
+CD_reverseonly,
+CD_reversemagic,
+CD_reversepath,
+CD_upstream,
+CD_loglevel,
+};
+
+struct config_directive_entry { const char* name; enum config_directive value; };
+
+const struct config_directive_entry *
+config_directive_find (register const char *str, register size_t len);
+
+#endif
+

src/conf.h

@@ -0,0 +1,120 @@
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2004 Robert James Kaes <rjkaes@users.sourceforge.net>
+ * Copyright (C) 2009 Michael Adam <obnox@samba.org>
+ *
+ * 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.
+ */
+
+/* See 'conf.c' for detailed information. */
+
+#ifndef TINYPROXY_CONF_H
+#define TINYPROXY_CONF_H
+
+#include "hsearch.h"
+#include "sblist.h"
+#include "acl.h"
+
+/*
+ * Stores a HTTP header created using the AddHeader directive.
+ */
+typedef struct {
+        char *name;
+        char *value;
+} http_header_t;
+
+/*
+ * Hold all the configuration time information.
+ */
+struct config_s {
+        sblist *basicauth_list;
+        char *basicauth_realm;
+        char *logf_name;
+        unsigned int syslog;    /* boolean */
+        unsigned int port;
+        char *stathost;
+        unsigned int quit;      /* boolean */
+        unsigned int maxclients;
+        char *user;
+        char *group;
+        sblist *listen_addrs;
+#ifdef FILTER_ENABLE
+        char *filter;
+        unsigned int filter_opts; /* enum filter_options */
+#endif                          /* FILTER_ENABLE */
+#ifdef XTINYPROXY_ENABLE
+        unsigned int add_xtinyproxy; /* boolean */
+#endif
+#ifdef REVERSE_SUPPORT
+        struct reversepath *reversepath_list;
+        unsigned int reverseonly;       /* boolean */
+        unsigned int reversemagic;      /* boolean */
+        char *reversebaseurl;
+#endif
+#ifdef UPSTREAM_SUPPORT
+        struct upstream *upstream_list;
+#endif                          /* UPSTREAM_SUPPORT */
+        char *pidpath;
+        unsigned int idletimeout;
+        sblist *bind_addrs;
+        unsigned int bindsame;
+
+        /*
+         * The configured name to use in the HTTP "Via" header field.
+         */
+        char *via_proxy_name;
+
+        unsigned int disable_viaheader; /* boolean */
+
+        /*
+         * Error page support.  Map error numbers to file paths.
+         */
+        struct htab *errorpages;
+
+        /*
+         * Error page to be displayed if appropriate page cannot be located
+         * in the errorpages structure.
+         */
+        char *errorpage_undef;
+
+        /*
+         * The HTML statistics page.
+         */
+        char *statpage;
+
+        acl_list_t access_list;
+
+        /*
+         * Store the list of port allowed by CONNECT.
+         */
+        sblist *connect_ports;
+
+        /*
+         * Map of headers which should be let through when the
+         * anonymous feature is turned on.
+         */
+        struct htab *anonymous_map;
+
+        /*
+         * Extra headers to be added to outgoing HTTP requests.
+         */
+        sblist* add_headers;
+};
+
+extern int reload_config_file (const char *config_fname, struct config_s *conf);
+
+int config_init (void);
+void free_config (struct config_s *conf);
+
+#endif

src/connect-ports.c

@@ -0,0 +1,77 @@
+/* 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) 2009 Michael Adam <obnox@samba.org>
+ *
+ * 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.
+ */
+
+#include "connect-ports.h"
+#include "log.h"
+
+/*
+ * Now, this routine adds a "port" to the list.  It also creates the list if
+ * it hasn't already by done.
+ */
+void add_connect_port_allowed (int port, sblist **connect_ports)
+{
+        if (!*connect_ports) {
+                *connect_ports = sblist_new (sizeof(int), 16);
+                if (!*connect_ports) {
+                        log_message (LOG_WARNING,
+                                     "Could not create a list of allowed CONNECT ports");
+                        return;
+                }
+        }
+
+        log_message (LOG_INFO,
+                     "Adding Port [%d] to the list allowed by CONNECT", port);
+        sblist_add (*connect_ports, &port);
+}
+
+/*
+ * This routine checks to see if a port is allowed in the CONNECT method.
+ *
+ * Returns: 1 if allowed
+ *          0 if denied
+ */
+int check_allowed_connect_ports (int port, sblist *connect_ports)
+{
+        size_t i;
+        int *data;
+
+        /*
+	 * The absence of ConnectPort options in the config file
+	 * meanas that all ports are allowed for CONNECT.
+         */
+        if (!connect_ports)
+                return 1;
+
+        for (i = 0; i < sblist_getsize (connect_ports); ++i) {
+                data = sblist_get (connect_ports, i);
+                if (data && *data == port)
+                        return 1;
+        }
+
+        return 0;
+}
+
+/**
+ * Free a connect_ports list.
+ */
+void free_connect_ports_list (sblist *connect_ports)
+{
+        sblist_free (connect_ports);
+}

src/connect-ports.h

@@ -0,0 +1,31 @@
+/* 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>
+ * Copyright (C) 2009 Michael Adam <obnox@samba.org>
+ *
+ * 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.
+ */
+
+#ifndef _TINYPROXY_CONNECT_PORTS_H_
+#define _TINYPROXY_CONNECT_PORTS_H_
+
+#include "common.h"
+#include "sblist.h"
+
+extern void add_connect_port_allowed (int port, sblist **connect_ports);
+int check_allowed_connect_ports (int port, sblist *connect_ports);
+void free_connect_ports_list (sblist *connect_ports);
+
+#endif /* _TINYPROXY_CONNECT_PORTS_ */

src/conns.c

@@ -1,60 +1,128 @@
-/* $Id: conns.c,v 1.4 2001-11-21 01:00:08 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
- * other connnection 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.
+ * 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@flarenet.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.
  */
 
-#include "tinyproxy.h"
+/* 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.
+ */
+
+#include "main.h"
 
 #include "buffer.h"
 #include "conns.h"
+#include "heap.h"
+#include "log.h"
 #include "stats.h"
-#include "utils.h"
 
-void initialize_conn(struct conn_s *connptr)
-{
-	connptr->client_fd = connptr->server_fd = -1;
-	connptr->cbuffer = new_buffer();
-	connptr->sbuffer = new_buffer();
-
-	connptr->send_message = FALSE;
-	connptr->simple_req = FALSE;
-
-	connptr->ssl = FALSE;
-	connptr->upstream = FALSE;
-
-	connptr->protocol.major = connptr->protocol.minor = 0;
-
-	update_stats(STAT_OPEN);
+void conn_struct_init(struct conn_s *connptr) {
+        connptr->error_number = -1;
+        connptr->client_fd = -1;
+        connptr->server_fd = -1;
+        /* There is _no_ content length initially */
+        connptr->content_length.server = connptr->content_length.client = -1;
 }
 
-void destroy_conn(struct conn_s *connptr)
+int conn_init_contents (struct conn_s *connptr, const char *ipaddr,
+                                const char *sock_ipaddr)
 {
+        struct buffer_s *cbuffer, *sbuffer;
+
+        assert (connptr->client_fd >= 0);
+
+        /*
+         * Allocate the memory for all the internal components
+         */
+        cbuffer = new_buffer ();
+        sbuffer = new_buffer ();
+
+        if (!cbuffer || !sbuffer)
+                goto error_exit;
+
+        connptr->cbuffer = cbuffer;
+        connptr->sbuffer = sbuffer;
+
+        connptr->server_ip_addr = (sock_ipaddr ?
+                                   safestrdup (sock_ipaddr) : NULL);
+        connptr->client_ip_addr = safestrdup (ipaddr);
+
+        update_stats (STAT_OPEN);
+
+        return 1;
+
+error_exit:
+        /*
+         * If we got here, there was a problem allocating memory
+         */
+        if (cbuffer)
+                delete_buffer (cbuffer);
+        if (sbuffer)
+                delete_buffer (sbuffer);
+
+        return 0;
+}
+
+void conn_destroy_contents (struct conn_s *connptr)
+{
+        assert (connptr != NULL);
+
         if (connptr->client_fd != -1)
-		close(connptr->client_fd);
+                if (close (connptr->client_fd) < 0)
+                        log_message (LOG_INFO, "Client (%d) close message: %s",
+                                     connptr->client_fd, strerror (errno));
+        connptr->client_fd = -1;
         if (connptr->server_fd != -1)
-		close(connptr->server_fd);
+                if (close (connptr->server_fd) < 0)
+                        log_message (LOG_INFO, "Server (%d) close message: %s",
+                                     connptr->server_fd, strerror (errno));
+        connptr->server_fd = -1;
 
         if (connptr->cbuffer)
-		delete_buffer(connptr->cbuffer);
+                delete_buffer (connptr->cbuffer);
         if (connptr->sbuffer)
-		delete_buffer(connptr->sbuffer);
+                delete_buffer (connptr->sbuffer);
 
-	safefree(connptr);
+        if (connptr->request_line)
+                safefree (connptr->request_line);
 
-	update_stats(STAT_CLOSE);
+        if (connptr->error_variables) {
+                char *k;
+                htab_value *v;
+                size_t it = 0;
+                while((it = htab_next(connptr->error_variables, it, &k, &v))) {
+                        safefree(v->p);
+                        safefree(k);
+                }
+                htab_destroy (connptr->error_variables);
+        }
+
+        if (connptr->error_string)
+                safefree (connptr->error_string);
+
+        if (connptr->server_ip_addr)
+                safefree (connptr->server_ip_addr);
+        if (connptr->client_ip_addr)
+                safefree (connptr->client_ip_addr);
+
+#ifdef REVERSE_SUPPORT
+        if (connptr->reversepath)
+                safefree (connptr->reversepath);
+#endif
+
+        update_stats (STAT_CLOSE);
 }

src/conns.h

@@ -1,45 +1,99 @@
-/* $Id: conns.h,v 1.4 2001-11-21 01:00:09 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@flarenet.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 'conns.c' for detailed information. */
+
 #ifndef TINYPROXY_CONNS_H
 #define TINYPROXY_CONNS_H
 
+#include "main.h"
+#include "hsearch.h"
+
 /*
  * Connection Definition
  */
 struct conn_s {
         int client_fd;
         int server_fd;
+
         struct buffer_s *cbuffer;
         struct buffer_s *sbuffer;
-	bool_t simple_req;
-	bool_t ssl;
-	bool_t upstream;
-	bool_t send_message;
+
+        /* The request line (first line) from the client */
+        char *request_line;
+
+        /* Booleans */
+        unsigned int connect_method;
+        unsigned int show_stats;
+
+        /*
+         * This structure stores key -> value mappings for substitution
+         * in the error HTML files.
+         */
+        struct htab *error_variables;
+
+        int error_number;
+        char *error_string;
+
+        /* A Content-Length value from the remote server */
         struct {
-		unsigned short int major;
-		unsigned short int minor;
+                long int server;
+                long int client;
+        } content_length;
+
+        /*
+         * Store the server's IP (for BindSame)
+         */
+        char *server_ip_addr;
+
+        /*
+         * Store the client's IP information
+         */
+        char *client_ip_addr;
+
+        /*
+         * Store the incoming request's HTTP protocol.
+         */
+        struct {
+                unsigned int major;
+                unsigned int minor;
         } protocol;
+
+#ifdef REVERSE_SUPPORT
+        /*
+         * Place to store the current per-connection reverse proxy path
+         */
+        char *reversepath;
+#endif
+
+        /*
+         * Pointer to upstream proxy.
+         */
+        struct upstream *upstream_proxy;
 };
 
-/*
- * Functions for the creation and destruction of a connection structure.
- */
-extern void initialize_conn(struct conn_s *connptr);
-extern void destroy_conn(struct conn_s *connptr);
+/* expects pointer to zero-initialized struct, set up struct
+   with default values for initial use */
+extern void conn_struct_init(struct conn_s *connptr);
+
+/* second stage initializiation, sets up buffers and connection details */
+extern int conn_init_contents (struct conn_s *connptr, const char *ipaddr,
+                                       const char *sock_ipaddr);
+extern void conn_destroy_contents (struct conn_s *connptr);
 
 #endif

src/daemon.c

@@ -0,0 +1,87 @@
+/* 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
+ * 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 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 "main.h"
+
+#include "daemon.h"
+#include "log.h"
+
+/*
+ * Fork a child process and then kill the parent so make the calling
+ * program a daemon process.
+ */
+void makedaemon (void)
+{
+        if (fork () != 0)
+                exit (0);
+
+        setsid ();
+        set_signal_handler (SIGHUP, SIG_IGN);
+
+        if (fork () != 0)
+                exit (0);
+
+	if (chdir ("/") != 0) {
+                log_message (LOG_WARNING,
+                             "Could not change directory to /");
+	}
+
+        umask (0177);
+
+#ifdef NDEBUG
+        /*
+         * When not in debugging mode, close the standard file
+         * descriptors.
+         */
+        close (0);
+        close (1);
+        close (2);
+#endif
+}
+
+/*
+ * Pass a signal number and a signal handling function into this function
+ * to handle signals sent to the process.
+ */
+signal_func *set_signal_handler (int signo, signal_func * func)
+{
+        struct sigaction act, oact;
+
+        act.sa_handler = func;
+        sigemptyset (&act.sa_mask);
+        act.sa_flags = 0;
+        if (signo == SIGALRM) {
+#ifdef SA_INTERRUPT
+                act.sa_flags |= SA_INTERRUPT;   /* SunOS 4.x */
+#endif
+        } else {
+#ifdef SA_RESTART
+                act.sa_flags |= SA_RESTART;     /* SVR4, 4.4BSD */
+#endif
+        }
+
+        if (sigaction (signo, &act, &oact) < 0)
+                return SIG_ERR;
+
+        return oact.sa_handler;
+}

src/daemon.h

@@ -0,0 +1,36 @@
+/* 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
+ * 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.
+ */
+
+/* See 'daemon.c' for detailed information. */
+
+#ifndef TINYPROXY_DAEMON_H
+#define TINYPROXY_DAEMON_H
+
+typedef void signal_func (int);
+
+/*
+ * Pass a singal integer and a function to handle the signal.
+ */
+extern signal_func *set_signal_handler (int signo, signal_func * func);
+
+/*
+ * Make a program a daemon process
+ */
+extern void makedaemon (void);
+
+#endif

src/dnscache.c

@@ -1,142 +0,0 @@
-/* $Id: dnscache.c,v 1.17 2001-10-25 17:27:39 rjkaes Exp $
- *
- * This is a caching DNS system. When a host name is needed we look it up here
- * and see if there is already an answer for it. The domains are placed in a
- * hashed linked list. If the name is not here, then we need to look it up and
- * add it to the system. This really speeds up the connection to servers since
- * the DNS name does not need to be looked up each time. It's kind of cool. :)
- *
- * Copyright (C) 1999  Robert James Kaes (rjkaes@flarenet.com)
- * 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"
-
-#include "dnscache.h"
-#include "log.h"
-#include "ternary.h"
-#include "utils.h"
-
-/*
- * The mutex is used for locking around accesses to the ternary tree.
- */
-static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-
-#define LOCK()   pthread_mutex_lock(&mutex);
-#define UNLOCK() pthread_mutex_unlock(&mutex);
-
-#define DNSEXPIRE (5 * 60)
-#define DNS_INSERT_LIMIT 10000            /* free the memory after inserts */
-
-struct dnscache_s {
-	struct in_addr ipaddr;
-	time_t expire;
-};
-
-static TERNARY dns_tree = -1;
-static unsigned int dns_insertions;
-
-static int dns_lookup(struct in_addr *addr, char *domain)
-{
-	int ret;
-	struct dnscache_s *ptr;
-
-	assert(addr != NULL);
-	assert(domain != NULL);
-
-	ret = ternary_search(dns_tree, domain, (void *)&ptr);
-
-	if (TE_ISERROR(ret)
-	    || difftime(time(NULL), ptr->expire) > DNSEXPIRE) {
-		return -1;
-	}
-
-	memcpy(addr, &ptr->ipaddr, sizeof(struct in_addr));
-
-	return 0;
-}
-
-static int dns_insert(struct in_addr *addr, char *domain)
-{
-	struct dnscache_s *newptr;
-
-	assert(addr != NULL);
-	assert(domain != NULL);
-
-	if (!(newptr = safemalloc(sizeof(struct dnscache_s)))) {
-		return -1;
-	}
-
-	memcpy(&newptr->ipaddr, addr, sizeof(struct in_addr));
-	newptr->expire = time(NULL);
-
-	DEBUG2("Inserting [%s] into DNS cache", domain);
-
-	if (TE_ISERROR(ternary_replace(dns_tree, domain, newptr))) {
-		safefree(newptr);
-		return -1;
-	}
-
-	DEBUG2("Finished inserting [%s] into DNS cache", domain);
-
-	return 0;
-}
-
-int dnscache(struct in_addr *addr, char *domain)
-{
-	struct hostent *resolv;
-
-	assert(addr != NULL);
-	assert(domain != NULL);
-
-	LOCK();
-
-	/* If the DNS tree doesn't exist, build a new one */
-	if (dns_tree < 0) {
-		dns_tree = ternary_new();
-		dns_insertions = 0;
-	}
-
-	if (inet_aton(domain, (struct in_addr *)addr) != 0) {
-		UNLOCK();
-		return 0;
-	}
-
-	/* Well, we're not dotted-decimal so we need to look it up */
-	if (dns_lookup(addr, domain) == 0) {
-		UNLOCK();
-		return 0;
-	}
-
-	/* Okay, so not in the list... need to actually look it up. */
-	if (!(resolv = gethostbyname(domain))) {
-		UNLOCK();
-		return -1;
-	}
-
-	memcpy(addr, resolv->h_addr_list[0], resolv->h_length);
-
-	dns_insert(addr, domain);
-
-	dns_insertions++;
-	if (dns_insertions > DNS_INSERT_LIMIT) {
-		log_message(LOG_INFO, "DNS Insertion limit reached (%u). Rebuilding cache.", dns_insertions);
-		ternary_destroy(dns_tree, free);
-		dns_tree = ternary_new();
-		dns_insertions = 0;
-	}
-
-	UNLOCK();
-
-	return 0;
-}

src/dnscache.h

@@ -1,25 +0,0 @@
-/* $Id: dnscache.h,v 1.7 2001-10-25 17:02:50 rjkaes Exp $
- *
- * See 'dnscache.c' for a detailed description.
- *
- * Copyright (C) 1999  Robert James Kaes (rjkaes@flarenet.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.
- */
-
-#ifndef _TINYPROXY_DNSCACHE_H_
-#define _TINYPROXY_DNSCACHE_H_
-
-#include "tinyproxy.h"
-
-extern int dnscache(struct in_addr *addr, char *domain);
-
-#endif

src/filter.c

@@ -1,123 +1,207 @@
-/* $Id: filter.c,v 1.7 2001-10-25 17:27:39 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)
+ * 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 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.
  */
 
-#include "tinyproxy.h"
+/* A substring of the domain to be filtered goes into the file
+ * pointed at by DEFAULT_FILTER.
+ */
 
+#include "main.h"
+
+#include <regex.h>
+#include <fnmatch.h>
 #include "filter.h"
-#include "regexp.h"
-#include "utils.h"
+#include "heap.h"
+#include "log.h"
+#include "reqs.h"
+#include "conf.h"
+#include "sblist.h"
+
+#define FILTER_BUFFER_LEN (512)
 
 static int err;
 
 struct filter_list {
-	struct filter_list *next;
-	char *pat;
-	regex_t *cpat;
+        union {
+                regex_t cpatb;
+                char *pattern;
+        } u;
 };
 
-
-static struct filter_list *fl = NULL;
+static sblist *fl = NULL;
 static int already_init = 0;
 
-/* initializes a linked list of strings containing hosts to be filtered */
-void filter_init(void)
+/*
+ * Initializes a list of strings containing hosts/urls to be filtered
+ */
+void filter_init (void)
 {
         FILE *fd;
-	struct filter_list *p;
-	char buf[255];
-	char *s;
+        struct filter_list fe;
+        char buf[FILTER_BUFFER_LEN];
+        char *s, *start;
+        int cflags, lineno = 0;
 
-	if (!fl && !already_init) {
-		fd = fopen(config.filter, "r");
-		if (fd) {
-			p = NULL;
+        if (fl || already_init) {
+                return;
+        }
 
-			while (fgets(buf, 255, fd)) {
+        fd = fopen (config->filter, "r");
+        if (!fd) {
+                perror ("filter file");
+                exit (EX_DATAERR);
+        }
+
+        cflags = REG_NEWLINE | REG_NOSUB;
+        cflags |= (REG_EXTENDED * !!(config->filter_opts & FILTER_OPT_TYPE_ERE));
+        cflags |= (REG_ICASE * !(config->filter_opts & FILTER_OPT_CASESENSITIVE));
+
+        while (fgets (buf, FILTER_BUFFER_LEN, fd)) {
+                ++lineno;
+                /* skip leading whitespace */
                 s = buf;
-				if (!p)	/* head of list */
-					fl = p = safecalloc(1, sizeof(struct filter_list));
-				else {	/* next entry */
-					p->next = safecalloc(1, sizeof(struct filter_list));
-					p = p->next;
-				}
+                while (*s && isspace ((unsigned char) *s))
+                        s++;
+                start = s;
 
-				/* replace first whitespace with \0 */
-				while (*s++)
-					if (isspace((unsigned char)*s))
+                /*
+                 * Remove any trailing white space and
+                 * comments.
+                 */
+                while (*s) {
+                        if (isspace ((unsigned char) *s))
+                                break;
+                        if (*s == '#') {
+                                /*
+                                 * If the '#' char is preceeded by
+                                 * an escape, it's not a comment
+                                 * string.
+                                 */
+                                if (s == buf || *(s - 1) != '\\')
+                                        break;
+                        }
+                        ++s;
+                }
                 *s = '\0';
+                s = start;
 
-				p->pat = strdup(buf);
-				p->cpat = safemalloc(sizeof(regex_t));
-				if ((err = regcomp(p->cpat, p->pat, REG_NEWLINE | REG_NOSUB)) != 0) {
-					fprintf(stderr,
-						"Bad regex in %s: %s\n",
-						config.filter, p->pat);
-					exit(EX_DATAERR);
+                /* skip blank lines and comments */
+                if (*s == '\0')
+                        continue;
+
+                if (!fl) fl = sblist_new(sizeof(struct filter_list),
+                                         4096/sizeof(struct filter_list));
+
+                if (config->filter_opts & FILTER_OPT_TYPE_FNMATCH) {
+                        fe.u.pattern = safestrdup(s);
+                        if (!fe.u.pattern) goto oom;
+                } else {
+
+                        err = regcomp (&fe.u.cpatb, s, cflags);
+                        if (err != 0) {
+                                if (err == REG_ESPACE) goto oom;
+                                fprintf (stderr,
+                                         "Bad regex in %s: line %d - %s\n",
+                                         config->filter, lineno, s);
+                                exit (EX_DATAERR);
                         }
                 }
+                if (!sblist_add(fl, &fe)) {
+                oom:;
+                        fprintf (stderr,
+                                 "out of memory parsing filter file %s: line %d\n",
+                                 config->filter, lineno);
+                        exit (EX_DATAERR);
+                }
+        }
+        if (ferror (fd)) {
+                perror ("fgets");
+                exit (EX_DATAERR);
+        }
+        fclose (fd);
+
         already_init = 1;
-			fclose(fd);
-		}
-	}
 }
 
 /* unlink the list */
-void filter_destroy(void)
+void filter_destroy (void)
 {
-	struct filter_list *p, *q;
+        struct filter_list *p;
+        size_t i;
 
         if (already_init) {
-		for (p = q = fl; p; p = q) {
-			regfree(p->cpat);
-			safefree(p->cpat);
-			safefree(p->pat);
-			q = p->next;
-			safefree(p);
+                if (fl) {
+                        for (i = 0; i < sblist_getsize(fl); ++i) {
+                                p = sblist_get(fl, i);
+                                if (config->filter_opts & FILTER_OPT_TYPE_FNMATCH)
+                                        safefree(p->u.pattern);
+                                else
+                                        regfree (&p->u.cpatb);
+                        }
+                        sblist_free(fl);
                 }
                 fl = NULL;
                 already_init = 0;
         }
 }
 
-/* returns 0 if host is not an element of filter list, non-zero otherwise */
-int filter_url(char *host)
+/**
+ * reload the filter file if filtering is enabled
+ */
+void filter_reload (void)
+{
+        if (config->filter) {
+                log_message (LOG_NOTICE, "Re-reading filter file.");
+                filter_destroy ();
+                filter_init ();
+        }
+}
+
+/* Return 0 to allow, non-zero to block */
+int filter_run (const char *str)
 {
         struct filter_list *p;
-	char *s, *port;
+        size_t i;
         int result;
 
         if (!fl || !already_init)
-		return (0);
+                goto COMMON_EXIT;
 
-	/* strip off the port number */
-	s = strdup(host);
-	port = strchr(s, ':');
-	if (port)
-		*port = '\0';
+        for (i = 0; i < sblist_getsize(fl); ++i) {
+                p = sblist_get(fl, i);
+                if (config->filter_opts & FILTER_OPT_TYPE_FNMATCH)
+                        result = fnmatch (p->u.pattern, str, 0);
+                else
+                        result =
+                            regexec (&p->u.cpatb, str, (size_t) 0, (regmatch_t *) 0, 0);
 
-	result = 0;
-
-	for (p = fl; p; p = p->next) {
-		result = !regexec(p->cpat, s, (size_t) 0, (regmatch_t *) 0, 0);
-
-		if (result)
-			break;
+                if (result == 0) {
+                        if (!(config->filter_opts & FILTER_OPT_DEFAULT_DENY))
+                                return 1;
+                        else
+                                return 0;
                 }
-	safefree(s);
-	return (result);
+        }
+
+COMMON_EXIT:
+        if (!(config->filter_opts & FILTER_OPT_DEFAULT_DENY))
+                return 0;
+        else
+                return 1;
 }

src/filter.h

@@ -1,25 +1,42 @@
-/* $Id: filter.h,v 1.3 2000-11-23 04:46:25 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_
 
-extern void filter_init(void);
-extern void filter_destroy(void);
-extern int filter_url(char *host);
+enum filter_options {
+        FILTER_OPT_CASESENSITIVE	= 1 << 0,
+        FILTER_OPT_URL			= 1 << 1,
+        FILTER_OPT_DEFAULT_DENY		= 1 << 2,
+
+        FILTER_OPT_TYPE_BRE		= 1 << 8,
+        FILTER_OPT_TYPE_ERE		= 1 << 9,
+        FILTER_OPT_TYPE_FNMATCH		= 1 << 10,
+};
+
+#define FILTER_TYPE_MASK \
+    (FILTER_OPT_TYPE_BRE | FILTER_OPT_TYPE_ERE | FILTER_OPT_TYPE_FNMATCH)
+
+extern void filter_init (void);
+extern void filter_destroy (void);
+extern void filter_reload (void);
+extern int filter_run (const char *str);
 
 #endif

src/gnuregex.h

@@ -1,542 +0,0 @@
-/* Definitions for data structures and routines for the regular
-   expression library, version 0.12.
-   Copyright (C) 1985,89,90,91,92,93,95,96,97,98 Free Software Foundation, Inc.
-
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.  The master source lives in /gd/gnu/lib.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef _REGEX_H
-#define _REGEX_H 1
-
-/* Allow the use in C++ code.  */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* POSIX says that <sys/types.h> must be included (by the caller) before
-   <regex.h>.  */
-
-#if !defined _POSIX_C_SOURCE && !defined _POSIX_SOURCE && defined VMS
-/* VMS doesn't have `size_t' in <sys/types.h>, even though POSIX says it
-   should be there.  */
-# include <stddef.h>
-#endif
-
-/* The following two types have to be signed and unsigned integer type
-   wide enough to hold a value of a pointer.  For most ANSI compilers
-   ptrdiff_t and size_t should be likely OK.  Still size of these two
-   types is 2 for Microsoft C.  Ugh... */
-typedef long int s_reg_t;
-typedef unsigned long int active_reg_t;
-
-/* The following bits are used to determine the regexp syntax we
-   recognize.  The set/not-set meanings are chosen so that Emacs syntax
-   remains the value 0.  The bits are given in alphabetical order, and
-   the definitions shifted by one from the previous bit; thus, when we
-   add or remove a bit, only one other definition need change.  */
-typedef unsigned long int reg_syntax_t;
-
-/* If this bit is not set, then \ inside a bracket expression is literal.
-   If set, then such a \ quotes the following character.  */
-#define RE_BACKSLASH_ESCAPE_IN_LISTS ((unsigned long int) 1)
-
-/* If this bit is not set, then + and ? are operators, and \+ and \? are
-     literals.
-   If set, then \+ and \? are operators and + and ? are literals.  */
-#define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1)
-
-/* If this bit is set, then character classes are supported.  They are:
-     [:alpha:], [:upper:], [:lower:],  [:digit:], [:alnum:], [:xdigit:],
-     [:space:], [:print:], [:punct:], [:graph:], and [:cntrl:].
-   If not set, then character classes are not supported.  */
-#define RE_CHAR_CLASSES (RE_BK_PLUS_QM << 1)
-
-/* If this bit is set, then ^ and $ are always anchors (outside bracket
-     expressions, of course).
-   If this bit is not set, then it depends:
-        ^  is an anchor if it is at the beginning of a regular
-           expression or after an open-group or an alternation operator;
-        $  is an anchor if it is at the end of a regular expression, or
-           before a close-group or an alternation operator.
-
-   This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because
-   POSIX draft 11.2 says that * etc. in leading positions is undefined.
-   We already implemented a previous draft which made those constructs
-   invalid, though, so we haven't changed the code back.  */
-#define RE_CONTEXT_INDEP_ANCHORS (RE_CHAR_CLASSES << 1)
-
-/* If this bit is set, then special characters are always special
-     regardless of where they are in the pattern.
-   If this bit is not set, then special characters are special only in
-     some contexts; otherwise they are ordinary.  Specifically,
-     * + ? and intervals are only special when not after the beginning,
-     open-group, or alternation operator.  */
-#define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1)
-
-/* If this bit is set, then *, +, ?, and { cannot be first in an re or
-     immediately after an alternation or begin-group operator.  */
-#define RE_CONTEXT_INVALID_OPS (RE_CONTEXT_INDEP_OPS << 1)
-
-/* If this bit is set, then . matches newline.
-   If not set, then it doesn't.  */
-#define RE_DOT_NEWLINE (RE_CONTEXT_INVALID_OPS << 1)
-
-/* If this bit is set, then . doesn't match NUL.
-   If not set, then it does.  */
-#define RE_DOT_NOT_NULL (RE_DOT_NEWLINE << 1)
-
-/* If this bit is set, nonmatching lists [^...] do not match newline.
-   If not set, they do.  */
-#define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1)
-
-/* If this bit is set, either \{...\} or {...} defines an
-     interval, depending on RE_NO_BK_BRACES.
-   If not set, \{, \}, {, and } are literals.  */
-#define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1)
-
-/* If this bit is set, +, ? and | aren't recognized as operators.
-   If not set, they are.  */
-#define RE_LIMITED_OPS (RE_INTERVALS << 1)
-
-/* If this bit is set, newline is an alternation operator.
-   If not set, newline is literal.  */
-#define RE_NEWLINE_ALT (RE_LIMITED_OPS << 1)
-
-/* If this bit is set, then `{...}' defines an interval, and \{ and \}
-     are literals.
-  If not set, then `\{...\}' defines an interval.  */
-#define RE_NO_BK_BRACES (RE_NEWLINE_ALT << 1)
-
-/* If this bit is set, (...) defines a group, and \( and \) are literals.
-   If not set, \(...\) defines a group, and ( and ) are literals.  */
-#define RE_NO_BK_PARENS (RE_NO_BK_BRACES << 1)
-
-/* If this bit is set, then \<digit> matches <digit>.
-   If not set, then \<digit> is a back-reference.  */
-#define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1)
-
-/* If this bit is set, then | is an alternation operator, and \| is literal.
-   If not set, then \| is an alternation operator, and | is literal.  */
-#define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1)
-
-/* If this bit is set, then an ending range point collating higher
-     than the starting range point, as in [z-a], is invalid.
-   If not set, then when ending range point collates higher than the
-     starting range point, the range is ignored.  */
-#define RE_NO_EMPTY_RANGES (RE_NO_BK_VBAR << 1)
-
-/* If this bit is set, then an unmatched ) is ordinary.
-   If not set, then an unmatched ) is invalid.  */
-#define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_EMPTY_RANGES << 1)
-
-/* If this bit is set, succeed as soon as we match the whole pattern,
-   without further backtracking.  */
-#define RE_NO_POSIX_BACKTRACKING (RE_UNMATCHED_RIGHT_PAREN_ORD << 1)
-
-/* If this bit is set, do not process the GNU regex operators.
-   If not set, then the GNU regex operators are recognized. */
-#define RE_NO_GNU_OPS (RE_NO_POSIX_BACKTRACKING << 1)
-
-/* If this bit is set, turn on internal regex debugging.
-   If not set, and debugging was on, turn it off.
-   This only works if regex.c is compiled -DDEBUG.
-   We define this bit always, so that all that's needed to turn on
-   debugging is to recompile regex.c; the calling code can always have
-   this bit set, and it won't affect anything in the normal case. */
-#define RE_DEBUG (RE_NO_GNU_OPS << 1)
-
-/* This global variable defines the particular regexp syntax to use (for
-   some interfaces).  When a regexp is compiled, the syntax used is
-   stored in the pattern buffer, so changing this does not affect
-   already-compiled regexps.  */
-extern reg_syntax_t re_syntax_options;
-
-/* Define combinations of the above bits for the standard possibilities.
-   (The [[[ comments delimit what gets put into the Texinfo file, so
-   don't delete them!)  */
-/* [[[begin syntaxes]]] */
-#define RE_SYNTAX_EMACS 0
-
-#define RE_SYNTAX_AWK							\
-  (RE_BACKSLASH_ESCAPE_IN_LISTS   | RE_DOT_NOT_NULL			\
-   | RE_NO_BK_PARENS              | RE_NO_BK_REFS			\
-   | RE_NO_BK_VBAR                | RE_NO_EMPTY_RANGES			\
-   | RE_DOT_NEWLINE		  | RE_CONTEXT_INDEP_ANCHORS		\
-   | RE_UNMATCHED_RIGHT_PAREN_ORD | RE_NO_GNU_OPS)
-
-#define RE_SYNTAX_GNU_AWK						\
-  ((RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DEBUG)	\
-   & ~(RE_DOT_NOT_NULL | RE_INTERVALS | RE_CONTEXT_INDEP_OPS))
-
-#define RE_SYNTAX_POSIX_AWK 						\
-  (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS		\
-   | RE_INTERVALS	    | RE_NO_GNU_OPS)
-
-#define RE_SYNTAX_GREP							\
-  (RE_BK_PLUS_QM              | RE_CHAR_CLASSES				\
-   | RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS				\
-   | RE_NEWLINE_ALT)
-
-#define RE_SYNTAX_EGREP							\
-  (RE_CHAR_CLASSES        | RE_CONTEXT_INDEP_ANCHORS			\
-   | RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE			\
-   | RE_NEWLINE_ALT       | RE_NO_BK_PARENS				\
-   | RE_NO_BK_VBAR)
-
-#define RE_SYNTAX_POSIX_EGREP						\
-  (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES)
-
-/* P1003.2/D11.2, section 4.20.7.1, lines 5078ff.  */
-#define RE_SYNTAX_ED RE_SYNTAX_POSIX_BASIC
-
-#define RE_SYNTAX_SED RE_SYNTAX_POSIX_BASIC
-
-/* Syntax bits common to both basic and extended POSIX regex syntax.  */
-#define _RE_SYNTAX_POSIX_COMMON						\
-  (RE_CHAR_CLASSES | RE_DOT_NEWLINE      | RE_DOT_NOT_NULL		\
-   | RE_INTERVALS  | RE_NO_EMPTY_RANGES)
-
-#define RE_SYNTAX_POSIX_BASIC						\
-  (_RE_SYNTAX_POSIX_COMMON | RE_BK_PLUS_QM)
-
-/* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes
-   RE_LIMITED_OPS, i.e., \? \+ \| are not recognized.  Actually, this
-   isn't minimal, since other operators, such as \`, aren't disabled.  */
-#define RE_SYNTAX_POSIX_MINIMAL_BASIC					\
-  (_RE_SYNTAX_POSIX_COMMON | RE_LIMITED_OPS)
-
-#define RE_SYNTAX_POSIX_EXTENDED					\
-  (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS			\
-   | RE_CONTEXT_INDEP_OPS  | RE_NO_BK_BRACES				\
-   | RE_NO_BK_PARENS       | RE_NO_BK_VBAR				\
-   | RE_UNMATCHED_RIGHT_PAREN_ORD)
-
-/* Differs from ..._POSIX_EXTENDED in that RE_CONTEXT_INVALID_OPS
-   replaces RE_CONTEXT_INDEP_OPS and RE_NO_BK_REFS is added.  */
-#define RE_SYNTAX_POSIX_MINIMAL_EXTENDED				\
-  (_RE_SYNTAX_POSIX_COMMON  | RE_CONTEXT_INDEP_ANCHORS			\
-   | RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES				\
-   | RE_NO_BK_PARENS        | RE_NO_BK_REFS				\
-   | RE_NO_BK_VBAR	    | RE_UNMATCHED_RIGHT_PAREN_ORD)
-/* [[[end syntaxes]]] */
-
-/* Maximum number of duplicates an interval can allow.  Some systems
-   (erroneously) define this in other header files, but we want our
-   value, so remove any previous define.  */
-#ifdef RE_DUP_MAX
-# undef RE_DUP_MAX
-#endif
-/* If sizeof(int) == 2, then ((1 << 15) - 1) overflows.  */
-#define RE_DUP_MAX (0x7fff)
-
-
-/* POSIX `cflags' bits (i.e., information for `regcomp').  */
-
-/* If this bit is set, then use extended regular expression syntax.
-   If not set, then use basic regular expression syntax.  */
-#define REG_EXTENDED 1
-
-/* If this bit is set, then ignore case when matching.
-   If not set, then case is significant.  */
-#define REG_ICASE (REG_EXTENDED << 1)
-
-/* If this bit is set, then anchors do not match at newline
-     characters in the string.
-   If not set, then anchors do match at newlines.  */
-#define REG_NEWLINE (REG_ICASE << 1)
-
-/* If this bit is set, then report only success or fail in regexec.
-   If not set, then returns differ between not matching and errors.  */
-#define REG_NOSUB (REG_NEWLINE << 1)
-
-
-/* POSIX `eflags' bits (i.e., information for regexec).  */
-
-/* If this bit is set, then the beginning-of-line operator doesn't match
-     the beginning of the string (presumably because it's not the
-     beginning of a line).
-   If not set, then the beginning-of-line operator does match the
-     beginning of the string.  */
-#define REG_NOTBOL 1
-
-/* Like REG_NOTBOL, except for the end-of-line.  */
-#define REG_NOTEOL (1 << 1)
-
-
-/* If any error codes are removed, changed, or added, update the
-   `re_error_msg' table in regex.c.  */
-typedef enum
-{
-#ifdef _XOPEN_SOURCE
-  REG_ENOSYS = -1,	/* This will never happen for this implementation.  */
-#endif
-
-  REG_NOERROR = 0,	/* Success.  */
-  REG_NOMATCH,		/* Didn't find a match (for regexec).  */
-
-  /* POSIX regcomp return error codes.  (In the order listed in the
-     standard.)  */
-  REG_BADPAT,		/* Invalid pattern.  */
-  REG_ECOLLATE,		/* Not implemented.  */
-  REG_ECTYPE,		/* Invalid character class name.  */
-  REG_EESCAPE,		/* Trailing backslash.  */
-  REG_ESUBREG,		/* Invalid back reference.  */
-  REG_EBRACK,		/* Unmatched left bracket.  */
-  REG_EPAREN,		/* Parenthesis imbalance.  */
-  REG_EBRACE,		/* Unmatched \{.  */
-  REG_BADBR,		/* Invalid contents of \{\}.  */
-  REG_ERANGE,		/* Invalid range end.  */
-  REG_ESPACE,		/* Ran out of memory.  */
-  REG_BADRPT,		/* No preceding re for repetition op.  */
-
-  /* Error codes we've added.  */
-  REG_EEND,		/* Premature end.  */
-  REG_ESIZE,		/* Compiled pattern bigger than 2^16 bytes.  */
-  REG_ERPAREN		/* Unmatched ) or \); not returned from regcomp.  */
-} reg_errcode_t;
-
-/* This data structure represents a compiled pattern.  Before calling
-   the pattern compiler, the fields `buffer', `allocated', `fastmap',
-   `translate', and `no_sub' can be set.  After the pattern has been
-   compiled, the `re_nsub' field is available.  All other fields are
-   private to the regex routines.  */
-
-#ifndef RE_TRANSLATE_TYPE
-# define RE_TRANSLATE_TYPE char *
-#endif
-
-struct re_pattern_buffer
-{
-/* [[[begin pattern_buffer]]] */
-	/* Space that holds the compiled pattern.  It is declared as
-          `unsigned char *' because its elements are
-           sometimes used as array indexes.  */
-  unsigned char *buffer;
-
-	/* Number of bytes to which `buffer' points.  */
-  unsigned long int allocated;
-
-	/* Number of bytes actually used in `buffer'.  */
-  unsigned long int used;
-
-        /* Syntax setting with which the pattern was compiled.  */
-  reg_syntax_t syntax;
-
-        /* Pointer to a fastmap, if any, otherwise zero.  re_search uses
-           the fastmap, if there is one, to skip over impossible
-           starting points for matches.  */
-  char *fastmap;
-
-        /* Either a translate table to apply to all characters before
-           comparing them, or zero for no translation.  The translation
-           is applied to a pattern when it is compiled and to a string
-           when it is matched.  */
-  RE_TRANSLATE_TYPE translate;
-
-	/* Number of subexpressions found by the compiler.  */
-  size_t re_nsub;
-
-        /* Zero if this pattern cannot match the empty string, one else.
-           Well, in truth it's used only in `re_search_2', to see
-           whether or not we should use the fastmap, so we don't set
-           this absolutely perfectly; see `re_compile_fastmap' (the
-           `duplicate' case).  */
-  unsigned can_be_null : 1;
-
-        /* If REGS_UNALLOCATED, allocate space in the `regs' structure
-             for `max (RE_NREGS, re_nsub + 1)' groups.
-           If REGS_REALLOCATE, reallocate space if necessary.
-           If REGS_FIXED, use what's there.  */
-#define REGS_UNALLOCATED 0
-#define REGS_REALLOCATE 1
-#define REGS_FIXED 2
-  unsigned regs_allocated : 2;
-
-        /* Set to zero when `regex_compile' compiles a pattern; set to one
-           by `re_compile_fastmap' if it updates the fastmap.  */
-  unsigned fastmap_accurate : 1;
-
-        /* If set, `re_match_2' does not return information about
-           subexpressions.  */
-  unsigned no_sub : 1;
-
-        /* If set, a beginning-of-line anchor doesn't match at the
-           beginning of the string.  */
-  unsigned not_bol : 1;
-
-        /* Similarly for an end-of-line anchor.  */
-  unsigned not_eol : 1;
-
-        /* If true, an anchor at a newline matches.  */
-  unsigned newline_anchor : 1;
-
-/* [[[end pattern_buffer]]] */
-};
-
-typedef struct re_pattern_buffer regex_t;
-
-/* Type for byte offsets within the string.  POSIX mandates this.  */
-typedef int regoff_t;
-
-
-/* This is the structure we store register match data in.  See
-   regex.texinfo for a full description of what registers match.  */
-struct re_registers
-{
-  unsigned num_regs;
-  regoff_t *start;
-  regoff_t *end;
-};
-
-
-/* If `regs_allocated' is REGS_UNALLOCATED in the pattern buffer,
-   `re_match_2' returns information about at least this many registers
-   the first time a `regs' structure is passed.  */
-#ifndef RE_NREGS
-# define RE_NREGS 30
-#endif
-
-
-/* POSIX specification for registers.  Aside from the different names than
-   `re_registers', POSIX uses an array of structures, instead of a
-   structure of arrays.  */
-typedef struct
-{
-  regoff_t rm_so;  /* Byte offset from string's start to substring's start.  */
-  regoff_t rm_eo;  /* Byte offset from string's start to substring's end.  */
-} regmatch_t;
-
-/* Declarations for routines.  */
-
-/* To avoid duplicating every routine declaration -- once with a
-   prototype (if we are ANSI), and once without (if we aren't) -- we
-   use the following macro to declare argument types.  This
-   unfortunately clutters up the declarations a bit, but I think it's
-   worth it.  */
-
-#if __STDC__
-
-# define _RE_ARGS(args) args
-
-#else /* not __STDC__ */
-
-# define _RE_ARGS(args) ()
-
-#endif /* not __STDC__ */
-
-/* Sets the current default syntax to SYNTAX, and return the old syntax.
-   You can also simply assign to the `re_syntax_options' variable.  */
-extern reg_syntax_t re_set_syntax _RE_ARGS ((reg_syntax_t syntax));
-
-/* Compile the regular expression PATTERN, with length LENGTH
-   and syntax given by the global `re_syntax_options', into the buffer
-   BUFFER.  Return NULL if successful, and an error string if not.  */
-extern const char *re_compile_pattern
-  _RE_ARGS ((const char *pattern, size_t length,
-             struct re_pattern_buffer *buffer));
-
-
-/* Compile a fastmap for the compiled pattern in BUFFER; used to
-   accelerate searches.  Return 0 if successful and -2 if was an
-   internal error.  */
-extern int re_compile_fastmap _RE_ARGS ((struct re_pattern_buffer *buffer));
-
-
-/* Search in the string STRING (with length LENGTH) for the pattern
-   compiled into BUFFER.  Start searching at position START, for RANGE
-   characters.  Return the starting position of the match, -1 for no
-   match, or -2 for an internal error.  Also return register
-   information in REGS (if REGS and BUFFER->no_sub are nonzero).  */
-extern int re_search
-  _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string,
-            int length, int start, int range, struct re_registers *regs));
-
-
-/* Like `re_search', but search in the concatenation of STRING1 and
-   STRING2.  Also, stop searching at index START + STOP.  */
-extern int re_search_2
-  _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1,
-             int length1, const char *string2, int length2,
-             int start, int range, struct re_registers *regs, int stop));
-
-
-/* Like `re_search', but return how many characters in STRING the regexp
-   in BUFFER matched, starting at position START.  */
-extern int re_match
-  _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string,
-             int length, int start, struct re_registers *regs));
-
-
-/* Relates to `re_match' as `re_search_2' relates to `re_search'.  */
-extern int re_match_2
-  _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1,
-             int length1, const char *string2, int length2,
-             int start, struct re_registers *regs, int stop));
-
-
-/* Set REGS to hold NUM_REGS registers, storing them in STARTS and
-   ENDS.  Subsequent matches using BUFFER and REGS will use this memory
-   for recording register information.  STARTS and ENDS must be
-   allocated with malloc, and must each be at least `NUM_REGS * sizeof
-   (regoff_t)' bytes long.
-
-   If NUM_REGS == 0, then subsequent matches should allocate their own
-   register data.
-
-   Unless this function is called, the first search or match using
-   PATTERN_BUFFER will allocate its own register data, without
-   freeing the old data.  */
-extern void re_set_registers
-  _RE_ARGS ((struct re_pattern_buffer *buffer, struct re_registers *regs,
-             unsigned num_regs, regoff_t *starts, regoff_t *ends));
-
-#if defined _REGEX_RE_COMP || defined _LIBC
-# ifndef _CRAY
-/* 4.2 bsd compatibility.  */
-extern char *re_comp _RE_ARGS ((const char *));
-extern int re_exec _RE_ARGS ((const char *));
-# endif
-#endif
-
-/* POSIX compatibility.  */
-extern int regcomp _RE_ARGS ((regex_t *__preg, const char *__pattern,
-			      int __cflags));
-
-extern int regexec _RE_ARGS ((const regex_t *__preg,
-			      const char *__string, size_t __nmatch,
-			      regmatch_t __pmatch[], int __eflags));
-
-extern size_t regerror _RE_ARGS ((int __errcode, const regex_t *__preg,
-				  char *__errbuf, size_t __errbuf_size));
-
-extern void regfree _RE_ARGS ((regex_t *__preg));
-
-
-#ifdef __cplusplus
-}
-#endif	/* C++ */
-
-#endif /* regex.h */
-
-/*
-Local variables:
-make-backup-files: t
-version-control: t
-trim-versions-without-asking: nil
-End:
-*/

src/grammar.y

@@ -1,180 +0,0 @@
-/* $Id: grammar.y,v 1.5 2001-09-16 20:08:24 rjkaes Exp $
- *
- * This is the grammar for tinyproxy's configuration file. It needs to be
- * in sync with scanner.l. If you know more about yacc and lex than I do
- * please update these files.
- *
- * Copyright (C) 2000  Robert James Kaes (rjkaes@flarenet.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"
-
-#include "acl.h"
-#include "anonymous.h"
-#include "log.h"
-#include "thread.h"
-
-void yyerror(char *s);
-int yylex(void);
-
-%}
-
-%union {
-	unsigned int num;
-	char *cptr;
-	void *ptr;
-}
-
-/* statements */
-%token KW_PORT KW_LISTEN
-%token KW_LOGFILE KW_PIDFILE KW_SYSLOG
-%token KW_MAXCLIENTS KW_MAXSPARESERVERS KW_MINSPARESERVERS KW_STARTSERVERS
-%token KW_MAXREQUESTSPERCHILD
-%token KW_TIMEOUT
-%token KW_USER KW_GROUP
-%token KW_ANONYMOUS KW_FILTER KW_XTINYPROXY
-%token KW_TUNNEL KW_UPSTREAM
-%token KW_ALLOW KW_DENY
-
-/* yes/no switches */
-%token KW_YES KW_NO
-
-/* settings for loglevel */
-%token KW_LOGLEVEL
-%token KW_LOG_CRITICAL KW_LOG_ERROR KW_LOG_WARNING KW_LOG_NOTICE KW_LOG_CONNECT KW_LOG_INFO
-
-%token <cptr> IDENTIFIER
-%token <num>  NUMBER
-%token <cptr> STRING
-%token <cptr> NUMERIC_ADDRESS
-%token <cptr> STRING_ADDRESS
-%token <cptr> NETMASK_ADDRESS
-
-%type <num> yesno
-%type <cptr> string
-%type <cptr> network_address
-%type <cptr> unique_address
-%type <num> loglevels
-
-%%
-
-start
-	: /* empty */
-	| start line
-	;
-
-line
-	: '\n'
-	| statement '\n'
-	;
-
-statement
-        : KW_PORT NUMBER		{ config.port = $2; }
-	| KW_TIMEOUT NUMBER		{ config.idletimeout = $2; }
-	| KW_SYSLOG yesno
-	  {
-#ifdef HAVE_SYSLOG_H
-	          config.syslog = $2;
-#else
-		  log_message(LOG_WARNING, "Syslog support was not compiled in.");
-#endif
-	  }
-	| KW_MAXCLIENTS NUMBER		{ thread_configure(THREAD_MAXCLIENTS, $2); }
-	| KW_MAXSPARESERVERS NUMBER	{ thread_configure(THREAD_MAXSPARESERVERS, $2); }
-	| KW_MINSPARESERVERS NUMBER	{ thread_configure(THREAD_MINSPARESERVERS, $2); }
-	| KW_STARTSERVERS NUMBER	{ thread_configure(THREAD_STARTSERVERS, $2); }
-	| KW_MAXREQUESTSPERCHILD NUMBER	{ thread_configure(THREAD_MAXREQUESTSPERCHILD, $2); }
-        | KW_LOGFILE string
-	  {
-	          config.logf_name = $2;
-		  if (!config.logf_name) {
-		          fprintf(stderr, "bad log file\n");
-		  }
-	  }
-	| KW_PIDFILE string		{ config.pidpath = $2; }
-	| KW_USER string		{ config.username = $2; }
-	| KW_GROUP string		{ config.group = $2; }
-	| KW_ANONYMOUS string		{ anonymous_insert($2); }
-	| KW_FILTER string
-	  {
-#ifdef FILTER_ENABLE
-		  config.filter = $2;
-#else
-	          log_message(LOG_WARNING, "Filter support was not compiled in.");
-#endif
-	  }
-	| KW_XTINYPROXY network_address	{ config.my_domain = $2; }
-	| KW_TUNNEL unique_address ':' NUMBER
-	  {
-#ifdef TUNNEL_SUPPORT
-	          config.tunnel_name = $2;
-		  config.tunnel_port = $4;
-#else
-		  log_message(LOG_WARNING, "Tunnel support was not compiled in.");
-#endif
-	  }
-        | KW_UPSTREAM unique_address ':' NUMBER
-          {
-#ifdef UPSTREAM_SUPPORT
-                  config.upstream_name = $2;
-                  config.upstream_port = $4;
-#else
-                  log_message(LOG_WARNING, "Upstream proxy support was not compiled in.");
-#endif
-          }
-	| KW_LISTEN NUMERIC_ADDRESS	{ config.ipAddr = $2; }
-	| KW_ALLOW network_address	{ insert_acl($2, ACL_ALLOW); }
-	| KW_DENY network_address	{ insert_acl($2, ACL_DENY); }
-        | KW_LOGLEVEL loglevels         { set_log_level($2); }
-	;
-
-loglevels
-        : KW_LOG_CRITICAL               { $$ = LOG_CRIT; }
-        | KW_LOG_ERROR                  { $$ = LOG_ERR; }
-        | KW_LOG_WARNING                { $$ = LOG_WARNING; }
-        | KW_LOG_NOTICE                 { $$ = LOG_NOTICE; }
-        | KW_LOG_CONNECT                { $$ = LOG_CONN; }
-        | KW_LOG_INFO                   { $$ = LOG_INFO; }
-        ;
-
-network_address
-	: unique_address
-	| NETMASK_ADDRESS
-	;
-
-unique_address
-	: STRING_ADDRESS
-	| NUMERIC_ADDRESS
-	;
-
-yesno
-	: KW_YES			{ $$ = 1; }
-	| KW_NO				{ $$ = 0; }
-	| NUMBER			{ $$ = $1; }
-	;
-
-string
-	: IDENTIFIER
-	| STRING
-	;
-
-%%
-
-extern unsigned int yylineno;
-
-void yyerror(char *s)
-{
-	fprintf(stderr, "Line %d: %s\n", yylineno, s);
-}

src/heap.c

@@ -0,0 +1,99 @@
+/* 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
+ * 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.
+ */
+
+#include "main.h"
+#include "heap.h"
+#include "text.h"
+
+#ifndef NDEBUG
+
+void *debugging_calloc (size_t nmemb, size_t size, const char *file,
+                        unsigned long line)
+{
+        void *ptr;
+
+        assert (nmemb > 0);
+        assert (size > 0);
+
+        ptr = calloc (nmemb, size);
+        fprintf (stderr, "{calloc: %p:%lu x %lu} %s:%lu\n", ptr,
+                 (unsigned long) nmemb, (unsigned long) size, file, line);
+        return ptr;
+}
+
+void *debugging_malloc (size_t size, const char *file, unsigned long line)
+{
+        void *ptr;
+
+        assert (size > 0);
+
+        ptr = malloc (size);
+        fprintf (stderr, "{malloc: %p:%lu} %s:%lu\n", ptr,
+                 (unsigned long) size, file, line);
+        return ptr;
+}
+
+void *debugging_realloc (void *ptr, size_t size, const char *file,
+                         unsigned long line)
+{
+        void *newptr;
+
+        assert (size > 0);
+
+        newptr = realloc (ptr, size);
+        fprintf (stderr, "{realloc: %p -> %p:%lu} %s:%lu\n", ptr, newptr,
+                 (unsigned long) size, file, line);
+        return newptr;
+}
+
+void debugging_free (void *ptr, const char *file, unsigned long line)
+{
+        fprintf (stderr, "{free: %p} %s:%lu\n", ptr, file, line);
+
+        if (ptr != NULL)
+                free (ptr);
+        return;
+}
+
+char *debugging_strdup (const char *s, const char *file, unsigned long line)
+{
+        char *ptr;
+        size_t len;
+
+        assert (s != NULL);
+
+        len = strlen (s) + 1;
+        ptr = (char *) malloc (len);
+        if (!ptr)
+                return NULL;
+        memcpy (ptr, s, len);
+
+        fprintf (stderr, "{strdup: %p:%lu} %s:%lu\n", ptr,
+                 (unsigned long) len, file, line);
+        return ptr;
+}
+
+#endif /* !NDEBUG */
+

src/heap.h

@@ -0,0 +1,55 @@
+/* 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
+ * 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.
+ */
+
+/* See 'heap.c' for detailed information. */
+
+#ifndef TINYPROXY_HEAP_H
+#define TINYPROXY_HEAP_H
+
+/*
+ * The following is to allow for better memory checking.
+ */
+#ifndef NDEBUG
+
+extern void *debugging_calloc (size_t nmemb, size_t size, const char *file,
+                               unsigned long line);
+extern void *debugging_malloc (size_t size, const char *file,
+                               unsigned long line);
+extern void debugging_free (void *ptr, const char *file, unsigned long line);
+extern void *debugging_realloc (void *ptr, size_t size, const char *file,
+                                unsigned long line);
+extern char *debugging_strdup (const char *s, const char *file,
+                               unsigned long line);
+
+#  define safecalloc(x, y) debugging_calloc(x, y, __FILE__, __LINE__)
+#  define safemalloc(x) debugging_malloc(x, __FILE__, __LINE__)
+#  define saferealloc(x, y) debugging_realloc(x, y, __FILE__, __LINE__)
+#  define safestrdup(x) debugging_strdup(x, __FILE__, __LINE__)
+#  define safefree(x) (debugging_free(x, __FILE__, __LINE__), *(&(x)) = NULL)
+
+#else
+
+#  define safecalloc(x, y) calloc(x, y)
+#  define safemalloc(x) malloc(x)
+#  define saferealloc(x, y) realloc(x, y)
+#  define safefree(x) (free (x), *(&(x)) = NULL)
+#  define safestrdup(x) strdup(x)
+
+#endif
+
+#endif

src/hostspec.c

@@ -0,0 +1,179 @@
+#include "common.h"
+#include "hostspec.h"
+#include "heap.h"
+#include "network.h"
+
+static int dotted_mask(char *bitmask_string, unsigned char array[])
+{
+	unsigned char v4bits[4];
+	if (1 != inet_pton (AF_INET, bitmask_string, v4bits)) return -1;
+	memset (array, 0xff, IPV6_LEN-4);
+	memcpy (array + IPV6_LEN-4, v4bits, 4);
+	return 0;
+}
+
+/*
+ * Fills in the netmask array given a numeric value.
+ *
+ * Returns:
+ *   0 on success
+ *  -1 on failure (invalid mask value)
+ *
+ */
+static int
+fill_netmask_array (char *bitmask_string, int v6,
+		    unsigned char array[])
+{
+	unsigned int i;
+	unsigned long int mask;
+	char *endptr;
+
+	errno = 0;              /* to distinguish success/failure after call */
+	if (strchr (bitmask_string, '.')) {
+		if (v6) return -1; /* ipv6 doesn't supported dotted netmasks */
+		return dotted_mask(bitmask_string, array);
+	}
+	mask = strtoul (bitmask_string, &endptr, 10);
+
+	/* check for various conversion errors */
+	if ((errno == ERANGE && mask == ULONG_MAX)
+	    || (errno != 0 && mask == 0) || (endptr == bitmask_string))
+		return -1;
+
+	if (v6 == 0) {
+		/* The mask comparison is done as an IPv6 address, so
+		 * convert to a longer mask in the case of IPv4
+		 * addresses. */
+		mask += 12 * 8;
+	}
+
+	/* check valid range for a bit mask */
+	if (mask > (8 * IPV6_LEN))
+		return -1;
+
+	/* we have a valid range to fill in the array */
+	for (i = 0; i != IPV6_LEN; ++i) {
+		if (mask >= 8) {
+			array[i] = 0xff;
+			mask -= 8;
+		} else if (mask > 0) {
+			array[i] = (unsigned char) (0xff << (8 - mask));
+			mask = 0;
+		} else {
+			array[i] = 0;
+		}
+	}
+
+	return 0;
+}
+
+
+/* parse a location string containing either an ipv4/ipv4 + hostmask tuple
+   or a dnsname into a struct hostspec.
+   returns 0 on success, non-0 on error (might be memory allocation, bogus
+   ip address or mask).
+*/
+int hostspec_parse(char *location, struct hostspec *h) {
+	char *mask, ip_dst[IPV6_LEN];
+
+	h->type = HST_NONE;
+	if(!location) return 0;
+
+	memset(h, 0, sizeof(*h));
+	if ((mask = strrchr(location, '/')))
+		*(mask++) = 0;
+
+	/*
+	 * Check for a valid IP address (the simplest case) first.
+	 */
+	if (full_inet_pton (location, ip_dst) > 0) {
+		h->type = HST_NUMERIC;
+		memcpy (h->address.ip.network, ip_dst, IPV6_LEN);
+		if(!mask) memset (h->address.ip.mask, 0xff, IPV6_LEN);
+		else {
+			char dst[sizeof(struct in6_addr)];
+			int v6, i;
+			/* Check if the IP address before the netmask is
+			 * an IPv6 address */
+			if (inet_pton(AF_INET6, location, dst) > 0)
+				v6 = 1;
+			else
+				v6 = 0;
+
+			if (fill_netmask_array
+			    (mask, v6, &(h->address.ip.mask[0]))
+			     < 0)
+				goto err;
+
+			for (i = 0; i < IPV6_LEN; i++)
+				h->address.ip.network[i] = ip_dst[i] &
+				h->address.ip.mask[i];
+		}
+	} else {
+		/* either bogus IP or hostname */
+			/* bogus ipv6 ? */
+		if (mask || strchr (location, ':'))
+			goto err;
+
+		/* In all likelihood a string */
+		h->type = HST_STRING;
+		h->address.string = safestrdup (location);
+		if (!h->address.string)
+			goto err;
+	}
+	/* restore mask */
+	if(mask) *(--mask) = '/';
+	return 0;
+err:;
+	if(mask) *(--mask) = '/';
+	return -1;
+}
+
+static int string_match(const char *ip, const char *addrspec)
+{
+	size_t test_length, match_length;
+	if(!strcasecmp(ip, addrspec)) return 1;
+	if(addrspec[0] != '.') return 0;
+	test_length = strlen (ip);
+	match_length = strlen (addrspec);
+	if (test_length < match_length) return 0;
+	return (strcasecmp
+	    (ip + (test_length - match_length),
+	     addrspec) == 0);
+}
+
+static int numeric_match(const uint8_t addr[], const struct hostspec *h)
+{
+	uint8_t x, y;
+	int i;
+
+	for (i = 0; i != IPV6_LEN; ++i) {
+		x = addr[i] & h->address.ip.mask[i];
+		y = h->address.ip.network[i];
+
+		/* If x and y don't match, the IP addresses don't match */
+		if (x != y)
+			return 0;
+	}
+
+	return 1;
+}
+
+/* check whether ip matches hostspec.
+   return 1 on match, 0 on non-match */
+int hostspec_match(const char *ip, const struct hostspec *h) {
+	int is_numeric_addr;
+	uint8_t numeric_addr[IPV6_LEN];
+	if (ip[0] == '\0') return 0;
+	is_numeric_addr = (full_inet_pton (ip, &numeric_addr) > 0);
+	switch (h->type) {
+	case HST_STRING:
+		if(is_numeric_addr) return 0;
+		return string_match (ip, h->address.string);
+	case HST_NUMERIC:
+		return numeric_match (numeric_addr, h);
+	case HST_NONE:
+		return 0;
+	}
+	return 0;
+}

src/hostspec.h

@@ -0,0 +1,26 @@
+#ifndef HOSTSPEC_H
+#define HOSTSPEC_H
+
+#define IPV6_LEN 16
+
+enum hostspec_type {
+	HST_NONE,
+	HST_STRING,
+	HST_NUMERIC,
+};
+
+struct hostspec {
+	enum hostspec_type type;
+	union {
+                char *string;
+                struct {
+                        unsigned char network[IPV6_LEN];
+                        unsigned char mask[IPV6_LEN];
+                } ip;
+	} address;
+};
+
+int hostspec_parse(char *domain, struct hostspec *h);
+int hostspec_match(const char *ip, const struct hostspec *h);
+
+#endif

src/hsearch.c

@@ -0,0 +1,222 @@
+/*
+musl license, hsearch.c originally written by Szabolcs Nagy
+
+Copyright © 2005-2020 Rich Felker, et al.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <stdlib.h>
+#include <string.h>
+#include "hsearch.h"
+
+/*
+open addressing hash table with 2^n table size
+quadratic probing is used in case of hash collision
+tab indices and hash are size_t
+after resize fails with ENOMEM the state of tab is still usable
+*/
+
+typedef struct htab_entry {
+	char *key;
+	htab_value data;
+} htab_entry;
+
+struct elem {
+	htab_entry item;
+	size_t hash;
+};
+
+struct htab {
+	struct elem *elems;
+	size_t mask;
+	size_t used;
+	size_t seed;
+	size_t dead;
+};
+
+#define MINSIZE 8
+#define MAXSIZE ((size_t)-1/2 + 1)
+
+#define CASE_INSENSITIVE
+#ifdef CASE_INSENSITIVE
+#include <ctype.h>
+#include <strings.h>
+#define LOWER_OR_NOT(X) tolower(X)
+#define STRCMP(X, Y) strcasecmp(X, Y)
+#else
+#define LOWER_OR_NOT(X) X
+#define STRCMP(X, Y) strcmp(X, Y)
+#endif
+
+static size_t keyhash(const char *k, size_t seed)
+{
+	const unsigned char *p = (const void *)k;
+	size_t h = seed;
+
+	while (*p)
+		h = 31*h + LOWER_OR_NOT(*p++);
+	return h;
+}
+
+static int resize(struct htab *htab, size_t nel)
+{
+	size_t newsize;
+	size_t i, j;
+	size_t oldmask = htab->mask;
+	struct elem *e, *newe;
+	struct elem *oldtab = htab->elems;
+	struct elem *oldend;
+
+	if (nel > MAXSIZE)
+		nel = MAXSIZE;
+	for (newsize = MINSIZE; newsize < nel; newsize *= 2);
+	htab->elems = calloc(newsize, sizeof *htab->elems);
+	if (!htab->elems) {
+		htab->elems = oldtab;
+		return 0;
+	}
+	htab->mask = newsize - 1;
+	if (!oldtab)
+		return 1;
+
+	oldend = oldtab + oldmask + 1;
+	for (e = oldtab; e < oldend; e++)
+		if (e->item.key) {
+			for (i=e->hash,j=1; ; i+=j++) {
+				newe = htab->elems + (i & htab->mask);
+				if (!newe->item.key)
+					break;
+			}
+			*newe = *e;
+		}
+	free(oldtab);
+	return 1;
+}
+
+static struct elem *lookup(struct htab *htab, const char *key, size_t hash, size_t dead)
+{
+	size_t i, j;
+	struct elem *e;
+
+	for (i=hash,j=1; ; i+=j++) {
+		e = htab->elems + (i & htab->mask);
+		if ((!e->item.key && (!e->hash || e->hash == dead)) ||
+		    (e->hash==hash && STRCMP(e->item.key, key)==0))
+			break;
+	}
+	return e;
+}
+
+struct htab *htab_create(size_t nel)
+{
+	struct htab *r = calloc(1, sizeof *r);
+	if(r && !resize(r, nel)) {
+		free(r);
+		r = 0;
+	}
+	r->seed = rand();
+	return r;
+}
+
+void htab_destroy(struct htab *htab)
+{
+	free(htab->elems);
+	free(htab);
+}
+
+static struct elem *htab_find_elem(struct htab *htab, const char* key)
+{
+	size_t hash = keyhash(key, htab->seed);
+	struct elem *e = lookup(htab, key, hash, 0);
+
+	if (e->item.key) {
+		return e;
+	}
+	return 0;
+}
+
+htab_value* htab_find(struct htab *htab, const char* key)
+{
+	struct elem *e = htab_find_elem(htab, key);
+	if(!e) return 0;
+	return &e->item.data;
+}
+
+htab_value* htab_find2(struct htab *htab, const char* key, char **saved_key)
+{
+	struct elem *e = htab_find_elem(htab, key);
+	if(!e) return 0;
+	*saved_key = e->item.key;
+	return &e->item.data;
+}
+
+int htab_delete(struct htab *htab, const char* key)
+{
+	struct elem *e = htab_find_elem(htab, key);
+	if(!e) return 0;
+	e->item.key = 0;
+	e->hash = 0xdeadc0de;
+	--htab->used;
+	++htab->dead;
+	return 1;
+}
+
+int htab_insert(struct htab *htab, char* key, htab_value value)
+{
+	size_t hash = keyhash(key, htab->seed), oh;
+	struct elem *e = lookup(htab, key, hash, 0xdeadc0de);
+	if(e->item.key) {
+		/* it's not allowed to overwrite existing data */
+		return 0;
+	}
+
+	oh = e->hash; /* save old hash in case it's tombstone marker */
+	e->item.key = key;
+	e->item.data = value;
+	e->hash = hash;
+	if (++htab->used + htab->dead > htab->mask - htab->mask/4) {
+		if (!resize(htab, 2*htab->used)) {
+			htab->used--;
+			e->item.key = 0;
+			e->hash = oh;
+			return 0;
+		}
+		htab->dead = 0;
+	} else if (oh == 0xdeadc0de) {
+		/* re-used tomb */
+		--htab->dead;
+	}
+	return 1;
+}
+
+size_t htab_next(struct htab *htab, size_t iterator, char** key, htab_value **v)
+{
+	size_t i;
+	for(i=iterator;i<htab->mask+1;++i) {
+		struct elem *e = htab->elems + i;
+		if(e->item.key) {
+			*key = e->item.key;
+			*v = &e->item.data;
+			return i+1;
+		}
+	}
+	return 0;
+}

src/hsearch.h

@@ -0,0 +1,23 @@
+#ifndef HSEARCH_H
+#define HSEARCH_H
+
+#include <stdlib.h>
+
+typedef union htab_value {
+	void *p;
+	size_t n;
+} htab_value;
+
+#define HTV_N(N) (htab_value) {.n = N}
+#define HTV_P(P) (htab_value) {.p = P}
+
+struct htab * htab_create(size_t);
+void htab_destroy(struct htab *);
+htab_value* htab_find(struct htab *, const char* key);
+/* same as htab_find, but can retrieve the saved key (for freeing) */
+htab_value* htab_find2(struct htab *htab, const char* key, char **saved_key);
+int htab_insert(struct htab *, char*, htab_value);
+int htab_delete(struct htab *htab, const char* key);
+size_t htab_next(struct htab *, size_t iterator, char** key, htab_value **v);
+
+#endif

src/html-error.c

@@ -0,0 +1,320 @@
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2003 Steven Young <sdyoung@miranda.org>
+ *
+ * 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 contains source code for the handling and display of
+ * HTML error pages with variable substitution.
+ */
+
+#include "common.h"
+#include "main.h"
+
+#include "buffer.h"
+#include "conns.h"
+#include "heap.h"
+#include "html-error.h"
+#include "network.h"
+#include "utils.h"
+#include "conf.h"
+#include "log.h"
+
+#include <regex.h>
+
+/*
+ * Add an error number -> filename mapping to the errorpages list.
+ */
+#define ERRORNUM_BUFSIZE 8      /* this is more than required */
+#define ERRPAGES_BUCKETCOUNT 16
+
+int add_new_errorpage (struct config_s *conf, char *filepath,
+                       unsigned int errornum)
+{
+        char errornbuf[ERRORNUM_BUFSIZE], *k;
+
+        if (!conf->errorpages)
+                conf->errorpages = htab_create (ERRPAGES_BUCKETCOUNT);
+        if (!conf->errorpages)
+                return (-1);
+
+        snprintf (errornbuf, ERRORNUM_BUFSIZE, "%u", errornum);
+
+        k = safestrdup(errornbuf);
+        if (!k) return -1;
+
+        if (!htab_insert (conf->errorpages, k, HTV_P(filepath))) {
+                safefree(k);
+                return (-1);
+        }
+
+        return (0);
+}
+
+/*
+ * Get the file appropriate for a given error.
+ */
+static char *get_html_file (unsigned int errornum)
+{
+        char errornbuf[ERRORNUM_BUFSIZE];
+        htab_value *hv;
+
+        assert (errornum >= 100 && errornum < 1000);
+
+        if (!config->errorpages)
+                return (config->errorpage_undef);
+
+        snprintf (errornbuf, ERRORNUM_BUFSIZE, "%u", errornum);
+
+        hv = htab_find (config->errorpages, errornbuf);
+        if (!hv) return (config->errorpage_undef);
+        return hv->p;
+}
+
+static char *lookup_variable (struct htab *map, const char *varname) {
+	htab_value *v;
+	v = htab_find(map, varname);
+	return v ? v->p : 0;
+}
+
+static void varsubst_sendline(struct conn_s *connptr, regex_t *re, char *p) {
+	int fd = connptr->client_fd;
+	while(*p) {
+		regmatch_t match;
+		char varname[32+1], *varval;
+		size_t l;
+		int st = regexec(re, p, 1, &match, 0);
+		if(st == 0) {
+			if(match.rm_so > 0) safe_write(fd, p, match.rm_so);
+			l = match.rm_eo - match.rm_so;
+			assert(l>2 && l-2 < sizeof(varname));
+			p += match.rm_so;
+			memcpy(varname, p+1, l-2);
+			varname[l-2] = 0;
+			varval = lookup_variable(connptr->error_variables, varname);
+			if(varval) write_message(fd, "%s", varval);
+			else if(varval && !*varval) write_message(fd, "(unknown)");
+			else safe_write(fd, p, l);
+			p += l;
+		} else {
+			write_message(fd, "%s", p);
+			break;
+		}
+	}
+}
+
+/*
+ * Send an already-opened file to the client with variable substitution.
+ */
+int
+send_html_file (FILE *infile, struct conn_s *connptr)
+{
+        regex_t re;
+        char *inbuf = safemalloc (4096);
+        (void) regcomp(&re, "{[a-z]\\{1,32\\}}", 0);
+
+        while (fgets (inbuf, 4096, infile)) {
+                varsubst_sendline(connptr, &re, inbuf);
+        }
+
+        regfree (&re);
+        safefree (inbuf);
+        return 1;
+}
+
+int send_http_headers (
+        struct conn_s *connptr, int code,
+        const char *message, const char *extra)
+{
+        const char headers[] =
+            "HTTP/1.%u %d %s\r\n"
+            "Server: %s\r\n"
+            "Content-Type: text/html\r\n"
+            "%s"
+            "Connection: close\r\n" "\r\n";
+
+        return (write_message (connptr->client_fd, headers,
+                               connptr->protocol.major != 1 ? 0 : connptr->protocol.minor,
+                               code, message, PACKAGE,
+                               extra));
+}
+
+/*
+ * Display an error to the client.
+ */
+int send_http_error_message (struct conn_s *connptr)
+{
+        char *error_file;
+        FILE *infile;
+        int ret;
+        const char *fallback_error =
+            "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+            "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" "
+            "\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\n"
+            "<html>\n"
+            "<head><title>%d %s</title></head>\n"
+            "<body>\n"
+            "<h1>%s</h1>\n"
+            "<p>%s</p>\n"
+            "<hr />\n"
+            "<p><em>Generated by %s.</em></p>\n" "</body>\n"
+            "</html>\n";
+
+	/* according to rfc7235, the 407 error must be accompanied by
+           a Proxy-Authenticate header field. */
+        const char *auth_str_type = 
+                connptr->error_number == 407 ? "Proxy-Authenticate" :
+                (connptr->error_number == 401 ? "WWW-Authenticate" : "");
+
+        const char auth_str_tpl[] = "%s: Basic realm=\"%s\"\r\n";
+        char* auth_str_add = NULL;
+
+        if (auth_str_type[0] != 0) {
+                int auth_str_size = snprintf (NULL, 0, auth_str_tpl, 
+                                        auth_str_type, config->basicauth_realm) + 1;
+                if (auth_str_size > 0) {
+                        auth_str_add = safemalloc (auth_str_size);
+                        if (auth_str_add != NULL) {
+                                snprintf (auth_str_add, auth_str_size, auth_str_tpl,
+                                        auth_str_type, config->basicauth_realm);
+                        }
+                }
+        }
+
+        send_http_headers (connptr, connptr->error_number,
+                           connptr->error_string, auth_str_add ? auth_str_add : "");
+
+        if (auth_str_add) safefree (auth_str_add);
+
+        error_file = get_html_file (connptr->error_number);
+        if (!error_file || !(infile = fopen (error_file, "r"))) {
+                char *detail;
+                if (error_file) log_message (LOG_ERR,
+                                "Error opening error file '%s' (%s)",
+                                error_file, strerror (errno));
+                detail = lookup_variable (connptr->error_variables, "detail");
+                return (write_message (connptr->client_fd, fallback_error,
+                                       connptr->error_number,
+                                       connptr->error_string,
+                                       connptr->error_string,
+                                       detail, PACKAGE));
+        }
+
+        ret = send_html_file (infile, connptr);
+        fclose (infile);
+        return (ret);
+}
+
+/*
+ * Add a key -> value mapping for HTML file substitution.
+ */
+
+#define ERRVAR_BUCKETCOUNT 16
+
+int
+add_error_variable (struct conn_s *connptr, const char *key, const char *val)
+{
+	char *k, *v;
+
+        if (!connptr->error_variables)
+                if (!
+                    (connptr->error_variables =
+                     htab_create (ERRVAR_BUCKETCOUNT)))
+                        return (-1);
+
+        k = safestrdup(key);
+        v = safestrdup(val);
+
+        if (!v || !k) goto oom;
+
+        if(htab_insert (connptr->error_variables, k, HTV_P(v)))
+                return 1;
+oom:;
+	safefree(k);
+	safefree(v);
+	return -1;
+}
+
+#define ADD_VAR_RET(x, y)				   \
+	do {                                               \
+                if (y == NULL)                             \
+                        break;                             \
+		if (add_error_variable(connptr, x, y) < 0) \
+			return -1;			   \
+	} while (0)
+
+/*
+ * Set some standard variables used by all HTML pages
+ */
+int add_standard_vars (struct conn_s *connptr)
+{
+        char errnobuf[16];
+        char timebuf[30];
+        time_t global_time;
+        struct tm tm_buf;
+
+        snprintf (errnobuf, sizeof errnobuf, "%d", connptr->error_number);
+        ADD_VAR_RET ("errno", errnobuf);
+
+        ADD_VAR_RET ("cause", connptr->error_string);
+        ADD_VAR_RET ("request", connptr->request_line);
+        ADD_VAR_RET ("clientip", connptr->client_ip_addr);
+
+        /* The following value parts are all non-NULL and will
+         * trigger warnings in ADD_VAR_RET(), so we use
+         * add_error_variable() directly.
+         */
+
+        global_time = time (NULL);
+        strftime (timebuf, sizeof (timebuf), "%a, %d %b %Y %H:%M:%S GMT",
+                  gmtime_r (&global_time, &tm_buf));
+        add_error_variable (connptr, "date", timebuf);
+
+        add_error_variable (connptr, "website",
+                            "https://tinyproxy.github.io/");
+        add_error_variable (connptr, "version", VERSION);
+        add_error_variable (connptr, "package", PACKAGE);
+
+        return (0);
+}
+
+/*
+ * Add the error information to the conn structure.
+ */
+int
+indicate_http_error (struct conn_s *connptr, int number,
+                     const char *message, ...)
+{
+        va_list ap;
+        char *key, *val;
+
+        va_start (ap, message);
+
+        while ((key = va_arg (ap, char *))) {
+                val = va_arg (ap, char *);
+
+                if (add_error_variable (connptr, key, val) == -1) {
+                        va_end (ap);
+                        return (-1);
+                }
+        }
+
+        connptr->error_number = number;
+        connptr->error_string = safestrdup (message);
+
+        va_end (ap);
+
+        return (add_standard_vars (connptr));
+}

src/html-error.h

@@ -0,0 +1,39 @@
+/* tinyproxy - A fast light-weight HTTP proxy
+ * Copyright (C) 2003 Steven Young <sdyoung@miranda.org>
+ *
+ * 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.
+ */
+
+/* See 'html-error.c' for detailed information. */
+
+#ifndef TINYPROXY_HTML_ERROR_H
+#define TINYPROXY_HTML_ERROR_H
+
+/* Forward declaration */
+struct conn_s;
+struct config_s;
+
+extern int add_new_errorpage (struct config_s *, char *filepath, unsigned int errornum);
+extern int send_http_error_message (struct conn_s *connptr);
+extern int indicate_http_error (struct conn_s *connptr, int number,
+                                const char *message, ...);
+extern int add_error_variable (struct conn_s *connptr, const char *key,
+                               const char *val);
+extern int send_html_file (FILE * infile, struct conn_s *connptr);
+extern int send_http_headers (struct conn_s *connptr, int code,
+                              const char *message, const char *extra);
+extern int add_standard_vars (struct conn_s *connptr);
+
+#endif /* !TINYPROXY_HTML_ERROR_H */

src/http-message.c

@@ -0,0 +1,272 @@
+/* tinyproxy - A fast light-weight HTTP proxy
+ * 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 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.
+ */
+
+/* See 'http-message.h' for detailed information. */
+
+#include "common.h"
+#include "heap.h"
+#include "http-message.h"
+#include "network.h"
+
+/*
+ * Package up an HTTP message into a nice little structure.  As you can
+ * see this structure doesn't actually store any allocated strings;
+ * therefore, the caller must free any memory referenced by this struct.
+ * Also, the caller MUST NOT free the memory while the structure is
+ * still in use---bad things would happen.
+ */
+struct http_message_s {
+        /* Response string and code supplied on the HTTP status line */
+        struct {
+                const char *string;
+                int code;
+        } response;
+
+        /*
+         * A group of headers to be sent with this message.  Right now
+         * the strings are referenced through pointers in an array.
+         * I might change this to a vector in the future.
+         */
+        struct {
+                const char **strings;
+                unsigned int total;
+                unsigned int used;
+        } headers;
+
+        /* Body of the message (most likely an HTML message) */
+        struct {
+                const char *text;
+                size_t length;
+        } body;
+};
+
+/*
+ * Check if the HTTP message is validly formed.  This is the one odd-ball
+ * function.  It returns 0 if the message is invalid; otherwise, a positive
+ * number is returned.  Useful for if() tests and assert() tests.
+ */
+static int is_http_message_valid (http_message_t msg)
+{
+        if (msg == NULL)
+                return 0;
+        if (msg->headers.strings == NULL)
+                return 0;
+        if (msg->response.string == NULL)
+                return 0;
+        if (msg->response.code < 1 || msg->response.code > 999)
+                return 0;
+
+        return 1;
+}
+
+/* Initially allocate space for 128 headers */
+#define NUMBER_OF_HEADERS 128
+
+/*
+ * Allocate a new http_message structure on the heap.
+ * If memory could not be allocated, return a NULL.
+ */
+http_message_t
+http_message_create (int response_code, const char *response_string)
+{
+        http_message_t msg;
+        int ret;
+
+        msg =
+            (struct http_message_s *) safecalloc (1,
+                                                  sizeof (struct
+                                                          http_message_s));
+        if (msg == NULL)
+                return NULL;
+
+        msg->headers.strings = (const char **) safecalloc (NUMBER_OF_HEADERS,
+                                                           sizeof (char *));
+        if (msg->headers.strings == NULL) {
+                safefree (msg);
+                return NULL;
+        }
+
+        msg->headers.total = NUMBER_OF_HEADERS;
+
+        /* Store the HTTP response information in the structure */
+        ret = http_message_set_response (msg, response_code, response_string);
+        if (IS_HTTP_MSG_ERROR (ret)) {
+                safefree (msg->headers.strings);
+                safefree (msg);
+                return NULL;
+        }
+
+        return msg;
+}
+
+/*
+ * Free up the space associated with this HTTP message structure.
+ * This DOES NOT free the pointers stored in this structure.  That memory
+ * is the responsibility of the caller.
+ */
+int http_message_destroy (http_message_t msg)
+{
+        assert (msg != NULL);
+        assert (msg->headers.strings != NULL);
+
+        /* Check for valid arguments */
+        if (msg == NULL)
+                return -EFAULT;
+
+        if (msg->headers.strings != NULL)
+                safefree (msg->headers.strings);
+        safefree (msg);
+        return 0;
+}
+
+/*
+ * Set the HTTP response information for this structure.  The response_string
+ * must be a NUL ('\0') terminated C string.
+ */
+int
+http_message_set_response (http_message_t msg,
+                           int response_code, const char *response_string)
+{
+        /* Check for valid arguments */
+        if (msg == NULL)
+                return -EFAULT;
+        if (response_code < 1 || response_code > 999)
+                return -EINVAL;
+        if (response_string == NULL)
+                return -EINVAL;
+        if (strlen (response_string) == 0)
+                return -EINVAL;
+
+        msg->response.code = response_code;
+        msg->response.string = response_string;
+
+        return 0;
+}
+
+/*
+ * Set the HTTP message body.
+ */
+int http_message_set_body (http_message_t msg, const char *body, size_t len)
+{
+        /* Check for valid arguments */
+        if (msg == NULL)
+                return -EFAULT;
+        if (body == NULL)
+                return -EINVAL;
+        if (len == 0)
+                return -EINVAL;
+
+        msg->body.text = body;
+        msg->body.length = len;
+
+        return 0;
+}
+
+/*
+ * Add headers to the structure.
+ */
+int
+http_message_add_headers (http_message_t msg, const char **headers,
+                          unsigned int num_headers)
+{
+        const char **new_headers;
+        unsigned int i;
+
+        /* Check for valid arguments */
+        if (msg == NULL)
+                return -EFAULT;
+        if (headers == NULL)
+                return -EINVAL;
+
+        /*
+         * If the number of headers to add is greater than the space
+         * available, reallocate the memory.
+         */
+        if (msg->headers.used + num_headers > msg->headers.total) {
+                new_headers =
+                    (const char **) safecalloc (msg->headers.total * 2,
+                                                sizeof (char *));
+                if (new_headers == NULL)
+                        return -ENOMEM;
+
+                /* Copy the array */
+                for (i = 0; i != msg->headers.used; ++i)
+                        new_headers[i] = msg->headers.strings[i];
+
+                /* Remove the old array and replace it with the new array */
+                safefree (msg->headers.strings);
+                msg->headers.strings = new_headers;
+                msg->headers.total *= 2;
+        }
+
+        /*
+         * Add the new headers to the structure
+         */
+        for (i = 0; i != num_headers; ++i)
+                msg->headers.strings[i + msg->headers.used] = headers[i];
+        msg->headers.used += num_headers;
+
+        return 0;
+}
+
+/*
+ * Send the completed HTTP message via the supplied file descriptor.
+ */
+int http_message_send (http_message_t msg, int fd)
+{
+        char timebuf[30];
+        time_t global_time;
+        unsigned int i;
+        struct tm tm_buf;
+
+        assert (is_http_message_valid (msg));
+
+        /* Check for valid arguments */
+        if (msg == NULL)
+                return -EFAULT;
+        if (fd < 1)
+                return -EBADF;
+        if (!is_http_message_valid (msg))
+                return -EINVAL;
+
+        /* Write the response line */
+        write_message (fd, "HTTP/1.0 %d %s\r\n",
+                       msg->response.code, msg->response.string);
+
+        /* Go through all the headers */
+        for (i = 0; i != msg->headers.used; ++i)
+                write_message (fd, "%s\r\n", msg->headers.strings[i]);
+
+        /* Output the date */
+        global_time = time (NULL);
+        strftime (timebuf, sizeof (timebuf), "%a, %d %b %Y %H:%M:%S GMT",
+                  gmtime_r (&global_time, &tm_buf));
+        write_message (fd, "Date: %s\r\n", timebuf);
+
+        /* Output the content-length */
+        write_message (fd, "Content-length: %lu\r\n", (unsigned long) msg->body.length);
+
+        /* Write the separator between the headers and body */
+        safe_write (fd, "\r\n", 2);
+
+        /* If there's a body, send it! */
+        if (msg->body.length > 0)
+                safe_write (fd, msg->body.text, msg->body.length);
+
+        return 0;
+}

src/http-message.h

@@ -0,0 +1,94 @@
+/* tinyproxy - A fast light-weight HTTP proxy
+ * 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 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
+ * functions allow the message to be built up systematically before
+ * transmission to a connected socket.
+ *
+ * The order of the functions in your program would look something like
+ * this:
+ *   http_message_create()
+ *   http_message_set_response()
+ *   http_message_set_body() [optional if no body is required]
+ *   http_message_add_headers() [optional if no additional headers are used]
+ *   http_message_send()
+ *   http_message_destroy()
+ *
+ * NOTE: No user data is stored in the http_message_t type; therefore,
+ * do not delete strings referenced by the http_message_t object
+ * before you call http_message_destroy().  By not copying data, the
+ * API functions are faster, but you must take greater care.
+ *
+ * (Side note: be _very_ careful when using stack allocated memory with
+ * this API.  Bad things will happen if you try to pass the
+ * http_message_t out of the calling function since the stack
+ * allocated memory referenced by the http_message_t will no long
+ * exist.)
+ */
+
+#ifndef _TINYPROXY_HTTP_MESSAGE_H_
+#define _TINYPROXY_HTTP_MESSAGE_H_
+
+/* Use the "http_message_t" as a cookie or handle to the structure. */
+typedef struct http_message_s *http_message_t;
+
+/*
+ * Macro to test if an error occurred with the API.  All the HTTP message
+ * functions will return 0 if no error occurred, or a negative number if
+ * there was a problem.
+ */
+#define IS_HTTP_MSG_ERROR(x) (x < 0)
+
+/* Initialize the internal structure of the HTTP message */
+extern http_message_t http_message_create (int response_code,
+                                           const char *response_string);
+
+/* Free up an _internal_ resources */
+extern int http_message_destroy (http_message_t msg);
+
+/*
+ * Send an HTTP message via the supplied file descriptor.  This function
+ * will add the "Date" header before it's sent.
+ */
+extern int http_message_send (http_message_t msg, int fd);
+
+/*
+ * Change the internal state of the HTTP message.  Either set the
+ * body of the message, update the response information, or
+ * add a new set of headers.
+ */
+extern int http_message_set_body (http_message_t msg,
+                                  const char *body, size_t len);
+extern int http_message_set_response (http_message_t msg,
+                                      int response_code,
+                                      const char *response_string);
+
+/*
+ * Set the headers for this HTTP message.  Each string must be NUL ('\0')
+ * terminated, but DO NOT include any carriage returns (CR) or
+ * line-feeds (LF) since they will be included when the http_message is
+ * sent.
+ */
+extern int http_message_add_headers (http_message_t msg,
+                                     const char **headers,
+                                     unsigned int num_headers);
+
+#endif /* _TINYPROXY_HTTP_MESSAGE_H_ */

src/log.c

@@ -1,27 +1,37 @@
-/* $Id: log.c,v 1.15 2001-10-25 17:27:39 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>
+ * Copyright (C) 2009 Michael Adam <obnox@samba.org>
  *
- * 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@flarenet.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.
  */
 
-#include "tinyproxy.h"
+/* Logs the various messages which tinyproxy produces to either a log file
+ * or the syslog daemon. Not much to it...
+ */
 
+#include "main.h"
+
+#include "heap.h"
 #include "log.h"
+#include "utils.h"
+#include "sblist.h"
+#include "conf.h"
+#include <pthread.h>
 
-static char *syslog_level[] = {
+static const char *syslog_level[] = {
         NULL,
         NULL,
         "CRITICAL",
@@ -36,15 +46,58 @@ static char *syslog_level[] = {
 #define TIME_LENGTH 16
 #define STRING_LENGTH 800
 
+static pthread_mutex_t log_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+/*
+ * Global file descriptor for the log file
+ */
+int log_file_fd = -1;
+
 /*
  * Store the log level setting.
  */
-static short int log_level = LOG_ERR;
+static int log_level = LOG_INFO;
+
+/*
+ * Hold a listing of log messages which need to be sent once the log
+ * file has been established.
+ * The key is the actual messages (already filled in full), and the value
+ * is the log level.
+ */
+static sblist *log_message_storage;
+
+static unsigned int logging_initialized = FALSE;     /* boolean */
+
+/*
+ * Open the log file and store the file descriptor in a global location.
+ */
+int open_log_file (const char *log_file_name)
+{
+        if (log_file_name == NULL) {
+                log_file_fd = fileno(stdout);
+        } else {
+                log_file_fd = create_file_safely (log_file_name, FALSE);
+        }
+        return log_file_fd;
+}
+
+/*
+ * Close the log file
+ */
+void close_log_file (void)
+{
+        if (log_file_fd < 0 || log_file_fd == fileno(stdout)) {
+                return;
+        }
+
+        close (log_file_fd);
+        log_file_fd = -1;
+}
 
 /*
  * Set the log level for writing to the log file.
  */
-void set_log_level(short int level)
+void set_log_level (int level)
 {
         log_level = level;
 }
@@ -52,16 +105,16 @@ void set_log_level(short int level)
 /*
  * This routine logs messages to either the log file or the syslog function.
  */
-void log_message(short int level, char *fmt, ...)
+void log_message (int level, const char *fmt, ...)
 {
         va_list args;
-	time_t nowtime;
-	FILE *cf;
+        struct timespec nowtime;
+        struct tm tm_buf;
 
         char time_string[TIME_LENGTH];
-#if defined(HAVE_SYSLOG_H) && !defined(HAVE_VSYSLOG_H)
         char str[STRING_LENGTH];
-#endif
+
+        ssize_t ret;
 
 #ifdef NDEBUG
         /*
@@ -77,40 +130,189 @@ void log_message(short int level, char *fmt, ...)
                 return;
 #endif
 
-
-#ifdef HAVE_SYSLOG_H
-	if (config.syslog && level == LOG_CONN) 
+        if (config && config->syslog && level == LOG_CONN)
                 level = LOG_INFO;
-#endif
 
-	va_start(args, fmt);
+        va_start (args, fmt);
 
-#ifdef HAVE_SYSLOG_H
-	if (config.syslog) {
-#  ifdef HAVE_VSYSLOG_H
-		vsyslog(level, fmt, args);
-#  else
-		vsnprintf(str, STRING_LENGTH, fmt, args);
-		syslog(level, "%s", str);
-#  endif
-	} else {
-#endif
-		nowtime = time(NULL);
-		/* Format is month day hour:minute:second (24 time) */
-		strftime(time_string, TIME_LENGTH, "%b %d %H:%M:%S",
-			 localtime(&nowtime));
+        /*
+         * If the config file hasn't been processed, then we need to store
+         * the messages for later processing.
+         */
+        if (!logging_initialized) {
+                char *entry_buffer;
 
-		if (!(cf = config.logf))
-			cf = stderr;
-
-		fprintf(cf, "%-9s %s [%ld]: ", syslog_level[level],
-			time_string, (long int)getpid());
-		vfprintf(cf, fmt, args);
-		fprintf(cf, "\n");
-		fflush(cf);
-#ifdef HAVE_SYSLOG_H
+                if (!log_message_storage) {
+                        log_message_storage = sblist_new (sizeof(char*), 64);
+                        if (!log_message_storage)
+                                goto out;
                 }
+
+                vsnprintf (str, STRING_LENGTH, fmt, args);
+
+                entry_buffer = (char *) safemalloc (strlen (str) + 6);
+                if (!entry_buffer)
+                        goto out;
+
+                sprintf (entry_buffer, "%d %s", level, str);
+                if(!sblist_add (log_message_storage, &entry_buffer))
+                        safefree (entry_buffer);
+                goto out;
+        }
+
+        if(!config->syslog && log_file_fd == -1)
+                goto out;
+
+        if (config->syslog) {
+                pthread_mutex_lock(&log_mutex);
+#ifdef HAVE_VSYSLOG_H
+                vsyslog (level, fmt, args);
+#else
+                vsnprintf (str, STRING_LENGTH, fmt, args);
+                syslog (level, "%s", str);
+#endif
+                pthread_mutex_unlock(&log_mutex);
+        } else {
+                char *p;
+
+                clock_gettime(CLOCK_REALTIME, &nowtime);
+                /* Format is month day hour:minute:second (24 time) */
+                strftime (time_string, TIME_LENGTH, "%b %d %H:%M:%S",
+                          localtime_r (&nowtime.tv_sec, &tm_buf));
+
+                snprintf (str, STRING_LENGTH, "%-9s %s.%03lu [%ld]: ",
+                          syslog_level[level], time_string,
+                          (unsigned long) nowtime.tv_nsec/1000000ul,
+                          (long int) getpid ());
+
+                /*
+                 * Overwrite the '\0' and leave room for a trailing '\n'
+                 * be added next.
+                 */
+                p = str + strlen(str);
+                vsnprintf (p, STRING_LENGTH - strlen(str) - 1, fmt, args);
+
+                p = str + strlen(str);
+                *p = '\n';
+                *(p+1) = '\0';
+
+                assert (log_file_fd >= 0);
+
+                pthread_mutex_lock(&log_mutex);
+                ret = write (log_file_fd, str, strlen (str));
+                pthread_mutex_unlock(&log_mutex);
+
+                if (ret == -1) {
+                        config->syslog = TRUE;
+
+                        log_message(LOG_CRIT, "ERROR: Could not write to log "
+                                    "file %s: %s.",
+                                    config->logf_name, strerror(errno));
+                        log_message(LOG_CRIT,
+                                    "Falling back to syslog logging");
+                }
+
+                pthread_mutex_lock(&log_mutex);
+                fsync (log_file_fd);
+                pthread_mutex_unlock(&log_mutex);
+
+        }
+
+out:
+        va_end (args);
+}
+
+/*
+ * This needs to send any stored log messages.
+ */
+static void send_stored_logs (void)
+{
+        char **string;
+        char *ptr;
+        int level;
+        size_t i;
+
+        if (log_message_storage == NULL)
+                return;
+
+        log_message(LOG_DEBUG, "sending stored logs");
+
+        for (i = 0; i < sblist_getsize (log_message_storage); ++i) {
+                string = sblist_get (log_message_storage, i);
+                if (!string || !*string) continue;
+
+                ptr = strchr (*string, ' ') + 1;
+                level = atoi (*string);
+
+#ifdef NDEBUG
+                if (log_level == LOG_CONN && level == LOG_INFO)
+                        continue;
+                else if (log_level == LOG_INFO) {
+                        if (level > LOG_INFO && level != LOG_CONN)
+                                continue;
+                } else if (level > log_level)
+                        continue;
 #endif
 
-	va_end(args);
+                log_message (level, "%s", ptr);
+                safefree(*string);
+        }
+
+        sblist_free (log_message_storage);
+        log_message_storage = NULL;
+
+        log_message(LOG_DEBUG, "done sending stored logs");
+}
+
+/**
+ * Initialize the logging subsystem, based on the configuration.
+ * Returns 0 upon success, -1 upon failure.
+ *
+ * This function uses fprintf() instead of log_message(), since
+ * the logging is not yet set up...
+ */
+int setup_logging (void)
+{
+        if (!config->syslog) {
+                if (open_log_file (config->logf_name) < 0) {
+                        /*
+                         * If opening the log file fails, we try
+                         * to fall back to syslog logging...
+                         */
+                        config->syslog = TRUE;
+
+                        log_message (LOG_CRIT, "ERROR: Could not create log "
+                                     "file %s: %s.",
+                                     config->logf_name, strerror (errno));
+                        log_message (LOG_CRIT,
+                                     "Falling back to syslog logging.");
+                }
+        }
+
+        if (config->syslog) {
+                openlog ("tinyproxy", LOG_PID, LOG_USER);
+        }
+
+        logging_initialized = TRUE;
+        send_stored_logs ();
+
+        return 0;
+}
+
+/**
+ * Stop the logging subsystem.
+ */
+void shutdown_logging (void)
+{
+        if (!logging_initialized) {
+                return;
+        }
+
+        if (config->syslog) {
+                closelog ();
+        } else {
+                close_log_file ();
+        }
+
+        logging_initialized = FALSE;
 }

src/log.h

@@ -1,21 +1,25 @@
-/* $Id: log.h,v 1.7 2001-08-26 21:10:04 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>
+ * Copyright (C) 2009 Michael Adam <obnox@samba.org>
  *
- * 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@flarenet.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 'log.c' for detailed information. */
+
 #ifndef TINYPROXY_LOG_H
 #define TINYPROXY_LOG_H
 
@@ -36,10 +40,10 @@
  * Level	Description
  * -----	-----------
  * LOG_CRIT	This is catastrophic. Basically, tinyproxy can not recover
- *		from this and will either close the thread (if we're lucky),
+ *		from this and will either close the child (if we're lucky),
  *		or the entire daemon. I would relegate this to conditions
  *		like unable to create the listening socket, or unable to
- *		create a thread. If you're going to log at this level provide
+ *		create a child. If you're going to log at this level provide
  *		as much information as possible.
  *
  * LOG_ERR	Okay, something bad happened. We can recover from this, but
@@ -56,7 +60,7 @@
  *
  * LOG_NOTICE	This is for a special condition. Nothing has gone wrong, but
  *		it is more important than the common LOG_INFO level. Right
- *		now it is used for actions like creating/destroying threads,
+ *		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
@@ -73,33 +77,37 @@
  *		don't advocate this, but it could be useful at times.)
  */
 
-#ifdef HAVE_SYSLOG_H
-#  include <syslog.h>
-#else
-#  define LOG_CRIT    2
-#  define LOG_ERR     3
-#  define LOG_WARNING 4
-#  define LOG_NOTICE  5
-#  define LOG_INFO    6
-#  define LOG_DEBUG   7
-#endif
+#include <syslog.h>
 
 #define LOG_CONN      8         /* extra to log connections without the INFO stuff */
 
+/* Suppress warnings when GCC is in -pedantic mode and not -std=c99 */
+#if (__GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96))
+#pragma GCC system_header
+#endif
+
 /*
  * Use this for debugging. The format is specific:
  *    DEBUG1("There was a major problem");
  *    DEBUG2("There was a big problem: %s in connptr %p", "hello", connptr);
  */
 #ifndef NDEBUG
-# define DEBUG1(x)       log_message(LOG_DEBUG, "[%s:%d] " x, __FILE__, __LINE__)
-# define DEBUG2(x, y...) log_message(LOG_DEBUG, "[%s:%d] " x, __FILE__, __LINE__, ## y)
+# define DEBUG1(x) \
+  log_message(LOG_DEBUG, "[%s:%d] " x, __FILE__, __LINE__)
+# define DEBUG2(x, y...) \
+  log_message(LOG_DEBUG, "[%s:%d] " x, __FILE__, __LINE__, ## y)
 #else
 # define DEBUG1(x)       do { } while(0)
 # define DEBUG2(x, y...) do { } while(0)
 #endif
 
-extern void log_message(short int level, char *fmt, ...);
-extern void set_log_level(short int level);
+extern int open_log_file (const char *file);
+extern void close_log_file (void);
+
+extern void log_message (int level, const char *fmt, ...);
+extern void set_log_level (int level);
+
+extern int setup_logging (void);
+extern void shutdown_logging (void);
 
 #endif