diff -u -r -N squid-3.1.2/ChangeLog squid-3.1.3/ChangeLog
--- squid-3.1.2/ChangeLog	2010-05-01 23:39:52.000000000 +1200
+++ squid-3.1.3/ChangeLog	2010-05-02 22:47:08.000000000 +1200
@@ -1,3 +1,8 @@
+Changes to squid-3.1.3 (02 May 2010):
+
+	- Remove: Advertise 1.1 on replies
+	- Fix tag ACL type not working
+
 Changes to squid-3.1.2 (01 May 2010):
 
 	- Bug 2913: Fix DB auth warning in new perl version
diff -u -r -N squid-3.1.2/configure squid-3.1.3/configure
--- squid-3.1.2/configure	2010-05-01 23:40:30.000000000 +1200
+++ squid-3.1.3/configure	2010-05-02 22:48:00.000000000 +1200
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in Revision.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for Squid Web Proxy 3.1.2.
+# Generated by GNU Autoconf 2.62 for Squid Web Proxy 3.1.3.
 #
 # Report bugs to <http://www.squid-cache.org/bugs/>.
 #
@@ -751,8 +751,8 @@
 # Identity of this package.
 PACKAGE_NAME='Squid Web Proxy'
 PACKAGE_TARNAME='squid'
-PACKAGE_VERSION='3.1.2'
-PACKAGE_STRING='Squid Web Proxy 3.1.2'
+PACKAGE_VERSION='3.1.3'
+PACKAGE_STRING='Squid Web Proxy 3.1.3'
 PACKAGE_BUGREPORT='http://www.squid-cache.org/bugs/'
 
 ac_unique_file="src/main.cc"
@@ -1692,7 +1692,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.1.2 to adapt to many kinds of systems.
+\`configure' configures Squid Web Proxy 3.1.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1762,7 +1762,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Squid Web Proxy 3.1.2:";;
+     short | recursive ) echo "Configuration of Squid Web Proxy 3.1.3:";;
    esac
   cat <<\_ACEOF
 
@@ -2094,7 +2094,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Squid Web Proxy configure 3.1.2
+Squid Web Proxy configure 3.1.3
 generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -2108,7 +2108,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.1.2, which was
+It was created by Squid Web Proxy $as_me 3.1.3, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
@@ -2826,7 +2826,7 @@
 
 # Define the identity of the package.
  PACKAGE='squid'
- VERSION='3.1.2'
+ VERSION='3.1.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -51146,7 +51146,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.1.2, which was
+This file was extended by Squid Web Proxy $as_me 3.1.3, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -51199,7 +51199,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-Squid Web Proxy config.status 3.1.2
+Squid Web Proxy config.status 3.1.3
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff -u -r -N squid-3.1.2/configure.in squid-3.1.3/configure.in
--- squid-3.1.2/configure.in	2010-05-01 23:40:30.000000000 +1200
+++ squid-3.1.3/configure.in	2010-05-02 22:48:00.000000000 +1200
@@ -2,7 +2,7 @@
 dnl
 dnl  $Id$
 dnl
-AC_INIT([Squid Web Proxy],[3.1.2],[http://www.squid-cache.org/bugs/],[squid])
+AC_INIT([Squid Web Proxy],[3.1.3],[http://www.squid-cache.org/bugs/],[squid])
 AC_PREREQ(2.61)
 AC_CONFIG_HEADERS([include/autoconf.h])
 AC_CONFIG_AUX_DIR(cfgaux)
diff -u -r -N squid-3.1.2/include/version.h squid-3.1.3/include/version.h
--- squid-3.1.2/include/version.h	2010-05-01 23:40:30.000000000 +1200
+++ squid-3.1.3/include/version.h	2010-05-02 22:48:00.000000000 +1200
@@ -9,7 +9,7 @@
  */
 
 #ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 1272713982
+#define SQUID_RELEASE_TIME 1272797215
 #endif
 
 #ifndef APP_SHORTNAME
diff -u -r -N squid-3.1.2/RELEASENOTES.html squid-3.1.3/RELEASENOTES.html
--- squid-3.1.2/RELEASENOTES.html	2010-05-01 23:52:31.000000000 +1200
+++ squid-3.1.3/RELEASENOTES.html	2010-05-02 23:04:50.000000000 +1200
@@ -2,10 +2,10 @@
 <HTML>
 <HEAD>
  <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.65">
- <TITLE>Squid 3.1.2 release notes</TITLE>
+ <TITLE>Squid 3.1.3 release notes</TITLE>
 </HEAD>
 <BODY>
-<H1>Squid 3.1.2 release notes</H1>
+<H1>Squid 3.1.3 release notes</H1>
 
 <H2>Squid Developers</H2>
 <HR>
@@ -70,7 +70,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.1.2.</P>
+<P>The Squid Team are pleased to announce the release of Squid-3.1.3.</P>
 <P>This new release is available for download from 
 <A HREF="http://www.squid-cache.org/Versions/v3/3.1/">http://www.squid-cache.org/Versions/v3/3.1/</A> or the 
 <A HREF="http://www.squid-cache.org/Mirrors/http-mirrors.html">mirrors</A>.</P>
diff -u -r -N squid-3.1.2/src/acl/Tag.cc squid-3.1.3/src/acl/Tag.cc
--- squid-3.1.2/src/acl/Tag.cc	2010-05-01 23:39:52.000000000 +1200
+++ squid-3.1.3/src/acl/Tag.cc	2010-05-02 22:47:08.000000000 +1200
@@ -43,7 +43,7 @@
 int
 ACLTagStrategy::match (ACLData<MatchType> * &data, ACLFilledChecklist *checklist)
 {
-    if (checklist->conn() != NULL)
+    if (checklist->request != NULL)
         return data->match (checklist->request->tag.termedBuf());
     return 0;
 }
diff -u -r -N squid-3.1.2/src/client_side.cc squid-3.1.3/src/client_side.cc
--- squid-3.1.2/src/client_side.cc	2010-05-01 23:39:52.000000000 +1200
+++ squid-3.1.3/src/client_side.cc	2010-05-02 22:47:08.000000000 +1200
@@ -706,8 +706,8 @@
     debugs(33, 3, "clientSetKeepaliveFlag: method = " <<
            RequestMethodStr(request->method));
 
-    /* We are HTTP/1.1 facing clients now*/
-    HttpVersion http_ver(1,1);
+    /* We are HTTP/1.0 facing clients still */
+    HttpVersion http_ver(1,0);
 
     if (httpMsgIsPersistent(http_ver, req_hdr))
         request->flags.proxy_keepalive = 1;
diff -u -r -N squid-3.1.2/src/client_side_reply.cc squid-3.1.3/src/client_side_reply.cc
--- squid-3.1.2/src/client_side_reply.cc	2010-05-01 23:39:52.000000000 +1200
+++ squid-3.1.3/src/client_side_reply.cc	2010-05-02 22:47:07.000000000 +1200
@@ -1435,8 +1435,8 @@
     reply = HTTPMSGLOCK(rep);
 
     if (reply->sline.protocol == PROTO_HTTP) {
-        /* RFC 2616 requires us to advertise our 1.1 version (but only on real HTTP traffic) */
-        reply->sline.version = HttpVersion(1,1);
+        /* enforce 1.0 reply version (but only on real HTTP traffic) */
+        reply->sline.version = HttpVersion(1,0);
     }
 
     /* do header conversions */
diff -u -r -N squid-3.1.2/src/http.cc squid-3.1.3/src/http.cc
--- squid-3.1.2/src/http.cc	2010-05-01 23:39:52.000000000 +1200
+++ squid-3.1.3/src/http.cc	2010-05-02 22:47:07.000000000 +1200
@@ -692,7 +692,7 @@
         if (!parsed && error > 0) { // unrecoverable parsing error
             debugs(11, 3, "processReplyHeader: Non-HTTP-compliant header: '" <<  readBuf->content() << "'");
             flags.headers_parsed = 1;
-            newrep->sline.version = HttpVersion(1,1);
+            newrep->sline.version = HttpVersion(1,0);
             newrep->sline.status = error;
             HttpReply *vrep = setVirginReply(newrep);
             entry->replaceHttpReply(vrep);
@@ -717,7 +717,7 @@
     /* Skip 1xx messages for now. Advertised in Via as an internal 1.0 hop */
     if (newrep->sline.protocol == PROTO_HTTP && newrep->sline.status >= 100 && newrep->sline.status < 200) {
 
-#if WHEN_HTTP11_EXPECT_HANDLED
+#if WHEN_HTTP11
         /* When HTTP/1.1 check if the client is expecting a 1xx reply and maybe pass it on */
         if (orig_request->header.has(HDR_EXPECT)) {
             // TODO: pass to the client anyway?
diff -u -r -N squid-3.1.2/src/HttpReply.cc squid-3.1.3/src/HttpReply.cc
--- squid-3.1.2/src/HttpReply.cc	2010-05-01 23:39:52.000000000 +1200
+++ squid-3.1.3/src/HttpReply.cc	2010-05-02 22:47:07.000000000 +1200
@@ -185,7 +185,7 @@
     /* rv->cache_control */
     /* rv->content_range */
     /* rv->keep_alive */
-    HttpVersion ver(1,1);
+    HttpVersion ver(1,0);
     httpStatusLineSet(&rv->sline, ver, HTTP_NOT_MODIFIED, "");
 
     for (t = 0; ImsEntries[t] != HDR_OTHER; ++t)
@@ -202,7 +202,7 @@
     /* Not as efficient as skipping the header duplication,
      * but easier to maintain
      */
-    HttpReply *temp = make304();
+    HttpReply *temp = make304 ();
     MemBuf *rv = temp->pack();
     delete temp;
     return rv;
@@ -213,7 +213,7 @@
                       const char *ctype, int64_t clen, time_t lmt, time_t expiresTime)
 {
     HttpHeader *hdr;
-    HttpVersion ver(1,1);
+    HttpVersion ver(1,0);
     httpStatusLineSet(&sline, ver, status, reason);
     hdr = &header;
     hdr->putStr(HDR_SERVER, visible_appname_string);
@@ -248,7 +248,7 @@
 HttpReply::redirect(http_status status, const char *loc)
 {
     HttpHeader *hdr;
-    HttpVersion ver(1,1);
+    HttpVersion ver(1,0);
     httpStatusLineSet(&sline, ver, status, httpStatusString(status));
     hdr = &header;
     hdr->putStr(HDR_SERVER, APP_FULLNAME);