Permalink
Browse files

Merge remote branch 'tcurdt/master'

Conflicts:
	Resources/MainViewController.xib
	Sources/AppDelegate.m
	Sources/AppTextFileResponse.m
	Sources/HTTPServer.m
	Sources/PacFileResponse.h
	Sources/StatusViewController.h
	Sources/StatusViewController.m
	iProxy.xcodeproj/project.pbxproj
  • Loading branch information...
Jérôme Lebel
Jérôme Lebel committed Sep 27, 2010
2 parents 550512d + 33d1099 commit 64e7b4e66a647f0859f96e7e8169fc6101b782e2
Showing with 30,552 additions and 1,059 deletions.
  1. +492 −0 Frameworks/polipo-20091115/CHANGES
  2. +19 −0 Frameworks/polipo-20091115/COPYING
  3. +72 −0 Frameworks/polipo-20091115/INSTALL
  4. +145 −0 Frameworks/polipo-20091115/Makefile
  5. +21 −0 Frameworks/polipo-20091115/README
  6. +37 −0 Frameworks/polipo-20091115/README.Windows
  7. +361 −0 Frameworks/polipo-20091115/atom.c
  8. +58 −0 Frameworks/polipo-20091115/atom.h
  9. +91 −0 Frameworks/polipo-20091115/auth.c
  10. +24 −0 Frameworks/polipo-20091115/auth.h
  11. +469 −0 Frameworks/polipo-20091115/chunk.c
  12. +51 −0 Frameworks/polipo-20091115/chunk.h
  13. +2,161 −0 Frameworks/polipo-20091115/client.c
  14. +64 −0 Frameworks/polipo-20091115/client.h
  15. +869 −0 Frameworks/polipo-20091115/config.c
  16. +68 −0 Frameworks/polipo-20091115/config.h
  17. +161 −0 Frameworks/polipo-20091115/config.sample
  18. +2,576 −0 Frameworks/polipo-20091115/diskcache.c
  19. +72 −0 Frameworks/polipo-20091115/diskcache.h
  20. +1,749 −0 Frameworks/polipo-20091115/dns.c
  21. +48 −0 Frameworks/polipo-20091115/dns.h
  22. +852 −0 Frameworks/polipo-20091115/event.c
  23. +88 −0 Frameworks/polipo-20091115/event.h
  24. +791 −0 Frameworks/polipo-20091115/forbidden.c
  25. +48 −0 Frameworks/polipo-20091115/forbidden.h
  26. +18 −0 Frameworks/polipo-20091115/forbidden.sample
  27. +361 −0 Frameworks/polipo-20091115/fts_compat.c
  28. +69 −0 Frameworks/polipo-20091115/fts_compat.h
  29. +12 −0 Frameworks/polipo-20091115/ftsimport.c
  30. +6 −0 Frameworks/polipo-20091115/ftsimport.h
  31. +1,078 −0 Frameworks/polipo-20091115/http.c
  32. +175 −0 Frameworks/polipo-20091115/http.h
  33. +1,567 −0 Frameworks/polipo-20091115/http_parse.c
  34. +58 −0 Frameworks/polipo-20091115/http_parse.h
  35. +1,142 −0 Frameworks/polipo-20091115/io.c
  36. +161 −0 Frameworks/polipo-20091115/io.h
  37. +743 −0 Frameworks/polipo-20091115/local.c
  38. +48 −0 Frameworks/polipo-20091115/local.h
  39. +13 −0 Frameworks/polipo-20091115/localindex.html
  40. +491 −0 Frameworks/polipo-20091115/log.c
  41. +140 −0 Frameworks/polipo-20091115/log.h
  42. +177 −0 Frameworks/polipo-20091115/main.c
  43. +322 −0 Frameworks/polipo-20091115/md5.c
  44. +61 −0 Frameworks/polipo-20091115/md5.h
  45. +15 −0 Frameworks/polipo-20091115/md5import.c
  46. +9 −0 Frameworks/polipo-20091115/md5import.h
  47. +491 −0 Frameworks/polipo-20091115/mingw.c
  48. +140 −0 Frameworks/polipo-20091115/mingw.h
  49. +1,038 −0 Frameworks/polipo-20091115/object.c
  50. +197 −0 Frameworks/polipo-20091115/object.h
  51. +215 −0 Frameworks/polipo-20091115/parse_time.c
  52. +27 −0 Frameworks/polipo-20091115/parse_time.h
  53. +219 −0 Frameworks/polipo-20091115/polipo.h
  54. +93 −0 Frameworks/polipo-20091115/polipo.man
  55. +2,016 −0 Frameworks/polipo-20091115/polipo.texi
  56. +2,893 −0 Frameworks/polipo-20091115/server.c
  57. +113 −0 Frameworks/polipo-20091115/server.h
  58. +519 −0 Frameworks/polipo-20091115/socks.c
  59. +36 −0 Frameworks/polipo-20091115/socks.h
  60. +547 −0 Frameworks/polipo-20091115/tunnel.c
  61. +50 −0 Frameworks/polipo-20091115/tunnel.h
  62. +838 −0 Frameworks/polipo-20091115/util.c
  63. +108 −0 Frameworks/polipo-20091115/util.h
  64. +220 −0 Frameworks/polipo.diff
  65. +1 −1 Frameworks/srelay-0.4.7p3/main.c
  66. +7 −31 Frameworks/srelay-0.4.7p3/relay.c
  67. +9 −2 Frameworks/srelay-0.4.7p3/util.c
  68. +41 −13 Frameworks/srelay.diff
  69. +2 −0 Frameworks/update.sh
  70. +13 −0 HISTORY.txt
  71. +6 −15 README.txt
  72. BIN Resources/Default.png
  73. BIN Resources/Default@2x.png
  74. +6 −3 Resources/Entitlements.plist
  75. BIN Resources/Icon-72-transparent.png
  76. BIN Resources/Icon-72.png
  77. BIN Resources/Icon-Small-50.png
  78. BIN Resources/Icon-Small.png
  79. BIN Resources/Icon-Small@2x.png
  80. BIN Resources/Icon.png
  81. BIN Resources/Icon@2x.png
  82. +16 −3 Resources/Info.plist
  83. +707 −0 Resources/InfoViewController.xib
  84. BIN Resources/Instructions.jpg
  85. +482 −435 Resources/{StatusViewController.xib → MainViewController.xib}
  86. +213 −37 Resources/MainWindow.xib
  87. BIN Resources/Status.png
  88. BIN Resources/Status.xcf
  89. +101 −0 Resources/polipo.config
  90. BIN Resources/silence.wav
  91. +5 −19 Sources/AppDelegate.h
  92. +50 −124 Sources/AppDelegate.m
  93. +0 −150 Sources/AppTextFileResponse.m
  94. +1 −0 Sources/HTTPResponseHandler.h
  95. +21 −1 Sources/HTTPResponseHandler.m
  96. +1 −4 Sources/HTTPServer.m
  97. +6 −3 Sources/{InstructionsViewController.h → InfoViewController.h}
  98. +101 −0 Sources/InfoViewController.m
  99. +0 −49 Sources/InstructionsViewController.m
  100. +64 −0 Sources/MainViewController.h
  101. +282 −0 Sources/MainViewController.m
  102. +7 −0 Sources/NSStringAdditions.h
  103. +43 −0 Sources/NSStringAdditions.m
  104. +1 −5 Sources/{AppTextFileResponse.h → PacFileResponse.h}
  105. +136 −0 Sources/PacFileResponse.m
  106. +31 −1 Sources/Prefix.pch
  107. +0 −84 Sources/StatusViewController.m
  108. +5 −0 Sources/UIDeviceAdditions.h
  109. +39 −0 Sources/UIDeviceAdditions.m
  110. +5 −0 Sources/UIViewAdditions.h
  111. +22 −0 Sources/UIViewAdditions.m
  112. +315 −79 iProxy.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -0,0 +1,19 @@
+Copyright (c) 2003-2008 by Juliusz Chroboczek
+
+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.
@@ -0,0 +1,72 @@
+Polipo installation instructions -*-text-*-
+********************************
+
+1. Building and running polipo
+******************************
+
+ $ make all
+ $ su -c 'make install'
+ $ man polipo
+ $ polipo &
+
+If you want Polipo to put itself into the background, you may replace
+the last line with:
+
+ $ polipo daemonise=true logFile="/var/log/polipo.log"
+
+On SVR4 systems (Solaris, HP/UX), you will need to use one of the
+following (whichever works):
+
+ $ make PLATFORM_DEFINES=-DSVR4 all
+ $ make PLATFORM_DEFINES=-DSVR4 LDLIBS='-lsocket -lnsl -lresolv' all
+
+You can also use Polipo without installing:
+
+ $ make
+ $ nroff -man polipo.man | more
+ $ ./polipo &
+
+For information about building on Windows, please see the file README.Windows.
+
+2. Configuring your user-agent
+******************************
+
+Once polipo is running, configure your user-agent (web browser) to use
+the proxy on `http://localhost:8123/'. Depending on the user-agent,
+this is done either by setting the environment variable http_proxy,
+e.g.
+
+ $ http_proxy=http://localhost:8123; export http_proxy
+
+or by using the browser's ``preferences'' menu.
+
+3. Configuring polipo
+*********************
+
+If you want to use an on-disk cache, you will need to create its root
+directory:
+
+ $ mkdir /var/cache/polipo/
+
+You should then arrange for cron to run the following on a regular
+basis:
+
+ killall -USR1 polipo
+ sleep 1
+ polipo -x
+ killall -USR2 polipo
+
+If you want to use a configuration file, you should put it in one of
+the locations `/etc/polipo/config' or `~/.polipo'; you can also use
+the `-c' flag to put it in a non-standard location. See the file
+`config.sample' for an example.
+
+You might also want to create a forbidden URLs file, which you should
+put either in one of `/etc/polipo/forbidden' or `~/.polipo-forbidden';
+you can set the variable `forbiddenFile' in your config file if you
+want to put it in a non-standard location. See `forbidden.sample' for
+an example.
+
+
+ Juliusz Chroboczek
+ <jch@pps.jussieu.fr>
@@ -0,0 +1,145 @@
+PREFIX = /usr/local
+BINDIR = $(PREFIX)/bin
+MANDIR = $(PREFIX)/man
+INFODIR = $(PREFIX)/info
+LOCAL_ROOT = /usr/share/polipo/www
+DISK_CACHE_ROOT = /var/cache/polipo
+
+# To compile with Unix CC:
+
+# CDEBUGFLAGS=-O
+
+# To compile with GCC:
+
+# CC = gcc
+# CDEBUGFLAGS = -Os -g -Wall -std=gnu99
+CDEBUGFLAGS = -Os -g -Wall
+# CDEBUGFLAGS = -Os -Wall
+# CDEBUGFLAGS = -g -Wall
+
+# To compile on a pure POSIX system:
+
+# CC = c89
+# CC = c99
+# CDEBUGFLAGS=-O
+
+# To compile with icc 7, you need -restrict. (Their bug.)
+
+# CC=icc
+# CDEBUGFLAGS = -O -restrict
+
+# On System V (Solaris, HP/UX) you need the following:
+
+# PLATFORM_DEFINES = -DSVR4
+
+# On Solaris, you need the following:
+
+# LDLIBS = -lsocket -lnsl -lresolv
+
+# On mingw, you need
+
+# EXE=.exe
+# LDLIBS = -lwsock32
+
+FILE_DEFINES = -DLOCAL_ROOT=\"$(LOCAL_ROOT)/\" \
+ -DDISK_CACHE_ROOT=\"$(DISK_CACHE_ROOT)/\"
+
+# You may optionally also add any of the following to DEFINES:
+#
+# -DNO_DISK_CACHE to compile out the on-disk cache and local web server;
+# -DNO_IPv6 to avoid using the RFC 3493 API and stick to stock
+# Berkeley sockets;
+# -DHAVE_IPv6 to force the use of the RFC 3493 API on systems other
+# than GNU/Linux and BSD (let me know if it works);
+# -DNO_FANCY_RESOLVER to compile out the asynchronous name resolution
+# code;
+# -DNO_STANDARD_RESOLVER to compile out the code that falls back to
+# gethostbyname/getaddrinfo when DNS requests fail;
+# -DNO_TUNNEL to compile out the code that handles CONNECT requests;
+# -DNO_SOCKS to compile out the SOCKS gateway code.
+# -DNO_FORBIDDEN to compile out the all of the forbidden URL code
+# -DNO_REDIRECTOR to compile out the Squid-style redirector code
+# -DNO_SYSLOG to compile out logging to syslog
+
+DEFINES = $(FILE_DEFINES) $(PLATFORM_DEFINES)
+
+CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES)
+
+SRCS = util.c event.c io.c chunk.c atom.c object.c log.c diskcache.c main.c \
+ config.c local.c http.c client.c server.c auth.c tunnel.c \
+ http_parse.c parse_time.c dns.c forbidden.c \
+ md5import.c md5.c ftsimport.c fts_compat.c socks.c mingw.c
+
+OBJS = util.o event.o io.o chunk.o atom.o object.o log.o diskcache.o main.o \
+ config.o local.o http.o client.o server.o auth.o tunnel.o \
+ http_parse.o parse_time.o dns.o forbidden.o \
+ md5import.o ftsimport.o socks.o mingw.o
+
+polipo$(EXE): $(OBJS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o polipo$(EXE) $(OBJS) $(MD5LIBS) $(LDLIBS)
+
+ftsimport.o: ftsimport.c fts_compat.c
+
+md5import.o: md5import.c md5.c
+
+.PHONY: all install install.binary install.man
+
+all: polipo$(EXE) polipo.info html/index.html localindex.html
+
+install: install.binary install.man
+
+install.binary: all
+ mkdir -p $(TARGET)$(BINDIR)
+ mkdir -p $(TARGET)$(LOCAL_ROOT)
+ mkdir -p $(TARGET)$(LOCAL_ROOT)/doc
+ rm -f $(TARGET)$(BINDIR)/polipo
+ cp -f polipo $(TARGET)$(BINDIR)/
+ cp -f html/* $(TARGET)$(LOCAL_ROOT)/doc
+ cp -f localindex.html $(TARGET)$(LOCAL_ROOT)/index.html
+
+install.man: all
+ mkdir -p $(TARGET)$(MANDIR)/man1
+ mkdir -p $(TARGET)$(INFODIR)
+ cp -f polipo.man $(TARGET)$(MANDIR)/man1/polipo.1
+ cp polipo.info $(TARGET)$(INFODIR)/
+ install-info --info-dir=$(TARGET)$(INFODIR) polipo.info
+
+
+polipo.info: polipo.texi
+ makeinfo polipo.texi
+
+html/index.html: polipo.texi
+ mkdir -p html
+ makeinfo --html -o html polipo.texi
+
+polipo.html: polipo.texi
+ makeinfo --html --no-split --no-headers -o polipo.html polipo.texi
+
+polipo.pdf: polipo.texi
+ texi2pdf polipo.texi
+
+polipo.ps.gz: polipo.ps
+ gzip -c polipo.ps > polipo.ps.gz
+
+polipo.ps: polipo.dvi
+ dvips -Pwww -o polipo.ps polipo.dvi
+
+polipo.dvi: polipo.texi
+ texi2dvi polipo.texi
+
+polipo.man.html: polipo.man
+ rman -f html polipo.man > polipo.man.html
+
+TAGS: $(SRCS)
+ etags $(SRCS)
+
+.PHONY: clean
+
+clean:
+ -rm -f polipo$(EXE) *.o *~ core TAGS gmon.out
+ -rm -f polipo.cp polipo.fn polipo.log polipo.vr
+ -rm -f polipo.cps polipo.info* polipo.pg polipo.toc polipo.vrs
+ -rm -f polipo.aux polipo.dvi polipo.ky polipo.ps polipo.tp
+ -rm -f polipo.dvi polipo.ps polipo.ps.gz polipo.pdf polipo.html
+ -rm -rf ./html/
+ -rm -f polipo.man.html
@@ -0,0 +1,21 @@
+Polipo README -*-text-*-
+*************
+
+Polipo is single-threaded, non blocking caching web proxy that has
+very modest resource needs. See the file INSTALL for installation
+instructions. See the texinfo manual (available as HTML after
+installation) for more information.
+
+Current information about Polipo can be found on the Polipo web page,
+
+ http://www.pps.jussieu.fr/~jch/software/polipo/
+
+I can be reached at the e-mail address below, or on the Polipo-users
+mailing list:
+
+ <polipo-users@lists.sourceforge.net>
+
+Please see the Polipo web page for subscription information.
+
+ Juliusz Chroboczek
+ <jch@pps.jussieu.fr>
@@ -0,0 +1,37 @@
+Building Polipo on Windows -*-text-*-
+**************************
+
+There are two distinct ports of Polipo to Windows -- a port using the
+Cygwin emulation libraries, and an experimental native port using Mingw.
+
+The Cygwin port is identical to the Unix binary. Build it just like
+you would build under Unix -- just type ``make all'' in the directory
+where you untarred the Polipo sources.
+
+In order to build the native port, cd to the Polipo directory, and do
+
+ make EXE=.exe LDLIBS=-lwsock32
+
+or, if you've got a regex library,
+
+ make EXE=.exe EXTRA_DEFINES=-DHAVE_REGEX LDLIBS="-lwsock32 -lregex"
+
+In order to cross-compile from a Unix system, you will probably need
+to point make at the right compiler:
+
+ make EXE=.exe CC=i586-mingw32msvc-gcc LDLIBS=-lwsock32
+
+The native port currently attempts to access files in locations that
+are typical for a Unix system; for example, it will attempt to read a
+configuration file /etc/polipo/config on the current drive. You will
+probably need to point it at your config file with an explicit ``-c''
+command-line argument, and define at least the following configuration
+variables:
+
+ dnsNameServer
+ diskCacheRoot
+ forbiddenFile
+
+Help with solving this issue would be very much appreciated.
+
+ Juliusz Chroboczek
Oops, something went wrong.

0 comments on commit 64e7b4e

Please sign in to comment.