Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnishevent
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
varnishevent
Commits
17d68a17
Commit
17d68a17
authored
Dec 12, 2016
by
Geoff Simmons
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
do not link with libvarnish (which is no longer shared)
parent
9eeaf7a8
Pipeline
#93
skipped
Changes
7
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
16 deletions
+16
-16
README.rst
README.rst
+4
-3
Makefile.am
src/Makefile.am
+1
-2
format.c
src/format.c
+2
-2
hdrtrie.c
src/hdrtrie.c
+2
-2
Makefile.am
src/test/Makefile.am
+5
-5
test_hdrtrie.c
src/test/test_hdrtrie.c
+1
-1
varnishevent.c
src/varnishevent.c
+1
-1
No files found.
README.rst
View file @
17d68a17
...
@@ -375,9 +375,10 @@ precision.
...
@@ -375,9 +375,10 @@ precision.
REQUIREMENTS
REQUIREMENTS
============
============
This version of varnishevent requires Varnish 5.0.0 (exactly that
This version of varnishevent requires the Varnish trunk since commit
version and no other). See the project repository for versions that
``d0bba14``; it is not currently compatible with any released version
are compatible with other versions of Varnish.
of Varnish. See the project repository for versions that are
compatible with other versions of Varnish.
DATA BUFFERS
DATA BUFFERS
...
...
src/Makefile.am
View file @
17d68a17
...
@@ -36,8 +36,7 @@ varnishevent_SOURCES = \
...
@@ -36,8 +36,7 @@ varnishevent_SOURCES = \
hdrtrie.c
hdrtrie.c
varnishevent_LDADD
=
\
varnishevent_LDADD
=
\
${
PTHREAD_LIBS
}
${
RT_LIBS
}
${
LIBM
}
@VARNISH_LIBS@
\
${
PTHREAD_LIBS
}
${
RT_LIBS
}
${
LIBM
}
@VARNISH_LIBS@
-L
${
VARNISH_PKG_LIB
}
/varnish
-lvarnish
# from Varnish include/Makefile.am
# from Varnish include/Makefile.am
BUILT_SOURCES
=
vcs_version.h
BUILT_SOURCES
=
vcs_version.h
...
...
src/format.c
View file @
17d68a17
...
@@ -1365,7 +1365,7 @@ compile_fmt(char * const format, compiled_fmt_t * const fmt,
...
@@ -1365,7 +1365,7 @@ compile_fmt(char * const format, compiled_fmt_t * const fmt,
*/
*/
VSB_putc
(
os
,
'\n'
);
VSB_putc
(
os
,
'\n'
);
add_formatter
(
fmt
,
os
,
n
,
NULL
);
add_formatter
(
fmt
,
os
,
n
,
NULL
);
VSB_de
lete
(
os
);
VSB_de
stroy
(
&
os
);
return
0
;
return
0
;
}
}
...
@@ -1570,7 +1570,7 @@ void
...
@@ -1570,7 +1570,7 @@ void
FMT_Fini
(
void
)
FMT_Fini
(
void
)
{
{
free
(
obuf
);
free
(
obuf
);
VSB_de
lete
(
scratch
);
VSB_de
stroy
(
&
scratch
);
free
(
payload
);
free
(
payload
);
free_incl
(
cincl
);
free_incl
(
cincl
);
...
...
src/hdrtrie.c
View file @
17d68a17
...
@@ -197,7 +197,7 @@ hdr_traverse(struct hdrt_node *hdrt, struct vsb *sb, struct vsb *prefix)
...
@@ -197,7 +197,7 @@ hdr_traverse(struct hdrt_node *hdrt, struct vsb *sb, struct vsb *prefix)
VSB_finish
(
word
);
VSB_finish
(
word
);
VSB_cat
(
sb
,
VSB_data
(
word
));
VSB_cat
(
sb
,
VSB_data
(
word
));
VSB_cat
(
sb
,
","
);
VSB_cat
(
sb
,
","
);
VSB_de
lete
(
word
);
VSB_de
stroy
(
&
word
);
}
}
for
(
int
i
=
0
;
i
<
64
;
i
++
)
for
(
int
i
=
0
;
i
<
64
;
i
++
)
if
(
hdrt
->
next
[
i
]
!=
NULL
)
{
if
(
hdrt
->
next
[
i
]
!=
NULL
)
{
...
@@ -208,7 +208,7 @@ hdr_traverse(struct hdrt_node *hdrt, struct vsb *sb, struct vsb *prefix)
...
@@ -208,7 +208,7 @@ hdr_traverse(struct hdrt_node *hdrt, struct vsb *sb, struct vsb *prefix)
VSB_putc
(
next
,
toupper
(
c
));
VSB_putc
(
next
,
toupper
(
c
));
hdr_traverse
(
hdrt
->
next
[
i
],
sb
,
next
);
hdr_traverse
(
hdrt
->
next
[
i
],
sb
,
next
);
}
}
VSB_de
lete
(
current
);
VSB_de
stroy
(
&
current
);
}
}
void
void
...
...
src/test/Makefile.am
View file @
17d68a17
...
@@ -20,7 +20,7 @@ test_data_LDADD = \
...
@@ -20,7 +20,7 @@ test_data_LDADD = \
../format.
$(OBJEXT)
\
../format.
$(OBJEXT)
\
../strfTIM.
$(OBJEXT)
\
../strfTIM.
$(OBJEXT)
\
../hdrtrie.
$(OBJEXT)
\
../hdrtrie.
$(OBJEXT)
\
@VARNISH_LIBS@ @VARNISH_LIBVARNISH_LIB@
${
LIBM
}
-lvarnish
@VARNISH_LIBS@ @VARNISH_LIBVARNISH_LIB@
${
LIBM
}
test_format_SOURCES
=
\
test_format_SOURCES
=
\
minunit.h
\
minunit.h
\
...
@@ -33,7 +33,7 @@ test_format_LDADD = \
...
@@ -33,7 +33,7 @@ test_format_LDADD = \
../data.
$(OBJEXT)
\
../data.
$(OBJEXT)
\
../hdrtrie.
$(OBJEXT)
\
../hdrtrie.
$(OBJEXT)
\
../format.
$(OBJEXT)
\
../format.
$(OBJEXT)
\
@VARNISH_LIBS@ @VARNISH_LIBVARNISH_LIB@
${
LIBM
}
-lvarnish
@VARNISH_LIBS@ @VARNISH_LIBVARNISH_LIB@
${
LIBM
}
test_writer_SOURCES
=
\
test_writer_SOURCES
=
\
minunit.h
\
minunit.h
\
...
@@ -50,7 +50,7 @@ test_writer_LDADD = \
...
@@ -50,7 +50,7 @@ test_writer_LDADD = \
../strfTIM.
$(OBJEXT)
\
../strfTIM.
$(OBJEXT)
\
../hdrtrie.
$(OBJEXT)
\
../hdrtrie.
$(OBJEXT)
\
../writer.
$(OBJEXT)
\
../writer.
$(OBJEXT)
\
@VARNISH_LIBS@ @VARNISH_LIBVARNISH_LIB@
${
LIBM
}
-lvarnish
@VARNISH_LIBS@ @VARNISH_LIBVARNISH_LIB@
${
LIBM
}
test_strfTIM_SOURCES
=
\
test_strfTIM_SOURCES
=
\
minunit.h
\
minunit.h
\
...
@@ -59,7 +59,7 @@ test_strfTIM_SOURCES = \
...
@@ -59,7 +59,7 @@ test_strfTIM_SOURCES = \
test_strfTIM_LDADD
=
\
test_strfTIM_LDADD
=
\
../strfTIM.
$(OBJEXT)
\
../strfTIM.
$(OBJEXT)
\
@VARNISH_LIBS@ @VARNISH_LIBVARNISH_LIB@
${
LIBM
}
-lvarnish
@VARNISH_LIBS@ @VARNISH_LIBVARNISH_LIB@
${
LIBM
}
test_hdrtrie_SOURCES
=
\
test_hdrtrie_SOURCES
=
\
minunit.h
\
minunit.h
\
...
@@ -68,4 +68,4 @@ test_hdrtrie_SOURCES = \
...
@@ -68,4 +68,4 @@ test_hdrtrie_SOURCES = \
test_hdrtrie_LDADD
=
\
test_hdrtrie_LDADD
=
\
../hdrtrie.
$(OBJEXT)
\
../hdrtrie.
$(OBJEXT)
\
@VARNISH_LIBS@ @VARNISH_LIBVARNISH_LIB@
${
LIBM
}
-lvarnish
@VARNISH_LIBS@ @VARNISH_LIBVARNISH_LIB@
${
LIBM
}
src/test/test_hdrtrie.c
View file @
17d68a17
...
@@ -512,7 +512,7 @@ static char
...
@@ -512,7 +512,7 @@ static char
MASSERT
(
strcasecmp
(
VSB_data
(
sb
),
EXP
)
==
0
);
MASSERT
(
strcasecmp
(
VSB_data
(
sb
),
EXP
)
==
0
);
#undef EXP
#undef EXP
VSB_de
lete
(
sb
);
VSB_de
stroy
(
&
sb
);
return
NULL
;
return
NULL
;
}
}
...
...
src/varnishevent.c
View file @
17d68a17
...
@@ -890,7 +890,7 @@ main(int argc, char *argv[])
...
@@ -890,7 +890,7 @@ main(int argc, char *argv[])
VSB_finish
(
hdrs
);
VSB_finish
(
hdrs
);
LOG_Log
(
LOG_INFO
,
"Reading tags %s with headers: %s"
,
VSL_tags
[
i
],
LOG_Log
(
LOG_INFO
,
"Reading tags %s with headers: %s"
,
VSL_tags
[
i
],
VSB_data
(
hdrs
));
VSB_data
(
hdrs
));
VSB_de
lete
(
hdrs
);
VSB_de
stroy
(
&
hdrs
);
}
}
}
}
...
...
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