From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 14 Jan 2015 15:11:26 +0000 (-0800)
Subject: Merge from trunk
X-Git-Tag: merge-candidate-3-v1~242^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7dcca85b904e395fd71ddb45ba20d22d77e7bfdd;p=thirdparty%2Fsquid.git

Merge from trunk
---

7dcca85b904e395fd71ddb45ba20d22d77e7bfdd
diff --cc configure.ac
index ef67be0521,629021e5ef..0d60982204
--- a/configure.ac
+++ b/configure.ac
@@@ -3848,9 -3832,60 +3832,61 @@@ AC_CONFIG_FILES(
  	helpers/ssl/Makefile
  	helpers/storeid_rewrite/Makefile
  	helpers/storeid_rewrite/file/Makefile
+ 	helpers/url_rewrite/Makefile
+ 	helpers/url_rewrite/fake/Makefile
+ 	helpers/url_rewrite/LFS/Makefile
+ 	icons/Makefile
+ 	lib/Makefile
+ 	lib/libTrie/Makefile
+ 	lib/libTrie/test/Makefile
+ 	lib/ntlmauth/Makefile
+ 	lib/profiler/Makefile
+ 	lib/rfcnb/Makefile
+ 	lib/smblib/Makefile
+ 	lib/snmplib/Makefile
+ 	scripts/Makefile
+ 	src/Makefile
+ 	src/acl/Makefile
+ 	src/adaptation/Makefile
+ 	src/adaptation/icap/Makefile
+ 	src/adaptation/ecap/Makefile
+ 	src/anyp/Makefile
+ 	src/auth/Makefile
+ 	src/auth/basic/Makefile
+ 	src/auth/digest/Makefile
+ 	src/auth/negotiate/Makefile
+ 	src/auth/ntlm/Makefile
+ 	src/base/Makefile
+ 	src/clients/Makefile
+ 	src/comm/Makefile
+ 	src/esi/Makefile
+ 	src/eui/Makefile
+ 	src/format/Makefile
+ 	src/fs/Makefile
+ 	src/ftp/Makefile
+ 	src/helper/Makefile
+ 	src/http/Makefile
+ 	src/http/one/Makefile
+ 	src/icmp/Makefile
+ 	src/ident/Makefile
+ 	src/ip/Makefile
+ 	src/ipc/Makefile
+ 	src/log/Makefile
+ 	src/mem/Makefile
+ 	src/mgr/Makefile
+ 	src/parser/Makefile
+ 	src/repl/Makefile
++	src/security/Makefile
+ 	src/servers/Makefile
+ 	src/snmp/Makefile
+ 	src/ssl/Makefile
+ 	test-suite/Makefile
  	tools/Makefile
- 	tools/squidclient/Makefile
+ 	tools/helper-mux/Makefile
  	tools/purge/Makefile
+ 	tools/squidclient/Makefile
+ 	tools/systemd/Makefile
+ 	tools/sysvinit/Makefile
  ])
  
  # must configure libltdl subdir unconditionally for "make distcheck" to work
diff --cc doc/release-notes/release-3.6.sgml
index 052b6c50f3,3d61567530..0efeced036
--- a/doc/release-notes/release-3.6.sgml
+++ b/doc/release-notes/release-3.6.sgml
@@@ -64,10 -98,10 +98,14 @@@ This section gives a thorough account o
  <sect1>New tags<label id="newtags">
  <p>
  <descrip>
 +	<tag>tls_outgoing_options</tag>
 +	<p>New tag to define TLS security context options for outgoing
 +	   connections. For example to HTTPS servers.
 +
+          <tag> url_rewrite_timeout </tag>
+          <p> Squid times active requests to redirector. This option sets
+              the timeout value and the Squid reaction to a timed out
+              request. </p>
  </descrip>
  
  <sect1>Changes to existing tags<label id="modifiedtags">
diff --cc src/Makefile.am
index c83c20efb8,6619f46778..bd7686508c
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -614,6 -608,12 +607,13 @@@ squid_LDADD = 
  	$(AUTH_LIBS) \
  	$(DISK_LIBS) \
  	acl/libapi.la \
+ 	clients/libclients.la \
+ 	servers/libservers.la \
+ 	ftp/libftp.la \
+ 	helper/libhelper.la \
+ 	http/libsquid-http.la \
+ 	parser/libsquid-parser.la \
++	security/libsecurity.la \
  	base/libbase.la \
  	libsquid.la \
  	ip/libip.la \