# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: leon@darkk.net.ru-20101214102031-rq7yglqjh5sshao8
# target_branch: file:///home/darkk/squid/repo/trunk/
# testament_sha1: 8b058246f2b7af03692f9d3fa24c0011e6202465
# timestamp: 2010-12-14 12:22:15 +0200
# base_revision_id: squid3@treenet.co.nz-20101214033501-\
#   8gfrbp4d376rhh7h
# 
# Begin patch
=== modified file 'src/HttpRequest.cc'
--- src/HttpRequest.cc	2010-11-19 02:10:21 +0000
+++ src/HttpRequest.cc	2010-12-14 10:20:31 +0000
@@ -71,6 +71,7 @@
     method = aMethod;
     protocol = aProtocol;
     urlpath = aUrlpath;
+    // FIXME: should we safe_free(this.canonical) at the moment?
 }
 
 void

=== modified file 'src/adaptation/ecap/MessageRep.cc'
--- src/adaptation/ecap/MessageRep.cc	2010-05-26 03:06:02 +0000
+++ src/adaptation/ecap/MessageRep.cc	2010-12-14 10:20:31 +0000
@@ -185,7 +185,10 @@
     // Can we change urlParse API to remove the method parameter?
     // TODO: optimize: urlPath should take constant URL buffer
     char *buf = xstrdup(aUri.toString().c_str());
+    char* old_canonical = theMessage.canonical;
     const bool ok = urlParse(theMessage.method, buf, &theMessage);
+    if (theMessage.canonical == old_canonical)
+        safe_free(theMessage.canonical); // it's not valid anymore
     xfree(buf);
     Must(ok);
 }

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSfHdeEAAj7fgEQQUff///tm
0kD////wUAU71sDVG924pVAChJFJ6mmo0eieUeiZoaTaTQ0aAaAAAOaMmJgAmIwI0wIMRgmTAIwa
E0IKflR6m9KeptNTRoaAAADIDygGp6kmnqNABkABoDI0yBiAAASSCZAAmplPTCp4T01Eemp6E2oa
HqDGkYBZDFK4W9uVmltwtxlbXqTEpGVR3armq0ET8k8yIrqVh9cgVAfWXllnrXyKxhmGY8/mjT6R
qbsYyaNGdG2VBiVrPceueENffZe7IYVjm1hPiv9XCcOb38kdPh50PFMT5+qLSywTPPLqgDxuPC6Y
L/vVnpbKQqiGI3drYD4sEQl9uV7F5lNjV89lD719WPv9mVgHfEmZrEv5Z5x01uA7j1bqoa7GLbVm
MHC1B4A9B2HjsDp7p1nygwcdbSBY9A6GTLWmQnAm6KR6DY+AmZBClReZQKqmVJJS3GwqPxsNHOuR
Wyc13O1OigchWAPsr7IzIWj0iF02MqT9hl/yYCkfi8nT8IFgdM3SMFCpRPAtGwJvmV5UVAGUDQgO
Aov50QIY2pFw8rHITigiqyAiIvEaGkZBgvFmYPqhBGTsE2IwQa6hgay9WEbSkY0vWIwUmsOq0taw
cANePTy8kcNkIZZicM+8KpPtSZHieBUi1zVENZ3CStGWQzisCWQHV6ywqLNWLzhEbcccWLQ00iYl
JmjVuGHStLCFw7ePYqpZUjljaGo1houoZ2r0A6iowcFzGBrR74kQtGGbEwNy4mJC4nKZwdoobXnq
HX5jEFlLxskZ6TWWvtholDCEkGUoEKeqQ61+MlrY1b27vtSlApGcpNgOgoCsWlGRxZSQopWYkIAb
bA60QpBJNvu+liEOmSBflPtuE1BMvvwXGU77AokcgZohBK+lbDLFJYFnCsKzlMBxGti62QuSkQwq
kMNxgVHROpo4lADjJ4D8nWgaINV3xmxCB5+G/3Zngd54Gq0tPE8TUq4dwGhBgxGJmhuOBcbi4D7e
Wpzl/VThZnwPLjTn++D3zD4s6EDeVjMZnQ8tPkqA6SZaEgiHgQSjPxA9Ba0GVXpK+4p2VjrbM85Q
oEVskfbiMZ1nZvOZhyVhbR3MWKDi4ch9GBE5b5UzzN7C5tXEKx5qTCmg/vxTxr/Zk6vpB28+KsGY
5IboQsixBGixHTduUEpxm6acRkIsCqC2vIznCTsE65B6TTauqSJsda2e4D6cu2R6AetVw6xXucA3
EmMr/Zan0LM5c8NE1AoU2iSXcAdjJmC+k9o1VK21eMUD0vDIw9H9T3d2SB27z60D1ZEwiBDs4mly
D86LNEa0Fe4TAxS42LtJDtotn+cDgDHtrU579NQHrdGGCkvGmNW5rLzv20bTnGvkr3lkhBJUQQz4
B8EEIcyIGLaoATYmlJhMDph27Qh4xA0wpo9Tib4NNFSBg59QD6UckpTWjwow7VKXZphxLPcqyTLF
dO7aEVcF2GyknMbADbgBVcjqBsR1o9Mi/Cw1KiLk8Ou+kDAw5VmLJ+v3q+qlBarH1hpwAkUMcEEn
g/p9M04fEZvTCID6gsTwIKsmggQoDeS62Huv7ywDrA1uZkSFHYNCos/WGT7YqlC4nB/dxpJL7hFp
ZR0CTcO8c35F/YQJFaLOTHkWIxPaEPNjYncND+amIJHSaedBuJ8MLpY6tL5G3pfbsdQJ0FmyqR6K
tNjji9zgKUQ1K6Wf/i7kinChIE+O68I=