Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
unique-xids
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
unique-xids
Commits
ce8a7726
Commit
ce8a7726
authored
Nov 10, 2011
by
Tollef Fog Heen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use PCRE_NOTEMPTY rather than NOTEMPTY_ATSTART, it suffices for us
parent
ccf9f85a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
8 deletions
+3
-8
cache_vrt_re.c
bin/varnishd/cache/cache_vrt_re.c
+1
-1
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 @
ce8a7726
...
...
@@ -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
)
{
...
...
include/vre.h
View file @
ce8a7726
...
...
@@ -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 @
ce8a7726
...
...
@@ -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