[master] 038b70f Whitespace
Federico G. Schwindt
fgsch at lodoss.net
Fri Dec 11 16:32:03 CET 2015
commit 038b70fdac73bf4d8f6845070b0c48d6788b85a9
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date: Thu Dec 10 11:10:13 2015 +0000
Whitespace
diff --git a/Makefile.inc.phk b/Makefile.inc.phk
index c864efa..680bab1 100644
--- a/Makefile.inc.phk
+++ b/Makefile.inc.phk
@@ -1,6 +1,6 @@
.PHONY: default
-default: all
+default: all
WARNS ?= 1
@@ -39,7 +39,7 @@ LIB_READLINE = ${CFG_LINEDISC}
#######################################################################
ifdef USE_THREADS
CFLAGS += -pthread -D_THREAD_SAFE -g -O2
-PROG_LDFLAGS += -pthread -D_THREAD_SAFE -g -O2
+PROG_LDFLAGS += -pthread -D_THREAD_SAFE -g -O2
endif
ifdef USE_DLOPEN
@@ -164,7 +164,7 @@ ifeq ($(TGT), all)
include _.deplib
endif
-$(LIBNAME).a: $(LIB_OBJ)
+$(LIBNAME).a: $(LIB_OBJ)
$(AR) -rc $(LIBNAME).a $^
ranlib $(LIBNAME).a
diff --git a/bin/Makefile.phk b/bin/Makefile.phk
index ce538a1..66816ff 100644
--- a/bin/Makefile.phk
+++ b/bin/Makefile.phk
@@ -1,10 +1,10 @@
-SUBDIRS += varnishadm
-SUBDIRS += varnishd
+SUBDIRS += varnishadm
+SUBDIRS += varnishd
SUBDIRS += varnishlog
SUBDIRS += varnishncsa
-SUBDIRS += varnishtest
+SUBDIRS += varnishtest
SUBDIRS += varnishstat
-SUBDIRS += varnishhist
+SUBDIRS += varnishhist
SUBDIRS += varnishtop
TOPDIR = $(CURDIR)/..
diff --git a/bin/flint.lnt b/bin/flint.lnt
index 0bc6639..0c9412c 100644
--- a/bin/flint.lnt
+++ b/bin/flint.lnt
@@ -35,7 +35,7 @@
-elib(659) // no tokens after struct def.
-elib(123) // macro def. with arg at, (just warn)
--emacro(702, WEXITSTATUS) // signed shift right
+-emacro(702, WEXITSTATUS) // signed shift right
-e786 // String concatenation within initializer
-e726 // Extraneous comma ignored
diff --git a/bin/varnishadm/Makefile.phk b/bin/varnishadm/Makefile.phk
index 6d6cb2a..368b80a 100644
--- a/bin/varnishadm/Makefile.phk
+++ b/bin/varnishadm/Makefile.phk
@@ -4,7 +4,7 @@ LD_ADD += ${LIB_VARNISHAPI}
LD_ADD += ${LIB_VARNISH}
LD_ADD += ${LIB_PCRE}
LD_ADD += ${LIB_READLINE}
-LD_ADD += -lm
+LD_ADD += -lm
RST_MAN += $(TOPDIR)/doc/sphinx/reference/varnishadm.rst
diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index d252c1b..0648822 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -97,7 +97,7 @@ varnishd_SOURCES = \
waiter/cache_waiter_epoll.c \
waiter/cache_waiter_kqueue.c \
waiter/cache_waiter_poll.c \
- waiter/cache_waiter_ports.c
+ waiter/cache_waiter_ports.c
noinst_HEADERS = \
builtin_vcl.h \
diff --git a/bin/varnishd/flint.lnt b/bin/varnishd/flint.lnt
index 38453d1..200e37b 100644
--- a/bin/varnishd/flint.lnt
+++ b/bin/varnishd/flint.lnt
@@ -118,9 +118,9 @@
-e455 // thread lock
-e458 // unprotected read
-e728 // Symbol ... not explicitly initialized
--e716 // while(1) ...
--e785 // Too few initializers for aggregate
--e850 // for loop index variable '___' whose type category is '___'
+-e716 // while(1) ...
+-e785 // Too few initializers for aggregate
+-e850 // for loop index variable '___' whose type category is '___'
// is modified in body of the for loop that began at '___'
diff --git a/bin/varnishd/vclflint.sh b/bin/varnishd/vclflint.sh
index cd3e7d9..24d47bf 100755
--- a/bin/varnishd/vclflint.sh
+++ b/bin/varnishd/vclflint.sh
@@ -10,4 +10,4 @@ else
echo "usage!" 1>&2
fi
-flexelint vclflint.lnt /tmp/_.c
+flexelint vclflint.lnt /tmp/_.c
diff --git a/bin/varnishlog/flint.lnt b/bin/varnishlog/flint.lnt
index c90f53b..f2b336d 100644
--- a/bin/varnishlog/flint.lnt
+++ b/bin/varnishlog/flint.lnt
@@ -3,11 +3,11 @@
-e747 // 16 Info 747 Significant prototype coercion (___) ___ to ___
-e763 // Redundant declaration for symbol '...' previously declared
--e716 // while(1) ...
+-e716 // while(1) ...
--e457 // unprotected write access
--e459 // unprotected access
--e458 // unprotected access
+-e457 // unprotected write access
+-e459 // unprotected access
+-e458 // unprotected access
-e732 // Loss of sign (arg. no. 2) (int to unsigned
-e737 // [45] Loss of sign in promotion from int to unsigned
diff --git a/bin/varnishncsa/flint.lnt b/bin/varnishncsa/flint.lnt
index ce8b3f4..fd2c864 100644
--- a/bin/varnishncsa/flint.lnt
+++ b/bin/varnishncsa/flint.lnt
@@ -4,8 +4,8 @@
-e763 // Redundant declaration for symbol '...' previously declared
-e726 // Extraneous comma ignored
-e728 // Symbol ... not explicitly initialized
--e716 // while(1) ...
--e785 // Too few initializers for aggregate
+-e716 // while(1) ...
+-e785 // Too few initializers for aggregate
-e786 // String concatenation within initializer
// cache_center.c
diff --git a/bin/varnishstat/flint.lnt b/bin/varnishstat/flint.lnt
index 005b4aa..509e13a 100644
--- a/bin/varnishstat/flint.lnt
+++ b/bin/varnishstat/flint.lnt
@@ -7,11 +7,11 @@
-e747 // 16 Info 747 Significant prototype coercion (___) ___ to ___
-e763 // Redundant declaration for symbol '...' previously declared
--e716 // while(1) ...
+-e716 // while(1) ...
--e457 // unprotected write access
--e459 // unprotected access
--e458 // unprotected access
+-e457 // unprotected write access
+-e459 // unprotected access
+-e458 // unprotected access
-e732 // Loss of sign (arg. no. 2) (int to unsigned
-e737 // [45] Loss of sign in promotion from int to unsigned
diff --git a/bin/varnishtest/flint.lnt b/bin/varnishtest/flint.lnt
index 8ee39d2..b7306f1 100644
--- a/bin/varnishtest/flint.lnt
+++ b/bin/varnishtest/flint.lnt
@@ -16,12 +16,12 @@
-e679 // Suspicious Truncation in arithmetic expression combining with pointer
-e763 // Redundant declaration for symbol '...' previously declared
--e716 // while(1) ...
+-e716 // while(1) ...
--e457 // unprotected write access
--e459 // unprotected access
--e458 // unprotected access
-//
+-e457 // unprotected write access
+-e459 // unprotected access
+-e458 // unprotected access
+//
-e732 // Loss of sign (arg. no. 2) (int to unsigned
-e737 // [45] Loss of sign in promotion from int to unsigned
-e713 // Loss of precision (assignment) (unsigned long long to long long)
diff --git a/bin/varnishtop/flint.lnt b/bin/varnishtop/flint.lnt
index 5f41983..4920e47 100644
--- a/bin/varnishtop/flint.lnt
+++ b/bin/varnishtop/flint.lnt
@@ -3,11 +3,11 @@
-e747 // 16 Info 747 Significant prototype coercion (___) ___ to ___
-e763 // Redundant declaration for symbol '...' previously declared
--e716 // while(1) ...
+-e716 // while(1) ...
--e457 // unprotected write access
--e459 // unprotected access
--e458 // unprotected access
+-e457 // unprotected write access
+-e459 // unprotected access
+-e458 // unprotected access
-e732 // Loss of sign (arg. no. 2) (int to unsigned
-e737 // [45] Loss of sign in promotion from int to unsigned
diff --git a/config.phk b/config.phk
index 430a887..7058ced 100644
--- a/config.phk
+++ b/config.phk
@@ -72,7 +72,7 @@ if true ; then
sys/mount.h \
sys/statvfs.h \
sys/vfs.h \
- umem.h
+ umem.h
do
if [ -f /usr/include/$i ] ; then
n=`echo $i | tr '[a-z/.]' '[A-Z__]'`
@@ -109,7 +109,7 @@ fi
VCSF=include/vcs_version.h
VMAV=include/vmod_abi.h
-if [ -d ./.git ] ; then
+if [ -d ./.git ] ; then
V=`git show -s --pretty=format:%h`
B=`git rev-parse --abbrev-ref HEAD`
else
@@ -147,7 +147,7 @@ fi
ask_compiler() {
a=`echo "$2" |
${CC-cc} -E - -DWARNS=${WARNS-1} |
- sed -e '/^#/d' -e '/^$/d' -e 's/"//g' -e 's/~/"/g' `
+ sed -e '/^#/d' -e '/^$/d' -e 's/"//g' -e 's/~/"/g' `
echo "$1='" $a "'" >> _.cache
}
@@ -302,5 +302,5 @@ exit 0
# HAVE_LIBUMEM -
# USE_PCRE_JIT -
# _FILE_OFFSET_BITS -
-#
+#
# #echo 'CF_CFLAGS="-Wall"'
diff --git a/configure.ac b/configure.ac
index 1062797..f89977b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,7 +179,7 @@ AC_CHECK_HEADERS([edit/readline/readline.h],
[AC_DEFINE([HAVE_LIBEDIT], [1], [Define if we have libedit])
LIBEDIT_LIBS="-ledit"],
- [PKG_CHECK_MODULES([LIBEDIT], [libedit],
+ [PKG_CHECK_MODULES([LIBEDIT], [libedit],
# having the module does not imply having the header
[AC_CHECK_HEADERS([editline/readline.h],
[AC_DEFINE([HAVE_LIBEDIT], [1], [Define if we have libedit])],
@@ -275,7 +275,7 @@ AC_CACHE_CHECK([whether we have support for visibility attributes],
if test "$ac_cv_have_viz" = no; then
libvgz_extra_cflags="-DNO_VIZ"
AC_SUBST(libvgz_extra_cflags)
-fi
+fi
CFLAGS="${save_CFLAGS}"
# Use jemalloc on Linux
@@ -334,7 +334,7 @@ AC_SYS_LARGEFILE
save_LIBS="${LIBS}"
LIBS="${LIBS} ${RT_LIBS}"
AC_CHECK_FUNCS([clock_gettime])
-AC_CHECK_FUNCS([gethrtime])
+AC_CHECK_FUNCS([gethrtime])
LIBS="${save_LIBS}"
# --enable-kqueue
diff --git a/doc/sphinx/Makefile.phk b/doc/sphinx/Makefile.phk
index 8ed14ae..35bea90 100644
--- a/doc/sphinx/Makefile.phk
+++ b/doc/sphinx/Makefile.phk
@@ -189,7 +189,7 @@ EXTRA_DIST = \
include/varnishhist_options.rst \
include/varnishhist_synopsis.rst \
reference/vmod_std.generated.rst \
- reference/vmod_directors.generated.rst
+ reference/vmod_directors.generated.rst
dist-hook:
diff --git a/doc/sphinx/glossary/index.rst b/doc/sphinx/glossary/index.rst
index a3d9761..7877f60 100644
--- a/doc/sphinx/glossary/index.rst
+++ b/doc/sphinx/glossary/index.rst
@@ -4,7 +4,7 @@
Varnish Glossary
================
-.. glossary::
+.. glossary::
:sorted:
..
diff --git a/doc/sphinx/installation/bugs.rst b/doc/sphinx/installation/bugs.rst
index b5fd756..091b7c7 100644
--- a/doc/sphinx/installation/bugs.rst
+++ b/doc/sphinx/installation/bugs.rst
@@ -19,7 +19,7 @@ do not have a way to simulate high levels of real-life web-traffic,
so telling us to "have 10.000 clients hit at once" does not really
allow us to reproduce.
-To report a bug please follow the suggested procedure described in the "Trouble Tickets"
+To report a bug please follow the suggested procedure described in the "Trouble Tickets"
section of the documentation (above).
Roughly we categorize bugs in to three kinds of bugs (described below) with Varnish. The information
@@ -119,7 +119,7 @@ furiously on some futile condition.
Commands like ``top -H`` or ``ps -Haxlw`` or ``ps -efH`` should be
able to figure that out.
-.. XXX:Maybe a short description of what valuable information the various commands above generates? /benc
+.. XXX:Maybe a short description of what valuable information the various commands above generates? /benc
If one or more threads are spinning, use ``strace`` or ``ktrace`` or ``truss``
diff --git a/doc/sphinx/installation/help.rst b/doc/sphinx/installation/help.rst
index 22cd106..ba6dbd8 100644
--- a/doc/sphinx/installation/help.rst
+++ b/doc/sphinx/installation/help.rst
@@ -8,7 +8,7 @@ this process as much as possible.
But before you grab hold of us, spend a moment composing your thoughts and
formulate your question. From our perspective there is nothing as pointless as simply telling
-us "Varnish does not work for me" with no further information. This does not give us any relevant information to use when trying to figure out whats wrong.
+us "Varnish does not work for me" with no further information. This does not give us any relevant information to use when trying to figure out whats wrong.
And before you even do that, do a couple of searches to see if your
question is already answered, if it has been, you will get your answer
@@ -78,7 +78,7 @@ bug in Varnish. Ask on IRC first if you are in doubt.
The reason for this policy, is to avoid bugs being drowned in a
pile of other `issues`, feature suggestions for future releases, and double postings of calls for help
-from people who forgot to check back on already opened Tickets.
+from people who forgot to check back on already opened Tickets.
.. XXX: Not sure what you want with the last sentence above. benc
diff --git a/doc/sphinx/installation/platformnotes.rst b/doc/sphinx/installation/platformnotes.rst
index 0eca96f..741d98b 100644
--- a/doc/sphinx/installation/platformnotes.rst
+++ b/doc/sphinx/installation/platformnotes.rst
@@ -13,7 +13,7 @@ On RHEL6 Transparent Hugepage kernel support is enabled by default.
This is known to cause sporadic crashes of Varnish.
It is recommended to disable transparent hugepages on affected systems. This
-can be done with
+can be done with
``echo "never" > /sys/kernel/mm/redhat_transparent_hugepage/enabled`` (runtime) and changes to
`/etc/sysctl.conf` (persisted.)
diff --git a/doc/sphinx/phk/autocrap.rst b/doc/sphinx/phk/autocrap.rst
index e97ac4c..86a2dd1 100644
--- a/doc/sphinx/phk/autocrap.rst
+++ b/doc/sphinx/phk/autocrap.rst
@@ -47,7 +47,7 @@ right before you can even think about compiling the source code.
Second, it doesn't actually work, you still have to do the hard work
and figure out the right way to explain to the autocrap tools what
-you are trying to do and how to do it, only you have to do so in
+you are trying to do and how to do it, only you have to do so in
a language which is used to produce M4 macro invocations etc. etc.
In the meantime, the UNIX diversity has shrunk from 50+ significantly
diff --git a/doc/sphinx/phk/backends.rst b/doc/sphinx/phk/backends.rst
index 952a791..2a2a348 100644
--- a/doc/sphinx/phk/backends.rst
+++ b/doc/sphinx/phk/backends.rst
@@ -52,7 +52,7 @@ VCLs where backend "b1" points at two different physical machines,
for instance when we migrate or upgrade the backend.
The identity of the state than can be shared is therefore the triplet:
- {VCL-name, IPv4+port, IPv6+port}
+ {VCL-name, IPv4+port, IPv6+port}
No Information without Representation
=====================================
diff --git a/doc/sphinx/phk/barriers.rst b/doc/sphinx/phk/barriers.rst
index 4eac78a..e85e81a 100644
--- a/doc/sphinx/phk/barriers.rst
+++ b/doc/sphinx/phk/barriers.rst
@@ -48,7 +48,7 @@ barriers between the various components::
The really Important Barrier
============================
-The central actor in Varnish is the Manager process, "MGR", which is the
+The central actor in Varnish is the Manager process, "MGR", which is the
process the administrator "(ADMIN)" starts to get web-cache service.
Having been there myself, I do not subscribe to the "I feel cool and important
diff --git a/doc/sphinx/phk/gzip.rst b/doc/sphinx/phk/gzip.rst
index c5e4aad..68ff0f0 100644
--- a/doc/sphinx/phk/gzip.rst
+++ b/doc/sphinx/phk/gzip.rst
@@ -47,7 +47,7 @@ always set to:
Accept-Encoding: gzip
-Even if this particular client does not support
+Even if this particular client does not support
To always entice the backend into sending us gzip'ed content.
diff --git a/doc/sphinx/phk/http20.rst b/doc/sphinx/phk/http20.rst
index c2b4d17..525f0f3 100644
--- a/doc/sphinx/phk/http20.rst
+++ b/doc/sphinx/phk/http20.rst
@@ -257,7 +257,7 @@ and repeat markers, rather than throwing everything after deflate
and hope for a miracle.
I think this protocol is the best basis to start from, but like
-the other two, it has a long way to go, before it can truly
+the other two, it has a long way to go, before it can truly
earn the name HTTP/2.0.
diff --git a/doc/sphinx/phk/platforms.rst b/doc/sphinx/phk/platforms.rst
index 18ee017..e85f925 100644
--- a/doc/sphinx/phk/platforms.rst
+++ b/doc/sphinx/phk/platforms.rst
@@ -39,7 +39,7 @@ We care about these platforms because our users use them and
because they deliver a lot of bang for the buck with Varnish.
These platforms are in our "tinderbox" tests, we use them ourselves
-and they pass all regression tests all the time.
+and they pass all regression tests all the time.
Platform specific bug reports gets acted on.
*FreeBSD*
diff --git a/doc/sphinx/phk/spdy.rst b/doc/sphinx/phk/spdy.rst
index 7cc1f4f..7f70236 100644
--- a/doc/sphinx/phk/spdy.rst
+++ b/doc/sphinx/phk/spdy.rst
@@ -61,7 +61,7 @@ Treaty and the convention about chemical and biological weapons.)
So my insight about Varnish, that it has to become a socket-wrench-like
toolchest for doing things with HTTP traffic, will probably elicit a lot
-of "duh!" reactions, until people, including me, understand the
+of "duh!" reactions, until people, including me, understand the
ramifications more fully.
Things you cannot do with Varnish today
diff --git a/doc/sphinx/phk/three-zero.rst b/doc/sphinx/phk/three-zero.rst
index 41499b0..c1fd3b8 100644
--- a/doc/sphinx/phk/three-zero.rst
+++ b/doc/sphinx/phk/three-zero.rst
@@ -53,7 +53,7 @@ shows a nice trend on Google and #varnish confuses the heck out of
teenage girls and wood workers on Twitter, so clearly I am doing
something right.
-I still worry about the `The Fraud Police
+I still worry about the `The Fraud Police
<http://www.theshadowbox.net/forum/index.php?topic=18041.0>`_ though,
"I have no idea what I'm doing, and I totally make shit up as I go
along." is a disturbingly precise summary of how I feel about my
diff --git a/doc/sphinx/phk/wanton_destruction.rst b/doc/sphinx/phk/wanton_destruction.rst
index 4289cf1..8ad757d 100644
--- a/doc/sphinx/phk/wanton_destruction.rst
+++ b/doc/sphinx/phk/wanton_destruction.rst
@@ -24,7 +24,7 @@ rebuild it, to become the house we want now.
For one thing, doing major surgery on a house while you live in it
is double-minus-fun and it always slows the rebuild project down
-when you have to keep at least one toilet working and sanitary and
+when you have to keep at least one toilet working and sanitary and
be able to cook and sleep on the building site.
So we'll be building a new house on a plot of land on the other
@@ -40,7 +40,7 @@ Using a major piece of software, is like moving into a house: You
need to adapt your life and the house or the software to each other,
since nothing is ever quite perfect, there will be limitations.
-And those limitations affect how you think: If you live in a
+And those limitations affect how you think: If you live in a
2 bedroom apartment, you won't even be considering inviting 80
guests to a party.
@@ -55,7 +55,7 @@ the next couple of years, it'll be called Varnish V4 and that means
that you will have to decide who gets which room and where to store
the towels and grandmothers old china, all over again.
-I'm sure you'll hate me for it, "Why do we have to move ?", "It
+I'm sure you'll hate me for it, "Why do we have to move ?", "It
really wasn't that bad after all" and so on and so forth.
But if I do my job right, that will soon turn into "Ohh, that's
pretty neat, I always wanted one of those..." and "Hey... Watch me
diff --git a/doc/sphinx/tutorial/backend_servers.rst b/doc/sphinx/tutorial/backend_servers.rst
index ce39bc1..7d7b70a 100644
--- a/doc/sphinx/tutorial/backend_servers.rst
+++ b/doc/sphinx/tutorial/backend_servers.rst
@@ -16,7 +16,7 @@ If you've been following the tutorial there is probably a section of
the configuration that looks like this::
vcl 4.0;
-
+
backend default {
.host = "www.varnish-cache.org";
.port = "80";
@@ -43,7 +43,7 @@ localhost, port 8080.::
Varnish can have several backends defined and can even join several backends
together into clusters of backends for load balancing purposes, having Varnish
-pick one backend based on different algorithms.
+pick one backend based on different algorithms.
Next, let's have a look at some of what makes Varnish unique and what you can do with it.
diff --git a/doc/sphinx/tutorial/starting_varnish.rst b/doc/sphinx/tutorial/starting_varnish.rst
index 8d9b64c..b90e6b6 100644
--- a/doc/sphinx/tutorial/starting_varnish.rst
+++ b/doc/sphinx/tutorial/starting_varnish.rst
@@ -39,7 +39,7 @@ of it is commented out but there is some text that is not. It will
probably look like this::
vcl 4.0;
-
+
backend default {
.host = "127.0.0.1";
.port = "8080";
@@ -49,7 +49,7 @@ We'll change it and make it point to something that works. Hopefully
http://www.varnish-cache.org/ is up. Let's use that. Replace the text with::
vcl 4.0;
-
+
backend default {
.host = "www.varnish-cache.org";
.port = "80";
diff --git a/doc/sphinx/users-guide/command-line.rst b/doc/sphinx/users-guide/command-line.rst
index 854fb32..ad04c02 100644
--- a/doc/sphinx/users-guide/command-line.rst
+++ b/doc/sphinx/users-guide/command-line.rst
@@ -3,8 +3,8 @@
Important command line arguments
--------------------------------
-There a two command line arguments you have to set when starting Varnish, these are:
-* what TCP port to serve HTTP from, and
+There a two command line arguments you have to set when starting Varnish, these are:
+* what TCP port to serve HTTP from, and
* where the backend server can be contacted.
If you have installed Varnish through using a provided operating system bound package,
diff --git a/doc/sphinx/users-guide/compression.rst b/doc/sphinx/users-guide/compression.rst
index edd3c6f..d88e351 100644
--- a/doc/sphinx/users-guide/compression.rst
+++ b/doc/sphinx/users-guide/compression.rst
@@ -4,7 +4,7 @@ Compression
-----------
In Varnish 3.0 we introduced native support for compression, using gzip
-encoding. *Before* 3.0, Varnish would never compress objects.
+encoding. *Before* 3.0, Varnish would never compress objects.
In Varnish 4.0 compression defaults to "on", meaning that it tries to
be smart and do the sensible thing.
diff --git a/doc/sphinx/users-guide/devicedetection.rst b/doc/sphinx/users-guide/devicedetection.rst
index 67f711a..8027909 100644
--- a/doc/sphinx/users-guide/devicedetection.rst
+++ b/doc/sphinx/users-guide/devicedetection.rst
@@ -7,7 +7,7 @@ Device detection is figuring out what kind of content to serve to a
client based on the User-Agent string supplied in a request.
Use cases for this are for example to send size reduced files to mobile
-clients with small screens and on high latency networks, or to
+clients with small screens and on high latency networks, or to
provide a streaming video codec that the client understands.
There are a couple of typical strategies to use for this type of scenario:
@@ -16,7 +16,7 @@ There are a couple of typical strategies to use for this type of scenario:
3) Change the backend request so that the backend sends tailored content.
To perhaps make the strategies easier to understand, we, in this context, assume
-that the `req.http.X-UA-Device` header is present and unique per client class.
+that the `req.http.X-UA-Device` header is present and unique per client class.
Setting this header can be as simple as::
@@ -35,7 +35,7 @@ https://github.com/varnish/varnish-devicedetect/.
Serve the different content on the same URL
-------------------------------------------
-The tricks involved are:
+The tricks involved are:
1. Detect the client (pretty simple, just include `devicedetect.vcl` and call
it).
2. Figure out how to signal the backend the client class. This
@@ -55,7 +55,7 @@ Example 1: Send HTTP header to backend
The basic case is that Varnish adds the 'X-UA-Device' HTTP header on the backend
requests, and the backend mentions in the response 'Vary' header that the content
-is dependant on this header.
+is dependant on this header.
Everything works out of the box from Varnish' perspective.
@@ -63,7 +63,7 @@ Everything works out of the box from Varnish' perspective.
VCL::
- sub vcl_recv {
+ sub vcl_recv {
# call some detection engine that set req.http.X-UA-Device
}
# req.http.X-UA-Device is copied by Varnish into bereq.http.X-UA-Device
@@ -73,15 +73,15 @@ VCL::
# use the same cached object for all U-As that map to the same X-UA-Device.
#
# If the backend does not mention in Vary that it has crafted special
- # content based on the User-Agent (==X-UA-Device), add it.
+ # content based on the User-Agent (==X-UA-Device), add it.
# If your backend does set Vary: User-Agent, you may have to remove that here.
sub vcl_backend_response {
if (bereq.http.X-UA-Device) {
if (!beresp.http.Vary) { # no Vary at all
- set beresp.http.Vary = "X-UA-Device";
+ set beresp.http.Vary = "X-UA-Device";
} elseif (beresp.http.Vary !~ "X-UA-Device") { # add to existing Vary
- set beresp.http.Vary = beresp.http.Vary + ", X-UA-Device";
- }
+ set beresp.http.Vary = beresp.http.Vary + ", X-UA-Device";
+ }
}
# comment this out if you don't want the client to know your
# classification
@@ -122,7 +122,7 @@ headers are (by default) available for the script.
VCL::
- sub vcl_recv {
+ sub vcl_recv {
# call some detection engine that set req.http.X-UA-Device
}
@@ -163,7 +163,7 @@ is changed.
VCL::
- sub vcl_recv {
+ sub vcl_recv {
# call some detection engine that set req.http.X-UA-Device
}
@@ -172,7 +172,7 @@ VCL::
# if there are existing GET arguments;
if (req.url ~ "\?") {
set req.http.X-get-devicetype = "&devicetype=" + req.http.X-UA-Device;
- } else {
+ } else {
set req.http.X-get-devicetype = "?devicetype=" + req.http.X-UA-Device;
}
set req.url = req.url + req.http.X-get-devicetype;
@@ -253,7 +253,7 @@ VCL::
return(synth(750, "Moved Temporarily"));
}
}
-
+
sub vcl_synth {
if (obj.status == 750) {
set obj.http.Location = "http://m.example.com" + req.url;
diff --git a/doc/sphinx/users-guide/esi.rst b/doc/sphinx/users-guide/esi.rst
index b81d2ea..30379a1 100644
--- a/doc/sphinx/users-guide/esi.rst
+++ b/doc/sphinx/users-guide/esi.rst
@@ -12,12 +12,12 @@ in all the other pages.
.. XXX:What other pages? benc
Used properly this strategy can dramatically increase
-your hit rate and reduce the load on your servers.
+your hit rate and reduce the load on your servers.
In Varnish we've only so far implemented a small subset of ESI. As of version 2.1 we
have three ESI statements::
- esi:include
+ esi:include
esi:remove
<!--esi ...-->
@@ -34,7 +34,7 @@ Lets see an example how this could be used. This simple cgi script
outputs the date::
#!/bin/sh
-
+
echo 'Content-type: text/html'
echo ''
date "+%Y-%m-%d %H:%M"
@@ -73,10 +73,10 @@ in them, allowing you to only render the content when the page is not
being ESI-processed.
For example::
- <esi:remove>
+ <esi:remove>
<a href="http://www.example.com/LICENSE">The license</a>
</esi:remove>
- <!--esi
+ <!--esi
<p>The full text of the license:</p>
<esi:include src="http://example.com/LICENSE" />
-->
diff --git a/doc/sphinx/users-guide/index.rst b/doc/sphinx/users-guide/index.rst
index e1c3e83..4aae504 100644
--- a/doc/sphinx/users-guide/index.rst
+++ b/doc/sphinx/users-guide/index.rst
@@ -8,7 +8,7 @@ The Varnish documentation consists of three main documents:
* :ref:`tutorial-index` explains the basics and gets you started with Varnish.
* :ref:`users-guide-index` (this document), explains how Varnish works
- and how you can use it to improve your website.
+ and how you can use it to improve your website.
* :ref:`reference-index` contains hard facts and is useful for
looking up specific questions.
diff --git a/doc/sphinx/users-guide/intro.rst b/doc/sphinx/users-guide/intro.rst
index 927292a..f430d75 100644
--- a/doc/sphinx/users-guide/intro.rst
+++ b/doc/sphinx/users-guide/intro.rst
@@ -5,7 +5,7 @@ The Big Varnish Picture
In this section we will cover answers to the questions:
- What is in this package called "Varnish"?
-- what are all the different bits and pieces named?
+- what are all the different bits and pieces named?
- Will you need a hex-wrench for assembly?
The two main parts of Varnish are the two processes in the `varnishd`
diff --git a/doc/sphinx/users-guide/operation-logging.rst b/doc/sphinx/users-guide/operation-logging.rst
index fdbcf58..bb4c7cc 100644
--- a/doc/sphinx/users-guide/operation-logging.rst
+++ b/doc/sphinx/users-guide/operation-logging.rst
@@ -6,7 +6,7 @@ Logging in Varnish
One of the really nice features in Varnish is the way logging
works. Instead of logging to a normal log file Varnish logs to a shared
memory segment, called the VSL - the Varnish Shared Log. When the end
-of the segment is reached we start over, overwriting old data.
+of the segment is reached we start over, overwriting old data.
This is much, much faster than logging to a file and it doesn't
require disk space. Besides it gives you much, much more information
@@ -32,7 +32,7 @@ These is the Varnish master process checking up on the caching process
to see that everything is OK.
Now go to the browser and reload the page displaying your web
-app.
+app.
.. XXX:Doesn't this require a setup of a running varnishd and a web application being cached? benc
You'll see lines like these.::
diff --git a/doc/sphinx/users-guide/params.rst b/doc/sphinx/users-guide/params.rst
index df4bfdf..5422c98 100644
--- a/doc/sphinx/users-guide/params.rst
+++ b/doc/sphinx/users-guide/params.rst
@@ -20,7 +20,7 @@ a somewhat longer description on what it does and what the default is
type ``param.show`` and the name of the parameter, like this::
varnish> param.show shortlived
- 200
+ 200
shortlived 10.000000 [s]
Default is 10.0
Objects created with TTL shorter than this are
diff --git a/doc/sphinx/users-guide/vcl-actions.rst b/doc/sphinx/users-guide/vcl-actions.rst
index ed2b8ba..e66250f 100644
--- a/doc/sphinx/users-guide/vcl-actions.rst
+++ b/doc/sphinx/users-guide/vcl-actions.rst
@@ -13,9 +13,9 @@ The most common actions to return are these:
`vcl_recv`.
*hash*
- When you return hash from `vcl_recv` you tell Varnish to deliver content
- from cache even if the request othervise indicates that the request
- should be passed.
+ When you return hash from `vcl_recv` you tell Varnish to deliver content
+ from cache even if the request othervise indicates that the request
+ should be passed.
*pipe*
@@ -23,11 +23,11 @@ The most common actions to return are these:
Pipe can be returned from `vcl_recv` as well. Pipe short circuits the
client and the backend connections and Varnish will just sit there
- and shuffle bytes back and forth. Varnish will not look at the data being
- send back and forth - so your logs will be incomplete.
+ and shuffle bytes back and forth. Varnish will not look at the data being
+ send back and forth - so your logs will be incomplete.
*deliver*
- Deliver the object to the client. Usually returned from `vcl_backend_response`.
+ Deliver the object to the client. Usually returned from `vcl_backend_response`.
*restart*
Restart processing of the request. You can restart the processing of
@@ -35,5 +35,5 @@ The most common actions to return are these:
*retry*
Retry the request against the backend. This can be returned from
- `vcl_backend_response` or `vcl_backend_error` if you don't like the response
+ `vcl_backend_response` or `vcl_backend_error` if you don't like the response
that the backend delivered.
diff --git a/doc/sphinx/users-guide/vcl-example-acls.rst b/doc/sphinx/users-guide/vcl-example-acls.rst
index 45afaa2..c76842f 100644
--- a/doc/sphinx/users-guide/vcl-example-acls.rst
+++ b/doc/sphinx/users-guide/vcl-example-acls.rst
@@ -11,7 +11,7 @@ the IP address of the client against an ACL with the match operator.::
"192.168.1.0"/24; /* and everyone on the local network */
! "192.168.1.23"; /* except for the dialin router */
}
-
+
sub vcl_recv {
if (req.method == "PURGE") {
if (client.ip ~ local) {
@@ -19,6 +19,6 @@ the IP address of the client against an ACL with the match operator.::
} else {
return(synth(403, "Access denied."));
}
- }
+ }
}
-
+
diff --git a/doc/sphinx/users-guide/vcl-example-manipulating-headers.rst b/doc/sphinx/users-guide/vcl-example-manipulating-headers.rst
index 7e65663..1ea81b1 100644
--- a/doc/sphinx/users-guide/vcl-example-manipulating-headers.rst
+++ b/doc/sphinx/users-guide/vcl-example-manipulating-headers.rst
@@ -17,5 +17,5 @@ Now, when the request is handled to the backend server there will be
no cookie header. The interesting line is the one with the
if-statement. It matches the URL, taken from the request object, and
matches it against the regular expression. Note the match operator. If
-it matches the Cookie: header of the request is unset (deleted).
+it matches the Cookie: header of the request is unset (deleted).
diff --git a/doc/sphinx/users-guide/vcl-inline-c.rst b/doc/sphinx/users-guide/vcl-inline-c.rst
index e0d0998..d9748a3 100644
--- a/doc/sphinx/users-guide/vcl-inline-c.rst
+++ b/doc/sphinx/users-guide/vcl-inline-c.rst
@@ -16,7 +16,7 @@ One of the first uses of inline C was logging to `syslog`.::
C{
#include <syslog.h>
}C
-
+
sub vcl_something {
C{
syslog(LOG_INFO, "Something happened at VCL line XX.");
diff --git a/doc/sphinx/users-guide/vcl-variables.rst b/doc/sphinx/users-guide/vcl-variables.rst
index 70862e5..4531537 100644
--- a/doc/sphinx/users-guide/vcl-variables.rst
+++ b/doc/sphinx/users-guide/vcl-variables.rst
@@ -28,7 +28,7 @@ objects can be accessed and manipulated using VCL.
The HTTP response right before it is delivered to the client. It is
typically modified in `vcl_deliver`.
-*obj*
+*obj*
The object as it is stored in cache. Read only.
.. XXX:What object? the current request? benc
diff --git a/include/Makefile.am b/include/Makefile.am
index 7088579..ced33c8 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -98,7 +98,7 @@ vcl.h: $(top_srcdir)/lib/libvcc/generate.py $(top_srcdir)/include/vrt.h
@PYTHON@ $(top_srcdir)/lib/libvcc/generate.py $(top_srcdir) $(top_builddir)
BUILT_SOURCES = vcs_version.h vmod_abi.h
-MAINTAINERCLEANFILES = vcs_version.h
+MAINTAINERCLEANFILES = vcs_version.h
vcs_version.h: FORCE
@if [ -d "$(top_srcdir)/.git" ]; then \
V="$$(git show -s --pretty=format:%h)" \
diff --git a/lib/Makefile.phk b/lib/Makefile.phk
index 6eba2c8..83d0674 100644
--- a/lib/Makefile.phk
+++ b/lib/Makefile.phk
@@ -1,5 +1,5 @@
SUBDIRS = libvcc libvarnish libvarnishapi libvarnishtools libvcc
-SUBDIRS += libvgz
+SUBDIRS += libvgz
SUBDIRS += libvmod_debug libvmod_directors libvmod_std
TOPDIR = $(CURDIR)/..
diff --git a/lib/libvarnish/flint.lnt b/lib/libvarnish/flint.lnt
index f86bb8d..c98d791 100644
--- a/lib/libvarnish/flint.lnt
+++ b/lib/libvarnish/flint.lnt
@@ -26,8 +26,8 @@
-e763 // Redundant declaration for symbol '...' previously declared
-e726 // Extraneous comma ignored
-e728 // Symbol ... not explicitly initialized
--e716 // while(1) ...
--e785 // Too few initializers for aggregate
+-e716 // while(1) ...
+-e785 // Too few initializers for aggregate
-e786 // String concatenation within initializer
-esym(534, sprintf) // Ignoring return value of function
diff --git a/lib/libvarnishapi/libvarnishapi.map b/lib/libvarnishapi/libvarnishapi.map
index 653342f..e5aa91d 100644
--- a/lib/libvarnishapi/libvarnishapi.map
+++ b/lib/libvarnishapi/libvarnishapi.map
@@ -2,7 +2,7 @@
* Copyright (c) 2011-2015 Varnish Software AS
* All rights reserved.
*
- * Author: Tollef Fog Heen <tfheen at varnish-software.com>
+ * Author: Tollef Fog Heen <tfheen at varnish-software.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/lib/libvcc/flint.lnt b/lib/libvcc/flint.lnt
index 60b3850..e264dab 100644
--- a/lib/libvcc/flint.lnt
+++ b/lib/libvcc/flint.lnt
@@ -26,7 +26,7 @@
-esym(534, vsb_vprintf) // Ignoring return value of function
-esym(534, memset) // Ignoring return value of function
-e788 // enum constant 'HND_Unclass' not used within defaulted switch
--e716 // while(1) ...
+-e716 // while(1) ...
-e786 // String concatenation within initializer
-e732 // Loss of sign (arg. no. 2) (int to unsigned int)
diff --git a/lib/libvmod_std/vmod.vcc b/lib/libvmod_std/vmod.vcc
index 61c334f..cc2506e 100644
--- a/lib/libvmod_std/vmod.vcc
+++ b/lib/libvmod_std/vmod.vcc
@@ -243,7 +243,7 @@ Description
Note that the comparison is case sensitive.
Example
| if (std.strstr(req.url, req.http.restrict)) {
- | ...
+ | ...
| }
This will check if the content of req.http.restrict occurs
@@ -265,7 +265,7 @@ Description
| "784111777"
Example
| if (std.time(resp.http.last-modified, now) < now - 1w) {
- | ...
+ | ...
| }
diff --git a/varnish.m4 b/varnish.m4
index fcf6b2d..8a9f647 100644
--- a/varnish.m4
+++ b/varnish.m4
@@ -31,7 +31,7 @@
# For compatibility with autoconf < 2.63b
m4_ifndef([AS_VAR_COPY],
[m4_define([AS_VAR_COPY],
- [AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])])])
+ [AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])])])
# VARNISH_VMOD_INCLUDE_DIR([])
# ----------------------------
More information about the varnish-commit
mailing list