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
e7694ea9
Commit
e7694ea9
authored
Nov 14, 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
9857918c
4e9bf8c8
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
18 deletions
+7
-18
cache_vrt_re.c
bin/varnishd/cache/cache_vrt_re.c
+1
-1
c00047.vtc
bin/varnishtest/tests/c00047.vtc
+0
-2
vtc.c
bin/varnishtest/vtc.c
+0
-4
vcl.rst
doc/sphinx/reference/vcl.rst
+4
-4
vre.h
include/vre.h
+1
-1
vre.c
lib/libvarnish/vre.c
+1
-6
No files found.
bin/varnishd/cache/cache_vrt_re.c
View file @
e7694ea9
...
...
@@ -139,7 +139,7 @@ VRT_regsub(const struct sess *sp, int all, const char *str, void *re,
if
(
!
all
)
break
;
memset
(
&
ovector
,
0
,
sizeof
(
ovector
));
options
|=
VRE_NOTEMPTY
_ATSTART
;
options
|=
VRE_NOTEMPTY
;
i
=
VRE_exec
(
t
,
str
,
len
,
0
,
options
,
ovector
,
30
,
&
cache_param
->
vre_limits
);
if
(
i
<
VRE_ERROR_NOMATCH
)
{
...
...
bin/varnishtest/tests/c00047.vtc
View file @
e7694ea9
varnishtest "Test VCL regsuball()"
feature VRE_NOTEMPTY_ATSTART
server s1 {
rxreq
txresp \
...
...
bin/varnishtest/vtc.c
View file @
e7694ea9
...
...
@@ -43,7 +43,6 @@
#include "vtc.h"
#include "vav.h"
#include "vre.h"
#include "vtim.h"
...
...
@@ -495,9 +494,6 @@ cmd_feature(CMD_ARGS)
continue
;
#endif
}
if
(
!
strcmp
(
av
[
i
],
"VRE_NOTEMPTY_ATSTART"
)
&&
VRE_NOTEMPTY_ATSTART
)
continue
;
vtc_log
(
vl
,
1
,
"SKIPPING test, missing feature: %s"
,
av
[
i
]);
vtc_stop
=
1
;
...
...
doc/sphinx/reference/vcl.rst
View file @
e7694ea9
...
...
@@ -976,10 +976,10 @@ based on the request URL:::
}
}
The following snippet demonstrates how to force a minimum TTL for
all documents. Note that this is not the same as setting the
default_ttl run-time parameter, as that only affects document for
which the backend did not specify a TTL:::
The following snippet demonstrates how to force a minimum TTL for
all documents. Note that this is not the same as setting the
default_ttl run-time parameter, as that only affects document for
which the backend did not specify a TTL:::
import std; # needed for std.log
...
...
include/vre.h
View file @
e7694ea9
...
...
@@ -49,7 +49,7 @@ typedef struct vre vre_t;
/* And those to PCRE options */
extern
const
unsigned
VRE_CASELESS
;
extern
const
unsigned
VRE_NOTEMPTY
_ATSTART
;
extern
const
unsigned
VRE_NOTEMPTY
;
vre_t
*
VRE_compile
(
const
char
*
,
int
,
const
char
**
,
int
*
);
int
VRE_exec
(
const
vre_t
*
code
,
const
char
*
subject
,
int
length
,
...
...
lib/libvarnish/vre.c
View file @
e7694ea9
...
...
@@ -49,12 +49,7 @@ struct vre {
* here.
*/
const
unsigned
VRE_CASELESS
=
PCRE_CASELESS
;
const
unsigned
VRE_NOTEMPTY_ATSTART
=
#ifdef PCRE_NOTEMPTY_ATSTART
PCRE_NOTEMPTY_ATSTART
;
#else
0
;
#endif
const
unsigned
VRE_NOTEMPTY
=
PCRE_NOTEMPTY
;
vre_t
*
VRE_compile
(
const
char
*
pattern
,
int
options
,
...
...
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