From b28e117a84e3e0434a29c4c2776512f16e80d6e4 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 9 Jul 2020 12:48:12 -0400 Subject: [PATCH] Check in 1.7.3 --- CMakeLists.txt | 2 +- LSQUICCOMMIT | 2 +- configure | 20 +++---- configure.ac | 2 +- dist/VERSION | 2 +- dist/docs/AdminGeneral_Help.html | 2 +- dist/docs/AdminListeners_General_Help.html | 2 +- dist/docs/AdminListeners_SSL_Help.html | 2 +- dist/docs/AdminSecurity_Help.html | 2 +- dist/docs/App_Server_Context.html | 2 +- dist/docs/App_Server_Help.html | 2 +- dist/docs/CGI_Context.html | 2 +- dist/docs/CompilePHP_Help.html | 2 +- dist/docs/Context_Help.html | 2 +- dist/docs/ExtApp_Help.html | 2 +- dist/docs/External_FCGI.html | 2 +- dist/docs/External_FCGI_Auth.html | 2 +- dist/docs/External_LB.html | 2 +- dist/docs/External_LSAPI.html | 2 +- dist/docs/External_PL.html | 2 +- dist/docs/External_Servlet.html | 2 +- dist/docs/External_WS.html | 2 +- dist/docs/FCGI_Context.html | 2 +- dist/docs/Java_Web_App_Context.html | 2 +- dist/docs/LB_Context.html | 2 +- dist/docs/LSAPI_Context.html | 2 +- dist/docs/Listeners_General_Help.html | 2 +- dist/docs/Listeners_SSL_Help.html | 2 +- dist/docs/Module_Context.html | 2 +- dist/docs/Module_Help.html | 2 +- dist/docs/Proxy_Context.html | 2 +- dist/docs/Redirect_Context.html | 2 +- dist/docs/Rewrite_Help.html | 2 +- dist/docs/ScriptHandler_Help.html | 2 +- dist/docs/ServGeneral_Help.html | 2 +- dist/docs/ServLog_Help.html | 2 +- dist/docs/ServSecurity_Help.html | 2 +- dist/docs/ServTuning_Help.html | 4 +- dist/docs/ServerStat_Help.html | 2 +- dist/docs/Servlet_Context.html | 2 +- dist/docs/Static_Context.html | 2 +- dist/docs/Templates_Help.html | 2 +- dist/docs/VHGeneral_Help.html | 2 +- dist/docs/VHSSL_Help.html | 2 +- dist/docs/VHSecurity_Help.html | 2 +- dist/docs/VHWebSocket_Help.html | 2 +- dist/docs/VirtualHosts_Help.html | 2 +- dist/docs/admin.html | 2 +- dist/docs/config.html | 2 +- dist/docs/index.html | 4 +- dist/docs/install.html | 2 +- dist/docs/intro.html | 2 +- dist/docs/license.html | 2 +- dist/docs/security.html | 2 +- dist/docs/webconsole.html | 2 +- dist/docs/zh-CN/AdminGeneral_Help.html | 2 +- .../zh-CN/AdminListeners_General_Help.html | 2 +- dist/docs/zh-CN/AdminListeners_SSL_Help.html | 2 +- dist/docs/zh-CN/AdminSecurity_Help.html | 2 +- dist/docs/zh-CN/App_Server_Context.html | 2 +- dist/docs/zh-CN/App_Server_Help.html | 2 +- dist/docs/zh-CN/CGI_Context.html | 2 +- dist/docs/zh-CN/CompilePHP_Help.html | 2 +- dist/docs/zh-CN/Context_Help.html | 2 +- dist/docs/zh-CN/ExtApp_Help.html | 2 +- dist/docs/zh-CN/External_FCGI.html | 2 +- dist/docs/zh-CN/External_FCGI_Auth.html | 2 +- dist/docs/zh-CN/External_LB.html | 2 +- dist/docs/zh-CN/External_LSAPI.html | 2 +- dist/docs/zh-CN/External_PL.html | 2 +- dist/docs/zh-CN/External_Servlet.html | 2 +- dist/docs/zh-CN/External_WS.html | 2 +- dist/docs/zh-CN/FCGI_Context.html | 2 +- dist/docs/zh-CN/Java_Web_App_Context.html | 2 +- dist/docs/zh-CN/LB_Context.html | 2 +- dist/docs/zh-CN/LSAPI_Context.html | 2 +- dist/docs/zh-CN/Listeners_General_Help.html | 2 +- dist/docs/zh-CN/Listeners_SSL_Help.html | 2 +- dist/docs/zh-CN/Module_Context.html | 2 +- dist/docs/zh-CN/Module_Help.html | 2 +- dist/docs/zh-CN/Proxy_Context.html | 2 +- dist/docs/zh-CN/Redirect_Context.html | 2 +- dist/docs/zh-CN/Rewrite_Help.html | 2 +- dist/docs/zh-CN/ScriptHandler_Help.html | 2 +- dist/docs/zh-CN/ServGeneral_Help.html | 2 +- dist/docs/zh-CN/ServLog_Help.html | 2 +- dist/docs/zh-CN/ServSecurity_Help.html | 2 +- dist/docs/zh-CN/ServTuning_Help.html | 2 +- dist/docs/zh-CN/ServerStat_Help.html | 2 +- dist/docs/zh-CN/Servlet_Context.html | 2 +- dist/docs/zh-CN/Static_Context.html | 2 +- dist/docs/zh-CN/Templates_Help.html | 2 +- dist/docs/zh-CN/VHGeneral_Help.html | 2 +- dist/docs/zh-CN/VHSSL_Help.html | 2 +- dist/docs/zh-CN/VHSecurity_Help.html | 2 +- dist/docs/zh-CN/VHWebSocket_Help.html | 2 +- dist/docs/zh-CN/VirtualHosts_Help.html | 2 +- dist/docs/zh-CN/admin.html | 2 +- dist/docs/zh-CN/config.html | 2 +- dist/docs/zh-CN/index.html | 4 +- dist/docs/zh-CN/install.html | 2 +- dist/docs/zh-CN/intro.html | 2 +- dist/docs/zh-CN/license.html | 2 +- dist/docs/zh-CN/security.html | 2 +- dist/docs/zh-CN/webconsole.html | 2 +- dist/install.sh | 2 +- dist/lsrecaptcha/_recaptcha.shtml | 2 +- src/config.h.cmake | 2 +- src/http/chunkoutputstream.cpp | 5 +- src/http/httpreq.cpp | 56 ++++++++++++++----- src/http/httpreq.h | 7 ++- src/http/httpsession.cpp | 43 ++++++++------ src/http/ntwkiolink.cpp | 30 ++++++++-- src/lsr/ls_xpool.c | 2 +- src/main/lshttpdmain.cpp | 2 +- 115 files changed, 222 insertions(+), 163 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ac98ade1..696cd446d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ add_definitions(-DPOOL_TESTING) add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0) #Add definition for QUIC -add_definitions(-DH3_ALPN="\\x05h3-25\\x05h3-27") +add_definitions(-DH3_ALPN="\\x05h3-27\\x05h3-28\\x05h3-29") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_CMAKE_WARNING_FLAG} ${MY_CMAKE_TSAN_FLAG} ${MY_CMAKE_ASAN_FLAG}") set(CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS} ${MY_CMAKE_WARNING_FLAG} ${MY_CMAKE_TSAN_FLAG} ${MY_CMAKE_ASAN_FLAG}") diff --git a/LSQUICCOMMIT b/LSQUICCOMMIT index 0858f2901..8488569ca 100644 --- a/LSQUICCOMMIT +++ b/LSQUICCOMMIT @@ -1 +1 @@ -307ca7fe5089bb86d38bb5408ffee6cc8fa7e08f +7483dee0749c024a32a2675408de34246ea6d792 diff --git a/configure b/configure index 39c07bc7e..5a90ecdd0 100755 --- a/configure +++ b/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.2. +# Generated by GNU Autoconf 2.69 for openlitespeed 1.7.3. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='openlitespeed' PACKAGE_TARNAME='openlitespeed' -PACKAGE_VERSION='1.7.2' -PACKAGE_STRING='openlitespeed 1.7.2' +PACKAGE_VERSION='1.7.3' +PACKAGE_STRING='openlitespeed 1.7.3' PACKAGE_BUGREPORT='info@litespeedtech.com' 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.2 to adapt to many kinds of systems. +\`configure' configures openlitespeed 1.7.3 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.2:";; + short | recursive ) echo "Configuration of openlitespeed 1.7.3:";; 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.2 +openlitespeed configure 1.7.3 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.2, which was +It was created by openlitespeed $as_me 1.7.3, 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.2' + VERSION='1.7.3' # Some tools Automake needs. @@ -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.2, which was +This file was extended by openlitespeed $as_me 1.7.3, 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.2 +openlitespeed config.status 1.7.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index d00aa7b2c..021d7291c 100644 --- a/configure.ac +++ b/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.2],[info@litespeedtech.com],[openlitespeed],[http://www.litespeedtech.com/]) +AC_INIT([openlitespeed],[1.7.3],[info@litespeedtech.com],[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) diff --git a/dist/VERSION b/dist/VERSION index f8a696c8d..661e7aead 100644 --- a/dist/VERSION +++ b/dist/VERSION @@ -1 +1 @@ -1.7.2 +1.7.3 diff --git a/dist/docs/AdminGeneral_Help.html b/dist/docs/AdminGeneral_Help.html index b90b3f106..58cc66cc8 100644 --- a/dist/docs/AdminGeneral_Help.html +++ b/dist/docs/AdminGeneral_Help.html @@ -17,7 +17,7 @@

OpenLiteSpeed Web Server Users' Manual

-

Version 1.7  — Rev. 12

+

Version 1.7  — Rev. 13


    diff --git a/dist/docs/AdminListeners_General_Help.html b/dist/docs/AdminListeners_General_Help.html index 2ec00a3d2..3cccdf892 100644 --- a/dist/docs/AdminListeners_General_Help.html +++ b/dist/docs/AdminListeners_General_Help.html @@ -17,7 +17,7 @@

    OpenLiteSpeed Web Server Users' Manual

    -

    Version 1.7  — Rev. 12

    +

    Version 1.7  — Rev. 13


      diff --git a/dist/docs/AdminListeners_SSL_Help.html b/dist/docs/AdminListeners_SSL_Help.html index 8d615f4da..e2455e716 100644 --- a/dist/docs/AdminListeners_SSL_Help.html +++ b/dist/docs/AdminListeners_SSL_Help.html @@ -17,7 +17,7 @@

      OpenLiteSpeed Web Server Users' Manual

      -

      Version 1.7  — Rev. 12

      +

      Version 1.7  — Rev. 13


        diff --git a/dist/docs/AdminSecurity_Help.html b/dist/docs/AdminSecurity_Help.html index 5eaa360ec..d6a1975b4 100644 --- a/dist/docs/AdminSecurity_Help.html +++ b/dist/docs/AdminSecurity_Help.html @@ -17,7 +17,7 @@

        OpenLiteSpeed Web Server Users' Manual

        -

        Version 1.7  — Rev. 12

        +

        Version 1.7  — Rev. 13


          diff --git a/dist/docs/App_Server_Context.html b/dist/docs/App_Server_Context.html index b3b1641d1..8d3c48de3 100644 --- a/dist/docs/App_Server_Context.html +++ b/dist/docs/App_Server_Context.html @@ -17,7 +17,7 @@

          OpenLiteSpeed Web Server Users' Manual

          -

          Version 1.7  — Rev. 12

          +

          Version 1.7  — Rev. 13


            diff --git a/dist/docs/App_Server_Help.html b/dist/docs/App_Server_Help.html index bd301c406..1964c6c40 100644 --- a/dist/docs/App_Server_Help.html +++ b/dist/docs/App_Server_Help.html @@ -17,7 +17,7 @@

            OpenLiteSpeed Web Server Users' Manual

            -

            Version 1.7  — Rev. 12

            +

            Version 1.7  — Rev. 13


              diff --git a/dist/docs/CGI_Context.html b/dist/docs/CGI_Context.html index e13d77f14..a7c18e52f 100644 --- a/dist/docs/CGI_Context.html +++ b/dist/docs/CGI_Context.html @@ -17,7 +17,7 @@

              OpenLiteSpeed Web Server Users' Manual

              -

              Version 1.7  — Rev. 12

              +

              Version 1.7  — Rev. 13


                diff --git a/dist/docs/CompilePHP_Help.html b/dist/docs/CompilePHP_Help.html index 605c90650..679300ab3 100644 --- a/dist/docs/CompilePHP_Help.html +++ b/dist/docs/CompilePHP_Help.html @@ -17,7 +17,7 @@

                OpenLiteSpeed Web Server Users' Manual

                -

                Version 1.7  — Rev. 12

                +

                Version 1.7  — Rev. 13


                  diff --git a/dist/docs/Context_Help.html b/dist/docs/Context_Help.html index f14424096..5693a808f 100644 --- a/dist/docs/Context_Help.html +++ b/dist/docs/Context_Help.html @@ -17,7 +17,7 @@

                  OpenLiteSpeed Web Server Users' Manual

                  -

                  Version 1.7  — Rev. 12

                  +

                  Version 1.7  — Rev. 13


                    diff --git a/dist/docs/ExtApp_Help.html b/dist/docs/ExtApp_Help.html index 937667214..ce9c7d708 100644 --- a/dist/docs/ExtApp_Help.html +++ b/dist/docs/ExtApp_Help.html @@ -17,7 +17,7 @@

                    OpenLiteSpeed Web Server Users' Manual

                    -

                    Version 1.7  — Rev. 12

                    +

                    Version 1.7  — Rev. 13


                      diff --git a/dist/docs/External_FCGI.html b/dist/docs/External_FCGI.html index cc19183d2..b18c8f578 100644 --- a/dist/docs/External_FCGI.html +++ b/dist/docs/External_FCGI.html @@ -17,7 +17,7 @@

                      OpenLiteSpeed Web Server Users' Manual

                      -

                      Version 1.7  — Rev. 12

                      +

                      Version 1.7  — Rev. 13


                        diff --git a/dist/docs/External_FCGI_Auth.html b/dist/docs/External_FCGI_Auth.html index 8d7348467..a9c66e8d7 100644 --- a/dist/docs/External_FCGI_Auth.html +++ b/dist/docs/External_FCGI_Auth.html @@ -17,7 +17,7 @@

                        OpenLiteSpeed Web Server Users' Manual

                        -

                        Version 1.7  — Rev. 12

                        +

                        Version 1.7  — Rev. 13


                          diff --git a/dist/docs/External_LB.html b/dist/docs/External_LB.html index 32066aca3..b31d47686 100644 --- a/dist/docs/External_LB.html +++ b/dist/docs/External_LB.html @@ -17,7 +17,7 @@

                          OpenLiteSpeed Web Server Users' Manual

                          -

                          Version 1.7  — Rev. 12

                          +

                          Version 1.7  — Rev. 13


                            diff --git a/dist/docs/External_LSAPI.html b/dist/docs/External_LSAPI.html index 6308b6208..653d33a72 100644 --- a/dist/docs/External_LSAPI.html +++ b/dist/docs/External_LSAPI.html @@ -17,7 +17,7 @@

                            OpenLiteSpeed Web Server Users' Manual

                            -

                            Version 1.7  — Rev. 12

                            +

                            Version 1.7  — Rev. 13


                              diff --git a/dist/docs/External_PL.html b/dist/docs/External_PL.html index 91324a1b3..f1a62e3f2 100644 --- a/dist/docs/External_PL.html +++ b/dist/docs/External_PL.html @@ -17,7 +17,7 @@

                              OpenLiteSpeed Web Server Users' Manual

                              -

                              Version 1.7  — Rev. 12

                              +

                              Version 1.7  — Rev. 13


                                diff --git a/dist/docs/External_Servlet.html b/dist/docs/External_Servlet.html index 26d4d66fc..b96290d3c 100644 --- a/dist/docs/External_Servlet.html +++ b/dist/docs/External_Servlet.html @@ -17,7 +17,7 @@

                                OpenLiteSpeed Web Server Users' Manual

                                -

                                Version 1.7  — Rev. 12

                                +

                                Version 1.7  — Rev. 13


                                  diff --git a/dist/docs/External_WS.html b/dist/docs/External_WS.html index e9882747d..90717eb75 100644 --- a/dist/docs/External_WS.html +++ b/dist/docs/External_WS.html @@ -17,7 +17,7 @@

                                  OpenLiteSpeed Web Server Users' Manual

                                  -

                                  Version 1.7  — Rev. 12

                                  +

                                  Version 1.7  — Rev. 13


                                    diff --git a/dist/docs/FCGI_Context.html b/dist/docs/FCGI_Context.html index d30b44859..6f8d44dac 100644 --- a/dist/docs/FCGI_Context.html +++ b/dist/docs/FCGI_Context.html @@ -17,7 +17,7 @@

                                    OpenLiteSpeed Web Server Users' Manual

                                    -

                                    Version 1.7  — Rev. 12

                                    +

                                    Version 1.7  — Rev. 13


                                      diff --git a/dist/docs/Java_Web_App_Context.html b/dist/docs/Java_Web_App_Context.html index c173c33ae..017f4b31f 100644 --- a/dist/docs/Java_Web_App_Context.html +++ b/dist/docs/Java_Web_App_Context.html @@ -17,7 +17,7 @@

                                      OpenLiteSpeed Web Server Users' Manual

                                      -

                                      Version 1.7  — Rev. 12

                                      +

                                      Version 1.7  — Rev. 13


                                        diff --git a/dist/docs/LB_Context.html b/dist/docs/LB_Context.html index 7e63dab45..0f044f922 100644 --- a/dist/docs/LB_Context.html +++ b/dist/docs/LB_Context.html @@ -17,7 +17,7 @@

                                        OpenLiteSpeed Web Server Users' Manual

                                        -

                                        Version 1.7  — Rev. 12

                                        +

                                        Version 1.7  — Rev. 13


                                          diff --git a/dist/docs/LSAPI_Context.html b/dist/docs/LSAPI_Context.html index 952348c52..9f35d1c06 100644 --- a/dist/docs/LSAPI_Context.html +++ b/dist/docs/LSAPI_Context.html @@ -17,7 +17,7 @@

                                          OpenLiteSpeed Web Server Users' Manual

                                          -

                                          Version 1.7  — Rev. 12

                                          +

                                          Version 1.7  — Rev. 13


                                            diff --git a/dist/docs/Listeners_General_Help.html b/dist/docs/Listeners_General_Help.html index 8cdb47618..019b391b6 100644 --- a/dist/docs/Listeners_General_Help.html +++ b/dist/docs/Listeners_General_Help.html @@ -17,7 +17,7 @@

                                            OpenLiteSpeed Web Server Users' Manual

                                            -

                                            Version 1.7  — Rev. 12

                                            +

                                            Version 1.7  — Rev. 13


                                              diff --git a/dist/docs/Listeners_SSL_Help.html b/dist/docs/Listeners_SSL_Help.html index 01cdbeaee..6063a7bcb 100644 --- a/dist/docs/Listeners_SSL_Help.html +++ b/dist/docs/Listeners_SSL_Help.html @@ -17,7 +17,7 @@

                                              OpenLiteSpeed Web Server Users' Manual

                                              -

                                              Version 1.7  — Rev. 12

                                              +

                                              Version 1.7  — Rev. 13


                                                diff --git a/dist/docs/Module_Context.html b/dist/docs/Module_Context.html index d5cd9cbbc..84435d4e5 100644 --- a/dist/docs/Module_Context.html +++ b/dist/docs/Module_Context.html @@ -17,7 +17,7 @@

                                                OpenLiteSpeed Web Server Users' Manual

                                                -

                                                Version 1.7  — Rev. 12

                                                +

                                                Version 1.7  — Rev. 13


                                                  diff --git a/dist/docs/Module_Help.html b/dist/docs/Module_Help.html index 3802beb6e..42f8f6e8c 100644 --- a/dist/docs/Module_Help.html +++ b/dist/docs/Module_Help.html @@ -17,7 +17,7 @@

                                                  OpenLiteSpeed Web Server Users' Manual

                                                  -

                                                  Version 1.7  — Rev. 12

                                                  +

                                                  Version 1.7  — Rev. 13


                                                    diff --git a/dist/docs/Proxy_Context.html b/dist/docs/Proxy_Context.html index 7a9ab947b..d0b123b65 100644 --- a/dist/docs/Proxy_Context.html +++ b/dist/docs/Proxy_Context.html @@ -17,7 +17,7 @@

                                                    OpenLiteSpeed Web Server Users' Manual

                                                    -

                                                    Version 1.7  — Rev. 12

                                                    +

                                                    Version 1.7  — Rev. 13


                                                      diff --git a/dist/docs/Redirect_Context.html b/dist/docs/Redirect_Context.html index 052baf29c..d4c149786 100644 --- a/dist/docs/Redirect_Context.html +++ b/dist/docs/Redirect_Context.html @@ -17,7 +17,7 @@

                                                      OpenLiteSpeed Web Server Users' Manual

                                                      -

                                                      Version 1.7  — Rev. 12

                                                      +

                                                      Version 1.7  — Rev. 13


                                                        diff --git a/dist/docs/Rewrite_Help.html b/dist/docs/Rewrite_Help.html index 294f458ce..a761391fd 100644 --- a/dist/docs/Rewrite_Help.html +++ b/dist/docs/Rewrite_Help.html @@ -17,7 +17,7 @@

                                                        OpenLiteSpeed Web Server Users' Manual

                                                        -

                                                        Version 1.7  — Rev. 12

                                                        +

                                                        Version 1.7  — Rev. 13


                                                          diff --git a/dist/docs/ScriptHandler_Help.html b/dist/docs/ScriptHandler_Help.html index 6df750e6e..aa61e14b2 100644 --- a/dist/docs/ScriptHandler_Help.html +++ b/dist/docs/ScriptHandler_Help.html @@ -17,7 +17,7 @@

                                                          OpenLiteSpeed Web Server Users' Manual

                                                          -

                                                          Version 1.7  — Rev. 12

                                                          +

                                                          Version 1.7  — Rev. 13


                                                            diff --git a/dist/docs/ServGeneral_Help.html b/dist/docs/ServGeneral_Help.html index bb0f35ade..0721b5ebe 100644 --- a/dist/docs/ServGeneral_Help.html +++ b/dist/docs/ServGeneral_Help.html @@ -17,7 +17,7 @@

                                                            OpenLiteSpeed Web Server Users' Manual

                                                            -

                                                            Version 1.7  — Rev. 12

                                                            +

                                                            Version 1.7  — Rev. 13


                                                              diff --git a/dist/docs/ServLog_Help.html b/dist/docs/ServLog_Help.html index 696416ce1..63a20fc45 100644 --- a/dist/docs/ServLog_Help.html +++ b/dist/docs/ServLog_Help.html @@ -17,7 +17,7 @@

                                                              OpenLiteSpeed Web Server Users' Manual

                                                              -

                                                              Version 1.7  — Rev. 12

                                                              +

                                                              Version 1.7  — Rev. 13


                                                                diff --git a/dist/docs/ServSecurity_Help.html b/dist/docs/ServSecurity_Help.html index c3dcabd58..5cbc854f5 100644 --- a/dist/docs/ServSecurity_Help.html +++ b/dist/docs/ServSecurity_Help.html @@ -17,7 +17,7 @@

                                                                OpenLiteSpeed Web Server Users' Manual

                                                                -

                                                                Version 1.7  — Rev. 12

                                                                +

                                                                Version 1.7  — Rev. 13


                                                                  diff --git a/dist/docs/ServTuning_Help.html b/dist/docs/ServTuning_Help.html index d3fb529af..4341f750f 100644 --- a/dist/docs/ServTuning_Help.html +++ b/dist/docs/ServTuning_Help.html @@ -17,7 +17,7 @@

                                                                  OpenLiteSpeed Web Server Users' Manual

                                                                  -

                                                                  Version 1.7  — Rev. 12

                                                                  +

                                                                  Version 1.7  — Rev. 13


                                                                    @@ -131,7 +131,7 @@

                                                                    Server Tuning

                                                                    Table of Contents

                                                                    Use sendfile()

                                                                    Description

                                                                    Specifies whether to use the sendfile() system call to serve static files. Static files can be served in four different ways: memory buffer cache, memory-mapped cache, plain read/write, and sendfile(). Files smaller than the Max Cached Small File Size (bytes) are served from memory buffer cache. Files larger than the Max Cached Small File Size (bytes) but smaller than the Max MMAP File Size (bytes) will be served from memory-mapped cache. Files larger than the Max MMAP File Size (bytes) will be served via plain read/write or sendfile(). Sendfile() is a "zero copy" system call that can greatly reduce CPU utilization when serving very large static files. Sendfile() requires an optimized network card kernel driver and thus may not be suitable for some small-vendor network adapters.

                                                                    Syntax

                                                                    Select from radio box

                                                                  File ETag

                                                                  Description

                                                                  Specifies whether to use a file's inode, last-modified time, and size attributes to generate the ETag HTTP response header for static files. All three attributes are enabled by default. If you plan to serve the same file out of mirrored servers, you should not include inode; otherwise, the ETag generated for one file will be different on different servers.

                                                                  Syntax

                                                                  Select from checkbox

                                                                  Enable Compression

                                                                  Description

                                                                  Enables GZIP/Brotli compression for both static and dynamic responses.

                                                                  Default value: Yes

                                                                  Syntax

                                                                  Select from radio box

                                                                  Tips

                                                                  Enable it to save network bandwidth. Text-based responses such as html, css, and javascript files benefit the most and on average can be compressed to half of their original size.

                                                                  -

                                                                  Compressible Types

                                                                  Description

                                                                  Specifies what MIME types are allowed to be compressed.

                                                                  Syntax

                                                                  MIME type list separated by commas. Wild card "*" and negate sign "!" are allowed, such as text/*, !text/js.

                                                                  Example

                                                                  If you want to compress text/* but not text/css, you can have a rule like text/*, !text/css. "!" will exclude that MIME type.

                                                                  Tips

                                                                  Only allow types that will benefit from GZIP/Brotli compression. Binary files such as gif/png/jpeg images and flash files do not benefit from compression.

                                                                  +

                                                                  Compressible Types

                                                                  Description

                                                                  Specifies what MIME types are allowed to be compressed. Leave this setting unset or enter default to use the server built-in default list which should already cover most mime-types.

                                                                  Default value: text/*,application/x-javascript,application/javascript,application/xml,image/svg+xml,application/rss+xml, application/json,application/vnd.ms-fontobject,application/x-font,application/x-font-opentype, application/x-font-truetype,application/x-font-ttf,font/eot,font/opentype,font/otf,font/ttf,image/x-icon, image/vnd.microsoft.icon,application/xhtml+xml

                                                                  Syntax

                                                                  MIME type list separated by commas. Wild card "*" and negate sign "!" are allowed, such as text/*, !text/js.

                                                                  Example

                                                                  If you want to compress text/* but not text/css, you can have a rule like text/*, !text/css. "!" will exclude that MIME type.

                                                                  Tips

                                                                  Only allow types that will benefit from GZIP/Brotli compression. Binary files such as gif/png/jpeg images and flash files do not benefit from compression.

                                                                  Enable GZIP Dynamic Compression

                                                                  Description

                                                                  Controls GZIP compression for dynamically generated responses.

                                                                  For this setting to have an effect, Enable Compression must be set to Yes.

                                                                  Default value: Yes

                                                                  Syntax

                                                                  Select from radio box

                                                                  Tips

                                                                  Compressing dynamic responses increases CPU and memory utilization but saves network bandwidth.

                                                                  GZIP Compression Level (Dynamic Content)

                                                                  Description

                                                                  Specifies the level of GZIP compression applied to dynamic content. Ranges from 1 (lowest) to 9 (highest).

                                                                  This setting will only take effect when Enable Compression and Enable GZIP Dynamic Compression are enabled.

                                                                  Default value: 6

                                                                  Syntax

                                                                  Number between 1 and 9.

                                                                  Tips

                                                                  Higher compression level will use more memory and CPU cycles. You can set it to a higher level if your machine has additional power. There is not much difference between 6 and 9, except that 9 uses many more CPU cycles.

                                                                  Brotli Compression Level (Dynamic Content)

                                                                  Description

                                                                  Controls the level of Brotli compression applied to dynamic responses. Ranges from 0 (OFF) to 6 (highest).

                                                                  This setting will only take effect when Enable Compression is enabled.

                                                                  Default value: 2

                                                                  Syntax

                                                                  Number between 0 and 6.

                                                                  diff --git a/dist/docs/ServerStat_Help.html b/dist/docs/ServerStat_Help.html index 307376d7f..24d7d743d 100644 --- a/dist/docs/ServerStat_Help.html +++ b/dist/docs/ServerStat_Help.html @@ -17,7 +17,7 @@

                                                                  OpenLiteSpeed Web Server Users' Manual

                                                                  -

                                                                  Version 1.7  — Rev. 12

                                                                  +

                                                                  Version 1.7  — Rev. 13


                                                                    diff --git a/dist/docs/Servlet_Context.html b/dist/docs/Servlet_Context.html index af1d964e9..7bbf2e6e7 100644 --- a/dist/docs/Servlet_Context.html +++ b/dist/docs/Servlet_Context.html @@ -17,7 +17,7 @@

                                                                    OpenLiteSpeed Web Server Users' Manual

                                                                    -

                                                                    Version 1.7  — Rev. 12

                                                                    +

                                                                    Version 1.7  — Rev. 13


                                                                      diff --git a/dist/docs/Static_Context.html b/dist/docs/Static_Context.html index 70281d21b..f4583ec98 100644 --- a/dist/docs/Static_Context.html +++ b/dist/docs/Static_Context.html @@ -17,7 +17,7 @@

                                                                      OpenLiteSpeed Web Server Users' Manual

                                                                      -

                                                                      Version 1.7  — Rev. 12

                                                                      +

                                                                      Version 1.7  — Rev. 13


                                                                        diff --git a/dist/docs/Templates_Help.html b/dist/docs/Templates_Help.html index d33e6b573..19c1b33fe 100644 --- a/dist/docs/Templates_Help.html +++ b/dist/docs/Templates_Help.html @@ -17,7 +17,7 @@

                                                                        OpenLiteSpeed Web Server Users' Manual

                                                                        -

                                                                        Version 1.7  — Rev. 12

                                                                        +

                                                                        Version 1.7  — Rev. 13


                                                                          diff --git a/dist/docs/VHGeneral_Help.html b/dist/docs/VHGeneral_Help.html index 20e838d53..6528cc0ce 100644 --- a/dist/docs/VHGeneral_Help.html +++ b/dist/docs/VHGeneral_Help.html @@ -17,7 +17,7 @@

                                                                          OpenLiteSpeed Web Server Users' Manual

                                                                          -

                                                                          Version 1.7  — Rev. 12

                                                                          +

                                                                          Version 1.7  — Rev. 13


                                                                            diff --git a/dist/docs/VHSSL_Help.html b/dist/docs/VHSSL_Help.html index 51388e0da..458510d0c 100644 --- a/dist/docs/VHSSL_Help.html +++ b/dist/docs/VHSSL_Help.html @@ -17,7 +17,7 @@

                                                                            OpenLiteSpeed Web Server Users' Manual

                                                                            -

                                                                            Version 1.7  — Rev. 12

                                                                            +

                                                                            Version 1.7  — Rev. 13


                                                                              diff --git a/dist/docs/VHSecurity_Help.html b/dist/docs/VHSecurity_Help.html index 919199c33..28bd3dfc2 100644 --- a/dist/docs/VHSecurity_Help.html +++ b/dist/docs/VHSecurity_Help.html @@ -17,7 +17,7 @@

                                                                              OpenLiteSpeed Web Server Users' Manual

                                                                              -

                                                                              Version 1.7  — Rev. 12

                                                                              +

                                                                              Version 1.7  — Rev. 13


                                                                                diff --git a/dist/docs/VHWebSocket_Help.html b/dist/docs/VHWebSocket_Help.html index 718590e42..a47d11564 100644 --- a/dist/docs/VHWebSocket_Help.html +++ b/dist/docs/VHWebSocket_Help.html @@ -17,7 +17,7 @@

                                                                                OpenLiteSpeed Web Server Users' Manual

                                                                                -

                                                                                Version 1.7  — Rev. 12

                                                                                +

                                                                                Version 1.7  — Rev. 13


                                                                                  diff --git a/dist/docs/VirtualHosts_Help.html b/dist/docs/VirtualHosts_Help.html index 232210ab9..d1f5c197a 100644 --- a/dist/docs/VirtualHosts_Help.html +++ b/dist/docs/VirtualHosts_Help.html @@ -17,7 +17,7 @@

                                                                                  OpenLiteSpeed Web Server Users' Manual

                                                                                  -

                                                                                  Version 1.7  — Rev. 12

                                                                                  +

                                                                                  Version 1.7  — Rev. 13


                                                                                    diff --git a/dist/docs/admin.html b/dist/docs/admin.html index cf1ca498d..27bbcf597 100644 --- a/dist/docs/admin.html +++ b/dist/docs/admin.html @@ -17,7 +17,7 @@

                                                                                    OpenLiteSpeed Web Server Users' Manual

                                                                                    -

                                                                                    Version 1.7  — Rev. 12

                                                                                    +

                                                                                    Version 1.7  — Rev. 13


                                                                                      diff --git a/dist/docs/config.html b/dist/docs/config.html index 36975832e..8e5bf75fb 100644 --- a/dist/docs/config.html +++ b/dist/docs/config.html @@ -17,7 +17,7 @@

                                                                                      OpenLiteSpeed Web Server Users' Manual

                                                                                      -

                                                                                      Version 1.7  — Rev. 12

                                                                                      +

                                                                                      Version 1.7  — Rev. 13


                                                                                        diff --git a/dist/docs/index.html b/dist/docs/index.html index 74734694a..df2e122e9 100644 --- a/dist/docs/index.html +++ b/dist/docs/index.html @@ -17,7 +17,7 @@

                                                                                        OpenLiteSpeed Web Server Users' Manual

                                                                                        -

                                                                                        Version 1.7  — Rev. 12

                                                                                        +

                                                                                        Version 1.7  — Rev. 13


                                                                                          @@ -102,7 +102,7 @@



                                                                                          Users' Manual

                                                                                          - — Rev. 12 + — Rev. 13


                                                                                          diff --git a/dist/docs/install.html b/dist/docs/install.html index 522a9774b..b37495b68 100644 --- a/dist/docs/install.html +++ b/dist/docs/install.html @@ -17,7 +17,7 @@

                                                                                          OpenLiteSpeed Web Server Users' Manual

                                                                                          -

                                                                                          Version 1.7  — Rev. 12

                                                                                          +

                                                                                          Version 1.7  — Rev. 13


                                                                                            diff --git a/dist/docs/intro.html b/dist/docs/intro.html index 32d391fea..25c6c2e7d 100644 --- a/dist/docs/intro.html +++ b/dist/docs/intro.html @@ -17,7 +17,7 @@

                                                                                            OpenLiteSpeed Web Server Users' Manual

                                                                                            -

                                                                                            Version 1.7  — Rev. 12

                                                                                            +

                                                                                            Version 1.7  — Rev. 13


                                                                                              diff --git a/dist/docs/license.html b/dist/docs/license.html index 4504d021b..1b0e000ee 100644 --- a/dist/docs/license.html +++ b/dist/docs/license.html @@ -17,7 +17,7 @@

                                                                                              OpenLiteSpeed Web Server Users' Manual

                                                                                              -

                                                                                              Version 1.7  — Rev. 12

                                                                                              +

                                                                                              Version 1.7  — Rev. 13


                                                                                                diff --git a/dist/docs/security.html b/dist/docs/security.html index f896fed31..4e9e2cc16 100644 --- a/dist/docs/security.html +++ b/dist/docs/security.html @@ -17,7 +17,7 @@

                                                                                                OpenLiteSpeed Web Server Users' Manual

                                                                                                -

                                                                                                Version 1.7  — Rev. 12

                                                                                                +

                                                                                                Version 1.7  — Rev. 13


                                                                                                  diff --git a/dist/docs/webconsole.html b/dist/docs/webconsole.html index 04e90c43a..b06a6a945 100644 --- a/dist/docs/webconsole.html +++ b/dist/docs/webconsole.html @@ -17,7 +17,7 @@

                                                                                                  OpenLiteSpeed Web Server Users' Manual

                                                                                                  -

                                                                                                  Version 1.7  — Rev. 12

                                                                                                  +

                                                                                                  Version 1.7  — Rev. 13


                                                                                                    diff --git a/dist/docs/zh-CN/AdminGeneral_Help.html b/dist/docs/zh-CN/AdminGeneral_Help.html index 53f57cc5f..86cb14c03 100644 --- a/dist/docs/zh-CN/AdminGeneral_Help.html +++ b/dist/docs/zh-CN/AdminGeneral_Help.html @@ -17,7 +17,7 @@

                                                                                                    OpenLiteSpeed Web Server Users' Manual

                                                                                                    -

                                                                                                    Version 1.7  — Rev. 12

                                                                                                    +

                                                                                                    Version 1.7  — Rev. 13


                                                                                                      diff --git a/dist/docs/zh-CN/AdminListeners_General_Help.html b/dist/docs/zh-CN/AdminListeners_General_Help.html index 41ff16a9b..c6f35fcaf 100644 --- a/dist/docs/zh-CN/AdminListeners_General_Help.html +++ b/dist/docs/zh-CN/AdminListeners_General_Help.html @@ -17,7 +17,7 @@

                                                                                                      OpenLiteSpeed Web Server Users' Manual

                                                                                                      -

                                                                                                      Version 1.7  — Rev. 12

                                                                                                      +

                                                                                                      Version 1.7  — Rev. 13


                                                                                                        diff --git a/dist/docs/zh-CN/AdminListeners_SSL_Help.html b/dist/docs/zh-CN/AdminListeners_SSL_Help.html index 28a319e9a..a2b12dab3 100644 --- a/dist/docs/zh-CN/AdminListeners_SSL_Help.html +++ b/dist/docs/zh-CN/AdminListeners_SSL_Help.html @@ -17,7 +17,7 @@

                                                                                                        OpenLiteSpeed Web Server Users' Manual

                                                                                                        -

                                                                                                        Version 1.7  — Rev. 12

                                                                                                        +

                                                                                                        Version 1.7  — Rev. 13


                                                                                                          diff --git a/dist/docs/zh-CN/AdminSecurity_Help.html b/dist/docs/zh-CN/AdminSecurity_Help.html index 6459c6cd2..23a587d57 100644 --- a/dist/docs/zh-CN/AdminSecurity_Help.html +++ b/dist/docs/zh-CN/AdminSecurity_Help.html @@ -17,7 +17,7 @@

                                                                                                          OpenLiteSpeed Web Server Users' Manual

                                                                                                          -

                                                                                                          Version 1.7  — Rev. 12

                                                                                                          +

                                                                                                          Version 1.7  — Rev. 13


                                                                                                            diff --git a/dist/docs/zh-CN/App_Server_Context.html b/dist/docs/zh-CN/App_Server_Context.html index 69cfb7451..191ccdafe 100644 --- a/dist/docs/zh-CN/App_Server_Context.html +++ b/dist/docs/zh-CN/App_Server_Context.html @@ -17,7 +17,7 @@

                                                                                                            OpenLiteSpeed Web Server Users' Manual

                                                                                                            -

                                                                                                            Version 1.7  — Rev. 12

                                                                                                            +

                                                                                                            Version 1.7  — Rev. 13


                                                                                                              diff --git a/dist/docs/zh-CN/App_Server_Help.html b/dist/docs/zh-CN/App_Server_Help.html index fa87415df..aa56baaa9 100644 --- a/dist/docs/zh-CN/App_Server_Help.html +++ b/dist/docs/zh-CN/App_Server_Help.html @@ -17,7 +17,7 @@

                                                                                                              OpenLiteSpeed Web Server Users' Manual

                                                                                                              -

                                                                                                              Version 1.7  — Rev. 12

                                                                                                              +

                                                                                                              Version 1.7  — Rev. 13


                                                                                                                diff --git a/dist/docs/zh-CN/CGI_Context.html b/dist/docs/zh-CN/CGI_Context.html index a2bfa9ef4..657fdf25e 100644 --- a/dist/docs/zh-CN/CGI_Context.html +++ b/dist/docs/zh-CN/CGI_Context.html @@ -17,7 +17,7 @@

                                                                                                                OpenLiteSpeed Web Server Users' Manual

                                                                                                                -

                                                                                                                Version 1.7  — Rev. 12

                                                                                                                +

                                                                                                                Version 1.7  — Rev. 13


                                                                                                                  diff --git a/dist/docs/zh-CN/CompilePHP_Help.html b/dist/docs/zh-CN/CompilePHP_Help.html index f5ac0ffc1..418b117d4 100644 --- a/dist/docs/zh-CN/CompilePHP_Help.html +++ b/dist/docs/zh-CN/CompilePHP_Help.html @@ -17,7 +17,7 @@

                                                                                                                  OpenLiteSpeed Web Server Users' Manual

                                                                                                                  -

                                                                                                                  Version 1.7  — Rev. 12

                                                                                                                  +

                                                                                                                  Version 1.7  — Rev. 13


                                                                                                                    diff --git a/dist/docs/zh-CN/Context_Help.html b/dist/docs/zh-CN/Context_Help.html index ff0e0c7d3..02c0c88c9 100644 --- a/dist/docs/zh-CN/Context_Help.html +++ b/dist/docs/zh-CN/Context_Help.html @@ -17,7 +17,7 @@

                                                                                                                    OpenLiteSpeed Web Server Users' Manual

                                                                                                                    -

                                                                                                                    Version 1.7  — Rev. 12

                                                                                                                    +

                                                                                                                    Version 1.7  — Rev. 13


                                                                                                                      diff --git a/dist/docs/zh-CN/ExtApp_Help.html b/dist/docs/zh-CN/ExtApp_Help.html index 89c805ec6..bf4fae6bf 100644 --- a/dist/docs/zh-CN/ExtApp_Help.html +++ b/dist/docs/zh-CN/ExtApp_Help.html @@ -17,7 +17,7 @@

                                                                                                                      OpenLiteSpeed Web Server Users' Manual

                                                                                                                      -

                                                                                                                      Version 1.7  — Rev. 12

                                                                                                                      +

                                                                                                                      Version 1.7  — Rev. 13


                                                                                                                        diff --git a/dist/docs/zh-CN/External_FCGI.html b/dist/docs/zh-CN/External_FCGI.html index f97ace0cd..20f0313f5 100644 --- a/dist/docs/zh-CN/External_FCGI.html +++ b/dist/docs/zh-CN/External_FCGI.html @@ -17,7 +17,7 @@

                                                                                                                        OpenLiteSpeed Web Server Users' Manual

                                                                                                                        -

                                                                                                                        Version 1.7  — Rev. 12

                                                                                                                        +

                                                                                                                        Version 1.7  — Rev. 13


                                                                                                                          diff --git a/dist/docs/zh-CN/External_FCGI_Auth.html b/dist/docs/zh-CN/External_FCGI_Auth.html index c4463e1f2..e39b85c06 100644 --- a/dist/docs/zh-CN/External_FCGI_Auth.html +++ b/dist/docs/zh-CN/External_FCGI_Auth.html @@ -17,7 +17,7 @@

                                                                                                                          OpenLiteSpeed Web Server Users' Manual

                                                                                                                          -

                                                                                                                          Version 1.7  — Rev. 12

                                                                                                                          +

                                                                                                                          Version 1.7  — Rev. 13


                                                                                                                            diff --git a/dist/docs/zh-CN/External_LB.html b/dist/docs/zh-CN/External_LB.html index 34aa9198c..87a2382f6 100644 --- a/dist/docs/zh-CN/External_LB.html +++ b/dist/docs/zh-CN/External_LB.html @@ -17,7 +17,7 @@

                                                                                                                            OpenLiteSpeed Web Server Users' Manual

                                                                                                                            -

                                                                                                                            Version 1.7  — Rev. 12

                                                                                                                            +

                                                                                                                            Version 1.7  — Rev. 13


                                                                                                                              diff --git a/dist/docs/zh-CN/External_LSAPI.html b/dist/docs/zh-CN/External_LSAPI.html index d95d3dae3..225a0617b 100644 --- a/dist/docs/zh-CN/External_LSAPI.html +++ b/dist/docs/zh-CN/External_LSAPI.html @@ -17,7 +17,7 @@

                                                                                                                              OpenLiteSpeed Web Server Users' Manual

                                                                                                                              -

                                                                                                                              Version 1.7  — Rev. 12

                                                                                                                              +

                                                                                                                              Version 1.7  — Rev. 13


                                                                                                                                diff --git a/dist/docs/zh-CN/External_PL.html b/dist/docs/zh-CN/External_PL.html index 5e1b04bcf..7617c6edf 100644 --- a/dist/docs/zh-CN/External_PL.html +++ b/dist/docs/zh-CN/External_PL.html @@ -17,7 +17,7 @@

                                                                                                                                OpenLiteSpeed Web Server Users' Manual

                                                                                                                                -

                                                                                                                                Version 1.7  — Rev. 12

                                                                                                                                +

                                                                                                                                Version 1.7  — Rev. 13


                                                                                                                                  diff --git a/dist/docs/zh-CN/External_Servlet.html b/dist/docs/zh-CN/External_Servlet.html index 72f16e51d..d22c32aee 100644 --- a/dist/docs/zh-CN/External_Servlet.html +++ b/dist/docs/zh-CN/External_Servlet.html @@ -17,7 +17,7 @@

                                                                                                                                  OpenLiteSpeed Web Server Users' Manual

                                                                                                                                  -

                                                                                                                                  Version 1.7  — Rev. 12

                                                                                                                                  +

                                                                                                                                  Version 1.7  — Rev. 13


                                                                                                                                    diff --git a/dist/docs/zh-CN/External_WS.html b/dist/docs/zh-CN/External_WS.html index 0a5ae74e6..6ff515f6e 100644 --- a/dist/docs/zh-CN/External_WS.html +++ b/dist/docs/zh-CN/External_WS.html @@ -17,7 +17,7 @@

                                                                                                                                    OpenLiteSpeed Web Server Users' Manual

                                                                                                                                    -

                                                                                                                                    Version 1.7  — Rev. 12

                                                                                                                                    +

                                                                                                                                    Version 1.7  — Rev. 13


                                                                                                                                      diff --git a/dist/docs/zh-CN/FCGI_Context.html b/dist/docs/zh-CN/FCGI_Context.html index dcfb02b95..c4af463a3 100644 --- a/dist/docs/zh-CN/FCGI_Context.html +++ b/dist/docs/zh-CN/FCGI_Context.html @@ -17,7 +17,7 @@

                                                                                                                                      OpenLiteSpeed Web Server Users' Manual

                                                                                                                                      -

                                                                                                                                      Version 1.7  — Rev. 12

                                                                                                                                      +

                                                                                                                                      Version 1.7  — Rev. 13


                                                                                                                                        diff --git a/dist/docs/zh-CN/Java_Web_App_Context.html b/dist/docs/zh-CN/Java_Web_App_Context.html index 1d4a02ab8..07670d374 100644 --- a/dist/docs/zh-CN/Java_Web_App_Context.html +++ b/dist/docs/zh-CN/Java_Web_App_Context.html @@ -17,7 +17,7 @@

                                                                                                                                        OpenLiteSpeed Web Server Users' Manual

                                                                                                                                        -

                                                                                                                                        Version 1.7  — Rev. 12

                                                                                                                                        +

                                                                                                                                        Version 1.7  — Rev. 13


                                                                                                                                          diff --git a/dist/docs/zh-CN/LB_Context.html b/dist/docs/zh-CN/LB_Context.html index 77f59198f..de98efa99 100644 --- a/dist/docs/zh-CN/LB_Context.html +++ b/dist/docs/zh-CN/LB_Context.html @@ -17,7 +17,7 @@

                                                                                                                                          OpenLiteSpeed Web Server Users' Manual

                                                                                                                                          -

                                                                                                                                          Version 1.7  — Rev. 12

                                                                                                                                          +

                                                                                                                                          Version 1.7  — Rev. 13


                                                                                                                                            diff --git a/dist/docs/zh-CN/LSAPI_Context.html b/dist/docs/zh-CN/LSAPI_Context.html index ea860fd78..46ea923fd 100644 --- a/dist/docs/zh-CN/LSAPI_Context.html +++ b/dist/docs/zh-CN/LSAPI_Context.html @@ -17,7 +17,7 @@

                                                                                                                                            OpenLiteSpeed Web Server Users' Manual

                                                                                                                                            -

                                                                                                                                            Version 1.7  — Rev. 12

                                                                                                                                            +

                                                                                                                                            Version 1.7  — Rev. 13


                                                                                                                                              diff --git a/dist/docs/zh-CN/Listeners_General_Help.html b/dist/docs/zh-CN/Listeners_General_Help.html index 28e13d9f5..950477a52 100644 --- a/dist/docs/zh-CN/Listeners_General_Help.html +++ b/dist/docs/zh-CN/Listeners_General_Help.html @@ -17,7 +17,7 @@

                                                                                                                                              OpenLiteSpeed Web Server Users' Manual

                                                                                                                                              -

                                                                                                                                              Version 1.7  — Rev. 12

                                                                                                                                              +

                                                                                                                                              Version 1.7  — Rev. 13


                                                                                                                                                diff --git a/dist/docs/zh-CN/Listeners_SSL_Help.html b/dist/docs/zh-CN/Listeners_SSL_Help.html index a3e3aea15..51e982732 100644 --- a/dist/docs/zh-CN/Listeners_SSL_Help.html +++ b/dist/docs/zh-CN/Listeners_SSL_Help.html @@ -17,7 +17,7 @@

                                                                                                                                                OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                -

                                                                                                                                                Version 1.7  — Rev. 12

                                                                                                                                                +

                                                                                                                                                Version 1.7  — Rev. 13


                                                                                                                                                  diff --git a/dist/docs/zh-CN/Module_Context.html b/dist/docs/zh-CN/Module_Context.html index 91d6ba29c..ae33bdb31 100644 --- a/dist/docs/zh-CN/Module_Context.html +++ b/dist/docs/zh-CN/Module_Context.html @@ -17,7 +17,7 @@

                                                                                                                                                  OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                  -

                                                                                                                                                  Version 1.7  — Rev. 12

                                                                                                                                                  +

                                                                                                                                                  Version 1.7  — Rev. 13


                                                                                                                                                    diff --git a/dist/docs/zh-CN/Module_Help.html b/dist/docs/zh-CN/Module_Help.html index 7b635284a..fe2eefcab 100644 --- a/dist/docs/zh-CN/Module_Help.html +++ b/dist/docs/zh-CN/Module_Help.html @@ -17,7 +17,7 @@

                                                                                                                                                    OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                    -

                                                                                                                                                    Version 1.7  — Rev. 12

                                                                                                                                                    +

                                                                                                                                                    Version 1.7  — Rev. 13


                                                                                                                                                      diff --git a/dist/docs/zh-CN/Proxy_Context.html b/dist/docs/zh-CN/Proxy_Context.html index 5e6c50a3e..a1d2ccdd9 100644 --- a/dist/docs/zh-CN/Proxy_Context.html +++ b/dist/docs/zh-CN/Proxy_Context.html @@ -17,7 +17,7 @@

                                                                                                                                                      OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                      -

                                                                                                                                                      Version 1.7  — Rev. 12

                                                                                                                                                      +

                                                                                                                                                      Version 1.7  — Rev. 13


                                                                                                                                                        diff --git a/dist/docs/zh-CN/Redirect_Context.html b/dist/docs/zh-CN/Redirect_Context.html index 1b51212bd..2d93282bc 100644 --- a/dist/docs/zh-CN/Redirect_Context.html +++ b/dist/docs/zh-CN/Redirect_Context.html @@ -17,7 +17,7 @@

                                                                                                                                                        OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                        -

                                                                                                                                                        Version 1.7  — Rev. 12

                                                                                                                                                        +

                                                                                                                                                        Version 1.7  — Rev. 13


                                                                                                                                                          diff --git a/dist/docs/zh-CN/Rewrite_Help.html b/dist/docs/zh-CN/Rewrite_Help.html index b41122821..9a43c0fe5 100644 --- a/dist/docs/zh-CN/Rewrite_Help.html +++ b/dist/docs/zh-CN/Rewrite_Help.html @@ -17,7 +17,7 @@

                                                                                                                                                          OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                          -

                                                                                                                                                          Version 1.7  — Rev. 12

                                                                                                                                                          +

                                                                                                                                                          Version 1.7  — Rev. 13


                                                                                                                                                            diff --git a/dist/docs/zh-CN/ScriptHandler_Help.html b/dist/docs/zh-CN/ScriptHandler_Help.html index 292826f62..a8027a5b0 100644 --- a/dist/docs/zh-CN/ScriptHandler_Help.html +++ b/dist/docs/zh-CN/ScriptHandler_Help.html @@ -17,7 +17,7 @@

                                                                                                                                                            OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                            -

                                                                                                                                                            Version 1.7  — Rev. 12

                                                                                                                                                            +

                                                                                                                                                            Version 1.7  — Rev. 13


                                                                                                                                                              diff --git a/dist/docs/zh-CN/ServGeneral_Help.html b/dist/docs/zh-CN/ServGeneral_Help.html index fbc252c3f..97134922d 100644 --- a/dist/docs/zh-CN/ServGeneral_Help.html +++ b/dist/docs/zh-CN/ServGeneral_Help.html @@ -17,7 +17,7 @@

                                                                                                                                                              OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                              -

                                                                                                                                                              Version 1.7  — Rev. 12

                                                                                                                                                              +

                                                                                                                                                              Version 1.7  — Rev. 13


                                                                                                                                                                diff --git a/dist/docs/zh-CN/ServLog_Help.html b/dist/docs/zh-CN/ServLog_Help.html index fe0a25ae4..1bbbad8a1 100644 --- a/dist/docs/zh-CN/ServLog_Help.html +++ b/dist/docs/zh-CN/ServLog_Help.html @@ -17,7 +17,7 @@

                                                                                                                                                                OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                -

                                                                                                                                                                Version 1.7  — Rev. 12

                                                                                                                                                                +

                                                                                                                                                                Version 1.7  — Rev. 13


                                                                                                                                                                  diff --git a/dist/docs/zh-CN/ServSecurity_Help.html b/dist/docs/zh-CN/ServSecurity_Help.html index d82e3e9c9..029436634 100644 --- a/dist/docs/zh-CN/ServSecurity_Help.html +++ b/dist/docs/zh-CN/ServSecurity_Help.html @@ -17,7 +17,7 @@

                                                                                                                                                                  OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                  -

                                                                                                                                                                  Version 1.7  — Rev. 12

                                                                                                                                                                  +

                                                                                                                                                                  Version 1.7  — Rev. 13


                                                                                                                                                                    diff --git a/dist/docs/zh-CN/ServTuning_Help.html b/dist/docs/zh-CN/ServTuning_Help.html index 687ec79d3..acd128a7f 100644 --- a/dist/docs/zh-CN/ServTuning_Help.html +++ b/dist/docs/zh-CN/ServTuning_Help.html @@ -17,7 +17,7 @@

                                                                                                                                                                    OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                    -

                                                                                                                                                                    Version 1.7  — Rev. 12

                                                                                                                                                                    +

                                                                                                                                                                    Version 1.7  — Rev. 13


                                                                                                                                                                      diff --git a/dist/docs/zh-CN/ServerStat_Help.html b/dist/docs/zh-CN/ServerStat_Help.html index 684d18fd1..237d7fd3c 100644 --- a/dist/docs/zh-CN/ServerStat_Help.html +++ b/dist/docs/zh-CN/ServerStat_Help.html @@ -17,7 +17,7 @@

                                                                                                                                                                      OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                      -

                                                                                                                                                                      Version 1.7  — Rev. 12

                                                                                                                                                                      +

                                                                                                                                                                      Version 1.7  — Rev. 13


                                                                                                                                                                        diff --git a/dist/docs/zh-CN/Servlet_Context.html b/dist/docs/zh-CN/Servlet_Context.html index 7f490deba..6fbf36a26 100644 --- a/dist/docs/zh-CN/Servlet_Context.html +++ b/dist/docs/zh-CN/Servlet_Context.html @@ -17,7 +17,7 @@

                                                                                                                                                                        OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                        -

                                                                                                                                                                        Version 1.7  — Rev. 12

                                                                                                                                                                        +

                                                                                                                                                                        Version 1.7  — Rev. 13


                                                                                                                                                                          diff --git a/dist/docs/zh-CN/Static_Context.html b/dist/docs/zh-CN/Static_Context.html index 6e28e9e22..aaeb647cf 100644 --- a/dist/docs/zh-CN/Static_Context.html +++ b/dist/docs/zh-CN/Static_Context.html @@ -17,7 +17,7 @@

                                                                                                                                                                          OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                          -

                                                                                                                                                                          Version 1.7  — Rev. 12

                                                                                                                                                                          +

                                                                                                                                                                          Version 1.7  — Rev. 13


                                                                                                                                                                            diff --git a/dist/docs/zh-CN/Templates_Help.html b/dist/docs/zh-CN/Templates_Help.html index 5cdcaa3df..e30305c27 100644 --- a/dist/docs/zh-CN/Templates_Help.html +++ b/dist/docs/zh-CN/Templates_Help.html @@ -17,7 +17,7 @@

                                                                                                                                                                            OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                            -

                                                                                                                                                                            Version 1.7  — Rev. 12

                                                                                                                                                                            +

                                                                                                                                                                            Version 1.7  — Rev. 13


                                                                                                                                                                              diff --git a/dist/docs/zh-CN/VHGeneral_Help.html b/dist/docs/zh-CN/VHGeneral_Help.html index 30cf7ab07..cc9e4f5b3 100644 --- a/dist/docs/zh-CN/VHGeneral_Help.html +++ b/dist/docs/zh-CN/VHGeneral_Help.html @@ -17,7 +17,7 @@

                                                                                                                                                                              OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                              -

                                                                                                                                                                              Version 1.7  — Rev. 12

                                                                                                                                                                              +

                                                                                                                                                                              Version 1.7  — Rev. 13


                                                                                                                                                                                diff --git a/dist/docs/zh-CN/VHSSL_Help.html b/dist/docs/zh-CN/VHSSL_Help.html index d9623f431..6945b8a45 100644 --- a/dist/docs/zh-CN/VHSSL_Help.html +++ b/dist/docs/zh-CN/VHSSL_Help.html @@ -17,7 +17,7 @@

                                                                                                                                                                                OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                -

                                                                                                                                                                                Version 1.7  — Rev. 12

                                                                                                                                                                                +

                                                                                                                                                                                Version 1.7  — Rev. 13


                                                                                                                                                                                  diff --git a/dist/docs/zh-CN/VHSecurity_Help.html b/dist/docs/zh-CN/VHSecurity_Help.html index 7d0e26157..04bd95e66 100644 --- a/dist/docs/zh-CN/VHSecurity_Help.html +++ b/dist/docs/zh-CN/VHSecurity_Help.html @@ -17,7 +17,7 @@

                                                                                                                                                                                  OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                  -

                                                                                                                                                                                  Version 1.7  — Rev. 12

                                                                                                                                                                                  +

                                                                                                                                                                                  Version 1.7  — Rev. 13


                                                                                                                                                                                    diff --git a/dist/docs/zh-CN/VHWebSocket_Help.html b/dist/docs/zh-CN/VHWebSocket_Help.html index 4f4517f37..a33de89ed 100644 --- a/dist/docs/zh-CN/VHWebSocket_Help.html +++ b/dist/docs/zh-CN/VHWebSocket_Help.html @@ -17,7 +17,7 @@

                                                                                                                                                                                    OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                    -

                                                                                                                                                                                    Version 1.7  — Rev. 12

                                                                                                                                                                                    +

                                                                                                                                                                                    Version 1.7  — Rev. 13


                                                                                                                                                                                      diff --git a/dist/docs/zh-CN/VirtualHosts_Help.html b/dist/docs/zh-CN/VirtualHosts_Help.html index e24dfc3da..aefd60b2a 100644 --- a/dist/docs/zh-CN/VirtualHosts_Help.html +++ b/dist/docs/zh-CN/VirtualHosts_Help.html @@ -17,7 +17,7 @@

                                                                                                                                                                                      OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                      -

                                                                                                                                                                                      Version 1.7  — Rev. 12

                                                                                                                                                                                      +

                                                                                                                                                                                      Version 1.7  — Rev. 13


                                                                                                                                                                                        diff --git a/dist/docs/zh-CN/admin.html b/dist/docs/zh-CN/admin.html index 48a707b85..2c305f3d3 100644 --- a/dist/docs/zh-CN/admin.html +++ b/dist/docs/zh-CN/admin.html @@ -17,7 +17,7 @@

                                                                                                                                                                                        OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                        -

                                                                                                                                                                                        Version 1.7  — Rev. 12

                                                                                                                                                                                        +

                                                                                                                                                                                        Version 1.7  — Rev. 13


                                                                                                                                                                                          diff --git a/dist/docs/zh-CN/config.html b/dist/docs/zh-CN/config.html index a60e6f0ec..344753498 100644 --- a/dist/docs/zh-CN/config.html +++ b/dist/docs/zh-CN/config.html @@ -17,7 +17,7 @@

                                                                                                                                                                                          OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                          -

                                                                                                                                                                                          Version 1.7  — Rev. 12

                                                                                                                                                                                          +

                                                                                                                                                                                          Version 1.7  — Rev. 13


                                                                                                                                                                                            diff --git a/dist/docs/zh-CN/index.html b/dist/docs/zh-CN/index.html index 613c37025..3e1029be6 100644 --- a/dist/docs/zh-CN/index.html +++ b/dist/docs/zh-CN/index.html @@ -17,7 +17,7 @@

                                                                                                                                                                                            OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                            -

                                                                                                                                                                                            Version 1.7  — Rev. 12

                                                                                                                                                                                            +

                                                                                                                                                                                            Version 1.7  — Rev. 13


                                                                                                                                                                                              @@ -102,7 +102,7 @@



                                                                                                                                                                                              Users' Manual

                                                                                                                                                                                              - — Rev. 12 + — Rev. 13


                                                                                                                                                                                              diff --git a/dist/docs/zh-CN/install.html b/dist/docs/zh-CN/install.html index af4fe6b21..fc809f2c6 100644 --- a/dist/docs/zh-CN/install.html +++ b/dist/docs/zh-CN/install.html @@ -17,7 +17,7 @@

                                                                                                                                                                                              OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                              -

                                                                                                                                                                                              Version 1.7  — Rev. 12

                                                                                                                                                                                              +

                                                                                                                                                                                              Version 1.7  — Rev. 13


                                                                                                                                                                                                diff --git a/dist/docs/zh-CN/intro.html b/dist/docs/zh-CN/intro.html index b7e2b6348..922035f1a 100644 --- a/dist/docs/zh-CN/intro.html +++ b/dist/docs/zh-CN/intro.html @@ -17,7 +17,7 @@

                                                                                                                                                                                                OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                                -

                                                                                                                                                                                                Version 1.7  — Rev. 12

                                                                                                                                                                                                +

                                                                                                                                                                                                Version 1.7  — Rev. 13


                                                                                                                                                                                                  diff --git a/dist/docs/zh-CN/license.html b/dist/docs/zh-CN/license.html index ab1d59be3..bfd28aec0 100644 --- a/dist/docs/zh-CN/license.html +++ b/dist/docs/zh-CN/license.html @@ -17,7 +17,7 @@

                                                                                                                                                                                                  OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                                  -

                                                                                                                                                                                                  Version 1.7  — Rev. 12

                                                                                                                                                                                                  +

                                                                                                                                                                                                  Version 1.7  — Rev. 13


                                                                                                                                                                                                    diff --git a/dist/docs/zh-CN/security.html b/dist/docs/zh-CN/security.html index 9d1fae5c0..5ad10df13 100644 --- a/dist/docs/zh-CN/security.html +++ b/dist/docs/zh-CN/security.html @@ -17,7 +17,7 @@

                                                                                                                                                                                                    OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                                    -

                                                                                                                                                                                                    Version 1.7  — Rev. 12

                                                                                                                                                                                                    +

                                                                                                                                                                                                    Version 1.7  — Rev. 13


                                                                                                                                                                                                      diff --git a/dist/docs/zh-CN/webconsole.html b/dist/docs/zh-CN/webconsole.html index 6dc4b6c52..b9efba9f8 100644 --- a/dist/docs/zh-CN/webconsole.html +++ b/dist/docs/zh-CN/webconsole.html @@ -17,7 +17,7 @@

                                                                                                                                                                                                      OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                                      -

                                                                                                                                                                                                      Version 1.7  — Rev. 12

                                                                                                                                                                                                      +

                                                                                                                                                                                                      Version 1.7  — Rev. 13


                                                                                                                                                                                                        diff --git a/dist/install.sh b/dist/install.sh index c05865daa..beef211e2 100755 --- a/dist/install.sh +++ b/dist/install.sh @@ -6,7 +6,7 @@ OSVER= OSTYPE=`getconf LONG_BIT` MARIADBCPUARCH= DLCMD= -LSPHPVER=73 +LSPHPVER=74 MYIP= testMyIP() diff --git a/dist/lsrecaptcha/_recaptcha.shtml b/dist/lsrecaptcha/_recaptcha.shtml index 3bc2c6b6f..3085e5a17 100644 --- a/dist/lsrecaptcha/_recaptcha.shtml +++ b/dist/lsrecaptcha/_recaptcha.shtml @@ -51,7 +51,7 @@
                                                                                                                                                                                                      - diff --git a/src/config.h.cmake b/src/config.h.cmake index 290800be7..c6e22d5c1 100644 --- a/src/config.h.cmake +++ b/src/config.h.cmake @@ -5,6 +5,6 @@ #define DEFAULT_TMP_DIR "/tmp/lshttpd" #define PID_FILE "/tmp/lshttpd/openlitespeed.pid" -#define PACKAGE_VERSION "1.7.2" +#define PACKAGE_VERSION "1.7.3" #define LS_MODULE_VERSION_INFO "\tmodgzip 1.1\n\tcache 1.62\n\tmodinspector 1.1\n\tuploadprogress 1.1\n\tmod_security 1.3\n" #endif diff --git a/src/http/chunkoutputstream.cpp b/src/http/chunkoutputstream.cpp index bf16df7ba..a30c067c4 100644 --- a/src/http/chunkoutputstream.cpp +++ b/src/http/chunkoutputstream.cpp @@ -136,7 +136,7 @@ int ChunkOutputStream::write(const char *pBuf, int size) pBuf += m_iLastBufLen; m_pLastBufBegin = NULL; m_iLastBufLen = 0; - if (!left) + if (left <= 0) return size; } @@ -158,10 +158,9 @@ int ChunkOutputStream::write(const char *pBuf, int size) if (ret > 0) { left -= ret; - if (!left) + if (left <= 0) return size; pBuf += ret; - assert(left > 0); } else if (!ret) return size - left; diff --git a/src/http/httpreq.cpp b/src/http/httpreq.cpp index 1577d8061..4986ab3df 100644 --- a/src/http/httpreq.cpp +++ b/src/http/httpreq.cpp @@ -498,9 +498,13 @@ void HttpReq::classifyUrl() else if (iUrlLen >= 12 && memcmp(pUrlEnd- 12, "/favicon.ico", 12) == 0) m_iUrlType = URL_FAVICON; - else if (iUrlLen >= 28 - && memcmp(getURI(), "/.well-known/acme-challenge/", 28) == 0) - m_iUrlType = URL_ACME_CHALLENGE; + else if (iUrlLen >= 13 && memcmp(pUrl, "/.well-known/", 13) == 0) + { + if (iUrlLen >= 28 && memcmp(pUrl + 13, "acme-challenge/", 15) == 0) + m_iUrlType = URL_ACME_CHALLENGE; + else + m_iUrlType = URL_WELL_KNOWN; + } else if (iUrlLen >= pRecaptchaUrl->len() && memcmp(pUrlEnd- pRecaptchaUrl->len(), pRecaptchaUrl->c_str(), pRecaptchaUrl->len()) == 0) m_iUrlType = URL_CAPTCHA; @@ -1070,9 +1074,11 @@ int HttpReq::processUnknownHeader(key_value_pair *pCurHeader, memset((char *)(name - 2), 0x20, 7 + pCurHeader->valLen + 4);// } } - else if (pCurHeader->keyLen == 16 - && (strncasecmp(name, "CF-Connecting-IP", 16) == 0)) - m_iCfIpHeader = m_unknHeaders.getSize(); + else if ((pCurHeader->keyLen == 16 + && (strncasecmp(name, "CF-Connecting-IP", 16) == 0)) + || (pCurHeader->keyLen == 9 + && (strncasecmp(name, "X-Real-IP", 9) == 0))) + m_iCfRealIpHeader = m_unknHeaders.getSize(); else if (pCurHeader->keyLen == 17 && strncasecmp(name, "X-Forwarded-Proto", 17) == 0) { @@ -1786,6 +1792,10 @@ int HttpReq::checkSuffixHandler(const char *pURI, int len, int &cacheable) if (!m_pContext->isAppContext()) LS_DBG_L(getLogSession(), "Cannot find appropriate handler for [%s].", pURI); + +#ifdef LS_ENABLE_DEBUG + LS_ERROR(getLogSession(), "checkSuffixHandler for [%s] return 404.", pURI); +#endif return SC_404; } @@ -1854,7 +1864,7 @@ int HttpReq::setMimeBySuffix(const char *pSuffix) { if (getPathInfoLen() > 0) //Path info is not allowed for static file { - LS_INFO(getLogSession(), + LS_ERROR(getLogSession(), "URI '%s' refers to a static file with PATH_INFO [%s].", getURI(), getPathInfo()); return SC_404; @@ -1950,7 +1960,7 @@ int HttpReq::processContext() if (!m_pVHost) { - LS_DBG_H(getLogSession(), "No Vhost found"); + LS_ERROR(getLogSession(), "No Vhost found"); return SC_404; } if (m_pVHost->getRootContext().getMatchList()) @@ -1965,7 +1975,7 @@ int HttpReq::processContext() m_pContext = m_pVHost->bestMatch(pURI, iURILen); if (!m_pContext) { - LS_DBG_L(getLogSession(), "No context found for URI: [%s].", pURI); + LS_ERROR(getLogSession(), "No context found for URI: [%s].", pURI); return SC_404; } LS_DBG_H(getLogSession(), "Find context with URI: [%s], " @@ -2155,7 +2165,14 @@ int HttpReq::processPath(const char *pURI, int uriLen, char *pBuf, ret = fileStat(pBuf, &m_fileStat); if (ret == -1 && m_lastStatRes == EACCES) { - LS_DBG_L(getLogSession(), "File not accessible [%s].", pBuf); + +#ifdef LS_ENABLE_DEBUG + LS_ERROR(getLogSession(), +#else + LS_DBG_L(getLogSession(), +#endif + "File not accessible [%s].", pBuf); + return SC_403; } @@ -2171,8 +2188,17 @@ int HttpReq::processPath(const char *pURI, int uriLen, char *pBuf, { if (++p != pEnd) { + if ((!m_pContext->isAppContext()) && (!isFavicon())) - LS_DBG_L(getLogSession(), "File not found [%s].", pBuf); + { + +#ifdef LS_ENABLE_DEBUG + LS_ERROR(getLogSession(), +#else + LS_DBG_L(getLogSession(), +#endif + "File not found [%s].", pBuf); + } return SC_404; } } @@ -2918,11 +2944,15 @@ const char *HttpReq::getUnknownHeaderByIndex(int idx, int &keyLen, } -const char *HttpReq::getCfIpHeader(int &len) +const char *HttpReq::getCfRealIpHeader(char *name, int &len) { - key_value_pair *pIdx = getUnknHeaderPair(m_iCfIpHeader - 1); + key_value_pair *pIdx = getUnknHeaderPair(m_iCfRealIpHeader - 1); if (pIdx) { + assert(pIdx->keyLen < 20); + memcpy(name, m_headerBuf.getp(pIdx->keyOff), pIdx->keyLen); + name[pIdx->keyLen] = 0; + len = pIdx->valLen; len = pIdx->valLen; return m_headerBuf.getp(pIdx->valOff); } diff --git a/src/http/httpreq.h b/src/http/httpreq.h index 485d7e98e..341b6e9d4 100644 --- a/src/http/httpreq.h +++ b/src/http/httpreq.h @@ -94,6 +94,7 @@ enum URL_GENERIC, URL_FAVICON, URL_ROBOTS_TXT, + URL_WELL_KNOWN, URL_ACME_CHALLENGE, URL_CAPTCHA, }; @@ -251,7 +252,7 @@ class HttpReq char m_method; char m_iUserAgentType; short m_iUrlType; - short m_iCfIpHeader; + short m_iCfRealIpHeader; int m_iEnvCount; unsigned short m_ver; @@ -689,8 +690,8 @@ class HttpReq } const char *getUnknownHeaderByIndex(int idx, int &keyLen, const char *&pValue, int &valLen) const; - char isCfIpSet() const { return m_iCfIpHeader; } - const char *getCfIpHeader(int &len); + char isCfRealIpSet() const { return m_iCfRealIpHeader; } + const char *getCfRealIpHeader(char *name, int &len); void setCrypto(HioCrypto *p) { m_pCrypto = p; } HioCrypto *getCrypto() const { return m_pCrypto; } diff --git a/src/http/httpsession.cpp b/src/http/httpsession.cpp index f34665d5c..2b29c35d0 100644 --- a/src/http/httpsession.cpp +++ b/src/http/httpsession.cpp @@ -1342,14 +1342,15 @@ int HttpSession::processNewReqInit() || (((useProxyHeader == 2) || (useProxyHeader == 3)) && (getClientInfo()->getAccess() == AC_TRUST))) { + char name_buf[20]; const char *pName; const char *pProxyHeader; int len; if (((useProxyHeader == 2) || (useProxyHeader == 3)) - && m_request.isCfIpSet()) + && m_request.isCfRealIpSet()) { - pName = "CF-Connecting-IP"; - pProxyHeader = m_request.getCfIpHeader(len); + pProxyHeader = m_request.getCfRealIpHeader(name_buf, len); + pName = name_buf; } else { @@ -1831,6 +1832,16 @@ bool HttpSession::shouldAvoidRecaptcha() LS_DBG_M(getLogSession(), "[RECAPTCHA] Favicon request, skip recaptcha."); return true; } + else if (m_request.getUrlType() == URL_WELL_KNOWN + || m_request.getUrlType() == URL_ACME_CHALLENGE) + { + getClientInfo()->incAllowedBotHits(); + if (!getClientInfo()->isReachBotLimit()) + { + LS_DBG(getLogSession(), "[RECAPITCHA] /.well-known/ request, skip recaptcha."); + return true; + } + } // if (getStream() && getStream()->isFromLocalAddr()) // { @@ -4992,6 +5003,7 @@ int HttpSession::sendStaticFileAio(SendFileInfo *pData) int HttpSession::sendStaticFileEx(SendFileInfo *pData) { + char buf[STATIC_FILE_BLOCK_SIZE]; const char *pBuf; off_t written; off_t remain; @@ -5040,7 +5052,6 @@ int HttpSession::sendStaticFileEx(SendFileInfo *pData) } #endif - BlockBuf tmpBlock; while ((remain = pData->getRemain()) > 0) { len = (remain < STATIC_FILE_BLOCK_SIZE) ? remain : STATIC_FILE_BLOCK_SIZE ; @@ -5054,10 +5065,11 @@ int HttpSession::sendStaticFileEx(SendFileInfo *pData) } else { - pBuf = VMemBuf::mapTmpBlock(pData->getfd(), tmpBlock, pData->getCurPos()); - if (!pBuf) - return -1; - written = tmpBlock.getBufEnd() - pBuf; + pBuf = buf; + written = pread(pData->getfd(), buf, len, pData->getCurPos()); + if (written <= 0) + return LS_FAIL; + if (written > remain) written = remain; if (written <= 0) @@ -5065,8 +5077,6 @@ int HttpSession::sendStaticFileEx(SendFileInfo *pData) } len = writeRespBodyBlockInternal(pData, pBuf, written); - if (!pData->getECache()) - VMemBuf::releaseBlock(&tmpBlock); if (len < 0) return len; else if (len == 0) @@ -5114,6 +5124,7 @@ int HttpSession::sendStaticFile(SendFileInfo *pData) LSI_FLAG_PROCESS_STATIC)) return sendStaticFileEx(pData); + char buf[STATIC_FILE_BLOCK_SIZE]; const char *pBuf; off_t written; off_t remain; @@ -5144,7 +5155,6 @@ int HttpSession::sendStaticFile(SendFileInfo *pData) param.flag_out = &buffered; - BlockBuf tmpBlock; while ((remain = pData->getRemain()) > 0) { len = (remain < STATIC_FILE_BLOCK_SIZE) ? remain : STATIC_FILE_BLOCK_SIZE ; @@ -5158,18 +5168,17 @@ int HttpSession::sendStaticFile(SendFileInfo *pData) } else { - pBuf = VMemBuf::mapTmpBlock(pData->getfd(), tmpBlock, pData->getCurPos()); - if (!pBuf) - return -1; - written = tmpBlock.getBufEnd() - pBuf; + pBuf = buf; + written = pread(pData->getfd(), buf, len, pData->getCurPos()); + if (written <= 0) + return LS_FAIL; + if (written > remain) written = remain; if (written <= 0) return -1; } len = writeRespBodyBlockFilterInternal(pData, pBuf, written, ¶m); - if (!pData->getECache()) - VMemBuf::releaseBlock(&tmpBlock); if (len < 0) return len; else if (len == 0) diff --git a/src/http/ntwkiolink.cpp b/src/http/ntwkiolink.cpp index eb13db6ad..b22e26bf9 100644 --- a/src/http/ntwkiolink.cpp +++ b/src/http/ntwkiolink.cpp @@ -474,11 +474,21 @@ void NtwkIOLink::suspendWrite() { LS_DBG_L(this, "NtwkIOLink::suspendWrite()..."); setFlag(HIO_FLAG_WANT_WRITE, 0); - if (!((isSSL()) && (m_ssl.wantWrite())) && m_hasBufferedData == 0) + if (isSSL()) { - MultiplexerFactory::getMultiplexer()->suspendWrite(this); - LS_DBG_L(this, "Write suspended"); + if (m_ssl.wantWrite() || m_ssl.wpending() > 0) + { + LS_DBG_L(this, "Pending SSL data, cannot suspend write."); + return; + } + if (m_hasBufferedData) + { + LS_DBG_L(this, "Pending buffered data, cannot suspend write."); + return; + } } + MultiplexerFactory::getMultiplexer()->suspendWrite(this); + LS_DBG_L(this, "Write suspended"); } @@ -511,7 +521,16 @@ void NtwkIOLink::switchWriteToRead() { setFlag(HIO_FLAG_WANT_READ, 1); setFlag(HIO_FLAG_WANT_WRITE, 0); - MultiplexerFactory::getMultiplexer()->switchWriteToRead(this); + if (isSSL() && m_ssl.wpending() > 0) + { + LS_DBG_L(this, "[LSTLS] has buffered data, do not stop write."); + MultiplexerFactory::getMultiplexer()->continueRead(this); + } + else + { + LS_DBG_L(this, "switchWriteToRead()"); + MultiplexerFactory::getMultiplexer()->switchWriteToRead(this); + } } @@ -663,7 +682,7 @@ void NtwkIOLink::setSSLAgain() MultiplexerFactory::getMultiplexer()->suspendRead(this); } - if (m_ssl.wantWrite() || getFlag(HIO_FLAG_WANT_WRITE)) + if (m_ssl.wantWrite() || m_ssl.wpending() > 0 || getFlag(HIO_FLAG_WANT_WRITE)) { dumpState("setSSLAgain", "CW"); MultiplexerFactory::getMultiplexer()->continueWrite(this); @@ -1480,6 +1499,7 @@ int NtwkIOLink::writevExT(LsiSession *pOS, const iovec *vector, int count) void NtwkIOLink::onTimerSSL_T(NtwkIOLink *pThis) { + pThis->setAllowWrite(); if (pThis->flushSslWpending() == 1) pThis->releaseIdleSslBuffer(); diff --git a/src/lsr/ls_xpool.c b/src/lsr/ls_xpool.c index e43ac19b8..da9fdf452 100644 --- a/src/lsr/ls_xpool.c +++ b/src/lsr/ls_xpool.c @@ -654,7 +654,7 @@ ls_inline void ls_std_inslist( { pTail->next = pOld1 = pOld; } - while((pOld = ls_atomic_casvptr(pList, pNew, pOld)) != pOld1); + while((pOld = ls_atomic_casvptr(pList, pOld, pNew)) != pOld1); return; } diff --git a/src/main/lshttpdmain.cpp b/src/main/lshttpdmain.cpp index 257d29c90..7ede5d0d9 100644 --- a/src/main/lshttpdmain.cpp +++ b/src/main/lshttpdmain.cpp @@ -83,7 +83,7 @@ /*** * Do not change the below format, it will be set correctly while packing the code */ -#define BUILDTIME " (built: Thu Jun 25 20:05:03 UTC 2020)" +#define BUILDTIME " (built: Thu Jul 9 13:51:56 UTC 2020)" #define GlobalServerSessionHooks (LsiApiHooks::getServerSessionHooks())