* released 1.1.18
* Haproxy can be compiled with PCRE regex instead of libc regex, by setting
REGEX=pcre on the make command line.
* HTTP health-checks now use "OPTIONS *" instead of "OPTIONS /".
* when explicit source address binding is required, it is now also used for
health-checks.
* added 'reqpass' and 'reqipass' to allow certain headers but not the request
itself.
* factored several strings to reduce binary size by about 2 kB.
* replaced setreuid() and setregid() with more standard setuid() and setgid().
* added 4 status flags to the log line indicating who ended the connection
first, the sessions state, the validity of the cookie, and action taken on
the set-cookie header.
* rearranged the changelog and removed it from haproxy.c
* large documentation updates
diff --git a/Makefile b/Makefile
index 70d5008..959d866 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,14 @@
CC = gcc
LD = gcc
+# By default, we use libc's regex.
+REGEX=libc
+#REGEX=pcre
+
+# This is the directory hosting include/pcre.h and lib/libpcre.* when REGEX=pcre
+PCREDIR := $(shell pcre-config --prefix)
+#PCREDIR=/usr/local
+
# This is for Linux 2.4 with netfilter
COPTS.linux24 = -O2 -DNETFILTER
LIBS.linux24 =
@@ -30,11 +38,17 @@
COPTS.openbsd = -O2
LIBS.openbsd =
+COPTS.libc=
+LIBS.libs=
+
+COPTS.pcre=-DUSE_PCRE -I$(PCREDIR)/include
+LIBS.pcre=-L$(PCREDIR)/lib -lpcreposix -lpcre
+
#DEBUG =
DEBUG = -g
-COPTS=$(COPTS.$(TARGET))
-LIBS=$(LIBS.$(TARGET))
+COPTS=$(COPTS.$(TARGET)) $(COPTS.$(REGEX))
+LIBS=$(LIBS.$(TARGET)) $(LIBS.$(REGEX))
# - use -DSTATTIME=0 to disable statistics, else specify an interval in
# milliseconds.