---------------------
PatchSet 3987 
Date: 2007/01/07 13:19:04
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
Bah! logic error down.

Members: 
	doc/squid.8:1.1->1.1.30.1 
	src/url.cc:1.9.8.5->1.9.8.6 

Index: squid3/doc/squid.8
===================================================================
RCS file: /cvsroot/squid-sf//squid3/doc/Attic/squid.8,v
retrieving revision 1.1
retrieving revision 1.1.30.1
diff -u -r1.1 -r1.1.30.1
--- squid3/doc/squid.8	14 Oct 2002 00:18:06 -0000	1.1
+++ squid3/doc/squid.8	7 Jan 2007 13:19:04 -0000	1.1.30.1
@@ -1,4 +1,4 @@
-.TH squid 8 "squid version 2.0"
+.TH squid 8 "Squid Web Proxy 3.0.PRE5-CVS"
 .\" Copyright and licensing information
 .\" goes here.
 .SH NAME
@@ -6,7 +6,9 @@
 .SH SYNOPSIS
 .B squid
 [
-.B \-dhsvzCDFNRVYX
+.B \-dhisrvzCDFNRVYX
+] [
+.BI \-l " facility"
 ] [
 .BI \-f " config-file"
 ] [
@@ -16,6 +18,10 @@
 .I port
 ] [
 .B \-k " signal"
+] [
+.BI \-n " service-name"
+] [
+.BI \-O " cmd-line"
 ]
 .SH DESCRIPTION
 .B squid
@@ -54,9 +60,8 @@
 on how to configure
 .B squid
 see the file 
-.BI /etc/squid/squid.conf,
-the FAQ included with the distribution
-and the documentation at the
+.BI /usr/local/squid/etc/squid.conf,
+the Squid FAQ and the documentation at the
 .B squid
 home page http://www.squid-cache.org
 .PP
@@ -67,18 +72,28 @@
 Write debugging to stderr also.
 .IP "-f file"
 Use the given config-file instead of
-.IR /etc/squid/squid.conf .
+.IR /usr/local/squid/etc/squid.conf .
 If the file name starts with a ! or | then it is assumed to be an external
 command or command line. Can for example be used to pre-process the
 configuration before it is being read by Squid. To facilitate this Squid
 also understands the common #line notion to indicate the real source file.
 .IP -h
 Print help message.
+.IP -i
+Install as a Windows Service (see -n option).
 .IP "-k reconfigure | rotate | shutdown | interrupt | kill | debug | check | parse"
 Parse configuration file, then send signal to running copy 
 (except -k parse) and exit.
+.IP "-n name"
+Specify Windows Service name to use for service operations, default is: 
+.BI Squid
+.
+.IP -r
+Remove a Windows Service (see -n option).
 .IP -s
 Enable logging to syslog.
+.IP "-l facility"
+Use specified syslog facility. implies -s
 .IP "-u port"
 Specify ICP port number (default: 3130), disable with 0.
 .IP -v
@@ -91,24 +106,54 @@
 Disable initial DNS tests.
 .IP -F
 Don't serve any requests until store is rebuilt.
+.IP "-O options"
+Set Windows Service Command line options in Registry.
 .IP -N
 No daemon mode.
 .IP -R
 Do not set REUSEADDR on port.
-.IP -V
-Virtual host httpd-accelerator.
 .IP -X
 Force full debugging.
 .IP -Y
 Only return UDP_HIT or UDP_MISS_NOFETCH during fast reload.   
 .SH FILES
-.I /etc/squid/squid.conf
+.I /usr/local/squid/etc/squid.conf
 .RS
 The main configuration file.  You must initially make 
 changes to this file for 
 .B squid
 to work.  For example, the default configuration does not 
 allow access from any browser.
+.RE
+
+.I /usr/local/squid/etc/squid.conf.default
+.RS
+Reference copy of the configuration file. Always kept up to date with
+the version of Squid you are using. Use this to look up configuration
+syntax after upgrading.
+.RE
+
+.I /usr/local/squid/etc/mime.conf (mime_table)
+.RS
+MIME type mappings for FTP gatewaying
+.RE
+
+.I /usr/local/squid/share/errors/English (error_directory)
+.RS
+Error page templates
+.RE
+
+.SH SEE ALSO
+.BR cachemgr.cgi "(8), "
+.BR pam_auth "(8), "
+.BR squid_ldap_auth "(8), "
+.BR squid_ldap_group "(8), "
+.BR squid_session "(8), "
+.BR squid_unix_group "(8), "
+.br
+.B The Squid FAQ
+
+
 
 .\" Could add the following sections:
 .\" .SH ENVIRONMENT
Index: squid3/src/url.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/url.cc,v
retrieving revision 1.9.8.5
retrieving revision 1.9.8.6
diff -u -r1.9.8.5 -r1.9.8.6
--- squid3/src/url.cc	7 Jan 2007 03:46:06 -0000	1.9.8.5
+++ squid3/src/url.cc	7 Jan 2007 13:19:06 -0000	1.9.8.6
@@ -1,6 +1,6 @@
 
 /*
- * $Id: url.cc,v 1.9.8.5 2007/01/07 03:46:06 amosjeffries Exp $
+ * $Id: url.cc,v 1.9.8.6 2007/01/07 13:19:06 amosjeffries Exp $
  *
  * DEBUG: section 23    URL Parsing
  * AUTHOR: Duane Wessels
@@ -251,7 +251,7 @@
         if (sscanf(url, "[%[^]]]:%d", host, &port) < 1)
 	    /* the next "if" is intended nested when INET6 */
 #endif
-	    if (sscanf(t, "%[^:]:%d", host, &port) < 1)
+	    if (sscanf(url, "%[^:]:%d", host, &port) < 1)
 		return NULL;
     } else if (!strncmp(url, "urn:", 4)) {
         return urnParse(method, url);