checkin v1.2.1

CMakeLists.txt

@@ -3,6 +3,12 @@ cmake_minimum_required(VERSION 2.8)
 Project(openlitespeed)
 INCLUDE( ${PROJECT_SOURCE_DIR}/CMakeModules/common.cmake)
 
+set(openlitespeed_MAJOR_VERSION 1)
+set(openlitespeed_MINOR_VERSION 1)
+set(openlitespeed_PATCH_VERSION 0)
+set(openlitespeed_VERSION
+  ${FOOBAR_MAJOR_VERSION}.${FOOBAR_MINOR_VERSION}.${FOOBAR_PATCH_VERSION})
+
 SET(CMAKE_INCLUDE_CURRENT_DIR ON)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config.h)
 

CMakeModules/common.cmake

@@ -1,3 +1,3 @@
 cmake_minimum_required(VERSION 2.8)
-include_directories ("${PROJECT_SOURCE_DIR}/src")
+include_directories ("${PROJECT_SOURCE_DIR}/src" "${PROJECT_BINARY_DIR}/src")
 

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.03.
+# Generated by GNU Autoconf 2.69 for openlitespeed 1.2.
 #
 # Report bugs to <[email protected]>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='openlitespeed'
 PACKAGE_TARNAME='openlitespeed'
-PACKAGE_VERSION='1.03'
-PACKAGE_STRING='openlitespeed 1.03'
+PACKAGE_VERSION='1.2'
+PACKAGE_STRING='openlitespeed 1.2'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL='http://www.litespeedtech.com/'
 
@@ -743,6 +743,7 @@ with_admin
 with_password
 with_email
 enable_adminssl
+enable_spdy
 enable_debug
 enable_rpath
 with_libdir
@@ -1305,7 +1306,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.03 to adapt to many kinds of systems.
+\`configure' configures openlitespeed 1.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1371,7 +1372,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of openlitespeed 1.03:";;
+     short | recursive ) echo "Configuration of openlitespeed 1.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1385,8 +1386,9 @@ Optional Features:
                           speeds up one-time build
   --disable-assert        turn off assertions
   --enable-adminssl=[yes/no]
-                          Enable SSL when logging to admin interface (modify
-                          adminssl.conf before installation) [default=yes]
+                          Enable HTTPS for admin console (modify adminssl.conf
+                          before installation) [default=yes]
+  --enable-spdy           Enable SPDY over HTTPS (Spdy is disabled by default)
   --enable-debug          Enable debugging symbols (Debug is disabled by
                           default)
   --disable-rpath         Disable rpath (It is 'no' by default)
@@ -1490,7 +1492,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-openlitespeed configure 1.03
+openlitespeed configure 1.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2127,7 +2129,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.03, which was
+It was created by openlitespeed $as_me 1.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2954,7 +2956,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='openlitespeed'
- VERSION='1.03'
+ VERSION='1.2'
 
 
 # Some tools Automake needs.
@@ -5128,6 +5130,15 @@ fi
 
 
 
+# Check whether --enable-spdy was given.
+if test "${enable_spdy+set}" = set; then :
+  enableval=$enable_spdy;
+$as_echo "#define LS_ENABLE_SPDY 1" >>confdefs.h
+
+                 echo "SPDY enabled!!!"
+fi
+
+
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug; OPENLSWS_DEBUG="$enableval"
@@ -5142,7 +5153,8 @@ if test "${enable_debug+set}" = set; then :
 
 fi
 
-
+CFLAGS="$CFLAGS -fstack-protector"
+CXXFLAGS="$CXXFLAGS -fstack-protector"
 
 # Check whether --enable-rpath was given.
 if test "${enable_rpath+set}" = set; then :
@@ -5161,10 +5173,15 @@ if test "${with_libdir+set}" = set; then :
 else
 
                 OSTYPE=`uname -m`
-                if test "$OSTYPE" != x86_64 ; then
+                OSNAME=`uname -s`
+                if test "$OSNAME" != Linux ; then
                     OPENLSWS_LIBDIR=lib
                 else
-                    OPENLSWS_LIBDIR=lib64
+                    if test "$OSTYPE" != x86_64 ; then
+                        OPENLSWS_LIBDIR=lib
+                    else
+                        OPENLSWS_LIBDIR=lib64
+                    fi
                 fi
 
 fi
@@ -7062,7 +7079,7 @@ fi
 done
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile src/edio/Makefile src/extensions/Makefile src/http/Makefile src/log4cxx/Makefile src/main/Makefile src/socket/Makefile src/sslpp/Makefile src/ssi/Makefile src/util/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile src/edio/Makefile src/extensions/Makefile src/http/Makefile src/spdy/Makefile src/log4cxx/Makefile src/main/Makefile src/socket/Makefile src/sslpp/Makefile src/ssi/Makefile src/util/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -7599,7 +7616,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.03, which was
+This file was extended by openlitespeed $as_me 1.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7666,7 +7683,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.03
+openlitespeed config.status 1.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -7802,6 +7819,7 @@ do
     "src/edio/Makefile") CONFIG_FILES="$CONFIG_FILES src/edio/Makefile" ;;
     "src/extensions/Makefile") CONFIG_FILES="$CONFIG_FILES src/extensions/Makefile" ;;
     "src/http/Makefile") CONFIG_FILES="$CONFIG_FILES src/http/Makefile" ;;
+    "src/spdy/Makefile") CONFIG_FILES="$CONFIG_FILES src/spdy/Makefile" ;;
     "src/log4cxx/Makefile") CONFIG_FILES="$CONFIG_FILES src/log4cxx/Makefile" ;;
     "src/main/Makefile") CONFIG_FILES="$CONFIG_FILES src/main/Makefile" ;;
     "src/socket/Makefile") CONFIG_FILES="$CONFIG_FILES src/socket/Makefile" ;;

configure.in

@@ -5,8 +5,8 @@ m4_include(ax_lib_expat.m4)
 
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.69])
-AC_INIT([openlitespeed],[1.03],[[email protected]],[openlitespeed],[http://www.litespeedtech.com/])
-AM_INIT_AUTOMAKE([1.03 foreign no-define ])
+AC_INIT([openlitespeed],[1.2],[[email protected]],[openlitespeed],[http://www.litespeedtech.com/])
+AM_INIT_AUTOMAKE([1.2 foreign no-define ])
 
 AM_CONFIG_HEADER(src/config.h:src/config.h.in)
 
@@ -75,10 +75,16 @@ AC_SUBST([OPENLSWS_EMAIL])
 
 AC_ARG_ENABLE([adminssl],
               [AC_HELP_STRING([--enable-adminssl=@<:@yes/no@:>@],
-                              [Enable SSL when logging to admin interface (modify adminssl.conf before installation) @<:@default=yes@:>@])],
+                              [Enable HTTPS for admin console (modify adminssl.conf before installation) @<:@default=yes@:>@])],
               [OPENLSWS_ADMINSSL="$enableval"], [OPENLSWS_ADMINSSL=yes])
 AC_SUBST([OPENLSWS_ADMINSSL])
 
+AC_ARG_ENABLE([spdy],
+              [AC_HELP_STRING([--enable-spdy],
+                              [Enable SPDY over HTTPS (Spdy is disabled by default)])],
+               [ AC_DEFINE([LS_ENABLE_SPDY], [1], [Define if need spdy feature]) 
+                 echo "SPDY enabled!!!" ], [])
+
 AC_ARG_ENABLE([debug],
               [AC_HELP_STRING([--enable-debug],
                               [Enable debugging symbols (Debug is disabled by default)])],
@@ -92,7 +98,8 @@ AC_ARG_ENABLE([debug],
                 fi
                 echo "OPENLSWS_DEBUG='$OPENLSWS_DEBUG'  CFLAGS='$CFLAGS'"
                 ], [])
-
+CFLAGS="$CFLAGS -fstack-protector"
+CXXFLAGS="$CXXFLAGS -fstack-protector"
 
 AC_ARG_ENABLE([rpath],
               [AC_HELP_STRING([--disable-rpath], 
@@ -105,10 +112,15 @@ AC_ARG_WITH([libdir],
             AS_HELP_STRING([--with-libdir],[Set system lib directory. It is lib or lib64 and will be automatically checked by default]),
             [OPENLSWS_LIBDIR="$withval"], [
                 OSTYPE=`uname -m`
-                if test "$OSTYPE" != x86_64 ; then
+                OSNAME=`uname -s`
+                if test "$OSNAME" != Linux ; then
                     OPENLSWS_LIBDIR=lib
                 else
-                    OPENLSWS_LIBDIR=lib64
+                    if test "$OSTYPE" != x86_64 ; then
+                        OPENLSWS_LIBDIR=lib
+                    else
+                        OPENLSWS_LIBDIR=lib64
+                    fi
                 fi
              ])
 echo "Default system lib directory = $OPENLSWS_LIBDIR"
@@ -155,6 +167,7 @@ AC_CONFIG_FILES(Makefile
                 src/edio/Makefile
                 src/extensions/Makefile
                 src/http/Makefile
+                src/spdy/Makefile
                 src/log4cxx/Makefile
                 src/main/Makefile
                 src/socket/Makefile

dist/DEFAULT/html/index.html

@@ -40,12 +40,11 @@ <h2 align="center"><font color="Blue">Congratulation! You have successfully
 </font>
 <hr>
 <Center>
-<a href="http://www.litespeedtech.com/"><img src="powered_by.gif" alt="powered 
-by" width=110 height=45 border=0></a><br>
-<font face="Verdana,arial,helvetica,sans-serif" color=blue 
-size="-1"><i><strong>Faster, Easier and Safer!</strong></i></font><br><br>
- <font face="Verdana,arial,helvetica,sans-serif" color="#999999" size="-1">
- Copyright &copy; 2003. <a href="http://www.litespeedtech.com/">Lite Speed 
+<a href="http://www.litespeedtech.com/"><img src="poweredby_openlitespeed.png" alt="powered 
+by" width=132 height=40 border=0></a><br>
+<br><br>
+<font face="Verdana,arial,helvetica,sans-serif" color="#999999" size="-1">
+ Copyright &copy; 2013. <a href="http://www.litespeedtech.com/">Lite Speed 
 Technologies Inc.</a><br>
         All rights reserved.</font>
 </Center>

dist/VERSION

@@ -1 +1 @@
-1.0.4
+1.2.1