Changed default port to 8118

diff --git a/README b/README
index 5e3fdc4..f42d550 100644 (file)
--- a/README
+++ b/README
@@ -104,7 +104,7 @@ http://ijbswa.sourceforge.net/user-manual/.
 
 Be sure to set your browser(s) for HTTP/HTTPS Proxy at <IP>:<Port>,
 or whatever you specify in the config file under 'listen-address'.
-DEFAULT is localhost:8000.
+DEFAULT is localhost:8118.
 
 The ijb.action file can be configured via the web interface accessed via
 http://i.j.b/, as well other options.
@@ -141,4 +141,4 @@ addressed.
 -------------------------------------------------------------------------
 ijbswa-developers@lists.sourceforge.net
 
-$Id: README,v 1.11 2002/02/27 15:07:26 oes Exp $
+$Id: README,v 1.12 2002/03/03 19:32:42 hal9 Exp $

diff --git a/config b/config
index 9d97954..8499892 100644 (file)
--- a/config
+++ b/config
@@ -1,7 +1,7 @@
 #  Sample Configuration file for the Internet Junkbuster 2.9.x
 
 #
-# $Id: config,v 1.26 2001/11/05 21:31:09 steudten Exp $
+# $Id: config,v 1.27 2001/11/30 23:35:51 jongfoster Exp $
 #
 
 #  Table of Contents
@@ -177,11 +177,11 @@ proxy-info-url http://www.your-site.com/proxy.html
 #
 #  Listen-address specifies the address and port where Junkbuster will
 #  listen for connections from your Web browser.  The default is to
-#  listen on the local host on port 8000, and this is suitable for
+#  listen on the local host on port 8118, and this is suitable for
 #  most users.  (In your web browser, under proxy configuration, list
-#  the proxy server as 'localhost' and the port as '8000').
+#  the proxy server as 'localhost' and the port as '8118').
 # 
-#  If you already have another service running on port 8000, or if you
+#  If you already have another service running on port 8118, or if you
 #  want to serve requests from other machines (e.g. on your local
 #  network) as well, you will need to override the default. The syntax
 #  is "listen-address [<ip-address>]:<port>" If you leave out the ip
@@ -194,20 +194,20 @@ proxy-info-url http://www.your-site.com/proxy.html
 #  (192.168.0.0) and has another outside connection with a different
 #  address. You want it to serve requests from inside only:
 #
-#     listen-address 192.168.0.1:8000
+#     listen-address 192.168.0.1:8118
 #
 #  If you want it to listen on all addresses (including the outside
 #  connection):
 #
-#     listen-address :8000
+#     listen-address :8118
 #
 #  If you do this, consider using acls (see "aclfile" above).
 #
 #  Note: you will need to point your browser(s) to the address
 #  and port that you have configured here.
 #
-#  Default:  listen-address    localhost:8000 
-#            listen-address    127.0.0.1:8000
+#  Default:  listen-address    localhost:8118 
+#            listen-address    127.0.0.1:8118
 #
 
 
@@ -516,11 +516,11 @@ enable-remote-toggle 1
 #
 # host-a can run an Internet Junkbuster proxy with forwarding like this:
 #   forward .* .
-#   forward isp-b.com host-b:8000
+#   forward isp-b.com host-b:8118
 #
 # host-b can run an Internet Junkbuster proxy with forwarding like this:
 #   forward .* .
-#   forward isp-a.com host-a:8000
+#   forward isp-a.com host-a:8118
 #
 # Now, *anyone* on the Internet (including users on host-a and host-b)
 # can set their browser's proxy to *either* host-a or host-b and
@@ -546,7 +546,7 @@ enable-remote-toggle 1
 #       Your squid configuration could then look like this:
 #
 #       # Define junkbuster as parent cache 
-#       cache_peer 127.0.0.1 8000 parent 0 no-query 
+#       cache_peer 127.0.0.1 8118 parent 0 no-query 
 #
 #       # Define ACL for protocol FTP 
 #       acl FTP proto FTP 

diff --git a/doc/changes.txt b/doc/changes.txt
index 6aa1482..5b6404d 100644 (file)
--- a/doc/changes.txt
+++ b/doc/changes.txt
@@ -113,7 +113,7 @@ browser to use the Junkbuster.
 
   Short instructions for the advanced user:
 
-   Configure Netscape to use 127.0.0.1 on port 8000 as 
+   Configure Netscape to use 127.0.0.1 on port 8118 as 
         a proxy server.
 
   Detailed instructions for the beginner:
@@ -174,7 +174,7 @@ Stefan.
 * Copied from old README.win                                                *
 *****************************************************************************
 
-$Id: README.WIN,v 1.1 2001/04/16 21:10:38 rodney Exp $
+$Id: changes.txt,v 1.1.1.1 2001/05/15 13:59:50 oes Exp $
 
 This is the README.WIN file for the Windows version of the Internet
 Junkbuster (from http://www.waldherr.org/junkbuster/).
@@ -197,7 +197,7 @@ browser to use the Junkbuster.
 
   Short instructions for the advanced user:
 
-   Configure Netscape to use 127.0.0.1 on port 8000 as 
+   Configure Netscape to use 127.0.0.1 on port 8118 as 
         a proxy server.
 
   Detailed instructions for the beginner:

diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index 3d2fedd..79b3970 100644 (file)
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -6,7 +6,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: user-manual.sgml,v 1.32 2002/03/03 09:26:06 joergs Exp $
+ $Id: user-manual.sgml,v 1.33 2002/03/03 19:46:13 hal9 Exp $
 
  Written by and Copyright (C) 2001 the SourceForge
  IJBSWA team.  http://ijbswa.sourceforge.net
@@ -28,7 +28,7 @@ Hal Burgiss <hal@foobox.net>
 <artheader>
 <title>Junkbuster User Manual</title>
 
-<pubdate>$Id: user-manual.sgml,v 1.32 2002/03/03 09:26:06 joergs Exp $</pubdate>
+<pubdate>$Id: user-manual.sgml,v 1.33 2002/03/03 19:46:13 hal9 Exp $</pubdate>
 
 <authorgroup>
  <author>
@@ -819,14 +819,14 @@ configuration section below. HB.)
 <para>
  <quote>Listen-address</quote> specifies the address and port where
  <application>Junkbuster</application> will listen for connections from your
- Web browser.  The default is to listen on the localhost port 8000, and
+ Web browser.  The default is to listen on the localhost port 8118, and
  this is suitable for most users.  (In your web browser, under proxy
  configuration, list the proxy server as <quote>localhost</quote> and the
- port as <quote>8000</quote>).
+ port as <quote>8118</quote>).
 </para>
 
 <para>
- If you already have another service running on port 8000, or if you want to
+ If you already have another service running on port 8118, or if you want to
  serve requests from other machines (e.g. on your local network) as well, you
  will need to override the default. The syntax is 
  <quote>listen-address [&lt;ip-address&gt;]:&lt;port&gt;</quote>. If you leave
@@ -847,7 +847,7 @@ configuration section below. HB.)
  <literal>
   <msgtext> 
    <literallayout>
-  <emphasis>listen-address  192.168.0.1:8000</emphasis>
+  <emphasis>listen-address  192.168.0.1:8118</emphasis>
    </literallayout>
   </msgtext> 
  </literal>
@@ -862,7 +862,7 @@ configuration section below. HB.)
  <literal>
   <msgtext> 
    <literallayout>
-  <emphasis>listen-address  :8000</emphasis>
+  <emphasis>listen-address  :8118</emphasis>
    </literallayout>
   </msgtext> 
  </literal>
@@ -871,7 +871,7 @@ configuration section below. HB.)
 <para>
  If you do this, consider using ACLs (see <quote>aclfile</quote> above). Note:
  you will need to point your browser(s) to the address and port that you have
- configured here. Default: localhost:8000 (127.0.0.1:8000).
+ configured here. Default: localhost:8118 (127.0.0.1:8118).
 </para>
 
 <para>
@@ -1510,7 +1510,7 @@ configuration section below. HB.)
   <msgtext> 
    <literallayout>
  <emphasis>forward    .*         .</emphasis>
- <emphasis>forward    isp-b.com  host-b:8000</emphasis>
+ <emphasis>forward    isp-b.com  host-b:8118</emphasis>
    </literallayout>
   </msgtext> 
  </literal>
@@ -1526,7 +1526,7 @@ configuration section below. HB.)
   <msgtext> 
    <literallayout>
  <emphasis>forward    .*          .</emphasis>
- <emphasis>forward    isp-a.com   host-a:8000</emphasis>
+ <emphasis>forward    isp-a.com   host-a:8118</emphasis>
    </literallayout>
   </msgtext> 
  </literal>
@@ -1576,9 +1576,9 @@ configuration section below. HB.)
    <literallayout>
   # Define junkbuster as parent cache 
  <!-- per feedback from user...
-  cache_peer 127.0.0.1 8000 parent 0 no-query 
+  cache_peer 127.0.0.1 8118 parent 0 no-query 
  --> 
-  cache_peer 127.0.0.1 parent 8000 0 no-query
+  cache_peer 127.0.0.1 parent 8118 0 no-query
   
   # Define ACL for protocol FTP 
   acl FTP proto FTP 
@@ -2829,13 +2829,13 @@ For RedHat: /etc/rc.d/init.d/junkbuster start
 
 <para>
  Be sure your browser is set to use the proxy which is by default at
- localhost, port 8000. With <application>Netscape</application> (and
+ localhost, port 8118. With <application>Netscape</application> (and
  <application>Mozilla</application>), this can be set under <literal>Edit
  -&gt; Preferences -&gt; Advanced -&gt; Proxies -&gt; HTTP Proxy</literal>.
  For <application>Internet Explorer</application>: <literal>Tools &gt;
  Internet Properties -&gt; Connections -&gt; LAN Setting</literal>. Then,
  check <quote>Use Proxy</quote> and fill in the appropriate info (Address:
- localhost, Port: 8000). Include if HTTPS proxy support too.
+ localhost, Port: 8118). Include if HTTPS proxy support too.
 </para>
 
 <para>
@@ -3288,6 +3288,9 @@ communication (bugs, feature requests, etc.)
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
  $Log: user-manual.sgml,v $
+ Revision 1.33  2002/03/03 19:46:13  hal9
+ Emphasis on where/how to report bugs, etc
+
  Revision 1.32  2002/03/03 09:26:06  joergs
  AmigaOS changes, config is now loaded from PROGDIR: instead of
  AmiTCP:db/junkbuster/ if no configuration file is specified on the

diff --git a/project.h b/project.h
index f8b2d96..a0a7678 100644 (file)
--- a/project.h
+++ b/project.h
@@ -1,6 +1,6 @@
 #ifndef PROJECT_H_INCLUDED
 #define PROJECT_H_INCLUDED
-#define PROJECT_H_VERSION "$Id: project.h,v 1.48 2002/03/03 14:50:40 oes Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.49 2002/03/04 18:28:55 oes Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/project.h,v $
@@ -36,6 +36,9 @@
  *
  * Revisions   :
  *    $Log: project.h,v $
+ *    Revision 1.49  2002/03/04 18:28:55  oes
+ *    Deleted PID_FILE_NAME
+ *
  *    Revision 1.48  2002/03/03 14:50:40  oes
  *    Fixed CLF logging: Added ocmd member for client's request to struct http_request
  *
@@ -458,7 +461,7 @@ typedef int jb_err;
 
 /* Default IP and port to listen on */
 #define HADDR_DEFAULT   "127.0.0.1"
-#define HADDR_PORT      8000
+#define HADDR_PORT      8118
 
 /* Forward defs for various structures */
 
@@ -938,7 +941,7 @@ struct configuration_spec
 
    /*
     * Port and IP to bind to.
-    * Defaults to HADDR_DEFAULT:HADDR_PORT == 127.0.0.1:8000
+    * Defaults to HADDR_DEFAULT:HADDR_PORT == 127.0.0.1:8118
     */
    const char *haddr;
    int         hport;