Re: One final (?) set of patches for 2.HEAD
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 We have another for HTCP accelerator mode. Jason will hopefully send. Mark Nottingham wrote: Just a few more; ... -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.7 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFKA3uDJiSUUSaRdSURCNh0AJ9NmA74Cmi8F+Xcvwic0EjzxSy+7QCgio5h xSE0i0TIOpGu/zWsViGZqPw= =SsoU -END PGP SIGNATURE-
omit to loop-forever processing some regex acls
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
- --
Matt Benjamin
The Linux Box
206 South Fifth Ave. Suite 150
Ann Arbor, MI 48104
http://linuxbox.com
tel. 734-761-4689
fax. 734-769-8938
cel. 734-216-5309
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFJLYaAJiSUUSaRdSURCNBMAJ90xJm8VjlLJuubuxqi2drt8plR7QCdHXDs
zBhdg5Gf8JScY8BdXqMZf8I=
=Kd5i
-END PGP SIGNATURE-
--- HttpHeaderTools.c.orig 2008-11-07 17:00:20.0 -0500
+++ HttpHeaderTools.c 2008-11-07 17:52:14.0 -0500
@@ -246,6 +246,7 @@
?,\t\r\n
};
int quoted = 0;
+
delim[0][1] = del;
delim[2][1] = del;
assert(str item pos);
@@ -258,6 +259,7 @@
*pos += strspn(*pos, delim[2]);
*item = *pos; /* remember item's start */
+
/* find next delimiter */
do {
*pos += strcspn(*pos, delim[quoted]);
@@ -265,13 +267,15 @@
break;
if (**pos == '') {
quoted = !quoted;
- *pos += 1;
+ goto advance;
}
if (quoted **pos == '\\') {
*pos += 1;
- if (**pos)
- *pos += 1;
+ goto advance;
}
+advance:
+ if (**pos)
+ (*pos)++;
} while (**pos);
len = *pos - *item;/* *pos points to del or '\0' */
/* rtrim */
fixup for URI decoration with port when not wanted
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Affects store keys and cache peering lookups.
Matt
- --
Matt Benjamin
The Linux Box
206 South Fifth Ave. Suite 150
Ann Arbor, MI 48104
http://linuxbox.com
tel. 734-761-4689
fax. 734-769-8938
cel. 734-216-5309
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFJLYbwJiSUUSaRdSURCD8oAJ4m5aa3dY95qVsNN4ociDuI2375EgCeOANb
HAtw5ccxyMiICF/ShN0bg3Q=
=6WMf
-END PGP SIGNATURE-
diff --git a/src/cf.data.pre b/src/cf.data.pre
index b9dc4c9..7d19ba4 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -3921,6 +3921,16 @@ DOC_START
sporadically hang or never complete requests set this to on.
DOC_END
+NAME: httpd_accel_no_append_port
+COMMENT: on|off
+TYPE: onoff
+DEFAULT: off
+LOC: Config.onoff.accel_no_append_port
+DOC_START
+ Do not append the accelerator port to request URI. This
+ is intended for clustered accelerator setups.
+DOC_END
+
COMMENT_START
DELAY POOL PARAMETERS
-
diff --git a/src/client_side.c b/src/client_side.c
index 23c4274..09899c9 100644
--- a/src/client_side.c
+++ b/src/client_side.c
@@ -3842,9 +3842,13 @@ parseHttpRequest(ConnStateData * conn, HttpMsgBuf * hmsg, method_t * method_p, i
if (strchr(host, ':'))
snprintf(http-uri, url_sz, %s://%s%s,
conn-port-protocol, host, url);
- else
+ else if(Config.onoff.accel_no_append_port) {
+ snprintf(http-uri, url_sz, %s://%s%s,
+ conn-port-protocol, host, url);
+ } else {
snprintf(http-uri, url_sz, %s://%s:%d%s,
- conn-port-protocol, host, port, url);
+ conn-port-protocol, host, port, url);
+ }
debug(33, 5) (VHOST REWRITE: '%s'\n, http-uri);
} else if (internalCheck(url)) {
goto internal;
diff --git a/src/structs.h b/src/structs.h
index 12652ab..33c7185 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -688,6 +688,7 @@ struct _SquidConfig {
int collapsed_forwarding;
int relaxed_header_parser;
int accel_no_pmtu_disc;
+ int accel_no_append_port;
int global_internal_static;
int httpd_suppress_version_string;
int via;
Re: intro/subscription request
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Thanks, Amos. Today, just request-side handling of Cache-Control: max-stale=0 (HttpHdrCc.c, 2.6-STABLE7+). If request's Cache-Control: max-stale has any positive value, Squid passes it through. Shouldn't the allowed range include 0 (delta-seconds := 1*DIGIT, and common usage)? Thanks, Matt Amos Jeffries wrote: | Matt Benjamin wrote: | -BEGIN PGP SIGNED MESSAGE- | Hash: SHA256 | | Hi, | | I'd like to quietly join squid-dev. | | I'm a a Squid user/administrator, with some experience in Squid 2.x and | 3.x source. I've run into things I'd like to discuss/fix, and this | seems to be the place to be... | | Welcome aboard Matt. | | What issues are you wanting to discuss? | | Amos - -- Matt Benjamin The Linux Box 206 South Fifth Ave. Suite 150 Ann Arbor, MI 48104 http://linuxbox.com tel. 734-761-4689 fax. 734-769-8938 cel. 734-216-5309 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.7 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFH48F5JiSUUSaRdSURCCTiAJ9B7TBKs038xLI+phZ1crNtD/bqpwCeLeCm kYzbW+lDpFgWqgVXxq2A9A8= =hdXo -END PGP SIGNATURE-
Re: max-stale=0 forwarding
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Hi Henrik, 1. I'll file a bug. I have the patch for it too, of course 2. The client in the case we've run into seems to be a network device, a proxy or traffic-management server--google finds examples of other folks doing it 3. The current code is problematic because the spec has max-stale without a value equivalent to max-stale: (Infinity) Matt Henrik Nordstrom wrote: | | It's meant to pass along whatever Cache-Control it gets unmodified. If | max-stale=0 isn't forwarded properly then file a bug. | | However, max-stale=0 is somewhat of an odd thing as it's the same as not | having max-stale at all: stale responses not accepted. So I guess the | code utilizes this to differentiate the three states (no max-stale, | max-stale, max-stale=NN) | | What clients is sending max-stale=0 btw? Can't remember seeing it.. | | Regards | Henrik | - -- Matt Benjamin The Linux Box 206 South Fifth Ave. Suite 150 Ann Arbor, MI 48104 http://linuxbox.com tel. 734-761-4689 fax. 734-769-8938 cel. 734-216-5309 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.7 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFH5DOtJiSUUSaRdSURCGlrAJ9cqZgfP68qQIQsnwA5mNLhfSOq2QCfXp5r WaCWhFyWZyXdTNpFievdVhI= =9eOu -END PGP SIGNATURE-
intro/subscription request
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Hi, I'd like to quietly join squid-dev. I'm a a Squid user/administrator, with some experience in Squid 2.x and 3.x source. I've run into things I'd like to discuss/fix, and this seems to be the place to be... Thanks, Matt - -- Matt Benjamin The Linux Box 206 South Fifth Ave. Suite 150 Ann Arbor, MI 48104 http://linuxbox.com tel. 734-761-4689 fax. 734-769-8938 cel. 734-216-5309 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.7 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFH4uAAJiSUUSaRdSURCHvfAJ49YIcbhGd7pYWCFMW6DbGC4wrqwwCfZQGI JIP5Ofh7zCKA827xbw9gljo= =AzRZ -END PGP SIGNATURE-
