diff -u -r -N squid-3.5.18/ChangeLog squid-3.5.19/ChangeLog
--- squid-3.5.18/ChangeLog	2016-05-06 22:13:11.000000000 +1200
+++ squid-3.5.19/ChangeLog	2016-05-09 00:46:35.000000000 +1200
@@ -1,3 +1,7 @@
+Changes to squid-3.5.19 (09 May 2016):
+
+	- Regression Bug 4515: interception proxy hangs
+
 Changes to squid-3.5.18 (06 May 2016):
 
 	- Bug 4510: stale comment about 32KB limit on shared memory cache entries
diff -u -r -N squid-3.5.18/configure squid-3.5.19/configure
--- squid-3.5.18/configure	2016-05-06 22:15:08.000000000 +1200
+++ squid-3.5.19/configure	2016-05-09 00:48:31.000000000 +1200
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Revision.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Squid Web Proxy 3.5.18.
+# Generated by GNU Autoconf 2.69 for Squid Web Proxy 3.5.19.
 #
 # Report bugs to <http://bugs.squid-cache.org/>.
 #
@@ -595,8 +595,8 @@
 # Identity of this package.
 PACKAGE_NAME='Squid Web Proxy'
 PACKAGE_TARNAME='squid'
-PACKAGE_VERSION='3.5.18'
-PACKAGE_STRING='Squid Web Proxy 3.5.18'
+PACKAGE_VERSION='3.5.19'
+PACKAGE_STRING='Squid Web Proxy 3.5.19'
 PACKAGE_BUGREPORT='http://bugs.squid-cache.org/'
 PACKAGE_URL=''
 
@@ -1636,7 +1636,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Squid Web Proxy 3.5.18 to adapt to many kinds of systems.
+\`configure' configures Squid Web Proxy 3.5.19 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1707,7 +1707,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Squid Web Proxy 3.5.18:";;
+     short | recursive ) echo "Configuration of Squid Web Proxy 3.5.19:";;
    esac
   cat <<\_ACEOF
 
@@ -2119,7 +2119,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Squid Web Proxy configure 3.5.18
+Squid Web Proxy configure 3.5.19
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3223,7 +3223,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Squid Web Proxy $as_me 3.5.18, which was
+It was created by Squid Web Proxy $as_me 3.5.19, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4090,7 +4090,7 @@
 
 # Define the identity of the package.
  PACKAGE='squid'
- VERSION='3.5.18'
+ VERSION='3.5.19'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -41872,7 +41872,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Squid Web Proxy $as_me 3.5.18, which was
+This file was extended by Squid Web Proxy $as_me 3.5.19, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -41938,7 +41938,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Squid Web Proxy config.status 3.5.18
+Squid Web Proxy config.status 3.5.19
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -u -r -N squid-3.5.18/configure.ac squid-3.5.19/configure.ac
--- squid-3.5.18/configure.ac	2016-05-06 22:15:08.000000000 +1200
+++ squid-3.5.19/configure.ac	2016-05-09 00:48:30.000000000 +1200
@@ -5,7 +5,7 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-AC_INIT([Squid Web Proxy],[3.5.18],[http://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[3.5.19],[http://bugs.squid-cache.org/],[squid])
 AC_PREREQ(2.61)
 AC_CONFIG_HEADERS([include/autoconf.h])
 AC_CONFIG_AUX_DIR(cfgaux)
diff -u -r -N squid-3.5.18/doc/release-notes/release-3.5.html squid-3.5.19/doc/release-notes/release-3.5.html
--- squid-3.5.18/doc/release-notes/release-3.5.html	2016-05-06 23:04:01.000000000 +1200
+++ squid-3.5.19/doc/release-notes/release-3.5.html	2016-05-09 01:38:07.000000000 +1200
@@ -2,10 +2,10 @@
 <HTML>
 <HEAD>
  <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.71">
- <TITLE>Squid 3.5.18 release notes</TITLE>
+ <TITLE>Squid 3.5.19 release notes</TITLE>
 </HEAD>
 <BODY>
-<H1>Squid 3.5.18 release notes</H1>
+<H1>Squid 3.5.19 release notes</H1>
 
 <H2>Squid Developers</H2>
 <HR>
@@ -64,7 +64,7 @@
 <HR>
 <H2><A NAME="s1">1.</A> <A HREF="#toc1">Notice</A></H2>
 
-<P>The Squid Team are pleased to announce the release of Squid-3.5.18.</P>
+<P>The Squid Team are pleased to announce the release of Squid-3.5.19.</P>
 <P>This new release is available for download from 
 <A HREF="http://www.squid-cache.org/Versions/v3/3.5/">http://www.squid-cache.org/Versions/v3/3.5/</A> or the
 <A HREF="http://www.squid-cache.org/Download/http-mirrors.html">mirrors</A>.</P>
diff -u -r -N squid-3.5.18/helpers/basic_auth/DB/basic_db_auth.8 squid-3.5.19/helpers/basic_auth/DB/basic_db_auth.8
--- squid-3.5.18/helpers/basic_auth/DB/basic_db_auth.8	2016-05-06 23:04:05.000000000 +1200
+++ squid-3.5.19/helpers/basic_auth/DB/basic_db_auth.8	2016-05-09 01:38:12.000000000 +1200
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BASIC_DB_AUTH 8"
-.TH BASIC_DB_AUTH 8 "2016-05-06" "perl v5.22.2" "User Contributed Perl Documentation"
+.TH BASIC_DB_AUTH 8 "2016-05-08" "perl v5.22.2" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -u -r -N squid-3.5.18/helpers/basic_auth/MSNT-multi-domain/basic_msnt_multi_domain_auth.8 squid-3.5.19/helpers/basic_auth/MSNT-multi-domain/basic_msnt_multi_domain_auth.8
--- squid-3.5.18/helpers/basic_auth/MSNT-multi-domain/basic_msnt_multi_domain_auth.8	2016-05-06 23:04:09.000000000 +1200
+++ squid-3.5.19/helpers/basic_auth/MSNT-multi-domain/basic_msnt_multi_domain_auth.8	2016-05-09 01:38:19.000000000 +1200
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BASIC_MSNT_MULTI_DOMAIN_AUTH 1"
-.TH BASIC_MSNT_MULTI_DOMAIN_AUTH 1 "2016-05-06" "perl v5.22.2" "User Contributed Perl Documentation"
+.TH BASIC_MSNT_MULTI_DOMAIN_AUTH 1 "2016-05-08" "perl v5.22.2" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -u -r -N squid-3.5.18/helpers/basic_auth/POP3/basic_pop3_auth.8 squid-3.5.19/helpers/basic_auth/POP3/basic_pop3_auth.8
--- squid-3.5.18/helpers/basic_auth/POP3/basic_pop3_auth.8	2016-05-06 23:04:14.000000000 +1200
+++ squid-3.5.19/helpers/basic_auth/POP3/basic_pop3_auth.8	2016-05-09 01:38:26.000000000 +1200
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BASIC_POP3_AUTH 8"
-.TH BASIC_POP3_AUTH 8 "2016-05-06" "perl v5.22.2" "User Contributed Perl Documentation"
+.TH BASIC_POP3_AUTH 8 "2016-05-08" "perl v5.22.2" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -u -r -N squid-3.5.18/helpers/external_acl/delayer/ext_delayer_acl.8 squid-3.5.19/helpers/external_acl/delayer/ext_delayer_acl.8
--- squid-3.5.18/helpers/external_acl/delayer/ext_delayer_acl.8	2016-05-06 23:04:27.000000000 +1200
+++ squid-3.5.19/helpers/external_acl/delayer/ext_delayer_acl.8	2016-05-09 01:38:45.000000000 +1200
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EXT_DELAYER_ACL 8"
-.TH EXT_DELAYER_ACL 8 "2016-05-06" "perl v5.22.2" "User Contributed Perl Documentation"
+.TH EXT_DELAYER_ACL 8 "2016-05-08" "perl v5.22.2" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -u -r -N squid-3.5.18/helpers/external_acl/SQL_session/ext_sql_session_acl.8 squid-3.5.19/helpers/external_acl/SQL_session/ext_sql_session_acl.8
--- squid-3.5.18/helpers/external_acl/SQL_session/ext_sql_session_acl.8	2016-05-06 23:04:35.000000000 +1200
+++ squid-3.5.19/helpers/external_acl/SQL_session/ext_sql_session_acl.8	2016-05-09 01:38:56.000000000 +1200
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EXT_SQL_SESSION_ACL 8"
-.TH EXT_SQL_SESSION_ACL 8 "2016-05-06" "perl v5.22.2" "User Contributed Perl Documentation"
+.TH EXT_SQL_SESSION_ACL 8 "2016-05-08" "perl v5.22.2" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -u -r -N squid-3.5.18/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 squid-3.5.19/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8
--- squid-3.5.18/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8	2016-05-06 23:04:39.000000000 +1200
+++ squid-3.5.19/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8	2016-05-09 01:39:01.000000000 +1200
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EXT_WBINFO_GROUP_ACL 8"
-.TH EXT_WBINFO_GROUP_ACL 8 "2016-05-06" "perl v5.22.2" "User Contributed Perl Documentation"
+.TH EXT_WBINFO_GROUP_ACL 8 "2016-05-08" "perl v5.22.2" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -u -r -N squid-3.5.18/helpers/log_daemon/DB/log_db_daemon.8 squid-3.5.19/helpers/log_daemon/DB/log_db_daemon.8
--- squid-3.5.18/helpers/log_daemon/DB/log_db_daemon.8	2016-05-06 23:04:42.000000000 +1200
+++ squid-3.5.19/helpers/log_daemon/DB/log_db_daemon.8	2016-05-09 01:39:05.000000000 +1200
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "LOG_DB_DAEMON 8"
-.TH LOG_DB_DAEMON 8 "2016-05-06" "perl v5.22.2" "User Contributed Perl Documentation"
+.TH LOG_DB_DAEMON 8 "2016-05-08" "perl v5.22.2" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -u -r -N squid-3.5.18/helpers/storeid_rewrite/file/storeid_file_rewrite.8 squid-3.5.19/helpers/storeid_rewrite/file/storeid_file_rewrite.8
--- squid-3.5.18/helpers/storeid_rewrite/file/storeid_file_rewrite.8	2016-05-06 23:04:57.000000000 +1200
+++ squid-3.5.19/helpers/storeid_rewrite/file/storeid_file_rewrite.8	2016-05-09 01:39:24.000000000 +1200
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "STOREID_FILE_REWRITE 8"
-.TH STOREID_FILE_REWRITE 8 "2016-05-06" "perl v5.22.2" "User Contributed Perl Documentation"
+.TH STOREID_FILE_REWRITE 8 "2016-05-08" "perl v5.22.2" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -u -r -N squid-3.5.18/include/version.h squid-3.5.19/include/version.h
--- squid-3.5.18/include/version.h	2016-05-06 22:15:09.000000000 +1200
+++ squid-3.5.19/include/version.h	2016-05-09 00:48:31.000000000 +1200
@@ -7,7 +7,7 @@
  */
 
 #ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 1462529584
+#define SQUID_RELEASE_TIME 1462711587
 #endif
 
 /*
diff -u -r -N squid-3.5.18/RELEASENOTES.html squid-3.5.19/RELEASENOTES.html
--- squid-3.5.18/RELEASENOTES.html	2016-05-06 23:04:01.000000000 +1200
+++ squid-3.5.19/RELEASENOTES.html	2016-05-09 01:38:07.000000000 +1200
@@ -2,10 +2,10 @@
 <HTML>
 <HEAD>
  <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.71">
- <TITLE>Squid 3.5.18 release notes</TITLE>
+ <TITLE>Squid 3.5.19 release notes</TITLE>
 </HEAD>
 <BODY>
-<H1>Squid 3.5.18 release notes</H1>
+<H1>Squid 3.5.19 release notes</H1>
 
 <H2>Squid Developers</H2>
 <HR>
@@ -64,7 +64,7 @@
 <HR>
 <H2><A NAME="s1">1.</A> <A HREF="#toc1">Notice</A></H2>
 
-<P>The Squid Team are pleased to announce the release of Squid-3.5.18.</P>
+<P>The Squid Team are pleased to announce the release of Squid-3.5.19.</P>
 <P>This new release is available for download from 
 <A HREF="http://www.squid-cache.org/Versions/v3/3.5/">http://www.squid-cache.org/Versions/v3/3.5/</A> or the
 <A HREF="http://www.squid-cache.org/Download/http-mirrors.html">mirrors</A>.</P>
diff -u -r -N squid-3.5.18/src/esi/Context.h squid-3.5.19/src/esi/Context.h
--- squid-3.5.18/src/esi/Context.h	2016-05-06 22:13:11.000000000 +1200
+++ squid-3.5.19/src/esi/Context.h	2016-05-09 00:46:35.000000000 +1200
@@ -13,8 +13,8 @@
 #include "err_type.h"
 #include "esi/Element.h"
 #include "esi/Parser.h"
-#include "HttpReply.h"
 #include "http/StatusCode.h"
+#include "HttpReply.h"
 
 class ESIVarState;
 class ClientHttpRequest;
diff -u -r -N squid-3.5.18/src/esi/Esi.cc squid-3.5.19/src/esi/Esi.cc
--- squid-3.5.18/src/esi/Esi.cc	2016-05-06 22:13:11.000000000 +1200
+++ squid-3.5.19/src/esi/Esi.cc	2016-05-09 00:46:35.000000000 +1200
@@ -574,7 +574,7 @@
 #endif
 
     if (!(rep != NULL || (outbound.getRaw() &&
-                  outbound->len && (outbound_offset <= outbound->len)))) {
+                          outbound->len && (outbound_offset <= outbound->len)))) {
         debugs(86, 5, "ESIContext::send: Nothing to send.");
         return 0;
     }
diff -u -r -N squid-3.5.18/src/mime_header.cc squid-3.5.19/src/mime_header.cc
--- squid-3.5.18/src/mime_header.cc	2016-05-06 22:13:11.000000000 +1200
+++ squid-3.5.19/src/mime_header.cc	2016-05-09 00:46:35.000000000 +1200
@@ -36,10 +36,13 @@
 
     debugs(25, 5, "mime_get_header: looking for '" << name << "'");
 
-    for (p = mime; *p; p += strcspn(p, "\n\r")) {
-        if (strcmp(p, "\r\n\r\n") == 0 || strcmp(p, "\n\n") == 0)
+    for (p = mime; *p; p += strcspn(p, "\n")) {
+        if (strcmp(p, "\n\r\n") == 0 || strcmp(p, "\n\n") == 0)
             return NULL;
 
+        if (*p == '\n')
+            ++p;
+
         if (strncasecmp(p, name, namelen))
             continue;