Permalink
Browse files

Use PCRE_NOTEMPTY rather than NOTEMPTY_ATSTART, it suffices for us

  • Loading branch information...
1 parent 3156777 commit b9830bfa28b60a70caae92787100c675e1c719c6 Tollef Fog Heen committed Nov 10, 2011
Showing with 3 additions and 8 deletions.
  1. +1 −1 bin/varnishd/cache_vrt_re.c
  2. +1 −1 include/vre.h
  3. +1 −6 lib/libvarnish/vre.c
@@ -144,7 +144,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,
&params->vre_limits);
if (i < VRE_ERROR_NOMATCH ) {
View
@@ -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,
View
@@ -45,12 +45,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,

0 comments on commit b9830bf

Please sign in to comment.