[packages/squid.git] / squid-3.0.PRE3-https_accel_doc.patch

Index: squid3/src/cf.data.pre
diff -c squid3/src/cf.data.pre:1.341 squid3/src/cf.data.pre:1.342
*** squid3/src/cf.data.pre:1.341	Sun Aug 31 15:20:08 2003
--- squid3/src/cf.data.pre	Sun Sep  7 11:55:53 2003
***************
*** 80,96 ****
  
  	You may specify multiple socket addresses on multiple lines.
  
! 	options are:
! 		accel		Accelerator mode
! 		transparent	Support for transparent proxies
! 		vhost		Accelerator using Host directive
! 		vport		Accelerator with IP virtual host support
! 		vport=NN	As above, but uses specified port number
! 				rather than the http_port number.
! 		defaultsite=xx	Main web site name for accelerators.
! 				also implies accel
! 		protocol=	Protocol to reconstruct accelerated
! 				requests with. Defaults to http.
  
  	If you run Squid on a dual-homed machine with an internal
  	and an external interface then we recommend you to specify the
--- 80,104 ----
  
  	You may specify multiple socket addresses on multiple lines.
  
! 	Options:
! 
! 	   transparent	Support for transparent proxies
! 
! 	   accel	Accelerator mode. Also set implicit by the other
! 			accelerator directives
! 
! 	   vhost	Accelerator mode using Host header for virtual
! 			domain support
! 
! 	   vport	Accelerator with IP based virtual host support
! 
! 	   vport=NN	As above, but uses specified port number rather
! 			than the http_port number
! 
! 	   defaultsite= Main web site name for accelerators
! 
! 	   protocol=	Protocol to reconstruct accelerated requests with.
! 			Defaults to http
  
  	If you run Squid on a dual-homed machine with an internal
  	and an external interface then we recommend you to specify the
***************
*** 123,132 ****
  	Options:
  
  	   defaultsite=	The name of the https site presented on
! 	   		this port.
  
  	   protocol=	Protocol to reconstruct accelerated requests
! 	   		with. Defaults to https.
  
  	   cert=	Path to SSL certificate (PEM format)
  		
--- 131,140 ----
  	Options:
  
  	   defaultsite=	The name of the https site presented on
! 	   		this port
  
  	   protocol=	Protocol to reconstruct accelerated requests
! 	   		with. Defaults to https
  
  	   cert=	Path to SSL certificate (PEM format)
  		
***************
*** 151,164 ****
  			    SINGLE_DH_USE Always create a new key when using
  				      temporary/ephemeral DH key exchanges
  			See src/ssl_support.c or OpenSSL SSL_CTX_set_options
! 			documentation for a complete list of options.
  
  	   clientca=	File containing the list of CAs to use when
  			requesting a client certificate
  
  	   cafile=	File containing additional CA certificates to
  			use when verifying client certificates. If unset
! 			clientca will be used.
  
  	   capath=	Directory containing additional CA certificates
  			to use when verifying client certificates
--- 159,172 ----
  			    SINGLE_DH_USE Always create a new key when using
  				      temporary/ephemeral DH key exchanges
  			See src/ssl_support.c or OpenSSL SSL_CTX_set_options
! 			documentation for a complete list of options
  
  	   clientca=	File containing the list of CAs to use when
  			requesting a client certificate
  
  	   cafile=	File containing additional CA certificates to
  			use when verifying client certificates. If unset
! 			clientca will be used
  
  	   capath=	Directory containing additional CA certificates
  			to use when verifying client certificates
***************
*** 173,179 ****
  				requires a certificate
  			    NO_DEFAULT_CA	
  				Don't use the default CA list built in
! 				to OpenSSL.
  
  DOC_END
  
--- 181,198 ----
  				requires a certificate
  			    NO_DEFAULT_CA	
  				Don't use the default CA list built in
! 				to OpenSSL
! 
! 	   accel	Accelerator mode. Also set implicit by the other
! 			accelerator directives
! 
! 	   vhost	Accelerator mode using Host header for virtual
! 			domain support
! 
! 	   vport	Accelerator with IP based virtual host support
! 
! 	   vport=NN	As above, but uses specified port number rather
! 			than the https_port number
  
  DOC_END
Commit	Line	Data
36aa8c36 JR	1	Index: squid3/src/cf.data.pre
	2	diff -c squid3/src/cf.data.pre:1.341 squid3/src/cf.data.pre:1.342
	3	*** squid3/src/cf.data.pre:1.341 Sun Aug 31 15:20:08 2003
	4	--- squid3/src/cf.data.pre Sun Sep 7 11:55:53 2003
	5	***************
	6	* 80,96 **
	7
	8	You may specify multiple socket addresses on multiple lines.
	9
	10	! options are:
	11	! accel Accelerator mode
	12	! transparent Support for transparent proxies
	13	! vhost Accelerator using Host directive
	14	! vport Accelerator with IP virtual host support
	15	! vport=NN As above, but uses specified port number
	16	! rather than the http_port number.
	17	! defaultsite=xx Main web site name for accelerators.
	18	! also implies accel
	19	! protocol= Protocol to reconstruct accelerated
	20	! requests with. Defaults to http.
	21
	22	If you run Squid on a dual-homed machine with an internal
	23	and an external interface then we recommend you to specify the
	24	--- 80,104 ----
	25
	26	You may specify multiple socket addresses on multiple lines.
	27
	28	! Options:
	29	!
	30	! transparent Support for transparent proxies
	31	!
	32	! accel Accelerator mode. Also set implicit by the other
	33	! accelerator directives
	34	!
	35	! vhost Accelerator mode using Host header for virtual
	36	! domain support
	37	!
	38	! vport Accelerator with IP based virtual host support
	39	!
	40	! vport=NN As above, but uses specified port number rather
	41	! than the http_port number
	42	!
	43	! defaultsite= Main web site name for accelerators
	44	!
	45	! protocol= Protocol to reconstruct accelerated requests with.
	46	! Defaults to http
	47
	48	If you run Squid on a dual-homed machine with an internal
	49	and an external interface then we recommend you to specify the
	50	***************
	51	* 123,132 **
	52	Options:
	53
	54	defaultsite= The name of the https site presented on
	55	! this port.
	56
	57	protocol= Protocol to reconstruct accelerated requests
	58	! with. Defaults to https.
	59
	60	cert= Path to SSL certificate (PEM format)
	61
	62	--- 131,140 ----
	63	Options:
	64
65	defaultsite= The name of the https site presented on
66	! this port
67
68	protocol= Protocol to reconstruct accelerated requests
69	! with. Defaults to https
70
71	cert= Path to SSL certificate (PEM format)
72
73	***************
74	* 151,164 **
75	SINGLE_DH_USE Always create a new key when using
76	temporary/ephemeral DH key exchanges
77	See src/ssl_support.c or OpenSSL SSL_CTX_set_options
78	! documentation for a complete list of options.
79
80	clientca= File containing the list of CAs to use when
81	requesting a client certificate
82
83	cafile= File containing additional CA certificates to
84	use when verifying client certificates. If unset
85	! clientca will be used.
86
87	capath= Directory containing additional CA certificates
88	to use when verifying client certificates
89	--- 159,172 ----
90	SINGLE_DH_USE Always create a new key when using
91	temporary/ephemeral DH key exchanges
92	See src/ssl_support.c or OpenSSL SSL_CTX_set_options
93	! documentation for a complete list of options
94
95	clientca= File containing the list of CAs to use when
96	requesting a client certificate
97
98	cafile= File containing additional CA certificates to
99	use when verifying client certificates. If unset
100	! clientca will be used
101
102	capath= Directory containing additional CA certificates
103	to use when verifying client certificates
104	***************
105	* 173,179 **
106	requires a certificate
107	NO_DEFAULT_CA
108	Don't use the default CA list built in
109	! to OpenSSL.
110
111	DOC_END
112
113	--- 181,198 ----
114	requires a certificate
115	NO_DEFAULT_CA
116	Don't use the default CA list built in
117	! to OpenSSL
118	!
119	! accel Accelerator mode. Also set implicit by the other
120	! accelerator directives
121	!
122	! vhost Accelerator mode using Host header for virtual
123	! domain support
124	!
125	! vport Accelerator with IP based virtual host support
126	!
127	! vport=NN As above, but uses specified port number rather
128	! than the https_port number
129
130	DOC_END
131