---------------------
PatchSet 4583 
Date: 2007/05/18 05:24:38
Author: amosjeffries
Branch: ayjwork
Tag: (none) 
Log:
Check code matches current HEAD before patching.
Fix small compile error is code added last few days.

Members: 
	src/DelayBucket.cc:1.5->1.5.22.1 
	src/access_log.cc:1.41.4.7->1.41.4.8 

Index: squid3/src/DelayBucket.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/DelayBucket.cc,v
retrieving revision 1.5
retrieving revision 1.5.22.1
diff -u -r1.5 -r1.5.22.1
--- squid3/src/DelayBucket.cc	11 Mar 2003 03:15:58 -0000	1.5
+++ squid3/src/DelayBucket.cc	18 May 2007 05:24:38 -0000	1.5.22.1
@@ -1,6 +1,6 @@
 
 /*
- * $Id: DelayBucket.cc,v 1.5 2003/03/11 03:15:58 squidadm Exp $
+ * $Id: DelayBucket.cc,v 1.5.22.1 2007/05/18 05:24:38 amosjeffries Exp $
  *
  * DEBUG: section 77    Delay Pools
  * AUTHOR: Robert Collins <robertc@squid-cache.org>
@@ -54,7 +54,7 @@
 #include "ConfigParser.h"
 #include "DelayId.h"
 #include "Array.h"
-#include "String.h"
+#include "SquidString.h"
 #include "CommonPool.h"
 #include "CompositePoolNode.h"
 #include "DelayPool.h"
Index: squid3/src/access_log.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/access_log.cc,v
retrieving revision 1.41.4.7
retrieving revision 1.41.4.8
diff -u -r1.41.4.7 -r1.41.4.8
--- squid3/src/access_log.cc	18 May 2007 04:44:45 -0000	1.41.4.7
+++ squid3/src/access_log.cc	18 May 2007 05:24:38 -0000	1.41.4.8
@@ -1,6 +1,6 @@
 
 /*
- * $Id: access_log.cc,v 1.41.4.7 2007/05/18 04:44:45 amosjeffries Exp $
+ * $Id: access_log.cc,v 1.41.4.8 2007/05/18 05:24:38 amosjeffries Exp $
  *
  * DEBUG: section 46    Access Log
  * AUTHOR: Duane Wessels
@@ -767,7 +767,7 @@
 
         case LFT_REQUEST_URLPATH:
 	    if (al->request) {
-		out = al->request->urlpath.buf();
+		out = al->request->urlpath.c_str();
 		quote = 1;
 	    }
             break;