summaryrefslogtreecommitdiff
path: root/ext/pcre/pcrelib/pcre_study.c
diff options
context:
space:
mode:
authorNuno Lopes <nlopess@php.net>2008-01-13 12:48:00 +0000
committerNuno Lopes <nlopess@php.net>2008-01-13 12:48:00 +0000
commit5da2171f41bd940379a9fca194404e77a0f10f2b (patch)
tree97fe5903964c3190e66292404b18824f4d2488d9 /ext/pcre/pcrelib/pcre_study.c
parentf9066b0e497e8a4731977c52d08251304c69b41e (diff)
downloadphp-git-5da2171f41bd940379a9fca194404e77a0f10f2b.tar.gz
upgrade to PCRE 7.5
Diffstat (limited to 'ext/pcre/pcrelib/pcre_study.c')
-rw-r--r--ext/pcre/pcrelib/pcre_study.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/pcre/pcrelib/pcre_study.c b/ext/pcre/pcrelib/pcre_study.c
index 8c82d1ce61..02e0c5288c 100644
--- a/ext/pcre/pcrelib/pcre_study.c
+++ b/ext/pcre/pcrelib/pcre_study.c
@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
supporting functions. */
-#include <config.h>
+#include "config.h"
#include "pcre_internal.h"
@@ -525,7 +525,8 @@ code = (uschar *)re + re->name_table_offset +
a multiline pattern that matches only at "line starts", no further processing
at present. */
-if ((re->options & (PCRE_ANCHORED|PCRE_FIRSTSET|PCRE_STARTLINE)) != 0)
+if ((re->options & PCRE_ANCHORED) != 0 ||
+ (re->flags & (PCRE_FIRSTSET|PCRE_STARTLINE)) != 0)
return NULL;
/* Set the character tables in the block that is passed around */