Revision: 14744
Author: adrian.chadd
Date: Wed Aug 4 22:24:11 2010
Log: Merge r14729:14743 from /branches/LUSCA_HEAD
http://code.google.com/p/lusca-cache/source/detail?r=14744
Modified:
/playpen/LUSCA_HEAD_ipv6/libsqstore/store_meta.c
/playpen/LUSCA_HEAD_ipv6/src/access_log.c
/playpen/LUSCA_HEAD_ipv6/src/htcp.c
/playpen/LUSCA_HEAD_ipv6/src/http.c
/playpen/LUSCA_HEAD_ipv6/tools/ufs_obj_cat.c
=======================================
--- /playpen/LUSCA_HEAD_ipv6/libsqstore/store_meta.c Sun Jul 4 06:56:53
2010
+++ /playpen/LUSCA_HEAD_ipv6/libsqstore/store_meta.c Wed Aug 4 22:24:11
2010
@@ -5,6 +5,7 @@
#include <unistd.h>
#include <string.h>
#include <fcntl.h>
+#include <sys/types.h>
#include "../include/util.h"
=======================================
--- /playpen/LUSCA_HEAD_ipv6/src/access_log.c Mon Jul 12 01:12:05 2010
+++ /playpen/LUSCA_HEAD_ipv6/src/access_log.c Wed Aug 4 22:24:11 2010
@@ -497,6 +497,7 @@
case LFT_OUTGOING_IP:
(void) sqinet_ntoa(&al->cache.out_ip2, cbuf, sizeof(cbuf),
SQADDR_NONE);
out = cbuf;
+ dofree = 1;
break;
/* case LFT_SERVER_PORT: */
=======================================
--- /playpen/LUSCA_HEAD_ipv6/src/htcp.c Sun Jul 4 06:56:53 2010
+++ /playpen/LUSCA_HEAD_ipv6/src/htcp.c Wed Aug 4 22:24:11 2010
@@ -35,6 +35,8 @@
#include "squid.h"
+#include "../libsqurl/url.h"
+
typedef struct _Countstr Countstr;
typedef struct _htcpHeader htcpHeader;
typedef struct _htcpDataHeader htcpDataHeader;
=======================================
--- /playpen/LUSCA_HEAD_ipv6/src/http.c Sun Jul 4 06:56:53 2010
+++ /playpen/LUSCA_HEAD_ipv6/src/http.c Wed Aug 4 22:24:11 2010
@@ -41,6 +41,8 @@
#include "squid.h"
#include "pconn.h"
+#include "../libsqurl/url.h"
+
static const char *const crlf = "\r\n";
static CWCB httpSendComplete;
=======================================
--- /playpen/LUSCA_HEAD_ipv6/tools/ufs_obj_cat.c Sun Jul 4 06:56:53 2010
+++ /playpen/LUSCA_HEAD_ipv6/tools/ufs_obj_cat.c Wed Aug 4 22:24:11 2010
@@ -5,6 +5,7 @@
#include <unistd.h>
#include <string.h>
#include <fcntl.h>
+#include <sys/types.h>
#include "../libcore/varargs.h"
#include "../libcore/tools.h"
--
You received this message because you are subscribed to the Google Groups
"lusca-commit" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/lusca-commit?hl=en.
