* building with -DUSE_PCRE should include PCRE headers and not regex.h. At

  least on Solaris, this caused the libc's regex primitives to be used instead
  of PCRE, which caused trouble on group references. This is now fixed.

diff --git a/CHANGELOG b/CHANGELOG
index edff112bbbac56a38ecfa1cdcdc06bbaf8fa505a..c046e3c3c13f4ce819fd357ab84842178442d4af 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,11 @@
 ChangeLog :
 ===========
 
+2005/10/25
+  - building with -DUSE_PCRE should include PCRE headers and not regex.h. At
+    least on Solaris, this caused the libc's regex primitives to be used instead
+    of PCRE, which caused trouble on group references. This is now fixed.
+
 2005/10/09 : 1.2.7rc (1.1.33rc)
   - second batch of socklen_t changes.
   - clean-ups from Cameron Simpson.

diff --git a/haproxy.c b/haproxy.c
index e362df5bb8cb719e1113981e26b27a34443d0f8d..723c15fbbed8afa7af30b1086176a8ef5b40e79e 100644 (file)
--- a/haproxy.c
+++ b/haproxy.c
@@ -52,8 +52,15 @@
 #include <stdarg.h>
 #include <sys/resource.h>
 #include <time.h>
-#include <regex.h>
 #include <syslog.h>
+
+#ifdef USE_PCRE
+#include <pcre.h>
+#include <pcreposix.h>
+#else
+#include <regex.h>
+#endif
+
 #if defined(TPROXY) && defined(NETFILTER)
 #include <linux/netfilter_ipv4.h>
 #endif