Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
194d664e
Commit
194d664e
authored
Sep 22, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
ssh://git.varnish-cache.org/git/varnish-cache
parents
8a385bfc
701e5c35
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
100 additions
and
9 deletions
+100
-9
.gitignore
.gitignore
+2
-0
mgt_sandbox.c
bin/varnishd/mgt_sandbox.c
+1
-0
varnishstat_curses.c
bin/varnishstat/varnishstat_curses.c
+4
-0
configure.ac
configure.ac
+1
-0
upgrade.rst
doc/sphinx/installation/upgrade.rst
+8
-8
Makefile.am
man/Makefile.am
+17
-1
vsc2rst.c
man/vsc2rst.c
+67
-0
No files found.
.gitignore
View file @
194d664e
...
...
@@ -54,8 +54,10 @@ TAGS
/lib/libvmod_std/vcc_if.h
# Man-files and binaries
/man/vsc2rst
/man/vcl.7
/man/varnish-cli.7
/man/varnish-counters.7
/bin/varnishadm/varnishadm
/bin/varnishadm/varnishadm.1
/bin/varnishd/varnishd
...
...
bin/varnishd/mgt_sandbox.c
View file @
194d664e
...
...
@@ -98,6 +98,7 @@ mgt_sandbox(void)
* silently ignore any errors if it doesn't exist
*/
priv_addset
(
minimal
,
"net_access"
);
priv_addset
(
minimal
,
"file_read"
);
#define SETPPRIV(which, set) \
if (setppriv(PRIV_SET, which, set)) \
...
...
bin/varnishstat/varnishstat_curses.c
View file @
194d664e
...
...
@@ -34,7 +34,11 @@
#include <sys/time.h>
#ifdef HAVE_NCURSES_CURSES_H
#include <ncurses/curses.h>
#elif HAVE_CURSES_H
#include <curses.h>
#endif
#include <errno.h>
#include <signal.h>
#include <stdio.h>
...
...
configure.ac
View file @
194d664e
...
...
@@ -87,6 +87,7 @@ AC_SUBST(CURSES_LIBS)
if test "$have_curses" = no; then
AC_MSG_WARN([curses not found; some tools will not be built])
fi
AC_CHECK_HEADERS([ncurses/curses.h curses.h])
AM_CONDITIONAL([HAVE_CURSES], [test x$have_curses = xyes])
save_LIBS="${LIBS}"
...
...
doc/sphinx/installation/upgrade.rst
View file @
194d664e
...
...
@@ -20,11 +20,11 @@ To simplify strings, the %-encoding has been removed. If you need non-printable
``log`` moved to the std vmod
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
``log`` has moved to the std vmod:
``log`` has moved to the std vmod:
:
log "log something";
becomes
becomes
::
import std;
std.log("log something");
...
...
@@ -34,11 +34,11 @@ You only need to import std once.
purges are now called bans
~~~~~~~~~~~~~~~~~~~~~~~~~~
``purge()`` and ``purge_url()`` are now respectively ``ban()`` and ``ban_url()``, so you should replace all occurences:
``purge()`` and ``purge_url()`` are now respectively ``ban()`` and ``ban_url()``, so you should replace all occurences:
:
purge("req.url = " req.url);
becomes
becomes
::
ban("req.url = " + req.url);
...
...
@@ -84,22 +84,22 @@ becomes::
``req.hash`` is replaced with ``hash_data()``
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
You no longer append to the hash with ``+=``, so
You no longer append to the hash with ``+=``, so
::
set req.hash += req.url;
becomes
becomes
::
hash_data(req.url);
``esi`` is replaced with ``beresp.do_esi``
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
You no longer enable ESI with ``esi``, so
You no longer enable ESI with ``esi``, so
::
esi;
in ``vcl_fetch`` becomes
in ``vcl_fetch`` becomes
::
set beresp.do_esi = true;
...
...
man/Makefile.am
View file @
194d664e
#
dist_man_MANS
=
vcl.7 varnish-cli.7
noinst_PROGRAMS
=
vsc2rst
vsc2rst_SOURCES
=
vsc2rst.c
\
$(top_srcdir)
/include/vsc_fields.h
INCLUDES
=
-I
$(top_srcdir)
/include
dist_man_MANS
=
vcl.7 varnish-cli.7 varnish-counters.7
MAINTAINERCLEANFILES
=
$(dist_man_MANS)
vcl.7
:
$(top_srcdir)/doc/sphinx/reference/vcl.rst
\
...
...
@@ -23,3 +29,13 @@ else
@echo
"========================================"
@false
endif
varnish-counters.7
:
vsc2rst
if
HAVE_RST2MAN
./vsc2rst
|
${RST2MAN}
-
$@
else
@echo
"========================================"
@echo
"You need rst2man installed to make dist"
@echo
"========================================"
@false
endif
man/vsc2rst.c
0 → 100644
View file @
194d664e
#include <stdio.h>
#define P(x, ...) printf(x "\n", ##__VA_ARGS__)
#define VSC_F(n, t, l, f, e, d) printf("%s – %s\n\t%s\n\n", #n, e, d);
int
main
(
int
argc
,
char
**
argv
)
{
(
void
)
argc
;
(
void
)
argv
;
P
(
"================"
);
P
(
"varnish-counters"
);
P
(
"================"
);
P
(
""
);
P
(
"---------------------------------"
);
P
(
"Varnish counter field definitions"
);
P
(
"---------------------------------"
);
P
(
":Author: Tollef Fog Heen"
);
P
(
":Date: 2011-09-20"
);
P
(
":Version: 1.0"
);
P
(
":Manual section: 7"
);
P
(
""
);
P
(
"MAIN COUNTERS"
);
P
(
"============="
);
P
(
""
);
#define VSC_DO_MAIN
#include "vsc_fields.h"
#undef VSC_DO_MAIN
P
(
""
);
P
(
"LOCK COUNTERS"
);
P
(
"============="
);
P
(
""
);
#define VSC_DO_LCK
#include "vsc_fields.h"
#undef VSC_DO_LCK
P
(
""
);
P
(
"PER MALLOC STORAGE COUNTERS"
);
P
(
"==========================="
);
P
(
""
);
#define VSC_DO_SMA
#include "vsc_fields.h"
#undef VSC_DO_SMA
P
(
""
);
P
(
"PER FILE STORAGE COUNTERS"
);
P
(
"========================="
);
P
(
""
);
#define VSC_DO_SMF
#include "vsc_fields.h"
#undef VSC_DO_SMF
P
(
""
);
P
(
"PER BACKEND COUNTERS"
);
P
(
"===================="
);
P
(
""
);
#define VSC_DO_VBE
#include "vsc_fields.h"
#undef VSC_DO_VBE
return
0
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment