Mailing List Archive

Author: des
Date: 2008-02-17 10:22:05 +0100 (Sun, 17 Feb 2008)
New Revision: 2495

Modified:
branches/1.1/
branches/1.1/LICENSE
branches/1.1/bin/varnishadm/varnishadm.1
branches/1.1/bin/varnishadm/varnishadm.c
branches/1.1/bin/varnishd/cache.h
branches/1.1/bin/varnishd/cache_acceptor.c
branches/1.1/bin/varnishd/cache_acceptor.h
branches/1.1/bin/varnishd/cache_acceptor_epoll.c
branches/1.1/bin/varnishd/cache_acceptor_kqueue.c
branches/1.1/bin/varnishd/cache_acceptor_poll.c
branches/1.1/bin/varnishd/cache_backend.c
branches/1.1/bin/varnishd/cache_ban.c
branches/1.1/bin/varnishd/cache_center.c
branches/1.1/bin/varnishd/cache_cli.c
branches/1.1/bin/varnishd/cache_expire.c
branches/1.1/bin/varnishd/cache_fetch.c
branches/1.1/bin/varnishd/cache_hash.c
branches/1.1/bin/varnishd/cache_http.c
branches/1.1/bin/varnishd/cache_main.c
branches/1.1/bin/varnishd/cache_pipe.c
branches/1.1/bin/varnishd/cache_pool.c
branches/1.1/bin/varnishd/cache_response.c
branches/1.1/bin/varnishd/cache_session.c
branches/1.1/bin/varnishd/cache_synthetic.c
branches/1.1/bin/varnishd/cache_vary.c
branches/1.1/bin/varnishd/cache_vcl.c
branches/1.1/bin/varnishd/cache_vrt.c
branches/1.1/bin/varnishd/cache_vrt_acl.c
branches/1.1/bin/varnishd/cache_vrt_re.c
branches/1.1/bin/varnishd/cache_ws.c
branches/1.1/bin/varnishd/common.h
branches/1.1/bin/varnishd/hash_classic.c
branches/1.1/bin/varnishd/hash_simple_list.c
branches/1.1/bin/varnishd/hash_slinger.h
branches/1.1/bin/varnishd/heritage.h
branches/1.1/bin/varnishd/mgt.h
branches/1.1/bin/varnishd/mgt_child.c
branches/1.1/bin/varnishd/mgt_cli.c
branches/1.1/bin/varnishd/mgt_cli.h
branches/1.1/bin/varnishd/mgt_event.c
branches/1.1/bin/varnishd/mgt_event.h
branches/1.1/bin/varnishd/mgt_param.c
branches/1.1/bin/varnishd/mgt_vcc.c
branches/1.1/bin/varnishd/rfc2616.c
branches/1.1/bin/varnishd/shmlog.c
branches/1.1/bin/varnishd/steps.h
branches/1.1/bin/varnishd/stevedore.c
branches/1.1/bin/varnishd/stevedore.h
branches/1.1/bin/varnishd/storage_file.c
branches/1.1/bin/varnishd/storage_malloc.c
branches/1.1/bin/varnishd/tcp.c
branches/1.1/bin/varnishd/varnishd.1
branches/1.1/bin/varnishd/varnishd.c
branches/1.1/bin/varnishhist/varnishhist.1
branches/1.1/bin/varnishhist/varnishhist.c
branches/1.1/bin/varnishlog/varnishlog.1
branches/1.1/bin/varnishlog/varnishlog.c
branches/1.1/bin/varnishncsa/varnishncsa.1
branches/1.1/bin/varnishncsa/varnishncsa.c
branches/1.1/bin/varnishreplay/varnishreplay.1
branches/1.1/bin/varnishreplay/varnishreplay.c
branches/1.1/bin/varnishstat/varnishstat.1
branches/1.1/bin/varnishstat/varnishstat.c
branches/1.1/bin/varnishtop/varnishtop.1
branches/1.1/bin/varnishtop/varnishtop.c
branches/1.1/configure.ac
branches/1.1/include/binary_heap.h
branches/1.1/include/cli.h
branches/1.1/include/cli_common.h
branches/1.1/include/cli_priv.h
branches/1.1/include/compat/asprintf.h
branches/1.1/include/compat/daemon.h
branches/1.1/include/compat/setproctitle.h
branches/1.1/include/compat/srandomdev.h
branches/1.1/include/compat/strlcat.h
branches/1.1/include/compat/strlcpy.h
branches/1.1/include/compat/strndup.h
branches/1.1/include/compat/vasprintf.h
branches/1.1/include/http_headers.h
branches/1.1/include/libvarnish.h
branches/1.1/include/libvcl.h
branches/1.1/include/shmlog.h
branches/1.1/include/shmlog_tags.h
branches/1.1/include/stat_field.h
branches/1.1/include/stats.h
branches/1.1/include/varnishapi.h
branches/1.1/include/vrt.h
branches/1.1/include/vss.h
branches/1.1/lib/libvarnish/argv.c
branches/1.1/lib/libvarnish/assert.c
branches/1.1/lib/libvarnish/binary_heap.c
branches/1.1/lib/libvarnish/cli.c
branches/1.1/lib/libvarnish/cli_common.c
branches/1.1/lib/libvarnish/crc32.c
branches/1.1/lib/libvarnish/flopen.c
branches/1.1/lib/libvarnish/time.c
branches/1.1/lib/libvarnish/version.c
branches/1.1/lib/libvarnish/vss.c
branches/1.1/lib/libvarnishapi/instance.c
branches/1.1/lib/libvarnishapi/shmlog.c
branches/1.1/lib/libvarnishcompat/asprintf.c
branches/1.1/lib/libvarnishcompat/setproctitle.c
branches/1.1/lib/libvarnishcompat/srandomdev.c
branches/1.1/lib/libvarnishcompat/strndup.c
branches/1.1/lib/libvarnishcompat/vasprintf.c
branches/1.1/lib/libvcl/vcc_acl.c
branches/1.1/lib/libvcl/vcc_action.c
branches/1.1/lib/libvcl/vcc_backend.c
branches/1.1/lib/libvcl/vcc_compile.c
branches/1.1/lib/libvcl/vcc_compile.h
branches/1.1/lib/libvcl/vcc_fixed_token.c
branches/1.1/lib/libvcl/vcc_gen_fixed_token.tcl
branches/1.1/lib/libvcl/vcc_gen_obj.tcl
branches/1.1/lib/libvcl/vcc_parse.c
branches/1.1/lib/libvcl/vcc_priv.h
branches/1.1/lib/libvcl/vcc_string.c
branches/1.1/lib/libvcl/vcc_token.c
branches/1.1/lib/libvcl/vcc_var.c
branches/1.1/lib/libvcl/vcc_xref.c
branches/1.1/man/vcl.7
Log:
Merged revisions 2233-2242,2244-2245,2256-2262,2296-2297,2299,2304-2305,2307-2309,2311-2312,2315,2317,2319,2321,2323,2325-2327,2358,2362-2364,2366,2374,2376-2378,2380-2381,2384-2386,2414-2415,2426,2432-2434,2444-2445,2457,2492-2494 via svnmerge from
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
r2414 | des | 2008-01-31 12:41:32 +0100 (Thu, 31 Jan 2008) | 3 lines

Mention that varnishd(1) has a list of commands and parameters, and
also how to obtain them from varnishd itself.
........
r2415 | des | 2008-01-31 12:57:51 +0100 (Thu, 31 Jan 2008) | 2 lines

Update copyright; also convert a couple of files from ISO-8859-1 to UTF-8.
........
r2444 | des | 2008-02-10 19:00:33 +0100 (Sun, 10 Feb 2008) | 2 lines

Alphabetize command-line options.
........
r2445 | des | 2008-02-11 03:58:41 +0100 (Mon, 11 Feb 2008) | 8 lines

Separate the handling of backend and client requests, greatly simplifying
both.

Skip piped requests, and requests that are interrupted by an error. This
should eliminate or at least greatly reduce the (null)s seen in logs.

Fix a conditional that blocked backend requests from being printed.
........
r2457 | des | 2008-02-13 18:10:04 +0100 (Wed, 13 Feb 2008) | 2 lines

SLT_Length is not relevant for backend requests.
........
r2492 | des | 2008-02-17 09:53:01 +0100 (Sun, 17 Feb 2008) | 2 lines

Request is bogus if df_m, df_Uq or df_H are NULL (Coverity CID#2, CID#3)
........
r2493 | des | 2008-02-17 09:54:53 +0100 (Sun, 17 Feb 2008) | 2 lines

Make sure buf is freed in error case (Coverity CID#9)
........
r2494 | des | 2008-02-17 10:03:32 +0100 (Sun, 17 Feb 2008) | 2 lines

Free leftover buffers when the loop ends (Coverity CID#10)
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
- /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206-2207,2211-2212,2215-2245,2256-2262,2270-2271,2275,2285-2286,2288-2291,2295-2301,2306,2310,2313-2314,2316,2318,2320,2322,2324,2357,2359,2361,2375,2379,2383
+ /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206-2207,2211-2212,2215-2245,2256-2262,2270-2271,2275,2285-2286,2288-2291,2295-2301,2304-2327,2357-2359,2361-2364,2366,2374-2381,2383-2386,2414-2415,2426,2432-2434,2444-2445,2457,2492-2494

Modified: branches/1.1/LICENSE
===================================================================
--- branches/1.1/LICENSE 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/LICENSE 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,5 +1,5 @@
Copyright (c) 2006 Verdens Gang AS
-Copyright (c) 2006-2007 Linpro AS
+Copyright (c) 2006-2008 Linpro AS
All rights reserved.

Redistribution and use in source and binary forms, with or without

Modified: branches/1.1/bin/varnishadm/varnishadm.1
===================================================================
--- branches/1.1/bin/varnishadm/varnishadm.1 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishadm/varnishadm.1 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
.\"-
.\" Copyright (c) 2006 Verdens Gang AS
-.\" Copyright (c) 2006-2007 Linpro AS
+.\" Copyright (c) 2006-2008 Linpro AS
.\" All rights reserved.
.\"
.\" Author: Cecilie Fritzvold <cecilihf at linpro.no>
@@ -28,7 +28,7 @@
.\"
.\" $Id$
.\"
-.Dd September 12, 2007
+.Dd January 31, 2008
.Dt VARNISHADM 1
.Os
.Sh NAME
@@ -50,6 +50,15 @@
.It Fl T Ar address Ns : Ns Ar port
Connect to the management interface at the specified address and port.
.El
+.Pp
+Available commands and parameters are documented in the
+.Xr varnishd 1
+manual page.
+Additionally, a summary of commands can be obtained by issuing the
+.Cm help
+command, and a summary of parameters can be obtained by issuing the
+.Cm param.show
+command.
.Sh EXIT STATUS
The exit status of the
.Nm

Modified: branches/1.1/bin/varnishadm/varnishadm.c
===================================================================
--- branches/1.1/bin/varnishadm/varnishadm.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishadm/varnishadm.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Cecilie Fritzvold <cecilihf at linpro.no>

Modified: branches/1.1/bin/varnishd/cache.h
===================================================================
--- branches/1.1/bin/varnishd/cache.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/cache_acceptor.c
===================================================================
--- branches/1.1/bin/varnishd/cache_acceptor.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_acceptor.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/cache_acceptor.h
===================================================================
--- branches/1.1/bin/varnishd/cache_acceptor.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_acceptor.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/cache_acceptor_epoll.c
===================================================================
--- branches/1.1/bin/varnishd/cache_acceptor_epoll.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_acceptor_epoll.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

Modified: branches/1.1/bin/varnishd/cache_acceptor_kqueue.c
===================================================================
--- branches/1.1/bin/varnishd/cache_acceptor_kqueue.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_acceptor_kqueue.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/cache_acceptor_poll.c
===================================================================
--- branches/1.1/bin/varnishd/cache_acceptor_poll.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_acceptor_poll.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/cache_backend.c
===================================================================
--- branches/1.1/bin/varnishd/cache_backend.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_backend.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/cache_ban.c
===================================================================
--- branches/1.1/bin/varnishd/cache_ban.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_ban.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/cache_center.c
===================================================================
--- branches/1.1/bin/varnishd/cache_center.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_center.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/cache_cli.c
===================================================================
--- branches/1.1/bin/varnishd/cache_cli.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_cli.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/cache_expire.c
===================================================================
--- branches/1.1/bin/varnishd/cache_expire.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_expire.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/cache_fetch.c
===================================================================
--- branches/1.1/bin/varnishd/cache_fetch.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_fetch.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/cache_hash.c
===================================================================
--- branches/1.1/bin/varnishd/cache_hash.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_hash.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/cache_http.c
===================================================================
--- branches/1.1/bin/varnishd/cache_http.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_http.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/cache_main.c
===================================================================
--- branches/1.1/bin/varnishd/cache_main.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_main.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/cache_pipe.c
===================================================================
--- branches/1.1/bin/varnishd/cache_pipe.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_pipe.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/cache_pool.c
===================================================================
--- branches/1.1/bin/varnishd/cache_pool.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_pool.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/cache_response.c
===================================================================
--- branches/1.1/bin/varnishd/cache_response.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_response.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/cache_session.c
===================================================================
--- branches/1.1/bin/varnishd/cache_session.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_session.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/cache_synthetic.c
===================================================================
--- branches/1.1/bin/varnishd/cache_synthetic.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_synthetic.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2007 Linpro AS
+ * Copyright (c) 2007-2008 Linpro AS
* All rights reserved.
*
* Author: Dag-Erling Sm??rgrav <des at linpro.no>

Modified: branches/1.1/bin/varnishd/cache_vary.c
===================================================================
--- branches/1.1/bin/varnishd/cache_vary.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_vary.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/cache_vcl.c
===================================================================
--- branches/1.1/bin/varnishd/cache_vcl.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_vcl.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/cache_vrt.c
===================================================================
--- branches/1.1/bin/varnishd/cache_vrt.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_vrt.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/cache_vrt_acl.c
===================================================================
--- branches/1.1/bin/varnishd/cache_vrt_acl.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_vrt_acl.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/cache_vrt_re.c
===================================================================
--- branches/1.1/bin/varnishd/cache_vrt_re.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_vrt_re.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/cache_ws.c
===================================================================
--- branches/1.1/bin/varnishd/cache_ws.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/cache_ws.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/common.h
===================================================================
--- branches/1.1/bin/varnishd/common.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/common.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/hash_classic.c
===================================================================
--- branches/1.1/bin/varnishd/hash_classic.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/hash_classic.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/hash_simple_list.c
===================================================================
--- branches/1.1/bin/varnishd/hash_simple_list.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/hash_simple_list.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/hash_slinger.h
===================================================================
--- branches/1.1/bin/varnishd/hash_slinger.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/hash_slinger.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/heritage.h
===================================================================
--- branches/1.1/bin/varnishd/heritage.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/heritage.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/mgt.h
===================================================================
--- branches/1.1/bin/varnishd/mgt.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/mgt.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/mgt_child.c
===================================================================
--- branches/1.1/bin/varnishd/mgt_child.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/mgt_child.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/mgt_cli.c
===================================================================
--- branches/1.1/bin/varnishd/mgt_cli.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/mgt_cli.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/mgt_cli.h
===================================================================
--- branches/1.1/bin/varnishd/mgt_cli.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/mgt_cli.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/mgt_event.c
===================================================================
--- branches/1.1/bin/varnishd/mgt_event.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/mgt_event.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/mgt_event.h
===================================================================
--- branches/1.1/bin/varnishd/mgt_event.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/mgt_event.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/mgt_param.c
===================================================================
--- branches/1.1/bin/varnishd/mgt_param.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/mgt_param.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/mgt_vcc.c
===================================================================
--- branches/1.1/bin/varnishd/mgt_vcc.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/mgt_vcc.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/rfc2616.c
===================================================================
--- branches/1.1/bin/varnishd/rfc2616.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/rfc2616.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/shmlog.c
===================================================================
--- branches/1.1/bin/varnishd/shmlog.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/shmlog.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/steps.h
===================================================================
--- branches/1.1/bin/varnishd/steps.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/steps.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/stevedore.c
===================================================================
--- branches/1.1/bin/varnishd/stevedore.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/stevedore.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2007 Linpro AS
+ * Copyright (c) 2007-2008 Linpro AS
* All rights reserved.
*
* Author: Dag-Erling Sm?rgav <des at linpro.no>

Modified: branches/1.1/bin/varnishd/stevedore.h
===================================================================
--- branches/1.1/bin/varnishd/stevedore.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/stevedore.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/storage_file.c
===================================================================
--- branches/1.1/bin/varnishd/storage_file.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/storage_file.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/storage_malloc.c
===================================================================
--- branches/1.1/bin/varnishd/storage_malloc.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/storage_malloc.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/tcp.c
===================================================================
--- branches/1.1/bin/varnishd/tcp.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/tcp.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishd/varnishd.1
===================================================================
--- branches/1.1/bin/varnishd/varnishd.1 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/varnishd.1 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
.\"-
.\" Copyright (c) 2006 Verdens Gang AS
-.\" Copyright (c) 2006-2007 Linpro AS
+.\" Copyright (c) 2006-2008 Linpro AS
.\" All rights reserved.
.\"
.\" Author: Dag-Erling Sm??rgrav <des at linpro.no>

Modified: branches/1.1/bin/varnishd/varnishd.c
===================================================================
--- branches/1.1/bin/varnishd/varnishd.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishd/varnishd.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishhist/varnishhist.1
===================================================================
--- branches/1.1/bin/varnishhist/varnishhist.1 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishhist/varnishhist.1 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
.\"-
.\" Copyright (c) 2006 Verdens Gang AS
-.\" Copyright (c) 2006-2007 Linpro AS
+.\" Copyright (c) 2006-2008 Linpro AS
.\" All rights reserved.
.\"
.\" Author: Dag-Erling Sm??rgrav <des at linpro.no>

Modified: branches/1.1/bin/varnishhist/varnishhist.c
===================================================================
--- branches/1.1/bin/varnishhist/varnishhist.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishhist/varnishhist.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishlog/varnishlog.1
===================================================================
--- branches/1.1/bin/varnishlog/varnishlog.1 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishlog/varnishlog.1 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
.\"-
.\" Copyright (c) 2006 Verdens Gang AS
-.\" Copyright (c) 2006-2007 Linpro AS
+.\" Copyright (c) 2006-2008 Linpro AS
.\" All rights reserved.
.\"
.\" Author: Dag-Erling Sm??rgrav <des at linpro.no>

Modified: branches/1.1/bin/varnishlog/varnishlog.c
===================================================================
--- branches/1.1/bin/varnishlog/varnishlog.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishlog/varnishlog.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
@@ -296,6 +296,14 @@
case 'a':
a_flag = 1;
break;
+ case 'b':
+ b_flag = 1;
+ VSL_Arg(vd, c, optarg);
+ break;
+ case 'c':
+ c_flag = 1;
+ VSL_Arg(vd, c, optarg);
+ break;
case 'D':
D_flag = 1;
break;
@@ -314,16 +322,6 @@
case 'w':
w_arg = optarg;
break;
- case 'c':
- c_flag = 1;
- if (VSL_Arg(vd, c, optarg) > 0)
- break;
- usage();
- case 'b':
- b_flag = 1;
- if (VSL_Arg(vd, c, optarg) > 0)
- break;
- usage();
default:
if (VSL_Arg(vd, c, optarg) > 0)
break;

Modified: branches/1.1/bin/varnishncsa/varnishncsa.1
===================================================================
--- branches/1.1/bin/varnishncsa/varnishncsa.1 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishncsa/varnishncsa.1 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
.\"-
.\" Copyright (c) 2006 Verdens Gang AS
-.\" Copyright (c) 2006-2007 Linpro AS
+.\" Copyright (c) 2006-2008 Linpro AS
.\" All rights reserved.
.\"
.\" Author: Dag-Erling Sm??rgrav <des at linpro.no>

Modified: branches/1.1/bin/varnishncsa/varnishncsa.c
===================================================================
--- branches/1.1/bin/varnishncsa/varnishncsa.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishncsa/varnishncsa.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Anders Berg <andersb at vgnett.no>
@@ -92,14 +92,13 @@
char *df_h; /* %h (host name / IP adress)*/
char *df_m; /* %m, Request method*/
char *df_s; /* %s, Status */
+ struct tm df_t; /* %t, Date and time */
char *df_u; /* %u, Remote user */
int bogus; /* bogus request */
} **ll;

static size_t nll;

-static time_t t;
-
static int
isprefix(const char *str, const char *prefix, const char *end, const char **next)
{
@@ -175,53 +174,98 @@
}

static int
-h_ncsa(void *priv, enum shmlogtag tag, unsigned fd,
- unsigned len, unsigned spec, const char *ptr)
+collect_backend(struct logline *lp, enum shmlogtag tag, unsigned spec,
+ const char *ptr, unsigned len)
{
const char *end, *next;
- char *q;
- FILE *fo;
- long l;
- struct tm tm;
- char tbuf[40];
- struct logline *lp;

+ assert(spec & VSL_S_BACKEND);
end = ptr + len;

- if (!(spec & VSL_S_CLIENT || spec & VSL_S_BACKEND))
- return (reopen);
-
- if (fd >= nll) {
- struct logline **newll = ll;
- size_t newnll = nll;
-
- while (fd >= newnll)
- newnll += newnll + 1;
- newll = realloc(newll, newnll * sizeof *newll);
- assert(newll != NULL);
- memset(newll + nll, 0, (newnll - nll) * sizeof *newll);
- ll = newll;
- nll = newnll;
- }
- if (ll[fd] == NULL) {
- ll[fd] = calloc(sizeof *ll[fd], 1);
- assert(ll[fd] != NULL);
- }
- lp = ll[fd];
-
switch (tag) {
case SLT_BackendOpen:
- if (!(spec & VSL_S_BACKEND))
- break;
if (lp->df_h != NULL)
lp->bogus = 1;
- else {
+ else
if (isprefix(ptr, "default", end, &next))
lp->df_h = trimfield(next, end);
else
lp->df_h = trimfield(ptr, end);
- }
break;
+
+ case SLT_TxRequest:
+ if (lp->df_m != NULL)
+ lp->bogus = 1;
+ else
+ lp->df_m = trimline(ptr, end);
+ break;
+
+ case SLT_TxURL:
+ if (lp->df_Uq != NULL)
+ lp->bogus = 1;
+ else
+ lp->df_Uq = trimline(ptr, end);
+ break;
+
+ case SLT_TxProtocol:
+ if (lp->df_H != NULL)
+ lp->bogus = 1;
+ else
+ lp->df_H = trimline(ptr, end);
+ break;
+
+ case SLT_RxStatus:
+ if (lp->df_s != NULL)
+ lp->bogus = 1;
+ else
+ lp->df_s = trimline(ptr, end);
+ break;
+
+ case SLT_RxHeader:
+ if (isprefix(ptr, "content-length:", end, &next))
+ lp->df_b = trimline(next, end);
+ else if (isprefix(ptr, "date:", end, &next) &&
+ strptime(next, "%a, %d %b %Y %T", &lp->df_t) == NULL)
+ lp->bogus = 1;
+ break;
+
+ case SLT_TxHeader:
+ if (isprefix(ptr, "user-agent:", end, &next))
+ lp->df_User_agent = trimline(next, end);
+ else if (isprefix(ptr, "referer:", end, &next))
+ lp->df_Referer = trimline(next, end);
+ else if (isprefix(ptr, "authorization:", end, &next) &&
+ isprefix(next, "basic", end, &next))
+ lp->df_u = trimline(next, end);
+ else if (isprefix(ptr, "host:", end, &next))
+ lp->df_Host = trimline(next, end);
+ break;
+
+ case SLT_BackendReuse:
+ case SLT_BackendClose:
+ /* got it all */
+ return (0);
+
+ default:
+ break;
+ }
+
+ /* more to come */
+ return (1);
+}
+
+static int
+collect_client(struct logline *lp, enum shmlogtag tag, unsigned spec,
+ const char *ptr, unsigned len)
+{
+ const char *end, *next;
+ long l;
+ time_t t;
+
+ assert(spec & VSL_S_CLIENT);
+ end = ptr + len;
+
+ switch (tag) {
case SLT_ReqStart:
if (lp->df_h != NULL)
lp->bogus = 1;
@@ -229,71 +273,35 @@
lp->df_h = trimfield(ptr, end);
break;

- case SLT_TxRequest:
- if (!(spec & VSL_S_BACKEND))
- break;
case SLT_RxRequest:
- if (tag == SLT_RxRequest && (spec & VSL_S_BACKEND))
- break;
-
if (lp->df_m != NULL)
lp->bogus = 1;
else
lp->df_m = trimline(ptr, end);
break;

- case SLT_TxURL:
- if (!(spec & VSL_S_BACKEND))
- break;
case SLT_RxURL:
- if (tag == SLT_RxURL && (spec & VSL_S_BACKEND))
- break;
-
if (lp->df_Uq != NULL)
lp->bogus = 1;
else
lp->df_Uq = trimline(ptr, end);
break;

- case SLT_TxProtocol:
- if (!(spec & VSL_S_BACKEND))
- break;
case SLT_RxProtocol:
- if (tag == SLT_RxProtocol && (spec & VSL_S_BACKEND))
- break;
-
if (lp->df_H != NULL)
lp->bogus = 1;
else
lp->df_H = trimline(ptr, end);
break;

- case SLT_RxStatus:
- if (!(spec & VSL_S_BACKEND))
- break;
case SLT_TxStatus:
- if (tag == SLT_TxStatus && (spec & VSL_S_BACKEND))
- break;
-
if (lp->df_s != NULL)
lp->bogus = 1;
else
lp->df_s = trimline(ptr, end);
break;

- case SLT_TxHeader:
- if (!(spec & VSL_S_BACKEND))
- break;
case SLT_RxHeader:
- if (tag == SLT_RxHeader && (spec & VSL_S_BACKEND)) {
- if (isprefix(ptr, "content-length:", end, &next)) {
- lp->df_b = trimline(next, end);
- } else if (isprefix(ptr, "date:", end, &next)) {
- if (strptime(trimline(next, end), "%a, %d %b %Y %T", &tm))
- t = mktime(&tm);
- }
- break;
- }
if (isprefix(ptr, "user-agent:", end, &next))
lp->df_User_agent = trimline(next, end);
else if (isprefix(ptr, "referer:", end, &next))
@@ -312,24 +320,73 @@
lp->df_b = trimline(ptr, end);
break;

+ case SLT_SessionClose:
+ if (strncmp(ptr, "pipe", len) == 0 ||
+ strncmp(ptr, "error", len) == 0)
+ lp->bogus = 1;
+ break;
+
+ case SLT_ReqEnd:
+ if (sscanf(ptr, "%*u %*u.%*u %ld.", &l) != 1) {
+ lp->bogus = 1;
+ } else {
+ t = l;
+ localtime_r(&t, &lp->df_t);
+ }
+ /* got it all */
+ return (0);
+
default:
break;
}

- if ((spec & VSL_S_CLIENT) && tag != SLT_ReqEnd)
- return (reopen);
+ /* more to come */
+ return (1);
+}

- if ((spec & VSL_S_BACKEND) && tag != SLT_BackendReuse &&
- (tag != SLT_BackendClose || lp->df_Uq))
- return (reopen);
+static int
+h_ncsa(void *priv, enum shmlogtag tag, unsigned fd,
+ unsigned len, unsigned spec, const char *ptr)
+{
+ struct logline *lp;
+ FILE *fo = priv;
+ char *q, tbuf[64];

- if (tag == SLT_ReqEnd) {
- if (sscanf(ptr, "%*u %*u.%*u %ld.", &l) != 1)
- lp->bogus = 1;
- else
- t = l;
+ if (fd >= nll) {
+ struct logline **newll = ll;
+ size_t newnll = nll;
+
+ while (fd >= newnll)
+ newnll += newnll + 1;
+ newll = realloc(newll, newnll * sizeof *newll);
+ assert(newll != NULL);
+ memset(newll + nll, 0, (newnll - nll) * sizeof *newll);
+ ll = newll;
+ nll = newnll;
}
+ if (ll[fd] == NULL) {
+ ll[fd] = calloc(sizeof *ll[fd], 1);
+ assert(ll[fd] != NULL);
+ }
+ lp = ll[fd];

+ if (spec & VSL_S_BACKEND) {
+ if (collect_backend(lp, tag, spec, ptr, len))
+ return (reopen);
+ } else if (spec & VSL_S_CLIENT) {
+ if (collect_client(lp, tag, spec, ptr, len))
+ return (reopen);
+ } else {
+ /* huh? */
+ return (reopen);
+ }
+
+#if 0
+ /* non-optional fields */
+ if (!lp->df_m || !lp->df_Uq || !lp->df_H || !lp->df_s)
+ lp->bogus = 1;
+#endif
+
if (!lp->bogus) {
fo = priv;

@@ -362,8 +419,7 @@
}

/* %t */
- localtime_r(&t, &tm);
- strftime(tbuf, sizeof tbuf, "[%d/%b/%Y:%T %z]", &tm);
+ strftime(tbuf, sizeof tbuf, "[%d/%b/%Y:%T %z]", &lp->df_t);
fprintf(fo, "%s ", tbuf);

/*
@@ -383,7 +439,7 @@
fprintf(fo, "%s ", lp->df_s);

/* %b */
- fprintf(fo, "%s ", lp->df_b);
+ fprintf(fo, "%s ", lp->df_b ? lp->df_b : "-");

/* %{Referer}i */
fprintf(fo, "\"%s\" ",
@@ -411,7 +467,7 @@
freez(lp->df_s);
freez(lp->df_u);
#undef freez
- lp->bogus = 0;
+ memset(lp, 0, sizeof *lp);

return (reopen);
}

Modified: branches/1.1/bin/varnishreplay/varnishreplay.1
===================================================================
--- branches/1.1/bin/varnishreplay/varnishreplay.1 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishreplay/varnishreplay.1 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,5 +1,5 @@
.\"-
-.\" Copyright (c) 2007 Linpro AS
+.\" Copyright (c) 2007-2008 Linpro AS
.\" All rights reserved.
.\"
.\" Author: Cecilie Fritzvold <cecilihf at linpro.no>

Modified: branches/1.1/bin/varnishreplay/varnishreplay.c
===================================================================
--- branches/1.1/bin/varnishreplay/varnishreplay.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishreplay/varnishreplay.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -360,7 +360,8 @@
(2048 < length - nbuf ? 2048 : length - nbuf));
if (n <= 0) {
thread_log(0, "failed reading the block\n");
- return (-1);
+ nbuf = -1;
+ break;
}
nbuf += n;
}
@@ -518,6 +519,9 @@
if (tag != SLT_ReqEnd)
continue;

+ if (!df_m || !df_Uq || !df_H)
+ bogus = 1;
+
if (bogus) {
thread_log(1, "bogus\n");
} else {
@@ -578,6 +582,16 @@
freez(df_c);
bogus = 0;
}
+
+ /* leftovers */
+ freez(msg->ptr);
+ freez(msg);
+ freez(df_H);
+ freez(df_Host);
+ freez(df_Uq);
+ freez(df_m);
+ freez(df_c);
+
return (0);
}


Modified: branches/1.1/bin/varnishstat/varnishstat.1
===================================================================
--- branches/1.1/bin/varnishstat/varnishstat.1 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishstat/varnishstat.1 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
.\"-
.\" Copyright (c) 2006 Verdens Gang AS
-.\" Copyright (c) 2006-2007 Linpro AS
+.\" Copyright (c) 2006-2008 Linpro AS
.\" All rights reserved.
.\"
.\" Author: Dag-Erling Sm??rgrav <des at linpro.no>

Modified: branches/1.1/bin/varnishstat/varnishstat.c
===================================================================
--- branches/1.1/bin/varnishstat/varnishstat.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishstat/varnishstat.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/bin/varnishtop/varnishtop.1
===================================================================
--- branches/1.1/bin/varnishtop/varnishtop.1 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishtop/varnishtop.1 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
.\"-
.\" Copyright (c) 2006 Verdens Gang AS
-.\" Copyright (c) 2006-2007 Linpro AS
+.\" Copyright (c) 2006-2008 Linpro AS
.\" All rights reserved.
.\"
.\" Author: Dag-Erling Sm??rgrav <des at linpro.no>

Modified: branches/1.1/bin/varnishtop/varnishtop.c
===================================================================
--- branches/1.1/bin/varnishtop/varnishtop.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/bin/varnishtop/varnishtop.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/configure.ac
===================================================================
--- branches/1.1/configure.ac 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/configure.ac 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,7 +1,7 @@
# $Id$

AC_PREREQ(2.59)
-AC_COPYRIGHT([Copyright (c) 2006-2007 Linpro AS / Verdens Gang AS])
+AC_COPYRIGHT([Copyright (c) 2006-2008 Linpro AS / Verdens Gang AS])
AC_REVISION([$Id$])
AC_INIT([Varnish], [1.1.2], [varnish-dev at projects.linpro.no])
AC_CONFIG_SRCDIR(include/varnishapi.h)

Modified: branches/1.1/include/binary_heap.h
===================================================================
--- branches/1.1/include/binary_heap.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/include/binary_heap.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/include/cli.h
===================================================================
--- branches/1.1/include/cli.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/include/cli.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/include/cli_common.h
===================================================================
--- branches/1.1/include/cli_common.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/include/cli_common.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/include/cli_priv.h
===================================================================
--- branches/1.1/include/cli_priv.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/include/cli_priv.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/include/compat/asprintf.h
===================================================================
--- branches/1.1/include/compat/asprintf.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/include/compat/asprintf.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Dag-Erling Sm??rgrav <des at linpro.no>

Modified: branches/1.1/include/compat/daemon.h
===================================================================
--- branches/1.1/include/compat/daemon.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/include/compat/daemon.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Dag-Erling Sm??rgrav <des at linpro.no>

Modified: branches/1.1/include/compat/setproctitle.h
===================================================================
--- branches/1.1/include/compat/setproctitle.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/include/compat/setproctitle.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Dag-Erling Sm??rgrav <des at linpro.no>

Modified: branches/1.1/include/compat/srandomdev.h
===================================================================
--- branches/1.1/include/compat/srandomdev.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/include/compat/srandomdev.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Dag-Erling Sm??rgrav <des at linpro.no>

Modified: branches/1.1/include/compat/strlcat.h
===================================================================
--- branches/1.1/include/compat/strlcat.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/include/compat/strlcat.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Dag-Erling Sm??rgrav <des at linpro.no>

Modified: branches/1.1/include/compat/strlcpy.h
===================================================================
--- branches/1.1/include/compat/strlcpy.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/include/compat/strlcpy.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Dag-Erling Sm??rgrav <des at linpro.no>

Modified: branches/1.1/include/compat/strndup.h
===================================================================
--- branches/1.1/include/compat/strndup.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/include/compat/strndup.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Dag-Erling Sm??rgrav <des at linpro.no>

Modified: branches/1.1/include/compat/vasprintf.h
===================================================================
--- branches/1.1/include/compat/vasprintf.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/include/compat/vasprintf.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Dag-Erling Sm??rgrav <des at linpro.no>

Modified: branches/1.1/include/http_headers.h
===================================================================
--- branches/1.1/include/http_headers.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/include/http_headers.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/include/libvarnish.h
===================================================================
--- branches/1.1/include/libvarnish.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/include/libvarnish.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/include/libvcl.h
===================================================================
--- branches/1.1/include/libvcl.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/include/libvcl.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/include/shmlog.h
===================================================================
--- branches/1.1/include/shmlog.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/include/shmlog.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/include/shmlog_tags.h
===================================================================
--- branches/1.1/include/shmlog_tags.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/include/shmlog_tags.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/include/stat_field.h
===================================================================
--- branches/1.1/include/stat_field.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/include/stat_field.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/include/stats.h
===================================================================
--- branches/1.1/include/stats.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/include/stats.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/include/varnishapi.h
===================================================================
--- branches/1.1/include/varnishapi.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/include/varnishapi.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/include/vrt.h
===================================================================
--- branches/1.1/include/vrt.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/include/vrt.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/include/vss.h
===================================================================
--- branches/1.1/include/vss.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/include/vss.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

Modified: branches/1.1/lib/libvarnish/argv.c
===================================================================
--- branches/1.1/lib/libvarnish/argv.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvarnish/argv.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/lib/libvarnish/assert.c
===================================================================
--- branches/1.1/lib/libvarnish/assert.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvarnish/assert.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/lib/libvarnish/binary_heap.c
===================================================================
--- branches/1.1/lib/libvarnish/binary_heap.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvarnish/binary_heap.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/lib/libvarnish/cli.c
===================================================================
--- branches/1.1/lib/libvarnish/cli.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvarnish/cli.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/lib/libvarnish/cli_common.c
===================================================================
--- branches/1.1/lib/libvarnish/cli_common.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvarnish/cli_common.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/lib/libvarnish/crc32.c
===================================================================
--- branches/1.1/lib/libvarnish/crc32.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvarnish/crc32.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/lib/libvarnish/flopen.c
===================================================================
--- branches/1.1/lib/libvarnish/flopen.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvarnish/flopen.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2007 Dag-Erling Co?dan Sm?rgrav
+ * Copyright (c) 2007 Dag-Erling Co??dan Sm??rgrav
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

Modified: branches/1.1/lib/libvarnish/time.c
===================================================================
--- branches/1.1/lib/libvarnish/time.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvarnish/time.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/lib/libvarnish/version.c
===================================================================
--- branches/1.1/lib/libvarnish/version.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvarnish/version.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Dag-Erling Sm??rgrav <des at linpro.no>
@@ -40,5 +40,5 @@
{
fprintf(stderr, "%s (%s-%s)\n", progname,
PACKAGE_TARNAME, PACKAGE_VERSION);
- fprintf(stderr, "Copyright (c) 2006-2007 Linpro AS / Verdens Gang AS\n");
+ fprintf(stderr, "Copyright (c) 2006-2008 Linpro AS / Verdens Gang AS\n");
}

Modified: branches/1.1/lib/libvarnish/vss.c
===================================================================
--- branches/1.1/lib/libvarnish/vss.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvarnish/vss.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Dag-Erling Sm??rgrav <des at linpro.no>

Modified: branches/1.1/lib/libvarnishapi/instance.c
===================================================================
--- branches/1.1/lib/libvarnishapi/instance.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvarnishapi/instance.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2007 Linpro AS
+ * Copyright (c) 2007-2008 Linpro AS
* All rights reserved.
*
* Author: Dag-Erling Sm??rgrav <des at linpro.no>

Modified: branches/1.1/lib/libvarnishapi/shmlog.c
===================================================================
--- branches/1.1/lib/libvarnishapi/shmlog.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvarnishapi/shmlog.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/lib/libvarnishcompat/asprintf.c
===================================================================
--- branches/1.1/lib/libvarnishcompat/asprintf.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvarnishcompat/asprintf.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Dag-Erling Sm??rgrav <des at linpro.no>

Modified: branches/1.1/lib/libvarnishcompat/setproctitle.c
===================================================================
--- branches/1.1/lib/libvarnishcompat/setproctitle.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvarnishcompat/setproctitle.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Dag-Erling Sm??rgrav <des at linpro.no>

Modified: branches/1.1/lib/libvarnishcompat/srandomdev.c
===================================================================
--- branches/1.1/lib/libvarnishcompat/srandomdev.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvarnishcompat/srandomdev.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Dag-Erling Sm??rgrav <des at linpro.no>

Modified: branches/1.1/lib/libvarnishcompat/strndup.c
===================================================================
--- branches/1.1/lib/libvarnishcompat/strndup.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvarnishcompat/strndup.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Dag-Erling Sm??rgrav <des at linpro.no>

Modified: branches/1.1/lib/libvarnishcompat/vasprintf.c
===================================================================
--- branches/1.1/lib/libvarnishcompat/vasprintf.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvarnishcompat/vasprintf.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Dag-Erling Sm??rgrav <des at linpro.no>

Modified: branches/1.1/lib/libvcl/vcc_acl.c
===================================================================
--- branches/1.1/lib/libvcl/vcc_acl.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvcl/vcc_acl.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/lib/libvcl/vcc_action.c
===================================================================
--- branches/1.1/lib/libvcl/vcc_action.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvcl/vcc_action.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/lib/libvcl/vcc_backend.c
===================================================================
--- branches/1.1/lib/libvcl/vcc_backend.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvcl/vcc_backend.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/lib/libvcl/vcc_compile.c
===================================================================
--- branches/1.1/lib/libvcl/vcc_compile.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvcl/vcc_compile.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/lib/libvcl/vcc_compile.h
===================================================================
--- branches/1.1/lib/libvcl/vcc_compile.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvcl/vcc_compile.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/lib/libvcl/vcc_fixed_token.c
===================================================================
--- branches/1.1/lib/libvcl/vcc_fixed_token.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvcl/vcc_fixed_token.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -358,7 +358,7 @@
vsb_cat(sb, "};\n");
vsb_cat(sb, "/*-\n");
vsb_cat(sb, " * Copyright (c) 2006 Verdens Gang AS\n");
- vsb_cat(sb, " * Copyright (c) 2006-2007 Linpro AS\n");
+ vsb_cat(sb, " * Copyright (c) 2006-2008 Linpro AS\n");
vsb_cat(sb, " * All rights reserved.\n");
vsb_cat(sb, " *\n");
vsb_cat(sb, " * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>\n");

Modified: branches/1.1/lib/libvcl/vcc_gen_fixed_token.tcl
===================================================================
--- branches/1.1/lib/libvcl/vcc_gen_fixed_token.tcl 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvcl/vcc_gen_fixed_token.tcl 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,7 +1,7 @@
#!/usr/local/bin/tclsh8.4
#-
# Copyright (c) 2006 Verdens Gang AS
-# Copyright (c) 2006-2007 Linpro AS
+# Copyright (c) 2006-2008 Linpro AS
# All rights reserved.
#
# Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/lib/libvcl/vcc_gen_obj.tcl
===================================================================
--- branches/1.1/lib/libvcl/vcc_gen_obj.tcl 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvcl/vcc_gen_obj.tcl 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,7 +1,7 @@
#!/usr/local/bin/tclsh8.4
#-
# Copyright (c) 2006 Verdens Gang AS
-# Copyright (c) 2006-2007 Linpro AS
+# Copyright (c) 2006-2008 Linpro AS
# All rights reserved.
#
# Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/lib/libvcl/vcc_parse.c
===================================================================
--- branches/1.1/lib/libvcl/vcc_parse.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvcl/vcc_parse.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/lib/libvcl/vcc_priv.h
===================================================================
--- branches/1.1/lib/libvcl/vcc_priv.h 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvcl/vcc_priv.h 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/lib/libvcl/vcc_string.c
===================================================================
--- branches/1.1/lib/libvcl/vcc_string.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvcl/vcc_string.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/lib/libvcl/vcc_token.c
===================================================================
--- branches/1.1/lib/libvcl/vcc_token.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvcl/vcc_token.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/lib/libvcl/vcc_var.c
===================================================================
--- branches/1.1/lib/libvcl/vcc_var.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvcl/vcc_var.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/lib/libvcl/vcc_xref.c
===================================================================
--- branches/1.1/lib/libvcl/vcc_xref.c 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/lib/libvcl/vcc_xref.c 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
+ * Copyright (c) 2006-2008 Linpro AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: branches/1.1/man/vcl.7
===================================================================
--- branches/1.1/man/vcl.7 2008-02-17 09:03:32 UTC (rev 2494)
+++ branches/1.1/man/vcl.7 2008-02-17 09:22:05 UTC (rev 2495)
@@ -1,6 +1,6 @@
.\"-
.\" Copyright (c) 2006 Verdens Gang AS
-.\" Copyright (c) 2006-2007 Linpro AS
+.\" Copyright (c) 2006-2008 Linpro AS
.\" All rights reserved.
.\"
.\" Author: Dag-Erling Sm??rgrav <des at linpro.no>