Check in 1.7.2

CMakeLists.txt

@@ -14,7 +14,7 @@ SET(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 SET(LSQUIC_SERVER_MODE 1)
 
-include_directories( BEFORE  include ${PROJECT_SOURCE_DIR}/../thirdparty/include/)
+include_directories( BEFORE  include src/lshpack src/liblsquic/ls-qpack ${PROJECT_SOURCE_DIR}/../thirdparty/include/)
 link_directories( ${PROJECT_SOURCE_DIR}/../thirdparty/lib/)
 
 SET (CMAKE_C_COMPILER         "/usr/bin/clang")
@@ -55,7 +55,7 @@ add_definitions(-DPOOL_TESTING)
 #add_definitions(-DLS_WORKCREW_DEBUG)
 add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
 
-#Add definition for QUIC 
+#Add definition for QUIC
 add_definitions(-DH3_ALPN="\\x05h3-25\\x05h3-27")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_CMAKE_WARNING_FLAG} ${MY_CMAKE_TSAN_FLAG} ${MY_CMAKE_ASAN_FLAG}")
@@ -67,7 +67,7 @@ find_package(Git QUIET)
 if (GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
   option(GIT_SUBMODULE "Check submodules during build" ON)
   if (GIT_SUBMODULE)
-    execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
+    execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive --force
                     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
                     RESULT_VARIABLE GIT_SUBMOD_RESULT)
     if(NOT GIT_SUBMOD_RESULT EQUAL "0")

LSQUICCOMMIT

@@ -1 +1 @@
-f4bfba069bd281258ce72183fd9d274168e9050c
+307ca7fe5089bb86d38bb5408ffee6cc8fa7e08f

build.sh

@@ -140,6 +140,9 @@ preparelibquic()
             rm -rf src/liblsquic
             mv lsquic/src/liblsquic src/
 
+            rm -rf src/lshpack
+            mv lsquic/src/lshpack src/
+
             rm include/lsquic.h
             mv lsquic/include/lsquic.h  include/
             rm include/lsquic_types.h
@@ -232,6 +235,11 @@ prepareLinux()
                     cat /etc/lsb-release | grep "DISTRIB_RELEASE=18." >/dev/null
                     if [ $? = 0 ] ; then
                         OSTYPE=UBUNTU18
+                    else
+                        cat /etc/lsb-release | grep "DISTRIB_RELEASE=20." >/dev/null
+                        if [ $? = 0 ] ; then
+                            OSTYPE=UBUNTU20
+                        fi
                     fi
                 fi
             fi
@@ -259,7 +267,7 @@ prepareLinux()
 
         #other debian OS, we still can 
         if [ "${OSTYPE}" = "unknowlinux" ] ; then
-            echo It seems you are not using ubuntu 14,16,18 and Debian 7/8/9/10.
+            echo It seems you are not using ubuntu 14,16,18,20 and Debian 7/8/9/10.
             echo But we still can try to go further.
         fi
 
@@ -478,6 +486,34 @@ freebsdFix()
             touch ./needreboot.txt
         fi
     fi
+}
+
+
+fixPagespeed()
+{
+PSOLVERSION=1.11.33.4
+cat << EOF > ../thirdparty/psol-$PSOLVERSION/include/pagespeed/kernel/base/scoped_ptr.h
+/**
+* Due the compiling issue, this file was updated from the original file.
+*/
+#ifndef PAGESPEED_KERNEL_BASE_SCOPED_PTR_H_
+#define PAGESPEED_KERNEL_BASE_SCOPED_PTR_H_
+#include "base/memory/scoped_ptr.h"
+
+namespace net_instaweb {
+template<typename T> class scoped_array : public scoped_ptr<T[]> {
+public:
+    scoped_array() : scoped_ptr<T[]>() {}
+    explicit scoped_array(T* t) : scoped_ptr<T[]>(t) {}
+};
+}
+#endif
+
+EOF
+
+
+
+
 }
 
 cd `dirname "$0"`
@@ -510,8 +546,8 @@ if [ "${ISLINUX}" != "yes" ] ; then
     sed -i -e "s/psol/ /g"  ./build_ols.sh
 fi
 
-./build_ols.sh
 
+./build_ols.sh
 
 cd ${CURDIR}
 
@@ -525,6 +561,10 @@ cp ../thirdparty/src/brotli/out/*.a          ../thirdparty/lib64/
 cp ../thirdparty/src//libxml2/.libs/*.a      ../thirdparty/lib64/
 cp ../thirdparty/src/libmaxminddb/include/*  ../thirdparty/include/
 
+if [ "${ISLINUX}" = "yes" ] ; then
+    fixPagespeed
+fi
+
 #special case modsecurity
 cd src/modules/modsecurity-ls
 ln -sf ../../../../thirdparty/src/ModSecurity .

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.7.1.
+# Generated by GNU Autoconf 2.69 for openlitespeed 1.7.2.
 #
 # Report bugs to <[email protected]>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='openlitespeed'
 PACKAGE_TARNAME='openlitespeed'
-PACKAGE_VERSION='1.7.1'
-PACKAGE_STRING='openlitespeed 1.7.1'
+PACKAGE_VERSION='1.7.2'
+PACKAGE_STRING='openlitespeed 1.7.2'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL='http://www.litespeedtech.com/'
 
@@ -1409,7 +1409,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.7.1 to adapt to many kinds of systems.
+\`configure' configures openlitespeed 1.7.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1480,7 +1480,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of openlitespeed 1.7.1:";;
+     short | recursive ) echo "Configuration of openlitespeed 1.7.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1641,7 +1641,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-openlitespeed configure 1.7.1
+openlitespeed configure 1.7.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2315,7 +2315,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.7.1, which was
+It was created by openlitespeed $as_me 1.7.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3181,7 +3181,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='openlitespeed'
- VERSION='1.7.1'
+ VERSION='1.7.2'
 
 
 # Some tools Automake needs.
@@ -19066,7 +19066,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-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/lsiapi/Makefile src/modules/Makefile src/shm/Makefile src/adns/Makefile src/quic/Makefile src/liblsquic/Makefile src/modules/modinspector/Makefile src/modules/modreqparser/Makefile src/modules/uploadprogress/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile src/edio/Makefile src/extensions/Makefile src/http/Makefile src/spdy/Makefile src/h2/Makefile src/log4cxx/Makefile src/main/Makefile src/socket/Makefile src/sslpp/Makefile src/ssi/Makefile src/lsiapi/Makefile src/modules/Makefile src/shm/Makefile src/adns/Makefile src/quic/Makefile src/liblsquic/Makefile src/modules/modinspector/Makefile src/modules/modreqparser/Makefile src/modules/uploadprogress/Makefile"
 
 
 if test x$need_lua = xyes ; then
@@ -19623,7 +19623,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.7.1, which was
+This file was extended by openlitespeed $as_me 1.7.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19690,7 +19690,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.7.1
+openlitespeed config.status 1.7.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -20209,6 +20209,7 @@ do
     "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/h2/Makefile") CONFIG_FILES="$CONFIG_FILES src/h2/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.ac

@@ -7,7 +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_INIT([openlitespeed],[1.7.1],[[email protected]],[openlitespeed],[http://www.litespeedtech.com/])
+AC_INIT([openlitespeed],[1.7.2],[[email protected]],[openlitespeed],[http://www.litespeedtech.com/])
 AM_INIT_AUTOMAKE([1.0 foreign no-define subdir-objects])
 
 AC_CONFIG_HEADERS(src/config.h:src/config.h.in)
@@ -486,6 +486,7 @@ AC_CONFIG_FILES(Makefile
                 src/extensions/Makefile
                 src/http/Makefile
                 src/spdy/Makefile
+                src/h2/Makefile
                 src/log4cxx/Makefile
                 src/main/Makefile
                 src/socket/Makefile

dist/Example/html/upload.html

@@ -185,8 +185,8 @@ <h5>To enable optional module uploadprogress</h5>
 
       <form id="upload" action="upload.php" target="resultwindow" method="post" enctype="multipart/form-data">
         <div>
-          <input type="file" name="file1" />
-          <input type="file" name="file2" />
+          <input type="file" name="file1" accept="image/jpeg" />
+          <input type="file" name="file2" accept="image/jpeg" />
           <p><input type="submit" /></p>
         </div>
       </form>