r2496 - in branches/1.2: . bin/varnishadm bin/varnishd bin/varnishhist bin/varnishlog bin/varnishncsa bin/varnishreplay bin/varnishstat bin/varnishtop include include/compat lib/libvarnish lib/libvarnishapi lib/libvarnishcompat lib/libvcl man

Sun Feb 17 10:26:32 CET 2008

Author: des
Date: 2008-02-17 10:26:32 +0100 (Sun, 17 Feb 2008)
New Revision: 2496

Modified:
   branches/1.2/
   branches/1.2/LICENSE
   branches/1.2/bin/varnishadm/varnishadm.1
   branches/1.2/bin/varnishadm/varnishadm.c
   branches/1.2/bin/varnishd/cache.h
   branches/1.2/bin/varnishd/cache_acceptor.c
   branches/1.2/bin/varnishd/cache_acceptor.h
   branches/1.2/bin/varnishd/cache_acceptor_epoll.c
   branches/1.2/bin/varnishd/cache_acceptor_kqueue.c
   branches/1.2/bin/varnishd/cache_acceptor_poll.c
   branches/1.2/bin/varnishd/cache_backend.c
   branches/1.2/bin/varnishd/cache_backend_random.c
   branches/1.2/bin/varnishd/cache_backend_round_robin.c
   branches/1.2/bin/varnishd/cache_backend_simple.c
   branches/1.2/bin/varnishd/cache_ban.c
   branches/1.2/bin/varnishd/cache_center.c
   branches/1.2/bin/varnishd/cache_cli.c
   branches/1.2/bin/varnishd/cache_expire.c
   branches/1.2/bin/varnishd/cache_fetch.c
   branches/1.2/bin/varnishd/cache_hash.c
   branches/1.2/bin/varnishd/cache_http.c
   branches/1.2/bin/varnishd/cache_httpconn.c
   branches/1.2/bin/varnishd/cache_main.c
   branches/1.2/bin/varnishd/cache_panic.c
   branches/1.2/bin/varnishd/cache_pipe.c
   branches/1.2/bin/varnishd/cache_pool.c
   branches/1.2/bin/varnishd/cache_response.c
   branches/1.2/bin/varnishd/cache_session.c
   branches/1.2/bin/varnishd/cache_synthetic.c
   branches/1.2/bin/varnishd/cache_vary.c
   branches/1.2/bin/varnishd/cache_vcl.c
   branches/1.2/bin/varnishd/cache_vrt.c
   branches/1.2/bin/varnishd/cache_vrt_acl.c
   branches/1.2/bin/varnishd/cache_vrt_esi.c
   branches/1.2/bin/varnishd/cache_vrt_re.c
   branches/1.2/bin/varnishd/cache_ws.c
   branches/1.2/bin/varnishd/common.h
   branches/1.2/bin/varnishd/hash_classic.c
   branches/1.2/bin/varnishd/hash_simple_list.c
   branches/1.2/bin/varnishd/hash_slinger.h
   branches/1.2/bin/varnishd/heritage.h
   branches/1.2/bin/varnishd/mgt.h
   branches/1.2/bin/varnishd/mgt_child.c
   branches/1.2/bin/varnishd/mgt_cli.c
   branches/1.2/bin/varnishd/mgt_cli.h
   branches/1.2/bin/varnishd/mgt_event.c
   branches/1.2/bin/varnishd/mgt_event.h
   branches/1.2/bin/varnishd/mgt_param.c
   branches/1.2/bin/varnishd/mgt_vcc.c
   branches/1.2/bin/varnishd/rfc2616.c
   branches/1.2/bin/varnishd/shmlog.c
   branches/1.2/bin/varnishd/steps.h
   branches/1.2/bin/varnishd/stevedore.c
   branches/1.2/bin/varnishd/stevedore.h
   branches/1.2/bin/varnishd/storage_file.c
   branches/1.2/bin/varnishd/storage_malloc.c
   branches/1.2/bin/varnishd/tcp.c
   branches/1.2/bin/varnishd/varnishd.1
   branches/1.2/bin/varnishd/varnishd.c
   branches/1.2/bin/varnishhist/varnishhist.1
   branches/1.2/bin/varnishhist/varnishhist.c
   branches/1.2/bin/varnishlog/varnishlog.1
   branches/1.2/bin/varnishlog/varnishlog.c
   branches/1.2/bin/varnishncsa/varnishncsa.1
   branches/1.2/bin/varnishncsa/varnishncsa.c
   branches/1.2/bin/varnishreplay/varnishreplay.1
   branches/1.2/bin/varnishreplay/varnishreplay.c
   branches/1.2/bin/varnishstat/varnishstat.1
   branches/1.2/bin/varnishstat/varnishstat.c
   branches/1.2/bin/varnishtop/varnishtop.1
   branches/1.2/bin/varnishtop/varnishtop.c
   branches/1.2/configure.ac
   branches/1.2/include/binary_heap.h
   branches/1.2/include/cli.h
   branches/1.2/include/cli_common.h
   branches/1.2/include/cli_priv.h
   branches/1.2/include/compat/asprintf.h
   branches/1.2/include/compat/daemon.h
   branches/1.2/include/compat/setproctitle.h
   branches/1.2/include/compat/srandomdev.h
   branches/1.2/include/compat/strlcat.h
   branches/1.2/include/compat/strlcpy.h
   branches/1.2/include/compat/strndup.h
   branches/1.2/include/compat/vasprintf.h
   branches/1.2/include/http_headers.h
   branches/1.2/include/libvarnish.h
   branches/1.2/include/libvcl.h
   branches/1.2/include/shmlog.h
   branches/1.2/include/shmlog_tags.h
   branches/1.2/include/stat_field.h
   branches/1.2/include/stats.h
   branches/1.2/include/varnishapi.h
   branches/1.2/include/vrt.h
   branches/1.2/include/vss.h
   branches/1.2/lib/libvarnish/argv.c
   branches/1.2/lib/libvarnish/assert.c
   branches/1.2/lib/libvarnish/binary_heap.c
   branches/1.2/lib/libvarnish/cli.c
   branches/1.2/lib/libvarnish/cli_common.c
   branches/1.2/lib/libvarnish/crc32.c
   branches/1.2/lib/libvarnish/flopen.c
   branches/1.2/lib/libvarnish/time.c
   branches/1.2/lib/libvarnish/version.c
   branches/1.2/lib/libvarnish/vss.c
   branches/1.2/lib/libvarnish/vtmpfile.c
   branches/1.2/lib/libvarnishapi/instance.c
   branches/1.2/lib/libvarnishapi/shmlog.c
   branches/1.2/lib/libvarnishcompat/asprintf.c
   branches/1.2/lib/libvarnishcompat/setproctitle.c
   branches/1.2/lib/libvarnishcompat/srandomdev.c
   branches/1.2/lib/libvarnishcompat/strndup.c
   branches/1.2/lib/libvarnishcompat/vasprintf.c
   branches/1.2/lib/libvcl/vcc_acl.c
   branches/1.2/lib/libvcl/vcc_action.c
   branches/1.2/lib/libvcl/vcc_backend.c
   branches/1.2/lib/libvcl/vcc_compile.c
   branches/1.2/lib/libvcl/vcc_compile.h
   branches/1.2/lib/libvcl/vcc_fixed_token.c
   branches/1.2/lib/libvcl/vcc_gen_fixed_token.tcl
   branches/1.2/lib/libvcl/vcc_gen_obj.tcl
   branches/1.2/lib/libvcl/vcc_parse.c
   branches/1.2/lib/libvcl/vcc_priv.h
   branches/1.2/lib/libvcl/vcc_string.c
   branches/1.2/lib/libvcl/vcc_token.c
   branches/1.2/lib/libvcl/vcc_var.c
   branches/1.2/lib/libvcl/vcc_xref.c
   branches/1.2/man/vcl.7
Log:
Merged revisions 2270-2271,2296-2297,2299,2304-2305,2307-2309,2311-2312,2315,2317,2319,2321,2323-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

........
  r2270 | des | 2007-11-20 15:55:49 +0100 (Tue, 20 Nov 2007) | 7 lines
  
  Make SIGHUP work: VSL_Dispatch() will not return as long as it has data
  to feed to h_ncsa(), so it is up to h_ncsa() to interrupt it if reopen
  is non-zero.
  
  Also remove a superfluous call to VSL_Arg() as was previously done in
  varnishlog(1).
........
  r2271 | des | 2007-11-20 15:56:21 +0100 (Tue, 20 Nov 2007) | 2 lines
  
  Fix some style issues, and harmonize with varnishncsa(1).
........
  r2324 | des | 2007-12-20 14:57:31 +0100 (Thu, 20 Dec 2007) | 2 lines
  
  When writing to a file, fflush() after every line so tail -F will work.
........
  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.2
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246-2255,2375,2379
   + /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246-2255,2270-2271,2296-2297,2299,2304-2305,2307-2309,2311-2312,2315,2317,2319,2321,2323-2327,2358,2362-2364,2366,2374-2381,2384-2386,2414-2415,2426,2432-2434,2444-2445,2457,2492-2494

Modified: branches/1.2/LICENSE
===================================================================

--- branches/1.2/LICENSE	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/LICENSE	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishadm/varnishadm.1
===================================================================
--- branches/1.2/bin/varnishadm/varnishadm.1	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishadm/varnishadm.1	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishadm/varnishadm.c
===================================================================
--- branches/1.2/bin/varnishadm/varnishadm.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishadm/varnishadm.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache.h
===================================================================
--- branches/1.2/bin/varnishd/cache.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_acceptor.c
===================================================================
--- branches/1.2/bin/varnishd/cache_acceptor.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_acceptor.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_acceptor.h
===================================================================
--- branches/1.2/bin/varnishd/cache_acceptor.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_acceptor.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_acceptor_epoll.c
===================================================================
--- branches/1.2/bin/varnishd/cache_acceptor_epoll.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_acceptor_epoll.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_acceptor_kqueue.c
===================================================================
--- branches/1.2/bin/varnishd/cache_acceptor_kqueue.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_acceptor_kqueue.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_acceptor_poll.c
===================================================================
--- branches/1.2/bin/varnishd/cache_acceptor_poll.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_acceptor_poll.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_backend.c
===================================================================
--- branches/1.2/bin/varnishd/cache_backend.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_backend.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_backend_random.c
===================================================================
--- branches/1.2/bin/varnishd/cache_backend_random.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_backend_random.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_backend_round_robin.c
===================================================================
--- branches/1.2/bin/varnishd/cache_backend_round_robin.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_backend_round_robin.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_backend_simple.c
===================================================================
--- branches/1.2/bin/varnishd/cache_backend_simple.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_backend_simple.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_ban.c
===================================================================
--- branches/1.2/bin/varnishd/cache_ban.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_ban.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_center.c
===================================================================
--- branches/1.2/bin/varnishd/cache_center.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_center.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_cli.c
===================================================================
--- branches/1.2/bin/varnishd/cache_cli.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_cli.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_expire.c
===================================================================
--- branches/1.2/bin/varnishd/cache_expire.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_expire.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_fetch.c
===================================================================
--- branches/1.2/bin/varnishd/cache_fetch.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_fetch.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_hash.c
===================================================================
--- branches/1.2/bin/varnishd/cache_hash.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_hash.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_http.c
===================================================================
--- branches/1.2/bin/varnishd/cache_http.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_http.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_httpconn.c
===================================================================
--- branches/1.2/bin/varnishd/cache_httpconn.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_httpconn.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_main.c
===================================================================
--- branches/1.2/bin/varnishd/cache_main.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_main.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_panic.c
===================================================================
--- branches/1.2/bin/varnishd/cache_panic.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_panic.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_pipe.c
===================================================================
--- branches/1.2/bin/varnishd/cache_pipe.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_pipe.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_pool.c
===================================================================
--- branches/1.2/bin/varnishd/cache_pool.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_pool.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_response.c
===================================================================
--- branches/1.2/bin/varnishd/cache_response.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_response.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_session.c
===================================================================
--- branches/1.2/bin/varnishd/cache_session.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_session.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_synthetic.c
===================================================================
--- branches/1.2/bin/varnishd/cache_synthetic.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_synthetic.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_vary.c
===================================================================
--- branches/1.2/bin/varnishd/cache_vary.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_vary.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_vcl.c
===================================================================
--- branches/1.2/bin/varnishd/cache_vcl.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_vcl.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_vrt.c
===================================================================
--- branches/1.2/bin/varnishd/cache_vrt.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_vrt.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_vrt_acl.c
===================================================================
--- branches/1.2/bin/varnishd/cache_vrt_acl.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_vrt_acl.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_vrt_esi.c
===================================================================
--- branches/1.2/bin/varnishd/cache_vrt_esi.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_vrt_esi.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_vrt_re.c
===================================================================
--- branches/1.2/bin/varnishd/cache_vrt_re.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_vrt_re.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/cache_ws.c
===================================================================
--- branches/1.2/bin/varnishd/cache_ws.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/cache_ws.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/common.h
===================================================================
--- branches/1.2/bin/varnishd/common.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/common.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/hash_classic.c
===================================================================
--- branches/1.2/bin/varnishd/hash_classic.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/hash_classic.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/hash_simple_list.c
===================================================================
--- branches/1.2/bin/varnishd/hash_simple_list.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/hash_simple_list.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/hash_slinger.h
===================================================================
--- branches/1.2/bin/varnishd/hash_slinger.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/hash_slinger.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/heritage.h
===================================================================
--- branches/1.2/bin/varnishd/heritage.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/heritage.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/mgt.h
===================================================================
--- branches/1.2/bin/varnishd/mgt.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/mgt.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/mgt_child.c
===================================================================
--- branches/1.2/bin/varnishd/mgt_child.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/mgt_child.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/mgt_cli.c
===================================================================
--- branches/1.2/bin/varnishd/mgt_cli.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/mgt_cli.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/mgt_cli.h
===================================================================
--- branches/1.2/bin/varnishd/mgt_cli.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/mgt_cli.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/mgt_event.c
===================================================================
--- branches/1.2/bin/varnishd/mgt_event.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/mgt_event.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/mgt_event.h
===================================================================
--- branches/1.2/bin/varnishd/mgt_event.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/mgt_event.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/mgt_param.c
===================================================================
--- branches/1.2/bin/varnishd/mgt_param.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/mgt_param.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/mgt_vcc.c
===================================================================
--- branches/1.2/bin/varnishd/mgt_vcc.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/mgt_vcc.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/rfc2616.c
===================================================================
--- branches/1.2/bin/varnishd/rfc2616.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/rfc2616.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/shmlog.c
===================================================================
--- branches/1.2/bin/varnishd/shmlog.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/shmlog.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/steps.h
===================================================================
--- branches/1.2/bin/varnishd/steps.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/steps.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/stevedore.c
===================================================================
--- branches/1.2/bin/varnishd/stevedore.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/stevedore.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/stevedore.h
===================================================================
--- branches/1.2/bin/varnishd/stevedore.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/stevedore.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/storage_file.c
===================================================================
--- branches/1.2/bin/varnishd/storage_file.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/storage_file.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/storage_malloc.c
===================================================================
--- branches/1.2/bin/varnishd/storage_malloc.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/storage_malloc.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/tcp.c
===================================================================
--- branches/1.2/bin/varnishd/tcp.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/tcp.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/varnishd.1
===================================================================
--- branches/1.2/bin/varnishd/varnishd.1	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/varnishd.1	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishd/varnishd.c
===================================================================
--- branches/1.2/bin/varnishd/varnishd.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishd/varnishd.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishhist/varnishhist.1
===================================================================
--- branches/1.2/bin/varnishhist/varnishhist.1	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishhist/varnishhist.1	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishhist/varnishhist.c
===================================================================
--- branches/1.2/bin/varnishhist/varnishhist.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishhist/varnishhist.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishlog/varnishlog.1
===================================================================
--- branches/1.2/bin/varnishlog/varnishlog.1	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishlog/varnishlog.1	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishlog/varnishlog.c
===================================================================
--- branches/1.2/bin/varnishlog/varnishlog.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishlog/varnishlog.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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>
@@ -179,14 +179,14 @@
 		match_tag = name2tag(argv[0]);
 		if (match_tag < 0) {
 			fprintf(stderr, "Tag \"%s\" unknown\n", argv[0]);
-			exit (2);
+			exit(2);
 		}
 		i = regcomp(&match_re, argv[1], REG_EXTENDED | REG_NOSUB);
 		if (i) {
 			char buf[BUFSIZ];
 			regerror(i, &match_re, buf, sizeof buf);
 			fprintf(stderr, "%s\n", buf);
-			exit (2);
+			exit(2);
 		}
 	}
 	if (!b_flag) {
@@ -235,7 +235,7 @@
 		fd = open(w_arg, flags, 0644);
 	if (fd < 0) {
 		perror(w_arg);
-		exit (1);
+		exit(1);
 	}
 	return (fd);
 }
@@ -265,7 +265,7 @@
 			reopen = 0;
 		}
 	}
-	exit (0);
+	exit(0);
 }
 
 /*--------------------------------------------------------------------*/
@@ -281,7 +281,7 @@
 int
 main(int argc, char **argv)
 {
-	int i, c;
+	int c;
 	int a_flag = 0, D_flag = 0, o_flag = 0;
 	const char *n_arg = NULL;
 	const char *P_arg = NULL;
@@ -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;
@@ -358,12 +356,11 @@
 	if (o_flag)
 		do_order(vd, argc - optind, argv + optind);
 
-	while (1) {
-		i = VSL_Dispatch(vd, VSL_H_Print, stdout);
-		if (i == 0)
-			fflush(stdout);
-		else if (i < 0)
+	while (VSL_Dispatch(vd, VSL_H_Print, stdout) >= 0) {
+		if (fflush(stdout) != 0) {
+			perror("stdout");
 			break;
+		}
 	}
 
 	if (pfh != NULL)

Modified: branches/1.2/bin/varnishncsa/varnishncsa.1
===================================================================
--- branches/1.2/bin/varnishncsa/varnishncsa.1	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishncsa/varnishncsa.1	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishncsa/varnishncsa.c
===================================================================
--- branches/1.2/bin/varnishncsa/varnishncsa.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishncsa/varnishncsa.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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>
@@ -80,6 +80,8 @@
 #include "shmlog.h"
 #include "varnishapi.h"
 
+static volatile sig_atomic_t reopen;
+
 static struct logline {
 	char *df_H;			/* %H, Protocol version */
 	char *df_Host;			/* %{Host}i */
@@ -90,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)
 {
@@ -173,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 (0);
-
-	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;
@@ -227,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))
@@ -310,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 (0);
+	/* more to come */
+	return (1);
+}
 
-	if ((spec & VSL_S_BACKEND) && tag != SLT_BackendReuse &&
-	    (tag != SLT_BackendClose || lp->df_Uq))
-		return (0);
+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;
 
@@ -360,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);
 
 		/*
@@ -381,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\" ",
@@ -390,6 +448,10 @@
 		/* %{User-agent}i */
 		fprintf(fo, "\"%s\"\n",
 		    lp->df_User_agent ? lp->df_User_agent : "-");
+
+		/* hack: flush after every line if writing to file */
+		if (fo != stdout)
+			fflush(fo);
 	}
 
 	/* clean up */
@@ -405,15 +467,13 @@
 	freez(lp->df_s);
 	freez(lp->df_u);
 #undef freez
-	lp->bogus = 0;
+	memset(lp, 0, sizeof *lp);
 
-	return (0);
+	return (reopen);
 }
 
 /*--------------------------------------------------------------------*/
 
-static volatile sig_atomic_t reopen;
-
 static void
 sighup(int sig)
 {
@@ -447,7 +507,7 @@
 int
 main(int argc, char *argv[])
 {
-	int i, c;
+	int c;
 	int a_flag = 0, D_flag = 0;
 	const char *n_arg = NULL;
 	const char *P_arg = NULL;
@@ -459,11 +519,6 @@
 	vd = VSL_New();
 
 	while ((c = getopt(argc, argv, VSL_ARGS "aDn:P:Vw:")) != -1) {
-		i = VSL_Arg(vd, c, optarg);
-		if (i < 0)
-			exit (1);
-		if (i > 0)
-			continue;
 		switch (c) {
 		case 'a':
 			a_flag = 1;
@@ -516,7 +571,7 @@
 		of = stdout;
 	}
 
-	while (VSL_Dispatch(vd, h_ncsa, of) == 0) {
+	while (VSL_Dispatch(vd, h_ncsa, of) >= 0) {
 		if (fflush(of) != 0) {
 			perror(w_arg);
 			exit(1);

Modified: branches/1.2/bin/varnishreplay/varnishreplay.1
===================================================================
--- branches/1.2/bin/varnishreplay/varnishreplay.1	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishreplay/varnishreplay.1	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishreplay/varnishreplay.c
===================================================================
--- branches/1.2/bin/varnishreplay/varnishreplay.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishreplay/varnishreplay.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -361,7 +361,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;
 	}
@@ -519,6 +520,9 @@
 		if (tag != SLT_ReqEnd)
 			continue;
 
+		if (!df_m || !df_Uq || !df_H)
+			bogus = 1;
+
 		if (bogus) {
 			thread_log(1, "bogus\n");
 		} else {
@@ -579,6 +583,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.2/bin/varnishstat/varnishstat.1
===================================================================
--- branches/1.2/bin/varnishstat/varnishstat.1	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishstat/varnishstat.1	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishstat/varnishstat.c
===================================================================
--- branches/1.2/bin/varnishstat/varnishstat.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishstat/varnishstat.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishtop/varnishtop.1
===================================================================
--- branches/1.2/bin/varnishtop/varnishtop.1	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishtop/varnishtop.1	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/bin/varnishtop/varnishtop.c
===================================================================
--- branches/1.2/bin/varnishtop/varnishtop.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/bin/varnishtop/varnishtop.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/configure.ac
===================================================================
--- branches/1.2/configure.ac	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/configure.ac	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2], [varnish-dev at projects.linpro.no])
 AC_CONFIG_SRCDIR(include/varnishapi.h)

Modified: branches/1.2/include/binary_heap.h
===================================================================
--- branches/1.2/include/binary_heap.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/include/binary_heap.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/include/cli.h
===================================================================
--- branches/1.2/include/cli.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/include/cli.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/include/cli_common.h
===================================================================
--- branches/1.2/include/cli_common.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/include/cli_common.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/include/cli_priv.h
===================================================================
--- branches/1.2/include/cli_priv.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/include/cli_priv.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/include/compat/asprintf.h
===================================================================
--- branches/1.2/include/compat/asprintf.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/include/compat/asprintf.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/include/compat/daemon.h
===================================================================
--- branches/1.2/include/compat/daemon.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/include/compat/daemon.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/include/compat/setproctitle.h
===================================================================
--- branches/1.2/include/compat/setproctitle.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/include/compat/setproctitle.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/include/compat/srandomdev.h
===================================================================
--- branches/1.2/include/compat/srandomdev.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/include/compat/srandomdev.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/include/compat/strlcat.h
===================================================================
--- branches/1.2/include/compat/strlcat.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/include/compat/strlcat.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/include/compat/strlcpy.h
===================================================================
--- branches/1.2/include/compat/strlcpy.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/include/compat/strlcpy.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/include/compat/strndup.h
===================================================================
--- branches/1.2/include/compat/strndup.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/include/compat/strndup.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/include/compat/vasprintf.h
===================================================================
--- branches/1.2/include/compat/vasprintf.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/include/compat/vasprintf.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/include/http_headers.h
===================================================================
--- branches/1.2/include/http_headers.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/include/http_headers.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/include/libvarnish.h
===================================================================
--- branches/1.2/include/libvarnish.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/include/libvarnish.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/include/libvcl.h
===================================================================
--- branches/1.2/include/libvcl.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/include/libvcl.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/include/shmlog.h
===================================================================
--- branches/1.2/include/shmlog.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/include/shmlog.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/include/shmlog_tags.h
===================================================================
--- branches/1.2/include/shmlog_tags.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/include/shmlog_tags.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/include/stat_field.h
===================================================================
--- branches/1.2/include/stat_field.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/include/stat_field.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/include/stats.h
===================================================================
--- branches/1.2/include/stats.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/include/stats.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/include/varnishapi.h
===================================================================
--- branches/1.2/include/varnishapi.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/include/varnishapi.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/include/vrt.h
===================================================================
--- branches/1.2/include/vrt.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/include/vrt.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/include/vss.h
===================================================================
--- branches/1.2/include/vss.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/include/vss.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvarnish/argv.c
===================================================================
--- branches/1.2/lib/libvarnish/argv.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvarnish/argv.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvarnish/assert.c
===================================================================
--- branches/1.2/lib/libvarnish/assert.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvarnish/assert.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvarnish/binary_heap.c
===================================================================
--- branches/1.2/lib/libvarnish/binary_heap.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvarnish/binary_heap.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvarnish/cli.c
===================================================================
--- branches/1.2/lib/libvarnish/cli.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvarnish/cli.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvarnish/cli_common.c
===================================================================
--- branches/1.2/lib/libvarnish/cli_common.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvarnish/cli_common.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvarnish/crc32.c
===================================================================
--- branches/1.2/lib/libvarnish/crc32.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvarnish/crc32.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvarnish/flopen.c
===================================================================
--- branches/1.2/lib/libvarnish/flopen.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvarnish/flopen.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvarnish/time.c
===================================================================
--- branches/1.2/lib/libvarnish/time.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvarnish/time.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvarnish/version.c
===================================================================
--- branches/1.2/lib/libvarnish/version.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvarnish/version.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvarnish/vss.c
===================================================================
--- branches/1.2/lib/libvarnish/vss.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvarnish/vss.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvarnish/vtmpfile.c
===================================================================
--- branches/1.2/lib/libvarnish/vtmpfile.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvarnish/vtmpfile.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -1,9 +1,9 @@
 /*-
  * 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>
+ * Author: Dag-Erling SmÃ¸rgrav <des at linpro.no>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: branches/1.2/lib/libvarnishapi/instance.c
===================================================================
--- branches/1.2/lib/libvarnishapi/instance.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvarnishapi/instance.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvarnishapi/shmlog.c
===================================================================
--- branches/1.2/lib/libvarnishapi/shmlog.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvarnishapi/shmlog.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvarnishcompat/asprintf.c
===================================================================
--- branches/1.2/lib/libvarnishcompat/asprintf.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvarnishcompat/asprintf.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvarnishcompat/setproctitle.c
===================================================================
--- branches/1.2/lib/libvarnishcompat/setproctitle.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvarnishcompat/setproctitle.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvarnishcompat/srandomdev.c
===================================================================
--- branches/1.2/lib/libvarnishcompat/srandomdev.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvarnishcompat/srandomdev.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvarnishcompat/strndup.c
===================================================================
--- branches/1.2/lib/libvarnishcompat/strndup.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvarnishcompat/strndup.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvarnishcompat/vasprintf.c
===================================================================
--- branches/1.2/lib/libvarnishcompat/vasprintf.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvarnishcompat/vasprintf.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvcl/vcc_acl.c
===================================================================
--- branches/1.2/lib/libvcl/vcc_acl.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvcl/vcc_acl.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvcl/vcc_action.c
===================================================================
--- branches/1.2/lib/libvcl/vcc_action.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvcl/vcc_action.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvcl/vcc_backend.c
===================================================================
--- branches/1.2/lib/libvcl/vcc_backend.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvcl/vcc_backend.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvcl/vcc_compile.c
===================================================================
--- branches/1.2/lib/libvcl/vcc_compile.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvcl/vcc_compile.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvcl/vcc_compile.h
===================================================================
--- branches/1.2/lib/libvcl/vcc_compile.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvcl/vcc_compile.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvcl/vcc_fixed_token.c
===================================================================
--- branches/1.2/lib/libvcl/vcc_fixed_token.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvcl/vcc_fixed_token.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -379,7 +379,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.2/lib/libvcl/vcc_gen_fixed_token.tcl
===================================================================
--- branches/1.2/lib/libvcl/vcc_gen_fixed_token.tcl	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvcl/vcc_gen_fixed_token.tcl	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvcl/vcc_gen_obj.tcl
===================================================================
--- branches/1.2/lib/libvcl/vcc_gen_obj.tcl	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvcl/vcc_gen_obj.tcl	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvcl/vcc_parse.c
===================================================================
--- branches/1.2/lib/libvcl/vcc_parse.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvcl/vcc_parse.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvcl/vcc_priv.h
===================================================================
--- branches/1.2/lib/libvcl/vcc_priv.h	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvcl/vcc_priv.h	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvcl/vcc_string.c
===================================================================
--- branches/1.2/lib/libvcl/vcc_string.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvcl/vcc_string.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvcl/vcc_token.c
===================================================================
--- branches/1.2/lib/libvcl/vcc_token.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvcl/vcc_token.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvcl/vcc_var.c
===================================================================
--- branches/1.2/lib/libvcl/vcc_var.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvcl/vcc_var.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/lib/libvcl/vcc_xref.c
===================================================================
--- branches/1.2/lib/libvcl/vcc_xref.c	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/lib/libvcl/vcc_xref.c	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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.2/man/vcl.7
===================================================================
--- branches/1.2/man/vcl.7	2008-02-17 09:22:05 UTC (rev 2495)
+++ branches/1.2/man/vcl.7	2008-02-17 09:26:32 UTC (rev 2496)
@@ -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>


