Check in 1.5.1

Author: davidlst

CMakeLists.txt

@@ -18,6 +18,14 @@ link_directories( ${PROJECT_SOURCE_DIR}/../thirdparty/lib/)
 SET (CMAKE_C_COMPILER         "/usr/bin/clang")
 SET (CMAKE_CXX_COMPILER       "/usr/bin/clang++")
 
+IF (CMAKE_BUILD_TYPE MATCHES "Debug")
+set(MY_CMAKE_WARNING_FLAG  " -Wall -Wextra -Wno-unused-parameter -fno-omit-frame-pointer")
+#set(MY_CMAKE_WARNING_FLAG  " -Wall -Wextra -Wno-unused-parameter -fsanitize=address -fsanitize-recover=address -fno-omit-frame-pointer")
+set(MY_CMAKE_POOL_FLAG  " -DPOOL_TESTING -DUSE_VALGRIND")
+#set(MY_CMAKE_POOL_FLAG  " -DPOOL_TESTING")
+ELSE ()
+set(MY_CMAKE_WARNING_FLAG  " -Wall -Wextra -Wno-unused-parameter ")
+ENDIF()
 
 ## thread sanitizer
 #set (TSAN "1")

Makefile.in

@@ -241,6 +241,7 @@ IS_LSCPD = @IS_LSCPD@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBBROTLI = @LIBBROTLI@
+LIBGEOIP = @LIBGEOIP@
 LIBMMDB = @LIBMMDB@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for openlitespeed 1.5.0.
+# Generated by GNU Autoconf 2.69 for openlitespeed 1.5.1.
 #
 # Report bugs to <[email protected]>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='openlitespeed'
 PACKAGE_TARNAME='openlitespeed'
-PACKAGE_VERSION='1.5.0'
-PACKAGE_STRING='openlitespeed 1.5.0'
+PACKAGE_VERSION='1.5.1'
+PACKAGE_STRING='openlitespeed 1.5.1'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL='http://www.litespeedtech.com/'
 
@@ -664,6 +664,7 @@ USE_DYN_OSSL_FALSE
 USE_DYN_OSSL_TRUE
 OPENLSWS_BSSL
 LIBMMDB
+LIBGEOIP
 LIBBROTLI
 HAVE_LIBLUA_FALSE
 HAVE_LIBLUA_TRUE
@@ -832,8 +833,10 @@ enable_debug
 enable_profiling
 with_lua
 with_brotli
+enable_iptogeo
 with_iptogeo2
 with_bssl
+enable_recaptcha
 with_ip2loc
 enable_rpath
 with_libdir
@@ -1398,7 +1401,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures openlitespeed 1.5.0 to adapt to many kinds of systems.
+\`configure' configures openlitespeed 1.5.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1468,7 +1471,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of openlitespeed 1.5.0:";;
+     short | recursive ) echo "Configuration of openlitespeed 1.5.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1497,6 +1500,11 @@ Optional Features:
                           default)
   --enable-profiling      Enable cpu profiling (profiling is disabled by
                           default)
+  --enable-iptogeo=[yes/no]
+                          Enable iptogeo which need to have Geoip library
+                          installed [default=yes]
+  --enable-recaptcha=[yes/no]
+                          Enable recaptcha [default=yes]
   --disable-rpath         Disable rpath (It is 'no' by default)
 
 Optional Packages:
@@ -1622,7 +1630,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-openlitespeed configure 1.5.0
+openlitespeed configure 1.5.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2296,7 +2304,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by openlitespeed $as_me 1.5.0, which was
+It was created by openlitespeed $as_me 1.5.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3162,7 +3170,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='openlitespeed'
- VERSION='1.5.0'
+ VERSION='1.5.1'
 
 
 # Some tools Automake needs.
@@ -16091,6 +16099,29 @@ echo "LIBBROTLI=$LIBBROTLI"
 
 
 
+LIBGEOIP=" -lGeoIP "
+OPENLSWS_IPTOGEO=yes
+# Check whether --enable-iptogeo was given.
+if test "${enable_iptogeo+set}" = set; then :
+  enableval=$enable_iptogeo; OPENLSWS_IPTOGEO="$enableval"
+fi
+
+
+if test "$OPENLSWS_IPTOGEO" = "no" ; then
+    echo "iptogeo disabled!!!"
+    LIBGEOIP=
+else
+
+cat >>confdefs.h <<_ACEOF
+#define ENABLE_IPTOGEO 1
+_ACEOF
+
+    LIBGEOIP=" -lGeoIP "
+    echo "iptogeo enabled!!!"
+fi
+echo "LIBGEOIP=$LIBGEOIP"
+
+
 
 LIBMMDB=
 OPENLSWS_IPTOGEO2=no
@@ -16235,7 +16266,18 @@ fi
 
 
 
+# Check whether --enable-recaptcha was given.
+if test "${enable_recaptcha+set}" = set; then :
+  enableval=$enable_recaptcha; OPENLSWS_RECAPTCHA="$enableval"
+fi
 
+if test "$OPENLSWS_RECAPTCHA" = "no" ; then
+    echo "Recaptcha disabled!!!"
+else
+    echo "Recaptcha enabled, will compile it..."
+    LSRECAPTCHA=`$srcdir/src/modules/lsrecaptcha/build_lsrecaptcha.sh`
+    echo $LSRECAPTCHA
+fi
 
 
 # Check whether --with-ip2loc was given.
@@ -17341,7 +17383,6 @@ $as_echo "$as_me: WARNING: Expat XML Parser support requested but headers or lib
         fi
     fi
 
-#AC_CHECK_LIB([GeoIP], [GeoIP_id_by_addr])
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
 $as_echo_n "checking for crypt in -lcrypt... " >&6; }
 if ${ac_cv_lib_crypt_crypt+:} false; then :
@@ -18902,7 +18943,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by openlitespeed $as_me 1.5.0, which was
+This file was extended by openlitespeed $as_me 1.5.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18969,7 +19010,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-openlitespeed config.status 1.5.0
+openlitespeed config.status 1.5.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -7,8 +7,7 @@ m4_include(ax_check_libudns.m4)
 m4_include(ax_check_ip2location.m4)
 
 dnl Process this file with autoconf to produce a configure script.
-#AC_PREREQ([2.69])
-AC_INIT([openlitespeed],[1.5.0],[[email protected]],[openlitespeed],[http://www.litespeedtech.com/])
+AC_INIT([openlitespeed],[1.5.1],[[email protected]],[openlitespeed],[http://www.litespeedtech.com/])
 AM_INIT_AUTOMAKE([1.0 foreign no-define ])
 
 AC_CONFIG_HEADERS(src/config.h:src/config.h.in)
@@ -267,6 +266,24 @@ echo "LIBBROTLI=$LIBBROTLI"
 AC_SUBST([LIBBROTLI])
 
 
+LIBGEOIP=" -lGeoIP "
+OPENLSWS_IPTOGEO=yes
+AC_ARG_ENABLE([iptogeo],
+              [AS_HELP_STRING([--enable-iptogeo=@<:@yes/no@:>@],
+                              [Enable iptogeo which need to have Geoip library installed @<:@default=yes@:>@])],
+               [OPENLSWS_IPTOGEO="$enableval"], [])
+
+if test "$OPENLSWS_IPTOGEO" = "no" ; then 
+    echo "iptogeo disabled!!!"
+    LIBGEOIP=
+else
+    AC_DEFINE_UNQUOTED([ENABLE_IPTOGEO], [1], [Defined to compile with iptogeo enabled])
+    LIBGEOIP=" -lGeoIP "
+    echo "iptogeo enabled!!!"
+fi
+echo "LIBGEOIP=$LIBGEOIP"
+AC_SUBST([LIBGEOIP])
+
 
 LIBMMDB=
 OPENLSWS_IPTOGEO2=no
@@ -355,7 +372,17 @@ AM_CONDITIONAL([USE_DYN_OSSL], [test x$usedynossl = xyes])
 AM_CONDITIONAL([USE_BSSL], [test x$OPENLSWS_BSSL = xyes])
 
 
-
+AC_ARG_ENABLE([recaptcha],
+              [AS_HELP_STRING([--enable-recaptcha=@<:@yes/no@:>@],
+                              [Enable recaptcha @<:@default=yes@:>@])],
+               [OPENLSWS_RECAPTCHA="$enableval"], [])
+if test "$OPENLSWS_RECAPTCHA" = "no" ; then 
+    echo "Recaptcha disabled!!!"
+else
+    echo "Recaptcha enabled, will compile it..."
+    LSRECAPTCHA=`$srcdir/src/modules/lsrecaptcha/build_lsrecaptcha.sh`
+    echo $LSRECAPTCHA
+fi
 
 AC_ARG_WITH(ip2loc,
 [  --with-ip2loc[[=DIR]]        enable ip2location (located in directory DIR, if supplied).  [[default=no]]],
@@ -442,7 +469,6 @@ AX_PATH_LIB_PCRE(, AC_MSG_ERROR(Can not find pcre. You must install it before co
 AX_PATH_LIB_UDNS(, AC_MSG_ERROR(Can not find udns library. You must install it before continuing.))
 
 AX_LIB_EXPAT(0.5)
-#AC_CHECK_LIB([GeoIP], [GeoIP_id_by_addr])
 AC_CHECK_LIB(crypt,crypt,LIBS="-lcrypt $LIBS")