From 351d4d872dacc9becd9d439bae03fd6d7fafd0e2 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 25 Jun 2020 17:26:58 -0400 Subject: [PATCH] Check in 1.7.2 --- CMakeLists.txt | 6 +- LSQUICCOMMIT | 2 +- build.sh | 44 +- configure | 23 +- configure.ac | 3 +- dist/Example/html/upload.html | 4 +- dist/Example/html/upload.php | 178 +- dist/VERSION | 2 +- dist/add-ons/webcachemgr/VERSION | 2 +- dist/add-ons/webcachemgr/src/Panel/CPanel.php | 83 +- .../webcachemgr/src/Panel/ControlPanel.php | 164 +- .../webcachemgr/src/Panel/DirectAdmin.php | 36 +- dist/add-ons/webcachemgr/src/Panel/Plesk.php | 50 +- dist/add-ons/webcachemgr/src/Util.php | 1 + dist/add-ons/webcachemgr/src/WPCaller.php | 340 +- .../webcachemgr/src/WPInstallStorage.php | 8 +- dist/admin/html.open/index.php | 2 +- dist/admin/html.open/lib/DMsg.php | 2 +- dist/admin/html.open/lib/DTbl.php | 1 + dist/admin/html.open/lib/DTblDefBase.php | 27 +- dist/admin/html.open/lib/ows/DPageDef.php | 10 +- dist/admin/html.open/lib/ows/DTblDef.php | 35 +- .../lib/util/build_php/BuildConfig.php | 6 +- dist/admin/html.open/login.php | 2 +- dist/admin/html.open/res/lang/en-US_msg.php | 5 +- dist/admin/html.open/res/lang/en-US_tips.php | 18 +- dist/admin/html.open/res/lang/ja-JP_tips.php | 10 + dist/admin/html.open/res/lang/zh-CN_tips.php | 14 +- dist/admin/html.open/view/inc/configui.php | 2 +- dist/conf/httpd_config.conf.in | 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 | 4 +- dist/docs/ServLog_Help.html | 2 +- dist/docs/ServSecurity_Help.html | 6 +- dist/docs/ServTuning_Help.html | 15 +- dist/docs/ServerStat_Help.html | 4 +- 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 | 5 +- dist/docs/VHWebSocket_Help.html | 2 +- dist/docs/VirtualHosts_Help.html | 2 +- dist/docs/admin.html | 2 +- dist/docs/config.html | 2 +- dist/docs/css/hdoc.css | 2 +- dist/docs/index.html | 4 +- dist/docs/install.html | 2 +- dist/docs/intro.html | 2 +- dist/docs/ja-JP/ServSecurity_Help.html | 4 + dist/docs/ja-JP/ServTuning_Help.html | 3 +- dist/docs/ja-JP/VHSecurity_Help.html | 3 + 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 | 6 +- dist/docs/zh-CN/ServTuning_Help.html | 11 +- dist/docs/zh-CN/ServerStat_Help.html | 4 +- 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 | 5 +- 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/fcgi-bin/RackRunner.rb | 16 +- dist/functions.sh | 29 +- dist/lsrecaptcha/_recaptcha.shtml | 5 +- include/ls.h | 32 +- include/lsdef.h | 1 - include/lsr/ls_atomic.h | 104 +- include/lsr/ls_evtcb.h | 121 +- include/lsr/ls_lock.h | 88 +- src/CMakeLists.txt | 4 +- src/Makefile.am | 10 +- src/Makefile.in | 33 +- src/adns/adns.cpp | 40 +- src/adns/adns.h | 21 +- src/config.h.cmake | 2 +- src/edio/CMakeLists.txt | 25 - src/edio/aiooutputstream.cpp | 133 +- src/edio/aiooutputstream.h | 83 +- src/edio/ediostream.h | 30 +- src/edio/epoll.cpp | 4 +- src/edio/eventnotifier.h | 2 + src/edio/evtcbque.cpp | 671 +- src/edio/evtcbque.h | 120 +- src/edio/flowcontrol.h | 26 +- src/edio/multiplexerfactory.cpp | 18 + src/edio/multiplexerfactory.h | 2 + src/edio/streamstat.h | 98 + src/extensions/CMakeLists.txt | 26 - src/extensions/cgi/cgidworker.cpp | 2 +- src/extensions/extworkerconfig.cpp | 3 + src/extensions/jk/jconn.cpp | 3 +- src/extensions/localworker.cpp | 6 +- src/extensions/lsapi/lsapiconn.cpp | 2 +- src/extensions/proxy/proxyconn.cpp | 2 +- src/h2/CMakeLists.txt | 17 + src/h2/Makefile.am | 12 + src/h2/Makefile.in | 703 + src/h2/h2connbase.cpp | 1849 + src/{spdy/h2connection.h => h2/h2connbase.h} | 304 +- src/h2/h2connection.cpp | 602 + src/h2/h2connection.h | 117 + src/{spdy => h2}/h2protocol.cpp | 4 +- src/{spdy => h2}/h2protocol.h | 12 +- src/h2/h2stream.cpp | 167 + src/h2/h2stream.h | 70 + src/h2/h2streambase.cpp | 592 + src/{spdy/h2stream.h => h2/h2streambase.h} | 92 +- src/{spdy => h2}/h2streampool.cpp | 2 +- src/{spdy => h2}/h2streampool.h | 2 +- src/h2/lsxpack_error_code.h | 48 + src/h2/ssledstream.cpp | 460 + src/h2/ssledstream.h | 145 + src/h2/unpackedheaders.cpp | 1553 + src/h2/unpackedheaders.h | 258 + src/http/CMakeLists.txt | 6 - src/http/Makefile.am | 2 - src/http/Makefile.in | 1 - src/http/accesslog.cpp | 55 +- src/http/hiohandlerfactory.cpp | 2 +- src/http/hiostream.cpp | 14 +- src/http/hiostream.h | 233 +- src/http/httpcgitool.cpp | 59 +- src/http/httpcgitool.h | 16 +- src/http/httpextconnector.cpp | 6 +- src/http/httpheader.cpp | 2 +- src/http/httpheader.h | 20 +- src/http/httplistener.cpp | 3 +- src/http/httplistener.h | 18 +- src/http/httplog.cpp | 44 +- src/http/httprange.cpp | 8 +- src/http/httpreq.cpp | 243 +- src/http/httpreq.h | 12 +- src/http/httpresp.cpp | 4 +- src/http/httpresp.h | 12 +- src/http/httprespheaders.cpp | 1620 +- src/http/httprespheaders.h | 370 +- src/http/httpsession.cpp | 129 +- src/http/httpsession.h | 18 +- src/http/httpstatuscode.h | 4 +- src/http/httpstatusline.cpp | 5 +- src/http/httpvhost.cpp | 14 +- src/http/httpvhostlist.cpp | 16 +- src/http/reqstats.cpp | 11 + src/http/reqstats.h | 40 +- src/http/requestvars.cpp | 13 +- src/http/rewriteengine.cpp | 3 +- src/http/staticfilehandler.cpp | 10 +- src/http/subrequest.cpp | 2 +- src/log4cxx/appendermanager.cpp | 3 +- src/log4cxx/fileappender.cpp | 11 +- src/log4cxx/fileappender.h | 8 +- src/log4cxx/logrotate.cpp | 8 +- src/log4cxx/logsession.h | 4 +- src/log4cxx/patternlayout.cpp | 4 + src/lsiapi/internal.h | 2 +- src/lsiapi/lsiapihooks.h | 8 +- src/lsiapi/lsiapilib.cpp | 11 +- src/lsr/CMakeLists.txt | 2 - src/lsr/ls_lfqueue.c | 14 +- src/lsr/ls_lock.c | 2 +- src/lsr/ls_offload.h | 30 +- src/main/httpserver.cpp | 102 +- src/main/lshttpdmain.cpp | 21 +- src/main/plainconf.cpp | 3 + src/modules/CMakeLists.txt | 2 +- src/modules/cache/cache.cpp | 104 +- src/modules/cache/dirhashcachestore.cpp | 46 +- src/modules/js/CMakeLists.txt | 7 +- src/modules/lua/CMakeLists.txt | 7 +- src/modules/pagespeed/pagespeed.cpp | 6 +- src/quic/quicengine.cpp | 170 +- src/quic/quicshm.cpp | 4 +- src/quic/quicstream.cpp | 145 +- src/quic/quicstream.h | 49 +- src/quic/udplistener.h | 24 +- src/shm/ls_shmhashstat.cpp | 23 + src/shm/lsshmhash.cpp | 51 +- src/shm/lsshmhash.h | 6 +- src/shm/lsshmpool.cpp | 14 + src/shm/lsshmtidmgr.cpp | 226 +- src/shm/lsshmtidmgr.h | 34 +- src/socket/CMakeLists.txt | 25 +- src/socket/Makefile.am | 2 +- src/socket/Makefile.in | 12 +- src/{lsr => socket}/reuseport.cpp | 2 +- {include/lsr => src/socket}/reuseport.h | 0 src/spdy/CMakeLists.txt | 6 - src/spdy/Makefile.am | 5 +- src/spdy/Makefile.in | 65 +- src/spdy/h2connection.cpp | 2170 - src/spdy/h2stream.cpp | 598 - src/spdy/lshpack.c | 72324 ---------------- src/spdy/lshpack.h | 279 - src/spdy/spdyconnection.cpp | 2 +- src/spdy/unpackedheaders.cpp | 431 - src/spdy/unpackedheaders.h | 124 - src/sslpp/ls_fdbuf_bio.c | 94 +- src/sslpp/ls_fdbuf_bio.h | 18 +- src/sslpp/sslconnection.cpp | 17 +- src/sslpp/sslconnection.h | 6 +- src/sslpp/sslcontext.cpp | 17 +- src/sslpp/sslcontext.h | 5 +- src/sslpp/sslcontextconfig.h | 4 + src/sslpp/sslutil.cpp | 76 +- src/sslpp/sslutil.h | 3 + src/thread/CMakeLists.txt | 1 + src/thread/Makefile.am | 12 + src/thread/Makefile.in | 649 + src/{lsr => thread}/offloader.cpp | 54 +- src/thread/workcrew.cpp | 115 +- src/thread/workcrew.h | 28 +- src/util/autobuf.h | 22 +- src/util/datetime.cpp | 3 +- src/util/datetime.h | 7 +- src/util/dlinkqueue.h | 14 + src/util/httpfetch.cpp | 66 +- src/util/httpfetch.h | 12 +- src/util/iovec.h | 5 + src/util/loopbuf.h | 4 + src/util/objarray.h | 75 +- src/util/vmembuf.cpp | 26 +- test/CMakeLists.txt | 2 +- test/http/httpheadertest.cpp | 21 +- test/http/httpreqtest.cpp | 8 +- test/http/statusurlmaptest.cpp | 6 +- test/util/httpfetchtest.cpp | 1 + test/util/objarraytest.cpp | 56 +- 300 files changed, 12694 insertions(+), 79055 deletions(-) create mode 100644 src/edio/streamstat.h create mode 100644 src/h2/CMakeLists.txt create mode 100755 src/h2/Makefile.am create mode 100644 src/h2/Makefile.in create mode 100644 src/h2/h2connbase.cpp rename src/{spdy/h2connection.h => h2/h2connbase.h} (58%) create mode 100644 src/h2/h2connection.cpp create mode 100644 src/h2/h2connection.h rename src/{spdy => h2}/h2protocol.cpp (95%) rename src/{spdy => h2}/h2protocol.h (95%) create mode 100644 src/h2/h2stream.cpp create mode 100644 src/h2/h2stream.h create mode 100644 src/h2/h2streambase.cpp rename src/{spdy/h2stream.h => h2/h2streambase.h} (61%) rename src/{spdy => h2}/h2streampool.cpp (96%) rename src/{spdy => h2}/h2streampool.h (96%) create mode 100644 src/h2/lsxpack_error_code.h create mode 100644 src/h2/ssledstream.cpp create mode 100644 src/h2/ssledstream.h create mode 100644 src/h2/unpackedheaders.cpp create mode 100644 src/h2/unpackedheaders.h rename src/{lsr => socket}/reuseport.cpp (97%) rename {include/lsr => src/socket}/reuseport.h (100%) delete mode 100644 src/spdy/h2connection.cpp delete mode 100644 src/spdy/h2stream.cpp delete mode 100644 src/spdy/lshpack.c delete mode 100644 src/spdy/lshpack.h delete mode 100644 src/spdy/unpackedheaders.cpp delete mode 100644 src/spdy/unpackedheaders.h create mode 100644 src/thread/Makefile.am create mode 100644 src/thread/Makefile.in rename src/{lsr => thread}/offloader.cpp (65%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9bd1a8187..1ac98ade1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ SET(CMAKE_INCLUDE_CURRENT_DIR ON) SET(LSQUIC_SERVER_MODE 1) -include_directories( BEFORE include ${PROJECT_SOURCE_DIR}/../thirdparty/include/) +include_directories( BEFORE include src/lshpack src/liblsquic/ls-qpack ${PROJECT_SOURCE_DIR}/../thirdparty/include/) link_directories( ${PROJECT_SOURCE_DIR}/../thirdparty/lib/) SET (CMAKE_C_COMPILER "/usr/bin/clang") @@ -55,7 +55,7 @@ add_definitions(-DPOOL_TESTING) #add_definitions(-DLS_WORKCREW_DEBUG) add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0) -#Add definition for QUIC +#Add definition for QUIC add_definitions(-DH3_ALPN="\\x05h3-25\\x05h3-27") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_CMAKE_WARNING_FLAG} ${MY_CMAKE_TSAN_FLAG} ${MY_CMAKE_ASAN_FLAG}") @@ -67,7 +67,7 @@ find_package(Git QUIET) if (GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") option(GIT_SUBMODULE "Check submodules during build" ON) if (GIT_SUBMODULE) - execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive + execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive --force WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} RESULT_VARIABLE GIT_SUBMOD_RESULT) if(NOT GIT_SUBMOD_RESULT EQUAL "0") diff --git a/LSQUICCOMMIT b/LSQUICCOMMIT index 688ff144d..0858f2901 100644 --- a/LSQUICCOMMIT +++ b/LSQUICCOMMIT @@ -1 +1 @@ -f4bfba069bd281258ce72183fd9d274168e9050c +307ca7fe5089bb86d38bb5408ffee6cc8fa7e08f diff --git a/build.sh b/build.sh index ee73e303d..00443541e 100755 --- a/build.sh +++ b/build.sh @@ -140,6 +140,9 @@ preparelibquic() rm -rf src/liblsquic mv lsquic/src/liblsquic src/ + rm -rf src/lshpack + mv lsquic/src/lshpack src/ + rm include/lsquic.h mv lsquic/include/lsquic.h include/ rm include/lsquic_types.h @@ -232,6 +235,11 @@ prepareLinux() cat /etc/lsb-release | grep "DISTRIB_RELEASE=18." >/dev/null if [ $? = 0 ] ; then OSTYPE=UBUNTU18 + else + cat /etc/lsb-release | grep "DISTRIB_RELEASE=20." >/dev/null + if [ $? = 0 ] ; then + OSTYPE=UBUNTU20 + fi fi fi fi @@ -259,7 +267,7 @@ prepareLinux() #other debian OS, we still can if [ "${OSTYPE}" = "unknowlinux" ] ; then - echo It seems you are not using ubuntu 14,16,18 and Debian 7/8/9/10. + echo It seems you are not using ubuntu 14,16,18,20 and Debian 7/8/9/10. echo But we still can try to go further. fi @@ -478,6 +486,34 @@ freebsdFix() touch ./needreboot.txt fi fi +} + + +fixPagespeed() +{ +PSOLVERSION=1.11.33.4 +cat << EOF > ../thirdparty/psol-$PSOLVERSION/include/pagespeed/kernel/base/scoped_ptr.h +/** +* Due the compiling issue, this file was updated from the original file. +*/ +#ifndef PAGESPEED_KERNEL_BASE_SCOPED_PTR_H_ +#define PAGESPEED_KERNEL_BASE_SCOPED_PTR_H_ +#include "base/memory/scoped_ptr.h" + +namespace net_instaweb { +template class scoped_array : public scoped_ptr { +public: + scoped_array() : scoped_ptr() {} + explicit scoped_array(T* t) : scoped_ptr(t) {} +}; +} +#endif + +EOF + + + + } cd `dirname "$0"` @@ -510,8 +546,8 @@ if [ "${ISLINUX}" != "yes" ] ; then sed -i -e "s/psol/ /g" ./build_ols.sh fi -./build_ols.sh +./build_ols.sh cd ${CURDIR} @@ -525,6 +561,10 @@ cp ../thirdparty/src/brotli/out/*.a ../thirdparty/lib64/ cp ../thirdparty/src//libxml2/.libs/*.a ../thirdparty/lib64/ cp ../thirdparty/src/libmaxminddb/include/* ../thirdparty/include/ +if [ "${ISLINUX}" = "yes" ] ; then + fixPagespeed +fi + #special case modsecurity cd src/modules/modsecurity-ls ln -sf ../../../../thirdparty/src/ModSecurity . diff --git a/configure b/configure index baf8a3328..39c07bc7e 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.1. +# Generated by GNU Autoconf 2.69 for openlitespeed 1.7.2. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='openlitespeed' PACKAGE_TARNAME='openlitespeed' -PACKAGE_VERSION='1.7.1' -PACKAGE_STRING='openlitespeed 1.7.1' +PACKAGE_VERSION='1.7.2' +PACKAGE_STRING='openlitespeed 1.7.2' PACKAGE_BUGREPORT='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.1 to adapt to many kinds of systems. +\`configure' configures openlitespeed 1.7.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1480,7 +1480,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of openlitespeed 1.7.1:";; + short | recursive ) echo "Configuration of openlitespeed 1.7.2:";; esac cat <<\_ACEOF @@ -1641,7 +1641,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -openlitespeed configure 1.7.1 +openlitespeed configure 1.7.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2315,7 +2315,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by openlitespeed $as_me 1.7.1, which was +It was created by openlitespeed $as_me 1.7.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3181,7 +3181,7 @@ fi # Define the identity of the package. PACKAGE='openlitespeed' - VERSION='1.7.1' + VERSION='1.7.2' # Some tools Automake needs. @@ -19066,7 +19066,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF -ac_config_files="$ac_config_files Makefile src/Makefile src/edio/Makefile src/extensions/Makefile src/http/Makefile src/spdy/Makefile src/log4cxx/Makefile src/main/Makefile src/socket/Makefile src/sslpp/Makefile src/ssi/Makefile src/lsiapi/Makefile src/modules/Makefile src/shm/Makefile src/adns/Makefile src/quic/Makefile src/liblsquic/Makefile src/modules/modinspector/Makefile src/modules/modreqparser/Makefile src/modules/uploadprogress/Makefile" +ac_config_files="$ac_config_files Makefile src/Makefile src/edio/Makefile src/extensions/Makefile src/http/Makefile src/spdy/Makefile src/h2/Makefile src/log4cxx/Makefile src/main/Makefile src/socket/Makefile src/sslpp/Makefile src/ssi/Makefile src/lsiapi/Makefile src/modules/Makefile src/shm/Makefile src/adns/Makefile src/quic/Makefile src/liblsquic/Makefile src/modules/modinspector/Makefile src/modules/modreqparser/Makefile src/modules/uploadprogress/Makefile" if test x$need_lua = xyes ; then @@ -19623,7 +19623,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by openlitespeed $as_me 1.7.1, which was +This file was extended by openlitespeed $as_me 1.7.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19690,7 +19690,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -openlitespeed config.status 1.7.1 +openlitespeed config.status 1.7.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -20209,6 +20209,7 @@ do "src/extensions/Makefile") CONFIG_FILES="$CONFIG_FILES src/extensions/Makefile" ;; "src/http/Makefile") CONFIG_FILES="$CONFIG_FILES src/http/Makefile" ;; "src/spdy/Makefile") CONFIG_FILES="$CONFIG_FILES src/spdy/Makefile" ;; + "src/h2/Makefile") CONFIG_FILES="$CONFIG_FILES src/h2/Makefile" ;; "src/log4cxx/Makefile") CONFIG_FILES="$CONFIG_FILES src/log4cxx/Makefile" ;; "src/main/Makefile") CONFIG_FILES="$CONFIG_FILES src/main/Makefile" ;; "src/socket/Makefile") CONFIG_FILES="$CONFIG_FILES src/socket/Makefile" ;; diff --git a/configure.ac b/configure.ac index 9525943b9..d00aa7b2c 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.1],[info@litespeedtech.com],[openlitespeed],[http://www.litespeedtech.com/]) +AC_INIT([openlitespeed],[1.7.2],[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) @@ -486,6 +486,7 @@ AC_CONFIG_FILES(Makefile src/extensions/Makefile src/http/Makefile src/spdy/Makefile + src/h2/Makefile src/log4cxx/Makefile src/main/Makefile src/socket/Makefile diff --git a/dist/Example/html/upload.html b/dist/Example/html/upload.html index 1da68b59f..651885f20 100644 --- a/dist/Example/html/upload.html +++ b/dist/Example/html/upload.html @@ -185,8 +185,8 @@
To enable optional module uploadprogress
- - + +

diff --git a/dist/Example/html/upload.php b/dist/Example/html/upload.php index 6162d8ab5..f4e4a2f3b 100644 --- a/dist/Example/html/upload.php +++ b/dist/Example/html/upload.php @@ -1,84 +1,94 @@ - - - - - -file is empty, not stored.

\n"; - } else { - rename($src, $dest); - echo "

Moved: " . $src . " ====> " . $dest . "
"; - echo "MD5 : " . md5_file($dest). "
"; - echo "Size : " . filesize($dest). " bytes

\n"; - } -} - -function disaplyParsedFile($filekey) -{ - echo "

File : " . $filekey . "
"; - echo "Name : " . $_POST["{$filekey}_name"] . "
"; - echo "Type : " . $_POST["{$filekey}_content-type"] . "
"; - echo "Path : " . $_POST["{$filekey}_path"] . "
"; - echo "MD5 : " . $_POST["{$filekey}_md5"] . "
"; - echo "Size : " . $_POST["{$filekey}_size"] . " Bytes

\n"; -} - -function displayNoParsedFile($filekey) -{ - echo "

File : " . $filekey . "
"; - echo "Name : " . $_FILES["{$filekey}"]['name'] . "
"; - echo "Type : " . $_FILES["{$filekey}"]['type'] . "
"; - echo "Path : " . $_FILES["{$filekey}"]['tmp_name'] . "
"; - echo "Size : " . $_FILES["{$filekey}"]['size'] . "

\n"; -} - - - - -if(empty($_FILES["file1"])) -{ - echo "

Request body updated by Parser

\n"; - - for ($i = 1; $i <= 2; $i++) { - disaplyParsedFile("file{$i}"); - $moved_to_path = '/tmp/uploadfile_' . $_POST["file{$i}_name"]; - moveAndShow($_POST["file{$i}_path"], $moved_to_path); - } - -} else { - echo "

No Parser used

\n"; - for ($i = 1; $i <= 2; $i++) { - displayNoParsedFile("file{$i}"); - $moved_to_path = '/tmp/uploadfile_' . $_FILES["file{$i}"]["name"]; - moveAndShow($_FILES["file{$i}"]["tmp_name"], $moved_to_path); - } -} -?> - - + + + + + +file is empty, not stored.

\n"; + } else { + $fileType = strtolower(pathinfo($dest,PATHINFO_EXTENSION)); + $check = getimagesize($src); + if($check == false) { + echo "

file is not jpg file, not stored.

\n"; + } else { + if($fileType != "jpg") { + echo "

file type is not jpg, not stored.

\n"; + } else { + rename($src, $dest); + echo "

Moved: " . $src . " ====> " . $dest . "
"; + echo "MD5 : " . md5_file($dest). "
"; + echo "Size : " . filesize($dest). " bytes

\n"; + } + } + } +} + +function disaplyParsedFile($filekey) +{ + echo "

File : " . $filekey . "
"; + echo "Name : " . $_POST["{$filekey}_name"] . "
"; + echo "Type : " . $_POST["{$filekey}_content-type"] . "
"; + echo "Path : " . $_POST["{$filekey}_path"] . "
"; + echo "MD5 : " . $_POST["{$filekey}_md5"] . "
"; + echo "Size : " . $_POST["{$filekey}_size"] . " Bytes

\n"; +} + +function displayNoParsedFile($filekey) +{ + echo "

File : " . $filekey . "
"; + echo "Name : " . $_FILES["{$filekey}"]['name'] . "
"; + echo "Type : " . $_FILES["{$filekey}"]['type'] . "
"; + echo "Path : " . $_FILES["{$filekey}"]['tmp_name'] . "
"; + echo "Size : " . $_FILES["{$filekey}"]['size'] . "

\n"; +} + + + + +if(empty($_FILES["file1"])) +{ + echo "

Request body updated by Parser

\n"; + + for ($i = 1; $i <= 2; $i++) { + disaplyParsedFile("file{$i}"); + $moved_to_path = '/tmp/uploadfile_' . $_POST["file{$i}_name"]; + moveAndShow($_POST["file{$i}_path"], $moved_to_path); + } + +} else { + echo "

No Parser used

\n"; + for ($i = 1; $i <= 2; $i++) { + displayNoParsedFile("file{$i}"); + $moved_to_path = '/tmp/uploadfile_' . $_FILES["file{$i}"]["name"]; + moveAndShow($_FILES["file{$i}"]["tmp_name"], $moved_to_path); + } +} +?> + + diff --git a/dist/VERSION b/dist/VERSION index 943f9cbc4..f8a696c8d 100644 --- a/dist/VERSION +++ b/dist/VERSION @@ -1 +1 @@ -1.7.1 +1.7.2 diff --git a/dist/add-ons/webcachemgr/VERSION b/dist/add-ons/webcachemgr/VERSION index 35d51f33b..da38e07b3 100644 --- a/dist/add-ons/webcachemgr/VERSION +++ b/dist/add-ons/webcachemgr/VERSION @@ -1 +1 @@ -1.12 \ No newline at end of file +1.13.1 \ No newline at end of file diff --git a/dist/add-ons/webcachemgr/src/Panel/CPanel.php b/dist/add-ons/webcachemgr/src/Panel/CPanel.php index e06808d32..a1656669e 100644 --- a/dist/add-ons/webcachemgr/src/Panel/CPanel.php +++ b/dist/add-ons/webcachemgr/src/Panel/CPanel.php @@ -1,6 +1,6 @@ isEA4 ) { - $this->apacheConf = '/etc/apache2/conf.d/includes/pre_main_global.conf'; - $this->apacheVHConf = '/etc/apache2/conf.d/userdata/lscache_vhosts.conf'; + $this->apacheConf = + '/etc/apache2/conf.d/includes/pre_main_global.conf'; + $this->apacheVHConf = + '/etc/apache2/conf.d/userdata/lscache_vhosts.conf'; } else { - $this->apacheConf = '/usr/local/apache/conf/includes/pre_main_global.conf'; - $this->apacheVHConf = '/usr/local/apache/conf/userdata/lscache_vhosts.conf'; + $this->apacheConf = + '/usr/local/apache/conf/includes/pre_main_global.conf'; + $this->apacheVHConf = + '/usr/local/apache/conf/userdata/lscache_vhosts.conf'; } } @@ -83,23 +83,25 @@ protected function vhCacheRootSearch() /** * - * @param string $file_contents - * @return string + * @param array $file_contents + * @param string $vhCacheRoot + * @return array */ protected function addVHCacheRootSection( $file_contents, $vhCacheRoot = 'lscache' ) { - array_unshift($file_contents, - "\nCacheRoot {$vhCacheRoot}\n\n\n"); - $modified_contents = $file_contents; + array_unshift( + $file_contents, + "\nCacheRoot {$vhCacheRoot}\n\n\n" + ); - return $modified_contents; + return $file_contents; } /** * * @param string $vhConf - * @throws LSCMException + * @throws LSCMException Thrown directly and indirectly. */ public function createVHConfAndSetCacheRoot( $vhConf, $vhCacheRoot = 'lscache' ) @@ -109,13 +111,16 @@ public function createVHConfAndSetCacheRoot( $vhConf, if ( !file_exists($vhConfDir) ) { if ( !mkdir($vhConfDir, 0755) ) { - throw new LSCMException("Failed to create directory {$vhConfDir}."); + throw new LSCMException( + "Failed to create directory {$vhConfDir}." + ); } $this->log("Created directory {$vhConfDir}", Logger::L_DEBUG); } - $content = "\nCacheRoot {$vhCacheRoot}\n"; + $content = + "\nCacheRoot {$vhCacheRoot}\n"; if ( false === file_put_contents($vhConf, $content) ) { throw new LSCMException("Failed to create file {$vhConf}."); @@ -139,8 +144,10 @@ public function applyVHConfChanges() */ protected function prepareDocrootMap() { - $cmd = 'grep -hro --exclude="cache" --exclude="main" ' - . '--exclude="*.cache" "documentroot.*\|serveralias.*\|servername.*" /var/cpanel/userdata/*'; + $cmd = + 'grep -hro --exclude="cache" --exclude="main" --exclude="*.cache" ' + . '"documentroot.*\|serveralias.*\|servername.*" ' + . '/var/cpanel/userdata/*'; exec($cmd, $lines); /** @@ -207,7 +214,9 @@ protected function prepareDocrootMap() $cur = ''; } else { - Logger::debug("Unused line when preparing docroot map: {$line}."); + Logger::debug( + "Unused line when preparing docroot map: {$line}." + ); } } @@ -227,7 +236,8 @@ protected function prepareDocrootMap() $index++; } - $this->docRootMap = array( 'docroots' => $roots, 'names' => $servernames ); + $this->docRootMap = + array( 'docroots' => $roots, 'names' => $servernames ); } /** @@ -249,8 +259,8 @@ public function getPhpBinary( WPInstall $wpInstall ) * cPanel php wrapper should accurately detect the correct binary in * EA4 when EA4 only directive '--ea-reference-dir' is provided. */ - $phpBin = - "/usr/local/bin/php --ea-reference-dir={$wpInstall->getPath()}/wp-admin"; + $phpBin = '/usr/local/bin/php ' + . "--ea-reference-dir={$wpInstall->getPath()}/wp-admin"; } return "{$phpBin} {$this->phpOptions}"; @@ -299,11 +309,16 @@ public static function turnOffCpanelPluginAutoInstall() public function installCpanelPlugin() { if ( !file_exists(self::USER_PLUGIN_INSTALL_SCRIPT) ) { - throw new LSCMException('Unable to find cPanel user-end plugin installation script.' - . ' Please ensure that the LiteSpeed WHM plugin is already installed.'); + throw new LSCMException( + 'Unable to find cPanel user-end plugin installation script.' + . ' Please ensure that the LiteSpeed WHM plugin is already ' + . 'installed.' + ); } - $cpanelPluginDir = '/usr/local/cpanel/base/frontend/paper_lantern/ls_web_cache_manager'; + $cpanelPluginDir = + '/usr/local/cpanel/base/frontend/paper_lantern/' + . 'ls_web_cache_manager'; $cpanelPluginConfFile = "{$cpanelPluginDir}/lswcm.conf"; $cpanelPluginTplDir = "{$cpanelPluginDir}/landing"; $cpanelPluginCustTransDir = "{$cpanelPluginDir}/lang/cust"; @@ -373,8 +388,10 @@ public function installCpanelPlugin() public function uninstallCpanelPlugin() { if ( !file_exists(self::USER_PLUGIN_UNINSTALL_SCRIPT) ) { - throw new LSCMException('Unable to find cPanel user-end plugin uninstallation script.' - . ' Plugin may already be uninstalled.'); + throw new LSCMException( + 'Unable to find cPanel user-end plugin uninstallation script.' + . ' Plugin may already be uninstalled.' + ); } exec(self::USER_PLUGIN_UNINSTALL_SCRIPT); diff --git a/dist/add-ons/webcachemgr/src/Panel/ControlPanel.php b/dist/add-ons/webcachemgr/src/Panel/ControlPanel.php index e2d51bb83..ac24fc353 100644 --- a/dist/add-ons/webcachemgr/src/Panel/ControlPanel.php +++ b/dist/add-ons/webcachemgr/src/Panel/ControlPanel.php @@ -34,7 +34,7 @@ abstract class ControlPanel /** * @var string */ - const PANEL_API_VERSION = '1.12'; + const PANEL_API_VERSION = '1.13.1'; /** * @since 1.9 @@ -70,6 +70,11 @@ abstract class ControlPanel */ const NOT_SET = '__LSC_NOTSET__'; + /** + * @var string + */ + protected $panelName = ''; + /** * @var string */ @@ -113,10 +118,13 @@ abstract class ControlPanel protected static $minAPIFilePath = ''; /** - * @var null|ControlPanel + * @var null|ControlPanel Object that extends ControlPanel abstract class. */ protected static $instance; + /** + * @throws LSCMException Thrown indirectly. + */ protected function __construct() { /** @@ -124,8 +132,9 @@ protected function __construct() * 'ob_gzhandler' etc. */ $this->phpOptions = '-d disable_functions=ini_set -d opcache.enable=0 ' - . '-d max_execution_time=' . static::PHP_TIMEOUT . ' -d memory_limit=512M ' - . '-d register_argc_argv=1 -d zlib.output_compression=0 -d output_handler= ' + . '-d max_execution_time=' . static::PHP_TIMEOUT + . ' -d memory_limit=512M -d register_argc_argv=1 ' + . '-d zlib.output_compression=0 -d output_handler= ' . '-d safe_mode=0 -d open_basedir='; $this->initConfPaths(); @@ -142,7 +151,8 @@ protected function __construct() * * @deprecated * @param string $className A fully qualified control panel class name - * @return ControlPanel|null + * @return ControlPanel|null Object that extends ControlPanel abstract + * class. * @throws LSCMException */ public static function initByClassName( $className ) @@ -151,7 +161,8 @@ public static function initByClassName( $className ) if ( $className == 'custom' ) { $lsws_home = realpath(__DIR__ . '/../../../../'); - $customPanelFile = "{$lsws_home}/admin/lscdata/custom/CustomPanel.php"; + $customPanelFile = + "{$lsws_home}/admin/lscdata/custom/CustomPanel.php"; if ( ! file_exists($customPanelFile) || ! include_once $customPanelFile ) { @@ -162,8 +173,10 @@ public static function initByClassName( $className ) $className = '\Lsc\Wp\Panel\CustomPanel'; - $isSubClass = - is_subclass_of($className, '\Lsc\Wp\Panel\CustomPanelBase'); + $isSubClass = is_subclass_of( + $className, + '\Lsc\Wp\Panel\CustomPanelBase' + ); if ( ! $isSubClass ) { $msg = 'Class CustomPanel must extend class ' @@ -185,8 +198,10 @@ public static function initByClassName( $className ) if ( $instanceClassName != $className ) { throw new LSCMException( - "Could not initialize {$className} instance as an instance of another " - . "class ({$instanceClassName}) has already been created."); + "Could not initialize {$className} instance as an instance " + . "of another class ({$instanceClassName}) has already " + . 'been created.' + ); } } @@ -199,13 +214,15 @@ public static function initByClassName( $className ) * @deprecated * * @param string $name - * @return ControlPanel + * @return ControlPanel Object that extends ControlPanel abstract class. * @throws LSCMException */ public static function init( $name ) { if ( static::$instance != null ) { - throw new LSCMException('ControlPanel cannot be initialized twice.'); + throw new LSCMException( + 'ControlPanel cannot be initialized twice.' + ); } switch ($name) { @@ -216,7 +233,9 @@ public static function init( $name ) $className = 'Plesk'; break; default: - throw new LSCMException("Control panel '{$name}' is not supported."); + throw new LSCMException( + "Control panel '{$name}' is not supported." + ); } return static::initByClassName("\Lsc\Wp\Panel\\{$className}"); @@ -228,7 +247,7 @@ public static function init( $name ) * initialized if it has not yet been initialized already. * * @param string $className Fully qualified class name. - * @return ControlPanel + * @return ControlPanel Object that extends ControlPanel abstract class. * @throws LSCMException Indirectly thrown by static::initByClassName(). */ public static function getClassInstance( $className = '' ) @@ -237,7 +256,9 @@ public static function getClassInstance( $className = '' ) static::initByClassName($className); } elseif ( static::$instance == null ) { - throw new LSCMException('Could not get instance, ControlPanel not initialized. '); + throw new LSCMException( + 'Could not get instance, ControlPanel not initialized. ' + ); } return static::$instance; @@ -247,7 +268,7 @@ public static function getClassInstance( $className = '' ) * Deprecated on 02/06/19. Use getClassInstance() instead. * * @deprecated - * @return ControlPanel + * @return ControlPanel Object that extends ControlPanel abstract class. */ public static function getInstance() { @@ -301,9 +322,9 @@ public function areCacheRootsSet() public function verifyCacheSetup() { if ( !$this->isCacheEnabled() ) { - $msg = 'LSCache is not included in the current LiteSpeed license. Please purchase the ' - . 'LSCache add-on or upgrade to a license type that includes LSCache and try ' - . 'again.'; + $msg = 'LSCache is not included in the current LiteSpeed license. ' + . 'Please purchase the LSCache add-on or upgrade to a ' + . 'license type that includes LSCache and try again.'; throw new LSCMException($msg, LSCMException::E_PERMISSION); } @@ -345,9 +366,14 @@ public function setVHCacheRoot( $vhCacheRoot = 'lscache' ) $this->vhCacheRoot = $vhCacheRoot; - $this->log("Virtual Host cache root set to {$vhCacheRoot}", Logger::L_INFO); + $this->log( + "Virtual Host cache root set to {$vhCacheRoot}", + Logger::L_INFO + ); + + if ( $this->vhCacheRoot[0] == '/' + && !file_exists($this->vhCacheRoot) ) { - if ( $this->vhCacheRoot[0] == '/' && !file_exists($this->vhCacheRoot) ) { /** * 01/29/19: Temporarily create top virtual host cache root * directory to avoid LSWS setting incorrect owner/group and @@ -371,8 +397,8 @@ public function isCacheEnabled() $statusFile = '/tmp/lshttpd/.status'; if ( !file_exists($statusFile) ) { - $msg = 'Cannot determine LSCache availability. Please start/switch to LiteSpeed Web ' - . 'Server before trying again.'; + $msg = 'Cannot determine LSCache availability. Please start/switch ' + . 'to LiteSpeed Web Server before trying again.'; throw new LSCMException($msg, LSCMException::E_PERMISSION); } @@ -386,7 +412,9 @@ public function isCacheEnabled() $line = fread($f, 128); fclose($f); - if ( preg_match('/FEATURES: ([0-9\.]+)/', $line, $m) && ($m[1] & 1) == 1 ) { + if ( preg_match('/FEATURES: ([0-9\.]+)/', $line, $m) + && ($m[1] & 1) == 1 ) { + return true; } @@ -458,6 +486,11 @@ public function getVHCacheRoot() return $this->vhCacheRoot; } + /** + * + * @return void + * @throws LSCMException Thrown in some existing implementations. + */ abstract protected function initConfPaths(); abstract protected function prepareDocrootMap(); @@ -558,7 +591,10 @@ protected function initCacheRoots() if ( $svrCacheRoot ) { $this->serverCacheRoot = $svrCacheRoot; - $this->log("Server level cache root is {$svrCacheRoot}.", Logger::L_DEBUG); + $this->log( + "Server level cache root is {$svrCacheRoot}.", + Logger::L_DEBUG + ); } else { $this->serverCacheRoot = static::NOT_SET; @@ -567,11 +603,17 @@ protected function initCacheRoots() if ( $vhCacheRoot ) { $this->vhCacheRoot = $vhCacheRoot; - $this->log("Virtual Host level cache root is {$vhCacheRoot}.", Logger::L_DEBUG); + $this->log( + "Virtual Host level cache root is {$vhCacheRoot}.", + Logger::L_DEBUG + ); } else { $this->vhCacheRoot = static::NOT_SET; - $this->log('Virtual Host level cache root is not set.', Logger::L_INFO); + $this->log( + 'Virtual Host level cache root is not set.', + Logger::L_INFO + ); } } @@ -633,7 +675,8 @@ public function setServerCacheRoot( $svrCacheRoot = '' ) $cacheroot = $this->defaultSvrCacheRoot; } - $cacheRootLine = "\nCacheRoot {$cacheroot}\n\n\n"; + $cacheRootLine = + "\nCacheRoot {$cacheroot}\n\n\n"; if ( !file_exists($this->apacheConf) ) { file_put_contents($this->apacheConf, $cacheRootLine); @@ -644,11 +687,15 @@ public function setServerCacheRoot( $svrCacheRoot = '' ) else { if ( !is_writable($this->apacheConf) ) { - throw new LSCMException('Apache Config is not writeable. No changes made.'); + throw new LSCMException( + 'Apache Config is not writeable. No changes made.' + ); } if ( !Util::createBackup($this->apacheConf) ) { - throw new LSCMException('Could not backup Apache config. No changes made.'); + throw new LSCMException( + 'Could not backup Apache config. No changes made.' + ); } else { $file_contents = file($this->apacheConf); @@ -656,13 +703,18 @@ public function setServerCacheRoot( $svrCacheRoot = '' ) if ( preg_grep('/^\s*/im', $file_contents) ) { if ( preg_grep('/^\s*CacheRoot +/im', $file_contents) ) { - $file_contents = preg_replace('/^\s*CacheRoot +.+/im', - "CacheRoot {$cacheroot}", $file_contents); + $file_contents = preg_replace( + '/^\s*CacheRoot +.+/im', + "CacheRoot {$cacheroot}", + $file_contents + ); } else { - $file_contents = preg_replace('/^\s*/im', - "\nCacheRoot {$cacheroot}", - $file_contents); + $file_contents = preg_replace( + '/^\s*/im', + "\nCacheRoot {$cacheroot}", + $file_contents + ); } } else { @@ -675,15 +727,27 @@ public function setServerCacheRoot( $svrCacheRoot = '' ) $this->serverCacheRoot = $cacheroot; - $this->log("Server level cache root set to {$cacheroot}", Logger::L_INFO); + $this->log( + "Server level cache root set to {$cacheroot}", + Logger::L_INFO + ); if ( file_exists($cacheroot) ) { exec("/bin/rm -rf {$cacheroot}"); - $this->log('Server level cache root directory removed for proper permission.', - Logger::L_DEBUG); + $this->log( + 'Server level cache root directory removed for proper ' + . 'permission.', + Logger::L_DEBUG + ); } } + /** + * + * @param array $file_contents + * @param string $vhCacheRoot + * @return array + */ abstract protected function addVHCacheRootSection( $file_contents, $vhCacheRoot = 'lscache' ); @@ -696,13 +760,16 @@ public function writeVHCacheRoot( $vhConf, $vhCacheRoot = 'lscache' ) { if ( !is_writable($vhConf) ) { throw new LSCMException( - "Could not write to VH config {$vhConf}. No changes made.", - LSCMException::E_PERMISSION); + "Could not write to VH config {$vhConf}. No changes made.", + LSCMException::E_PERMISSION + ); } if ( !Util::createBackup($vhConf) ) { throw new LSCMException( - "Could not backup Virtual Host config file {$vhConf}. No changes made.", - LSCMException::E_PERMISSION); + "Could not backup Virtual Host config file {$vhConf}. No " + . 'changes made.', + LSCMException::E_PERMISSION + ); } $file_contents = file($vhConf); @@ -714,9 +781,11 @@ public function writeVHCacheRoot( $vhConf, $vhCacheRoot = 'lscache' ) "CacheRoot {$vhCacheRoot}", $file_contents); } else { - $modified_contents = preg_replace('/^\s*/im', - "\nCacheRoot {$vhCacheRoot}", - $file_contents); + $modified_contents = preg_replace( + '/^\s*/im', + "\nCacheRoot {$vhCacheRoot}", + $file_contents + ); } } else { @@ -846,6 +915,11 @@ public static function meetsMinAPIVerRequirement() public static function checkPanelAPICompatibility( $panelAPIVer ) { $supportedAPIVers = array ( + '1.13.1', + '1.13.0.3', + '1.13.0.2', + '1.13.0.1', + '1.13', '1.12', '1.11', '1.10', diff --git a/dist/add-ons/webcachemgr/src/Panel/DirectAdmin.php b/dist/add-ons/webcachemgr/src/Panel/DirectAdmin.php index a179e9134..c1de025a7 100644 --- a/dist/add-ons/webcachemgr/src/Panel/DirectAdmin.php +++ b/dist/add-ons/webcachemgr/src/Panel/DirectAdmin.php @@ -1,9 +1,9 @@ apacheConf = '/etc/httpd/conf/extra/httpd-includes.conf'; - $this->apacheVHConf = - '/usr/local/directadmin/data/templates/custom/cust_httpd.CUSTOM.2.pre'; + $this->apacheVHConf = '/usr/local/directadmin/data/templates/custom/' + . 'cust_httpd.CUSTOM.2.pre'; } /** @@ -88,17 +88,19 @@ public function daVhCacheRootSearch( $confDir ) /** * - * @param string $file_contents - * @return string + * @param array $file_contents + * @param string $vhCacheRoot + * @return array */ protected function addVHCacheRootSection( $file_contents, $vhCacheRoot = 'lscache' ) { - array_unshift($file_contents, - "\nCacheRoot {$vhCacheRoot}\n\n\n"); - $modified_contents = $file_contents; + array_unshift( + $file_contents, + "\nCacheRoot {$vhCacheRoot}\n\n\n" + ); - return $modified_contents; + return $file_contents; } /** @@ -114,13 +116,16 @@ public function createVHConfAndSetCacheRoot( $vhConf, if ( !file_exists($vhConfDir) ) { if ( !mkdir($vhConfDir, 0755) ) { - throw new LSCMException("Failed to create directory {$vhConfDir}."); + throw new LSCMException( + "Failed to create directory {$vhConfDir}." + ); } $this->log("Created directory {$vhConfDir}", Logger::L_DEBUG); } - $content = "\nCacheRoot {$vhCacheRoot}\n"; + $content = + "\nCacheRoot {$vhCacheRoot}\n"; if ( false === file_put_contents($vhConf, $content) ) { throw new LSCMException("Failed to create file {$vhConf}."); @@ -207,7 +212,9 @@ protected function prepareDocrootMap() $curServerName = $curServerAliases = $curDocRoot = ''; } else { - Logger::debug("Unused line when preparing docroot map: {$line}."); + Logger::debug( + "Unused line when preparing docroot map: {$line}." + ); } } @@ -227,7 +234,8 @@ protected function prepareDocrootMap() $index++; } - $this->docRootMap = array( 'docroots' => $roots, 'names' => $servernames ); + $this->docRootMap = + array( 'docroots' => $roots, 'names' => $servernames ); } /** diff --git a/dist/add-ons/webcachemgr/src/Panel/Plesk.php b/dist/add-ons/webcachemgr/src/Panel/Plesk.php index f47f7a589..ccf0e2829 100644 --- a/dist/add-ons/webcachemgr/src/Panel/Plesk.php +++ b/dist/add-ons/webcachemgr/src/Panel/Plesk.php @@ -32,9 +32,17 @@ public function __construct() */ public function getPleskOS() { - $supportedOS = array( 'centos', 'cloudlinux', 'redhat', 'ubuntu', 'debian' ); $cmd = ''; + $supportedOS = array( + 'centos', + 'virtuozzo', + 'cloudlinux', + 'redhat', + 'ubuntu', + 'debian' + ); + if ( is_readable('/etc/os-release') ) { $cmd = 'grep ^ID= /etc/os-release | cut -d"=" -f2 | xargs'; } @@ -57,16 +65,23 @@ public function getPleskOS() } throw new LSCMException( - 'Plesk detected with unsupported OS. (Not CentOS/Cloudlinux/RedHat/Ubuntu/Debian)', - LSCMException::E_UNSUPPORTED); + 'Plesk detected with unsupported OS. ' + . '(Not CentOS/Virtuozzo/Cloudlinux/RedHat/Ubuntu/Debian)', + LSCMException::E_UNSUPPORTED + ); } + /** + * + * @throws LSCMException Thrown indirectly. + */ protected function initConfPaths() { $OS = $this->getPleskOS(); switch ($OS) { case 'centos': + case 'virtuozzo': case 'cloudlinux': case 'redhat': $this->apacheConf = '/etc/httpd/conf.d/lscache.conf'; @@ -79,7 +94,8 @@ protected function initConfPaths() case 'debian': if ( is_dir('/etc/apache2/conf-enabled') ) { - $this->apacheConf = '/etc/apache2/conf-enabled/lscache.conf'; + $this->apacheConf = + '/etc/apache2/conf-enabled/lscache.conf'; } else { /** @@ -93,8 +109,8 @@ protected function initConfPaths() //no default case } - $this->apacheVHConf = - '/usr/local/psa/admin/conf/templates/custom/domain/domainVirtualHost.php'; + $this->apacheVHConf = '/usr/local/psa/admin/conf/templates' + . '/custom/domain/domainVirtualHost.php'; } protected function serverCacheRootSearch() @@ -117,20 +133,28 @@ protected function vhCacheRootSearch() return ''; } + /** + * + * @param array $file_contents + * @param string $vhCacheRoot + * @return array + */ protected function addVHCacheRootSection( $file_contents, $vhCacheRoot = 'lscache' ) { - $modified_contents = preg_replace('!^\s*!im', - "\nCacheRoot {$vhCacheRoot}\n\n", - $file_contents); - - return $modified_contents; + return preg_replace( + '!^\s*!im', + "\nCacheRoot {$vhCacheRoot}\n\n" + . '', + $file_contents + ); } /** + * * @param string $vhConf * @param string $vhCacheRoot - * @throws LSCMException Indirectly thrown by $this->log(). + * @throws LSCMException Thrown indirectly. */ public function createVHConfAndSetCacheRoot( $vhConf, $vhCacheRoot = 'lscache' ) @@ -171,8 +195,6 @@ public function applyVHConfChanges() * * Note: This function is repeated in Plesk plugin files to avoid extra * serialize ops etc. This copy is for cli only. - * - * @return string[][] Array of docroot keys and their server name(s). */ protected function prepareDocrootMap() { diff --git a/dist/add-ons/webcachemgr/src/Util.php b/dist/add-ons/webcachemgr/src/Util.php index 790bd0e94..6954f9057 100644 --- a/dist/add-ons/webcachemgr/src/Util.php +++ b/dist/add-ons/webcachemgr/src/Util.php @@ -426,6 +426,7 @@ public static function ensureVHCacheRootInCage( $vhCacheRoot ) * * @param string $dir Directory path * @param boolean $keepParent Only remove directory contents when true. + * @return boolean */ public static function rrmdir( $dir, $keepParent = false ) { diff --git a/dist/add-ons/webcachemgr/src/WPCaller.php b/dist/add-ons/webcachemgr/src/WPCaller.php index 557bf7330..c905f9870 100644 --- a/dist/add-ons/webcachemgr/src/WPCaller.php +++ b/dist/add-ons/webcachemgr/src/WPCaller.php @@ -41,6 +41,12 @@ class WPCaller */ private $pluginEntry; + /** + * @since 1.13 + * @var null|string + */ + private $installedLscwpVer = null; + /** * @var string[] */ @@ -83,6 +89,14 @@ public static function getInstance( WPInstall $currInstall, return self::$instance; } + /** + * + * @param int $errno Not used at this time. + * @param string $errstr + * @return boolean + * + * @noinspection PhpUnusedParameterInspection + */ public static function warning_handler( $errno, $errstr ) { $strs = array( @@ -178,6 +192,7 @@ public function getDebugMsgs() * @deprecated 1.9 Deprecated 07/30/19. Use * Logger::getUiMsgs(Logger::UI_ERR) to get these messages. * @return string[] + * @throws LSCMException Thrown indirectly. */ public function getErrMsgs() { @@ -190,6 +205,7 @@ public function getErrMsgs() * Logger::getUiMsgs(Logger::UI_SUCC) to get these * messages. * @return string[] + * @throws LSCMException Thrown indirectly. */ public function getSuccMsgs() { @@ -198,17 +214,21 @@ public function getSuccMsgs() /** * + * WP Variables $wpdb, $table_prefix * WP Functions: get_option() * - * @global wpdb $wpdb + * @global \wpdb $wpdb * @global string $table_prefix * @return string + * + * @noinspection PhpFullyQualifiedNameUsageInspection + * @noinspection PhpUndefinedClassInspection */ private function getSiteURL() { - global $wpdb; - global $table_prefix; + global $wpdb, $table_prefix; + /** @noinspection PhpUndefinedFunctionInspection */ $siteURL = get_option('siteurl'); if ( !$siteURL ) { @@ -235,6 +255,7 @@ private function getSiteURL() * * @param WPInstall $install * @return int + * @throws LSCMException Thrown indirectly. */ private function checkStatus( WPInstall $install ) { @@ -255,13 +276,23 @@ private function checkStatus( WPInstall $install ) /** * Check if plugin files exist first, as status in db could be stale if * LSCWP was removed manually. + * + * @noinspection PhpUndefinedFunctionInspection */ if ( file_exists($this->pluginEntry) && is_plugin_active(self::LSCWP_PLUGIN) ) { $status |= WPInstall::ST_PLUGIN_ACTIVE; - if ( defined('LSCACHE_ADV_CACHE') && LSCACHE_ADV_CACHE === true ) { + //TODO: Get rid of ST_LSC_ADVCACHE_DEFINED status or replace with + // new "is caching enabled" define check. + + $advCacheFile = $this->currInstall->getPath() + . '/wp-content/advanced-cache.php'; + + if ( (version_compare($this->installedLscwpVer, '3.0.4', '>=') && !file_exists($advCacheFile)) + || (defined('LSCACHE_ADV_CACHE') && LSCACHE_ADV_CACHE === true) ) { + $status |= WPInstall::ST_LSC_ADVCACHE_DEFINED; } else { @@ -293,6 +324,7 @@ private function checkStatus( WPInstall $install ) * * @param boolean $output * @return int + * @throws LSCMException Thrown indirectly. */ public function updateStatus( $output = false ) { @@ -310,12 +342,16 @@ public function updateStatus( $output = false ) return UserCommand::EXIT_SUCC; } + /** + * + * @return int + * @throws LSCMException Thrown indirectly. + */ private function getCurrStatus() { $this->updateStatus(); - $status = $this->currInstall->getStatus(); - return $status; + return $this->currInstall->getStatus(); } /** @@ -338,6 +374,9 @@ private function checkForKnownNonAdvCachePlugins() /** * Check if plugin files exist first, as status in db could be * stale if plugin files were removed manually. + * + * @noinspection PhpUndefinedConstantInspection + * @noinspection PhpUndefinedFunctionInspection */ if ( file_exists(WP_PLUGIN_DIR . "/{$plugin}") && is_plugin_active($plugin) ) { @@ -354,8 +393,10 @@ private function checkForKnownNonAdvCachePlugins() * WP Constants: WP_PLUGIN_DIR * WP Functions: get_option() * - * @param boolean $isMassAction + * @param boolean $isMassAction + * @param boolean $isNewInstall * @return boolean + * @throws LSCMException Thrown indirectly. */ private function canEnable( $isMassAction, $isNewInstall ) { @@ -366,8 +407,12 @@ private function canEnable( $isMassAction, $isNewInstall ) if ( !$isNewInstall && $isMassAction ) { $this->currInstall->addUserFlagFile(); - Logger::uiSuccess('LSCWP Detected As Manually Disabled - Flag Set'); - Logger::notice('Ignore - Previously disabled, flag it from mass operation'); + Logger::uiSuccess( + 'LSCWP Detected As Manually Disabled - Flag Set' + ); + Logger::notice( + 'Ignore - Previously disabled, flag it from mass operation' + ); return false; } @@ -378,8 +423,8 @@ private function canEnable( $isMassAction, $isNewInstall ) if ( $thirdPartyCachePluginSlug != '' ) { $this->currInstall->addUserFlagFile(); - $msg = 'Cannot Enable LSCWP - Detected another active cache plugin' - . " \"{$thirdPartyCachePluginSlug}\". Flag set."; + $msg = 'Cannot Enable LSCWP - Detected another active cache ' + . "plugin \"{$thirdPartyCachePluginSlug}\". Flag set."; Logger::uiError($msg); $msg = 'Ignore - Detected another active cache plugin ' @@ -400,11 +445,14 @@ private function canEnable( $isMassAction, $isNewInstall ) else { $this->currInstall->addUserFlagFile(); - $msg = 'LSCWP Already Enabled But Not Caching - Detected another active cache' - . ' plugin. Please visit the WordPress Dashboard for further instructions.'; + $msg = 'LSCWP Already Enabled But Not Caching - Detected ' + . 'another active cache plugin. Please visit the ' + . 'WordPress Dashboard for further instructions.'; Logger::uiError($msg); - Logger::notice('Ignore - Existing install but advanced cache not set'); + Logger::notice( + 'Ignore - Existing install but advanced cache not set' + ); } return false; @@ -416,7 +464,7 @@ private function canEnable( $isMassAction, $isNewInstall ) /** * * @return int - * @throws LSCMException + * @throws LSCMException Thrown indirectly. */ public function directEnable() { @@ -439,19 +487,27 @@ public function directEnable() } /** + * + * WP Constants: WP_PLUGIN_DIR + * WP Functions: unzip_file() + * WP Classes: WP_Filesystem * * @return int - * @throws LSCMException + * @throws LSCMException Thrown directly and indirectly. */ private function directEnableNewInstall() { + /** @noinspection PhpUndefinedConstantInspection */ $pluginDir = WP_PLUGIN_DIR; $lscwpZip = "{$pluginDir}/litespeed-cache.latest-stable.zip"; $this->downloadLSCWPZip($lscwpZip); + /** @noinspection PhpUndefinedFunctionInspection */ WP_Filesystem(); + + /** @noinspection PhpUndefinedFunctionInspection */ $unzipRet = unzip_file($lscwpZip, $pluginDir); unlink($lscwpZip); @@ -471,6 +527,8 @@ private function directEnableNewInstall() copy($customIni, $defaultIni); } + $this->installedLscwpVer = $this->getPluginVersionFromFile(); + $status = $this->enable_lscwp(); if ( $status & WPInstall::ST_PLUGIN_INACTIVE) { @@ -484,6 +542,8 @@ private function directEnableNewInstall() } /** + * + * WP Constants: WP_PLUGIN_DIR * * @param string $lscwpZip * @return null @@ -491,6 +551,7 @@ private function directEnableNewInstall() */ private function downloadLscwpZip( $lscwpZip ) { + /** @noinspection PhpUndefinedConstantInspection */ $pluginDir = WP_PLUGIN_DIR; $url = 'https://downloads.wordpress.org/plugin/litespeed-cache.latest-stable.zip'; @@ -519,17 +580,24 @@ private function downloadLscwpZip( $lscwpZip ) } /** + * + * WP Constants: WP_PLUGIN_DIR * * @param array $extraArgs Not used at this time. * @param boolean $massOp True when called from massEnable(). * @return int + * @throws LSCMException Thrown indirectly. + * + * @noinspection PhpUnusedParameterInspection */ public function enable( $extraArgs, $massOp = false ) { + /** @noinspection PhpUndefinedConstantInspection */ $isNewInstall = PluginVersion::getInstance()->prepareUserInstall(WP_PLUGIN_DIR); if ( $isNewInstall ) { + $this->installedLscwpVer = $this->getPluginVersionFromFile(); $this->currInstall->addNewLscwpFlagFile(); } @@ -544,7 +612,7 @@ public function enable( $extraArgs, $massOp = false ) if ( $isNewInstall ) { - if ( $status &= WPInstall::ST_PLUGIN_INACTIVE ) { + if ( $status & WPInstall::ST_PLUGIN_INACTIVE ) { $this->removeLscwpPluginFiles(); } else { @@ -558,8 +626,9 @@ public function enable( $extraArgs, $massOp = false ) /** * - * @param array $extraArgs + * @param string[] $extraArgs * @return int + * @throws LSCMException Thrown indirectly. */ public function massEnable( $extraArgs ) { @@ -576,8 +645,9 @@ public function massEnable( $extraArgs ) * * WP Functions: is_plugin_active_for_network() * - * @param boolean $isMassAction + * @param boolean $isMassAction * @return boolean + * @throws LSCMException Thrown indirectly. */ private function canDisable( $isMassAction ) { @@ -606,6 +676,7 @@ private function canDisable( $isMassAction ) return false; } + /** @noinspection PhpUndefinedFunctionInspection */ if ( is_plugin_active_for_network(self::LSCWP_PLUGIN) ) { $this->currInstall->addUserFlagFile(); @@ -622,9 +693,12 @@ private function canDisable( $isMassAction ) /** * - * @param array $extraArgs Not used at this time. - * @param boolean $massOp True when called from MassDisable(). + * @param string[] $extraArgs Not used at this time. + * @param boolean $massOp True when called from MassDisable(). * @return int + * @throws LSCMException Thrown indirectly. + * + * @noinspection PhpUnusedParameterInspection */ public function disable( $extraArgs, $massOp = false ) { @@ -651,8 +725,9 @@ public function disable( $extraArgs, $massOp = false ) /** * - * @param array $extraArgs + * @param string[] $extraArgs * @return int + * @throws LSCMException Thrown indirectly. */ public function massDisable( $extraArgs ) { @@ -668,25 +743,27 @@ public function massDisable( $extraArgs ) /** * Includes LSCWP files needed to properly disable the LSCWP plugin. * - * @param string $lscwpVer Current LSCWP version in the WP plugins - * directory. + * @since 1.13 Removed param $lscwpVer. + * + * @noinspection PhpIncludeInspection */ - private function includeDisableRequiredFiles( $lscwpVer ) + private function includeDisableRequiredFiles() { + /** @noinspection PhpUndefinedConstantInspection */ $dir = WP_PLUGIN_DIR . '/litespeed-cache'; - if ( version_compare($lscwpVer, '3.0', '>=') ) { + if ( version_compare($this->installedLscwpVer, '3.0', '>=') ) { require_once "${dir}/src/admin.cls.php"; } - elseif ( version_compare($lscwpVer, '1.1.2.2', '>') ) { + elseif ( version_compare($this->installedLscwpVer, '1.1.2.2', '>') ) { require_once "{$dir}/admin/litespeed-cache-admin.class.php"; } else { require_once "{$dir}/admin/class-litespeed-cache-admin.php"; } - if ( version_compare($lscwpVer, '1.1.0', '<') - && version_compare($lscwpVer, '1.0.6', '>') ) { + if ( version_compare($this->installedLscwpVer, '1.1.0', '<') + && version_compare($this->installedLscwpVer, '1.0.6', '>') ) { require_once "{$dir}/admin/class-litespeed-cache-admin-rules.php"; } @@ -696,10 +773,11 @@ private function includeDisableRequiredFiles( $lscwpVer ) * * @param boolean $uninstall * @return int + * @throws LSCMException Thrown indirectly. */ private function performDisable( $uninstall ) { - $this->includeDisableRequiredFiles($this->getPluginVersionFromFile()); + $this->includeDisableRequiredFiles(); return $this->disable_lscwp($uninstall); } @@ -709,6 +787,8 @@ private function performDisable( $uninstall ) * @param string $toVersion * @param boolean $massOp Not used at this time. * @return boolean + * + * @noinspection PhpUnusedParameterInspection */ private function canUpgrade( $fromVersions, $toVersion, $massOp ) { @@ -716,9 +796,7 @@ private function canUpgrade( $fromVersions, $toVersion, $massOp ) return false; } - $currVersion = $this->getPluginVersionFromFile(); - - if ( $toVersion == $currVersion ) { + if ( $toVersion == $this->installedLscwpVer ) { return false; } @@ -728,14 +806,14 @@ private function canUpgrade( $fromVersions, $toVersion, $massOp ) if ( strpos($ver, '.x') !== false ) { $ver1 = explode('.', $ver); - $ver2 = explode('.', $currVersion); + $ver2 = explode('.', $this->installedLscwpVer); if ( $ver1[0] === $ver2[0] && $ver1[1] === $ver2[1] ) { $match = true; break; } } - elseif ( $ver === $currVersion ) { + elseif ( $ver === $this->installedLscwpVer ) { $match = true; break; } @@ -749,6 +827,7 @@ private function canUpgrade( $fromVersions, $toVersion, $massOp ) * @param string[] $extraArgs * @param boolean $massOp * @return int + * @throws LSCMException Thrown indirectly. */ public function upgrade( $extraArgs, $massOp = false ) { @@ -771,6 +850,7 @@ public function upgrade( $extraArgs, $massOp = false ) * * @param string[] $extraArgs * @return int + * @throws LSCMException Thrown indirectly. */ public function massUpgrade( $extraArgs ) { @@ -791,10 +871,12 @@ public function massUpgrade( $extraArgs ) */ private function deactivate_lscwp( $uninstall ) { + /** @noinspection PhpUndefinedFunctionInspection */ deactivate_plugins(self::LSCWP_PLUGIN); if ( $uninstall ) { //add some msg about having removed plugin files? + /** @noinspection PhpUndefinedFunctionInspection */ delete_plugins(array( self::LSCWP_PLUGIN )); } } @@ -805,20 +887,29 @@ private function deactivate_lscwp( $uninstall ) * WP Variables: $wpdb * WP Functions: switch_to_blog(), restore_current_blog() * - * @global wpdb $wpdb + * @global \wpdb $wpdb * @param boolean $uninstall * @return int + * @throws LSCMException Thrown indirectly. + * + * @noinspection PhpFullyQualifiedNameUsageInspection + * @noinspection PhpUndefinedClassInspection */ private function disable_lscwp( $uninstall ) { + /** @noinspection PhpUndefinedConstantInspection */ if ( MULTISITE ) { global $wpdb; $blogs = $wpdb->get_col("SELECT blog_id FROM {$wpdb->blogs};"); foreach ( $blogs as $id ) { + /** @noinspection PhpUndefinedFunctionInspection */ switch_to_blog($id); + $this->deactivate_lscwp($uninstall); + + /** @noinspection PhpUndefinedFunctionInspection */ restore_current_blog(); } } @@ -835,11 +926,14 @@ private function disable_lscwp( $uninstall ) * WP Functions: activate_plugin() * * @return int + * @throws LSCMException Thrown indirectly. */ private function enable_lscwp() { /** * Should not check directly, can error on success due to object cache. + * + * @noinspection PhpUndefinedFunctionInspection */ activate_plugin(self::LSCWP_PLUGIN, '', false, false); @@ -848,9 +942,10 @@ private function enable_lscwp() if ( !($status & WPInstall::ST_LSC_ADVCACHE_DEFINED) ) { $status = $this->performDisable(true); - $msg = 'Detected another active cache plugin. Please deactivate the detected plugin and ' - . 'try again. You may also try manually installing through the WordPress ' - . 'Dashboard and following the instructions given.'; + $msg = 'Detected another active cache plugin. Please deactivate ' + . 'the detected plugin and try again. You may also try ' + . 'manually installing through the WordPress Dashboard and ' + . 'following the instructions given.'; Logger::uiError($msg); $this->massIncr = 'FAIL'; @@ -870,8 +965,8 @@ private function enable_lscwp() $this->currInstall->addUserFlagFile(); $status = $this->currInstall->getStatus(); - $msg = 'LSCWP Enabled But Not Caching - Please visit the WordPress Dashboard ' - . 'for further instructions.'; + $msg = 'LSCWP Enabled But Not Caching - Please visit the ' + . 'WordPress Dashboard for further instructions.'; Logger::uiError($msg); $this->massIncr = 'SUCC'; @@ -888,6 +983,7 @@ private function enable_lscwp() /** * + * WP Constants: WP_PLUGIN_DIR * WP Functions: add_filter(), remove_filter(), is_wp_error(), * wp_clean_plugins_cache() * WP Classes: Plugin_Upgrader @@ -903,20 +999,43 @@ private function upgrade_lscwp( $ver, $runHooks = true ) */ echo "[UPGRADE]\n"; + /** + * @noinspection PhpUndefinedClassInspection + * @noinspection PhpFullyQualifiedNameUsageInspection + */ $upgrader = new \Plugin_Upgrader; + /** @noinspection PhpUndefinedMethodInspection */ $upgrader->init(); + + /** @noinspection PhpUndefinedMethodInspection */ $upgrader->upgrade_strings(); - $lscwpPackageURL = "https://downloads.wordpress.org/plugin/litespeed-cache.{$ver}.zip"; + $lscwpPackageURL = + "https://downloads.wordpress.org/plugin/litespeed-cache.{$ver}.zip"; if ( $runHooks ) { - add_filter('upgrader_pre_install', - array( $upgrader, 'deactivate_plugin_before_upgrade' ), 10, 2); - add_filter('upgrader_clear_destination', - array( $upgrader, 'delete_old_plugin' ), 10, 4); + /** @noinspection PhpUndefinedFunctionInspection */ + add_filter( + 'upgrader_pre_install', + array( $upgrader, 'deactivate_plugin_before_upgrade' ), + 10, + 2 + ); + + /** @noinspection PhpUndefinedFunctionInspection */ + add_filter( + 'upgrader_clear_destination', + array( $upgrader, 'delete_old_plugin' ), + 10, + 4 + ); } + /** + * @noinspection PhpUndefinedMethodInspection + * @noinspection PhpUndefinedConstantInspection + */ $upgrader->run(array( 'package' => $lscwpPackageURL, 'destination' => WP_PLUGIN_DIR, @@ -938,13 +1057,25 @@ private function upgrade_lscwp( $ver, $runHooks = true ) /** * Cleanup our hooks, in case something else does a upgrade on * this connection. + * + * @noinspection PhpUndefinedFunctionInspection */ - remove_filter('upgrader_pre_install', - array( $upgrader, 'deactivate_plugin_before_upgrade' )); - remove_filter('upgrader_clear_destination', - array( $upgrader, 'delete_old_plugin' )); + remove_filter( + 'upgrader_pre_install', + array( $upgrader, 'deactivate_plugin_before_upgrade' ) + ); + + /** @noinspection PhpUndefinedFunctionInspection */ + remove_filter( + 'upgrader_clear_destination', + array( $upgrader, 'delete_old_plugin' ) + ); } + /** + * @noinspection PhpUndefinedFieldInspection + * @noinspection PhpUndefinedFunctionInspection + */ if ( !$upgrader->result || is_wp_error($upgrader->result) ) { throw new LSCMException("Failed to upgrade to v{$ver}.", LSCMException::E_NON_FATAL); @@ -954,6 +1085,8 @@ private function upgrade_lscwp( $ver, $runHooks = true ) /** * Force refresh of plugin update information + * + * @noinspection PhpUndefinedFunctionInspection */ wp_clean_plugins_cache(true); } @@ -961,17 +1094,16 @@ private function upgrade_lscwp( $ver, $runHooks = true ) /** * Gets LSCWP version from the litespeed-cache.php file. * - * WP Constants: WP_PLUGIN_DIR * WP Functions: get_plugin_data() * * @return string */ private function getPluginVersionFromFile() { + /** @noinspection PhpUndefinedFunctionInspection */ $lscwp_data = get_plugin_data($this->pluginEntry, false, false); - $ver = $lscwp_data['Version']; - return $ver; + return $lscwp_data['Version']; } /** @@ -979,21 +1111,20 @@ private function getPluginVersionFromFile() * languages directory if able. This function will also attempt to inform * the root user when a locales translation should be retrieved or removed. * - * WP Functions: get_locale() + * WP Functions: get_locale(), unzip_file() * WP Classes: WP_Filesystem */ public function updateTranslationFiles() { + /** @noinspection PhpUndefinedFunctionInspection */ $locale = get_locale(); if ( $locale == 'en_US' ) { return; } - $pluginVersion = $this->getPluginVersionFromFile(); - $localTranslationDir = Context::LOCAL_PLUGIN_DIR - . "/{$pluginVersion}/translations"; + . "/{$this->installedLscwpVer}/translations"; $moFileName = "litespeed-cache-{$locale}.mo"; $poFileName = "litespeed-cache-{$locale}.po"; @@ -1003,7 +1134,8 @@ public function updateTranslationFiles() $translationFlag = "{$localTranslationDir}/" . PluginVersion::TRANSLATION_CHECK_FLAG_BASE . "_{$locale}"; - $langDir = $this->currInstall->getPath() . '/wp-content/languages/plugins'; + $langDir = + $this->currInstall->getPath() . '/wp-content/languages/plugins'; if ( !file_exists($langDir) ) { mkdir($langDir, 0755); @@ -1014,17 +1146,25 @@ public function updateTranslationFiles() copy($localPoFile, "{$langDir}/{$poFileName}"); } elseif ( file_exists($zipFile) ) { + /** + * @noinspection PhpUndefinedFunctionInspection + * @noinspection PhpFullyQualifiedNameUsageInspection + */ \WP_Filesystem(); + /** @noinspection PhpUndefinedFunctionInspection */ if ( unzip_file($zipFile, $langDir) !== true ) { $this->outputResult('BAD_TRANSLATION', - "{$locale} {$pluginVersion}"); + "{$locale} {$this->installedLscwpVer}"); } } elseif ( !file_exists($translationFlag) || (time() - filemtime($translationFlag)) > 86400 ) { - $this->outputResult('GET_TRANSLATION', "{$locale} {$pluginVersion}"); + $this->outputResult( + 'GET_TRANSLATION', + "{$locale} {$this->installedLscwpVer}" + ); } return; @@ -1039,6 +1179,7 @@ private function includeLSCWPAdvancedCacheFile() $content = file_get_contents($advCacheFile); if ( strpos($content, 'LSCACHE_ADV_CACHE') !== false ) { + /** @noinspection PhpIncludeInspection */ include_once $advCacheFile; } } @@ -1049,10 +1190,20 @@ public function removeLscwpPluginFiles() $this->currInstall->removePluginFiles(dirname($this->pluginEntry)); } + /** + * @param string[] $extraArgs + * @param boolean $massOp Not used at this time. + * @return int + * @throws LSCMException Thrown indirectly. + * + * @noinspection PhpUnusedParameterInspection + */ public function dashNotify( $extraArgs, $massOp = false ) { $jsonInfo = base64_decode($extraArgs[0]); + $ret = UserCommand::EXIT_FAIL; + if ( DashNotifier::canNotify($this->currInstall->getPath()) ) { DashNotifier::prepareUserInstall(); @@ -1064,7 +1215,6 @@ public function dashNotify( $extraArgs, $massOp = false ) else { Logger::uiError('Failed to Notify'); $this->massIncr = 'FAIL'; - $ret = UserCommand::EXIT_FAIL; } } else { @@ -1076,8 +1226,9 @@ public function dashNotify( $extraArgs, $massOp = false ) /** * - * @param array $extraArgs + * @param string[] $extraArgs * @return int + * @throws LSCMException Thrown indirectly. */ public function massDashNotify( $extraArgs ) { @@ -1090,16 +1241,37 @@ public function massDashNotify( $extraArgs ) return $ret; } + /** + * + * WP Constants: MULTISITE + * WP Variables: $wpdb + * WP Functions: switch_to_blog(), restore_current_blog(), + * is_plugin_active() + * + * @global \wpdb $wpdb + * @param string[] $extraArgs Unused for now. + * @param boolean $massOp + * @return int + * + * @noinspection PhpUndefinedClassInspection + * @noinspection PhpFullyQualifiedNameUsageInspection + * @noinspection PhpUnusedParameterInspection + */ public function dashDisable( $extraArgs, $massOp = false ) { + /** @noinspection PhpUndefinedConstantInspection */ if ( MULTISITE ) { global $wpdb; $blogs = $wpdb->get_col("SELECT blog_id FROM {$wpdb->blogs};"); foreach ( $blogs as $id ) { + /** @noinspection PhpUndefinedFunctionInspection */ switch_to_blog($id); + DashNotifier::deactivate(true); + + /** @noinspection PhpUndefinedFunctionInspection */ restore_current_blog(); } } @@ -1107,6 +1279,7 @@ public function dashDisable( $extraArgs, $massOp = false ) DashNotifier::deactivate(true); } + /** @noinspection PhpUndefinedFunctionInspection */ if ( is_plugin_active(DashNotifier::DASH_PLUGIN) ) { $this->massIncr = 'FAIL'; $ret = UserCommand::EXIT_FAIL; @@ -1137,14 +1310,17 @@ public function massDashDisable( $extraArgs ) } /** + * + * WP Functions: apply_filters(). * * @since 1.12 * - * @param bool $setOutputResult + * @param boolean $setOutputResult * @return string */ public function getQuicCloudAPIKey( $setOutputResult = false ) { + /** @noinspection PhpUndefinedFunctionInspection */ $key = apply_filters('litespeed_conf', 'api_key'); if ( $key == 'api_key' || $key == null ) { @@ -1237,15 +1413,26 @@ private function isMultisite() /** * + * WP Constants: WP_PLUGIN_DIR + * WP Variables: $wpdb, $shortcode_tags + * WP Functions: wp_plugin_directory_constants(), wp_cookie_constants() + * WP Classes: WP_Query + * + * @global \wpdb $wpdb + * @global array $shortcode_tags * @throws LSCMException Thrown directly and indirectly. + * + * @noinspection PhpUndefinedClassInspection + * @noinspection PhpFullyQualifiedNameUsageInspection */ private function initWp() { /** * Declared global variables for use in included files. + * + * @noinspection PhpUnusedLocalVariableInspection */ - global $wpdb; - global $shortcode_tags; + global $wpdb, $shortcode_tags; error_reporting(E_ALL); @@ -1264,13 +1451,17 @@ private function initWp() /** * Set WP version data global variables, including $wp_version. + * + * @noinspection PhpIncludeInspection */ include_once "{$wpPath}/wp-includes/version.php"; /** @noinspection PhpUndefinedVariableInspection */ if ( version_compare($wp_version, '4.0', '<') ) { - throw new LSCMException("Detected WordPress version as {$wp_version}. " - . 'Version 4.0 required at minimum.'); + throw new LSCMException( + "Detected WordPress version as {$wp_version}. Version 4.0 ' + . 'required at minimum." + ); } /** @@ -1392,6 +1583,7 @@ private function initWp() throw new LSCMException("Could not include missing file {$file}."); } + /** @noinspection PhpIncludeInspection */ include_once $file; } @@ -1405,6 +1597,7 @@ private function initWp() /** * Define common WP constants and set 'wp_plugin_paths' array. */ + /** @noinspection PhpUndefinedFunctionInspection */ wp_plugin_directory_constants(); /** @@ -1412,20 +1605,31 @@ private function initWp() */ $GLOBALS['wp_plugin_paths'] = array(); + /** @noinspection PhpUndefinedFunctionInspection */ wp_cookie_constants(); /** * Create global wp_query (WordPress) object entry. Needed during * LSCWP uninstall. + * + * @noinspection PhpUndefinedClassInspection + * @noinspection PhpFullyQualifiedNameUsageInspection */ $GLOBALS['wp_the_query'] = new \WP_Query(); $GLOBALS['wp_query'] = $GLOBALS['wp_the_query']; + /** @noinspection PhpUndefinedConstantInspection */ $this->pluginEntry = WP_PLUGIN_DIR . '/' . self::LSCWP_PLUGIN; if ( $this->loadLscwp && file_exists($this->pluginEntry) ) { + /** @noinspection PhpIncludeInspection */ include $this->pluginEntry; - $this->includeLSCWPAdvancedCacheFile(); + + $this->installedLscwpVer = $this->getPluginVersionFromFile(); + + if ( version_compare($this->installedLscwpVer, '3.0.4', '<') ) { + $this->includeLSCWPAdvancedCacheFile(); + } } } diff --git a/dist/add-ons/webcachemgr/src/WPInstallStorage.php b/dist/add-ons/webcachemgr/src/WPInstallStorage.php index 33213505e..bf976f372 100644 --- a/dist/add-ons/webcachemgr/src/WPInstallStorage.php +++ b/dist/add-ons/webcachemgr/src/WPInstallStorage.php @@ -206,15 +206,19 @@ public function getError() */ public function getCount( $nonFatalOnly = false ) { + $count = 0; + if ( !$nonFatalOnly ) { - $count = count($this->wpInstalls); + + if ( $this->wpInstalls != null ) { + $count += count($this->wpInstalls); + } if ( $this->custWpInstalls != null ) { $count += count($this->custWpInstalls); } } else { - $count = 0; foreach ( $this->wpInstalls as $install ) { diff --git a/dist/admin/html.open/index.php b/dist/admin/html.open/index.php index e7bb9904c..4443d3b7e 100644 --- a/dist/admin/html.open/index.php +++ b/dist/admin/html.open/index.php @@ -44,7 +44,7 @@
- LiteSpeed WebAdmin Console © 2014-2019 + LiteSpeed WebAdmin Console © 2014-2020
-

Copyright © 2014-2019 LiteSpeed Technologies, Inc.

+

Copyright © 2014-2020 LiteSpeed Technologies, Inc.


This setting will only take effect when "Enable Compression" and "Auto Update Static File" are enabled.

Default value: 5', ' 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.', 'Number between 1 and 11.', ''); +$_tipsdb['bubbleWrap'] = new DAttrHelp("Bubblewrap Container", 'Set to On if you wish to start CGI processes (including PHP programs) in a bubblewrap sandbox. See https://wiki.archlinux.org/index.php/Bubblewrap for details on using bubblewrap. Bubblewrap must be installed on your system prior to using this setting.

This setting cannot be turned on at the Virtual Host level if set to "Disabled" at the Server level.

Default values:
Server level: Disabled
VH level: Inherit Server level setting', '', 'Select from drop down list', ''); + +$_tipsdb['bubbleWrapCmd'] = new DAttrHelp("Bubblewrap Command", 'The full bubblewrap use command, including the bubblewrap program itself. More on configuring this command can be found here: https://openlitespeed.org/kb/bubblewrap-in-openlitespeed/ . If not specified, the default command listed below will be used.

Default value: /bin/bwrap --ro-bind /usr /usr --ro-bind /lib /lib --ro-bind-try /lib64 /lib64 --ro-bind /bin /bin --ro-bind /sbin /sbin --dir /var --dir /tmp --proc /proc --symlink../tmp var/tmp --dev /dev --ro-bind-try /etc/localtime /etc/localtime --ro-bind-try /etc/ld.so.cache /etc/ld.so.cache --ro-bind-try /etc/resolv.conf /etc/resolv.conf --ro-bind-try /etc/ssl /etc/ssl --ro-bind-try /etc/pki /etc/pki --ro-bind-try /etc/man_db.conf /etc/man_db.conf --ro-bind-try /home/$USER /home/$USER --bind-try /var/lib/mysql/mysql.sock /var/lib/mysql/mysql.sock --bind-try /home/mysql/mysql.sock /home/mysql/mysql.sock --bind-try /tmp/mysql.sock /tmp/mysql.sock --unshare-all --share-net --die-with-parent --dir /run/user/$UID ‘$PASSWD 65534’ ‘$GROUP 65534’', '', '', ''); + $_tipsdb['certChain'] = new DAttrHelp("Chained Certificate", 'Specifies whether the certificate is a chained certificate or not. The file that stores a certificate chain must be in PEM format, and the certificates must be in the chained order, from the lowest level (the actual client or server certificate) to the highest level (root) CA.', '', 'Select from radio box', ''); $_tipsdb['certFile'] = new DAttrHelp("Certificate File", 'The filename of the SSL certificate file.', ' The certificate file should be placed in a secured directory, which allows read-only access to the user that the server runs as.', 'Filename which can be an absolute path or a relative path to $SERVER_ROOT.', ''); @@ -412,7 +416,7 @@ $_tipsdb['maxConns'] = new DAttrHelp("Max Connections", 'Specifies the maximum number of concurrent connections that can be established between the server and an external application. This setting controls how many requests can be processed concurrently by an external application, however, the real limit also depends on the external application itself. Setting this value higher will not help if the external application is not fast enough or cannot scale to a large number of concurrent requests.', ' Setting a high value does not directly translate to higher performance. Setting the limit to a value that will not overload the external application will provide the best performance/throughput.', 'Integer number', ''); -$_tipsdb['maxDynRespHeaderSize'] = new DAttrHelp("Max Dynamic Response Header Size (bytes)", 'Specifies the maximum header size of a dynamically generated response. Hard limit is 64KB.

Default value: 16KB', ' Set it reasonably low to help recognize bad responses dynamically generated by external applications.', 'Integer number', ''); +$_tipsdb['maxDynRespHeaderSize'] = new DAttrHelp("Max Dynamic Response Header Size (bytes)", 'Specifies the maximum header size of a dynamically generated response. Hard limit is 64K.

Default value: 16K', ' Set it reasonably low to help recognize bad responses dynamically generated by external applications.', 'Integer number', ''); $_tipsdb['maxDynRespSize'] = new DAttrHelp("Max Dynamic Response Body Size (bytes)", 'Specifies the maximum body size of a dynamically generated response. Hard limit is 2047MB.', ' Set the limit reasonably low to help identify bad responses. It is not uncommon to malformed scripts to contain an infinite loop which leads to infinity-sized responses.', 'Integer number', ''); @@ -604,7 +608,7 @@ $_tipsdb['shType'] = new DAttrHelp("Handler Type", 'Specifies the type of external application that processes these script files. Available types are: CGI, FastCGI, Web Server, LSAPI app, Load balancer, or Servlet Engine. For FastCGI, Web Server and Servlet Engine, a "Handler Name" needs to be specified. This is an external application name as predefined in the "External Apps" section.', '', 'Select from drop down list', ''); -$_tipsdb['shmDefaultDir'] = new DAttrHelp("Default SHM Directory", 'Changes shared memory's default directory to the specified path. If the directory does not exist, it will be created. All SHM data will be stored in this directory unless otherwise specified.', '', 'Path', ''); +$_tipsdb['shmDefaultDir'] = new DAttrHelp("Default SHM Directory", 'Changes shared memory's default directory to the specified path. If the directory does not exist, it will be created. All SHM data will be stored in this directory unless otherwise specified.', '', 'path', ''); $_tipsdb['showVersionNumber'] = new DAttrHelp("Server Signature", 'Specifies whether to show the server signature and version number in the response header's "Server" value. There are three options: when set to Hide Version, only LiteSpeed is shown. When set to Show Version, LiteSpeed and the version number are shown. When set to Hide Full Header, the entire Server header will not be shown in the response header.', ' Set to Hide Version if you do not wish to expose the server version number.', 'Select from drop down list', ''); @@ -616,6 +620,8 @@ $_tipsdb['sslCert'] = new DAttrHelp("SSL Private Key & Certificate", 'Every SSL listener requires a paired SSL private key and SSL certificate. Multiple SSL listeners can share the same key and certificate.

You can generate SSL private keys yourself using an SSL software package, such as OpenSSL. SSL certificates can also be purchased from an authorized certificate issuer like VeriSign or Thawte. You can also sign the certificate yourself. Self-signed certificates will not be trusted by web browsers and should not be used on public websites containing critical data. However, a self-signed certificate is good enough for internal use, e.g. for encrypting traffic to LiteSpeed Web Server's WebAdmin Console.', '', '', ''); +$_tipsdb['sslDefaultCiphers'] = new DAttrHelp("Default Cipher Suite", 'Default cipher suite for SSL certificates.

Default value: Server Internal Default (Based on current best practices)', '', 'Colon-separated string of cipher specifications.', ''); + $_tipsdb['sslEnableMultiCerts'] = new DAttrHelp("Enable Multiple SSL Certificates", 'Allows listeners/vhosts to set multiple SSL certificates. If multiple certificates are enabled, the certificates/keys are expected to follow a naming scheme. If the cert is named server.crt, other possible cert names are server.crt.rsa, server.crt.dsa, server.crt.ecc. If "Not Set", defaults to "No".', '', 'Select from radio box', ''); $_tipsdb['sslOCSP'] = new DAttrHelp("OCSP Stapling", 'Online Certificate Status Protocol (OCSP) is a more efficient method of checking whether a digital certificate is valid. It works by communicating with another server — the OCSP responder — to get verification that the certificate is valid instead of checking through certificate revocation lists (CRL).

OCSP stapling is a further improvement on this protocol, allowing the server to check with the OCSP responder at regular intervals instead of every time a certificate is requested. See the OCSP Wikipedia page for more details.', '', '', ''); @@ -686,7 +692,7 @@ $_tipsdb['uri'] = new DAttrHelp("URI", 'Specifies the URI for this context. The URI should start with a "/". If a URI ends with a "/", then this context will include all sub-URIs under this URI.', '', 'URI', ''); -$_tipsdb['useIpInProxyHeader'] = new DAttrHelp("Use Client IP in Header", 'Specifies whether to use the IP address listed in the "X-Forwarded-For" HTTP request header for all IP address-related features, including connection/bandwidth throttling, access control, and IP geolocation.

This feature is useful if your web server is behind a load balancer or a proxy server. If you select "Trusted IP Only", then X-Forwarded-For IP will be used only when the request is coming from trusted IPs defined in the server-level "Allowed List".

"Keep Header from Trusted IP" is the same as "Trusted IP Only", but the X-Forwarded-For header used for the backend will not be modified to include the connecting peer address.', '', 'Select from drop down list', ''); +$_tipsdb['useIpInProxyHeader'] = new DAttrHelp("Use Client IP in Header", 'Specifies whether to use the first most valid IP IP address listed in the "X-Forwarded-For" HTTP request header for all IP address-related features, including connection/bandwidth throttling, access control, and IP geolocation.

This feature is useful if your web server is behind a load balancer or a proxy server. If you select Trusted IP Only, then X-Forwarded-For IP will be used only when the request is coming from trusted IPs defined in the server-level "Allowed List".

Keep Header from Trusted IP is the same as Trusted IP Only, but the X-Forwarded-For header used for the backend will not be modified to include the connecting peer address.

Use Last IP (for AWS ELB) will use the last IP address in the "X-Forwarded-For" list. Select this option if you are using AWS Elastic Load Balancer or expect the real IP to appended to the end of the "X-Forwarded-For" list.', '', 'Select from drop down list', ''); $_tipsdb['useSendfile'] = new DAttrHelp("Use sendfile()", '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.', '', 'Select from radio box', ''); @@ -726,7 +732,7 @@ $_tipsdb['vhlog_logLevel'] = new DAttrHelp("Log Level", 'Specifies the level of logging. Available levels (from high to low) are ERROR, WARNING, NOTICE, INFO, and DEBUG. Only messages with a level higher than or equal to the current setting will be logged. If you want to set it to DEBUG, you must set the server log level to DEBUG as well. The level of debugging is controlled solely at the server level by "Debug Level".', ' Unless "Debug Level" is set to a level other than NONE, DEBUG log level does not have any performance impact and is recommended.', 'Select from drop down list', ''); -$_tipsdb['viewlog'] = new DAttrHelp("Server Log Viewer", 'The Server Log Viewer is a convenient tool for browsing the current server log to check for errors or problems. The log viewer searches the server log file in blocks for the specified log level. The default block size is 20KB. You can use the Begin, End, Next, and Prev buttons to navigate a large log file.', 'The size of a dynamically generated page is limited by "Max Dynamic Response Body Size (bytes)". So if the block is too big, the page might be truncated.', '', ''); +$_tipsdb['viewlog'] = new DAttrHelp("Server Log Viewer", 'The Server Log Viewer is a convenient tool for browsing the current server log to check for errors or problems. The log viewer searches the server log file in blocks for the specified log level. The default block size is 20KB. You can use the Begin, End, Next, and Prev buttons to navigate a large log file.', 'The size of a dynamically generated page is limited by "Max Dynamic Response Body Size (bytes)". So if the block is too big, the page might be truncated.', '', ''); $_tipsdb['virtualHostMapping'] = new DAttrHelp("Virtual Host Mappings", 'Specifies the relationship between the listener and virtual hosts. Listeners and virtual hosts are associated by domain names. An HTTP request will be routed to a virtual host with a matching domain name. One listener can map to multiple virtual hosts for different domain names. One virtual host can also be mapped from different listeners. One listener can allow one catchall virtual host with the domain name value "*". When there is no explicitly matched domain name in the listener's mapping, the listener will forward the request to that catchall virtual host.', ' Only add necessary mappings. If the listener is mapped to only one virtual host, then only set up a catchall mapping "*".', '', ''); @@ -779,6 +785,10 @@ $_tipsdb['EDTP:binPath'] = array('',''); +$_tipsdb['EDTP:bubbleWrap'] = array(''); + +$_tipsdb['EDTP:bubbleWrapCmd'] = array(''); + $_tipsdb['EDTP:cgi_path'] = array('A CGI context can be used to specify a directory only contains CGI scripts. Path can be absolute path or relative to $SERVER_ROOT, $VH_ROOT or $DOC_ROOT(default). Path and URI must be ended with "/" for a cgi-bin directory.','If only a specific script is needed in that directory, it is recommended to create a CGI context for that script only. In this case, path and URI need not be a directory. For e.g., path can be ~/myapp/myscript.pl, URI can be /myapp/myscript.pl. All other files will not be served as CGI.'); $_tipsdb['EDTP:checkSymbolLink'] = array('Check-Symbolic-Link control will take effect only if Follow-Symbolic-Link is turned on. This controls whether symbolic links are checked against Access Denied Directories.'); diff --git a/dist/admin/html.open/res/lang/ja-JP_tips.php b/dist/admin/html.open/res/lang/ja-JP_tips.php index f41f184ad..6bcf1877b 100644 --- a/dist/admin/html.open/res/lang/ja-JP_tips.php +++ b/dist/admin/html.open/res/lang/ja-JP_tips.php @@ -150,6 +150,10 @@ $_tipsdb['brStaticCompressLevel'] = new DAttrHelp("Brotli Compression Level (Static File)", 'Specifies the level of Brotli compression applied to static files. Ranges from 1 (lowest) to 11 (highest).

This setting will only take effect when "圧縮を有効にする" and "静的ファイルの自動更新" are enabled.

Default value: 5', ' 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.', 'Number between 1 and 11.', ''); +$_tipsdb['bubbleWrap'] = new DAttrHelp("Bubblewrap Container", 'Set to On if you wish to start CGI processes (including PHP programs) in a bubblewrap sandbox. See https://wiki.archlinux.org/index.php/Bubblewrap for details on using bubblewrap. Bubblewrap must be installed on your system prior to using this setting.

This setting cannot be turned on at the Virtual Host level if set to "Disabled" at the Server level.

Default values:
Server level: Disabled
VH level: Inherit Server level setting', '', 'ドロップダウンリストから選択', ''); + +$_tipsdb['bubbleWrapCmd'] = new DAttrHelp("Bubblewrap Command", 'The full bubblewrap use command, including the bubblewrap program itself. More on configuring this command can be found here: https://openlitespeed.org/kb/bubblewrap-in-openlitespeed/ . If not specified, the default command listed below will be used.

Default value: /bin/bwrap --ro-bind /usr /usr --ro-bind /lib /lib --ro-bind-try /lib64 /lib64 --ro-bind /bin /bin --ro-bind /sbin /sbin --dir /var --dir /tmp --proc /proc --symlink../tmp var/tmp --dev /dev --ro-bind-try /etc/localtime /etc/localtime --ro-bind-try /etc/ld.so.cache /etc/ld.so.cache --ro-bind-try /etc/resolv.conf /etc/resolv.conf --ro-bind-try /etc/ssl /etc/ssl --ro-bind-try /etc/pki /etc/pki --ro-bind-try /etc/man_db.conf /etc/man_db.conf --ro-bind-try /home/$USER /home/$USER --bind-try /var/lib/mysql/mysql.sock /var/lib/mysql/mysql.sock --bind-try /home/mysql/mysql.sock /home/mysql/mysql.sock --bind-try /tmp/mysql.sock /tmp/mysql.sock --unshare-all --share-net --die-with-parent --dir /run/user/$UID ‘$PASSWD 65534’ ‘$GROUP 65534’', '', '', ''); + $_tipsdb['certChain'] = new DAttrHelp("チェーン証明書", '証明書がチェーン証明書であるかどうかを指定します。 チェーン証明を格納するファイルは、PEM形式でなければならず、証明書は最下位レベル（実際のクライアントまたはサーバー証明書）から最上位（ルート）CAまでの連鎖の順序でなければなりません。', '', 'ラジオボックスから選択', ''); $_tipsdb['certFile'] = new DAttrHelp("証明書ファイル", 'SSL証明書ファイルのファイル名。', '[セキュリティ]証明書ファイルは、サーバーが実行されるユーザーへの読み取り専用アクセスを可能にする安全なディレクトリに配置する必要があります。', 'ファイル名への絶対パス又は$SERVER_ROOTからの相対パス', ''); @@ -616,6 +620,8 @@ $_tipsdb['sslCert'] = new DAttrHelp("SSL秘密鍵と証明書", 'すべてのSSLリスナーには、ペアのSSL秘密鍵とSSL証明書が必要です。 複数のSSLリスナーは、同じ鍵と証明書を共有できます。
OpenSSLなどのSSLソフトウェアパッケージを使用して、SSL秘密鍵を自分で生成することができます。 SSL証明書は、VeriSignやThawteのような認可された証明書の発行者から購入することもできます。 自分で証明書に署名することもできます。 自己署名証明書はWebブラウザから信頼されないため、重要なデータを含む公開Webサイトでは使用しないでください。 ただし、自己署名証明書は内部使用に十分適しており、 例えば LiteSpeed WebサーバーのWebAdminコンソールへのトラフィックを暗号化します。', '', '', ''); +$_tipsdb['sslDefaultCiphers'] = new DAttrHelp("Default Cipher Suite", 'Default cipher suite for SSL certificates.

Default value: Server Internal Default (Based on current best practices)', '', 'Colon-separated string of cipher specifications.', ''); + $_tipsdb['sslEnableMultiCerts'] = new DAttrHelp("複数のSSL証明書を有効にする", 'リスナー/バーチャルホストが複数のSSL証明書を設定できるようにします。 複数の証明書が有効な場合、証明書/キーは命名規則に従うことが想定されます。 証明書の名前がserver.crtの場合、その他の可能な証明書名はserver.crt.rsa、server.crt.dsa、server.crt.eccです。 「未設定」の場合、デフォルトは「いいえ」です。', '', 'ラジオボックスから選択', ''); $_tipsdb['sslOCSP'] = new DAttrHelp("OCSPステープリング", 'オンライン証明書ステータスプロトコル（OCSP）は、デジタル証明書が有効かどうかを確認するより効率的な方法です。 OCSP応答者である他のサーバーと通信して、証明書失効リスト（CRL）をチェックする代わりに証明書が有効であることを確認します。
OCSPステープリングは、このプロトコルのさらなる改良であり、証明書が要求されるたびにではなく、定期的な間隔でサーバーがOCSPレスポンダを確認できるようにします。 詳細については、OCSP Wikipediaのページをご覧ください。', '', '', ''); @@ -779,6 +785,10 @@ $_tipsdb['EDTP:binPath'] = array('',''); +$_tipsdb['EDTP:bubbleWrap'] = array(''); + +$_tipsdb['EDTP:bubbleWrapCmd'] = array(''); + $_tipsdb['EDTP:cgi_path'] = array('CGIコンテキストを使用して、ディレクトリにCGIスクリプトのみを指定することができます。 パスは絶対パスでも、$SERVER_ROOT、$VH_ROOT、$DOC_ROOT（デフォルト）でもかまいません。 パスとURIは、cgi-binディレクトリのために "/"で終わらなければなりません。','そのディレクトリに特定のスクリプトだけが必要な場合は、そのスクリプトのCGIコンテキストを作成することをお勧めします。 この場合、pathとURIはディレクトリである必要はありません。 たとえば、pathは〜/myapp/myscript.pl、URIは/myapp/myscript.plです。 その他のファイルはすべてCGIとして提供されません。'); $_tipsdb['EDTP:checkSymbolLink'] = array('Check-Symbolic-Link制御は、Follow-Symbolic-Linkがオンになっている場合にのみ有効です。 これは、シンボリックリンクがアクセス拒否ディレクトリに対してチェックされるかどうかを制御します。'); diff --git a/dist/admin/html.open/res/lang/zh-CN_tips.php b/dist/admin/html.open/res/lang/zh-CN_tips.php index bcf1daf0f..c40e48a7b 100644 --- a/dist/admin/html.open/res/lang/zh-CN_tips.php +++ b/dist/admin/html.open/res/lang/zh-CN_tips.php @@ -150,6 +150,10 @@ $_tipsdb['brStaticCompressLevel'] = new DAttrHelp("Brotli Compression Level (Static File)", 'Specifies the level of Brotli compression applied to static files. Ranges from 1 (lowest) to 11 (highest).

This setting will only take effect when "启用压缩" and "自动更新静态文件" are enabled.

Default value: 5', ' 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.', 'Number between 1 and 11.', ''); +$_tipsdb['bubbleWrap'] = new DAttrHelp("Bubblewrap Container", 'Set to On if you wish to start CGI processes (including PHP programs) in a bubblewrap sandbox. See https://wiki.archlinux.org/index.php/Bubblewrap for details on using bubblewrap. Bubblewrap must be installed on your system prior to using this setting.

This setting cannot be turned on at the Virtual Host level if set to "Disabled" at the Server level.

Default values:
Server level: Disabled
VH level: Inherit Server level setting', '', 'Select from drop down list', ''); + +$_tipsdb['bubbleWrapCmd'] = new DAttrHelp("Bubblewrap Command", 'The full bubblewrap use command, including the bubblewrap program itself. More on configuring this command can be found here: https://openlitespeed.org/kb/bubblewrap-in-openlitespeed/ . If not specified, the default command listed below will be used.

Default value: /bin/bwrap --ro-bind /usr /usr --ro-bind /lib /lib --ro-bind-try /lib64 /lib64 --ro-bind /bin /bin --ro-bind /sbin /sbin --dir /var --dir /tmp --proc /proc --symlink../tmp var/tmp --dev /dev --ro-bind-try /etc/localtime /etc/localtime --ro-bind-try /etc/ld.so.cache /etc/ld.so.cache --ro-bind-try /etc/resolv.conf /etc/resolv.conf --ro-bind-try /etc/ssl /etc/ssl --ro-bind-try /etc/pki /etc/pki --ro-bind-try /etc/man_db.conf /etc/man_db.conf --ro-bind-try /home/$USER /home/$USER --bind-try /var/lib/mysql/mysql.sock /var/lib/mysql/mysql.sock --bind-try /home/mysql/mysql.sock /home/mysql/mysql.sock --bind-try /tmp/mysql.sock /tmp/mysql.sock --unshare-all --share-net --die-with-parent --dir /run/user/$UID ‘$PASSWD 65534’ ‘$GROUP 65534’', '', '', ''); + $_tipsdb['certChain'] = new DAttrHelp("Chained Certificate", 'Specifies whether the certificate is a chained certificate or not. The file that stores a certificate chain must be in PEM format, and the certificates must be in the chained order, from the lowest level (the actual client or server certificate) to the highest level (root) CA.', '', 'Select from radio box', ''); $_tipsdb['certFile'] = new DAttrHelp("Certificate File", 'The filename of the SSL certificate file.', ' The certificate file should be placed in a secured directory, which allows read-only access to the user that the server runs as.', 'Filename which can be an absolute path or a relative path to $SERVER_ROOT.', ''); @@ -604,7 +608,7 @@ $_tipsdb['shType'] = new DAttrHelp("类型", '指定处理这些脚本文件的外部程序类型。 可用类型有：CGI, FastCGI, Web服务器, LSAPI应用程序, 负载均衡器, 或 Servlet引擎。 对于FastCGI, Web服务器和Servlet引擎，需要指定"处理器名称"。 这是在"External Apps"部分预设定的外部程序名称。', '', '选项', ''); -$_tipsdb['shmDefaultDir'] = new DAttrHelp("Default SHM Directory", 'Changes shared memory's default directory to the specified path. If the directory does not exist, it will be created. All SHM data will be stored in this directory unless otherwise specified.', '', 'Path', ''); +$_tipsdb['shmDefaultDir'] = new DAttrHelp("Default SHM Directory", 'Changes shared memory's default directory to the specified path. If the directory does not exist, it will be created. All SHM data will be stored in this directory unless otherwise specified.', '', 'path', ''); $_tipsdb['showVersionNumber'] = new DAttrHelp("服务器签名", '指定是否在响应头的Server参数中显示服务器签名和版本号。 有三个选项: 当设置为Hide Version时、只显示LiteSpeed。当设置为 Show Version，显示LiteSpeed和版本号。 设置为Hide Full Header时，整个Server头都不会显示在响应报头中。', '[安全建议] 如果你不想暴露服务器的版本号，设置为Hide Version。', '布尔值', ''); @@ -616,6 +620,8 @@ $_tipsdb['sslCert'] = new DAttrHelp("SSL Private Key & Certificate", 'Every SSL listener requires a paired SSL private key and SSL certificate. Multiple SSL listeners can share the same key and certificate.

You can generate SSL private keys yourself using an SSL software package, such as OpenSSL. SSL certificates can also be purchased from an authorized certificate issuer like VeriSign or Thawte. You can also sign the certificate yourself. Self-signed certificates will not be trusted by web browsers and should not be used on public websites containing critical data. However, a self-signed certificate is good enough for internal use, e.g. for encrypting traffic to LiteSpeed Web Server's WebAdmin Console.', '', '', ''); +$_tipsdb['sslDefaultCiphers'] = new DAttrHelp("Default Cipher Suite", 'Default cipher suite for SSL certificates.

Default value: Server Internal Default (Based on current best practices)', '', 'Colon-separated string of cipher specifications.', ''); + $_tipsdb['sslEnableMultiCerts'] = new DAttrHelp("Enable Multiple SSL Certificates", 'Allows listeners/vhosts to set multiple SSL certificates. If multiple certificates are enabled, the certificates/keys are expected to follow a naming scheme. If the cert is named server.crt, other possible cert names are server.crt.rsa, server.crt.dsa, server.crt.ecc. If "Not Set", defaults to "No".', '', 'Select from radio box', ''); $_tipsdb['sslOCSP'] = new DAttrHelp("OCSP Stapling", 'Online Certificate Status Protocol (OCSP) is a more efficient method of checking whether a digital certificate is valid. It works by communicating with another server — the OCSP responder — to get verification that the certificate is valid instead of checking through certificate revocation lists (CRL).

OCSP stapling is a further improvement on this protocol, allowing the server to check with the OCSP responder at regular intervals instead of every time a certificate is requested. See the OCSP Wikipedia page for more details.', '', '', ''); @@ -726,7 +732,7 @@ $_tipsdb['vhlog_logLevel'] = new DAttrHelp("日志级别", '指定日志记录级别。可用级别（从高到低）为ERROR, WARNING, NOTICE, INFO, 和 DEBUG。 只有当消息等级高于或与当前设置相同时才被记录。 如果您希望将此设置为DEBUG，您也需要设置服务器日志级别为DEBUG。 调试的级别只能在服务器级别通过"调试级别"控制。', '[性能建议] 除非"调试级别"设置为NONE以外的日志级别, 否则DEBUG级别不会对性能产生任何影响，推荐采用。', '选项', ''); -$_tipsdb['viewlog'] = new DAttrHelp("Server Log Viewer", 'The Server Log Viewer is a convenient tool for browsing the current server log to check for errors or problems. The log viewer searches the server log file in blocks for the specified log level. The default block size is 20KB. You can use the Begin, End, Next, and Prev buttons to navigate a large log file.', 'The size of a dynamically generated page is limited by "动态回应主内容最大大小". So if the block is too big, the page might be truncated.', '', ''); +$_tipsdb['viewlog'] = new DAttrHelp("Server Log Viewer", 'The Server Log Viewer is a convenient tool for browsing the current server log to check for errors or problems. The log viewer searches the server log file in blocks for the specified log level. The default block size is 20KB. You can use the Begin, End, Next, and Prev buttons to navigate a large log file.', 'The size of a dynamically generated page is limited by "动态回应主内容最大大小". So if the block is too big, the page might be truncated.', '', ''); $_tipsdb['virtualHostMapping'] = new DAttrHelp("Virtual Host Mappings", 'Specifies the relationship between the listener and virtual hosts. Listeners and virtual hosts are associated by domain names. An HTTP request will be routed to a virtual host with a matching domain name. One listener can map to multiple virtual hosts for different domain names. One virtual host can also be mapped from different listeners. One listener can allow one catchall virtual host with the domain name value "*". When there is no explicitly matched domain name in the listener's mapping, the listener will forward the request to that catchall virtual host.', ' Only add necessary mappings. If the listener is mapped to only one virtual host, then only set up a catchall mapping "*".', '', ''); @@ -779,6 +785,10 @@ $_tipsdb['EDTP:binPath'] = array('',''); +$_tipsdb['EDTP:bubbleWrap'] = array(''); + +$_tipsdb['EDTP:bubbleWrapCmd'] = array(''); + $_tipsdb['EDTP:cgi_path'] = array('A CGI context can be used to specify a directory only contains CGI scripts. Path can be absolute path or relative to $SERVER_ROOT, $VH_ROOT or $DOC_ROOT(default). Path and URI must be ended with "/" for a cgi-bin directory.','If only a specific script is needed in that directory, it is recommended to create a CGI context for that script only. In this case, path and URI need not be a directory. For e.g., path can be ~/myapp/myscript.pl, URI can be /myapp/myscript.pl. All other files will not be served as CGI.'); $_tipsdb['EDTP:checkSymbolLink'] = array('Check-Symbolic-Link control will take effect only if Follow-Symbolic-Link is turned on. This controls whether symbolic links are checked against Access Denied Directories.'); diff --git a/dist/admin/html.open/view/inc/configui.php b/dist/admin/html.open/view/inc/configui.php index d57d8d633..55078d262 100644 --- a/dist/admin/html.open/view/inc/configui.php +++ b/dist/admin/html.open/view/inc/configui.php @@ -112,7 +112,7 @@ $footer_lic_info = ' Open LiteSpeed is an open source HTTP server. - Copyright (C) 2013-2019 Lite Speed Technologies, Inc. + Copyright (C) 2013-2020 Lite Speed Technologies, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/dist/conf/httpd_config.conf.in b/dist/conf/httpd_config.conf.in index f111ebf2a..84fb8b903 100755 --- a/dist/conf/httpd_config.conf.in +++ b/dist/conf/httpd_config.conf.in @@ -69,7 +69,7 @@ tuning{ enableDynGzipCompress 1 gzipCompressLevel 6 brStaticCompressLevel 6 - compressibleTypes text/*, application/x-javascript, application/xml, application/javascript, image/svg+xml,application/rss+xml + compressibleTypes default gzipAutoUpdateStatic 1 gzipMinFileSize 300 diff --git a/dist/docs/AdminGeneral_Help.html b/dist/docs/AdminGeneral_Help.html index 4ab69b462..b90b3f106 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. 7

+

Version 1.7  — Rev. 12

    diff --git a/dist/docs/AdminListeners_General_Help.html b/dist/docs/AdminListeners_General_Help.html index d67c658af..2ec00a3d2 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. 7

    +

    Version 1.7  — Rev. 12

      diff --git a/dist/docs/AdminListeners_SSL_Help.html b/dist/docs/AdminListeners_SSL_Help.html index 062cf8e8c..8d615f4da 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. 7

      +

      Version 1.7  — Rev. 12

        diff --git a/dist/docs/AdminSecurity_Help.html b/dist/docs/AdminSecurity_Help.html index dae19c028..5eaa360ec 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. 7

        +

        Version 1.7  — Rev. 12

          diff --git a/dist/docs/App_Server_Context.html b/dist/docs/App_Server_Context.html index a7403627c..b3b1641d1 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. 7

          +

          Version 1.7  — Rev. 12

            diff --git a/dist/docs/App_Server_Help.html b/dist/docs/App_Server_Help.html index 0b6be895d..bd301c406 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. 7

            +

            Version 1.7  — Rev. 12

              diff --git a/dist/docs/CGI_Context.html b/dist/docs/CGI_Context.html index 1115d9c80..e13d77f14 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. 7

              +

              Version 1.7  — Rev. 12

                diff --git a/dist/docs/CompilePHP_Help.html b/dist/docs/CompilePHP_Help.html index 004a06c3f..605c90650 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. 7

                +

                Version 1.7  — Rev. 12

                  diff --git a/dist/docs/Context_Help.html b/dist/docs/Context_Help.html index 4c5b6b5f9..f14424096 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. 7

                  +

                  Version 1.7  — Rev. 12

                    diff --git a/dist/docs/ExtApp_Help.html b/dist/docs/ExtApp_Help.html index 0e0340193..937667214 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. 7

                    +

                    Version 1.7  — Rev. 12

                      diff --git a/dist/docs/External_FCGI.html b/dist/docs/External_FCGI.html index 2de545540..cc19183d2 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. 7

                      +

                      Version 1.7  — Rev. 12

                        diff --git a/dist/docs/External_FCGI_Auth.html b/dist/docs/External_FCGI_Auth.html index cdb3b52f7..8d7348467 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. 7

                        +

                        Version 1.7  — Rev. 12

                          diff --git a/dist/docs/External_LB.html b/dist/docs/External_LB.html index d3783af17..32066aca3 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. 7

                          +

                          Version 1.7  — Rev. 12

                            diff --git a/dist/docs/External_LSAPI.html b/dist/docs/External_LSAPI.html index b653fc7b0..6308b6208 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. 7

                            +

                            Version 1.7  — Rev. 12

                              diff --git a/dist/docs/External_PL.html b/dist/docs/External_PL.html index f87c19739..91324a1b3 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. 7

                              +

                              Version 1.7  — Rev. 12

                                diff --git a/dist/docs/External_Servlet.html b/dist/docs/External_Servlet.html index 7a9c6434e..26d4d66fc 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. 7

                                +

                                Version 1.7  — Rev. 12

                                  diff --git a/dist/docs/External_WS.html b/dist/docs/External_WS.html index 159a85522..e9882747d 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. 7

                                  +

                                  Version 1.7  — Rev. 12

                                    diff --git a/dist/docs/FCGI_Context.html b/dist/docs/FCGI_Context.html index 68482eadb..d30b44859 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. 7

                                    +

                                    Version 1.7  — Rev. 12

                                      diff --git a/dist/docs/Java_Web_App_Context.html b/dist/docs/Java_Web_App_Context.html index 6a59f6ffe..c173c33ae 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. 7

                                      +

                                      Version 1.7  — Rev. 12

                                        diff --git a/dist/docs/LB_Context.html b/dist/docs/LB_Context.html index b92157930..7e63dab45 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. 7

                                        +

                                        Version 1.7  — Rev. 12

                                          diff --git a/dist/docs/LSAPI_Context.html b/dist/docs/LSAPI_Context.html index c070af2c6..952348c52 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. 7

                                          +

                                          Version 1.7  — Rev. 12

                                            diff --git a/dist/docs/Listeners_General_Help.html b/dist/docs/Listeners_General_Help.html index 5f760e14e..8cdb47618 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. 7

                                            +

                                            Version 1.7  — Rev. 12

                                              diff --git a/dist/docs/Listeners_SSL_Help.html b/dist/docs/Listeners_SSL_Help.html index 1c8c96f65..01cdbeaee 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. 7

                                              +

                                              Version 1.7  — Rev. 12

                                                diff --git a/dist/docs/Module_Context.html b/dist/docs/Module_Context.html index 195e62668..d5cd9cbbc 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. 7

                                                +

                                                Version 1.7  — Rev. 12

                                                  diff --git a/dist/docs/Module_Help.html b/dist/docs/Module_Help.html index 3a878d8da..3802beb6e 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. 7

                                                  +

                                                  Version 1.7  — Rev. 12

                                                    diff --git a/dist/docs/Proxy_Context.html b/dist/docs/Proxy_Context.html index a70cae8c0..7a9ab947b 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. 7

                                                    +

                                                    Version 1.7  — Rev. 12

                                                      diff --git a/dist/docs/Redirect_Context.html b/dist/docs/Redirect_Context.html index 1e3f79222..052baf29c 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. 7

                                                      +

                                                      Version 1.7  — Rev. 12

                                                        diff --git a/dist/docs/Rewrite_Help.html b/dist/docs/Rewrite_Help.html index dda2b23af..294f458ce 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. 7

                                                        +

                                                        Version 1.7  — Rev. 12

                                                          diff --git a/dist/docs/ScriptHandler_Help.html b/dist/docs/ScriptHandler_Help.html index 4ae46f8e5..6df750e6e 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. 7

                                                          +

                                                          Version 1.7  — Rev. 12

                                                            diff --git a/dist/docs/ServGeneral_Help.html b/dist/docs/ServGeneral_Help.html index 70ac563b3..bb0f35ade 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. 7

                                                            +

                                                            Version 1.7  — Rev. 12

                                                              @@ -135,7 +135,7 @@

                                                              Table of Contents

                                                              Disable Initial Log Rotation⇑

                                                              Description

                                                              Specifies whether to enable/disable rotation of server error log file at startup. Initial log rotation is enabled by default when using value "Not Set".

                                                              Syntax

                                                              Select from radio box

                                                            Server Signature⇑

                                                            Description

                                                            Specifies whether to show the server signature and version number in the response header's "Server" value. There are three options: when set to Hide Version, only LiteSpeed is shown. When set to Show Version, LiteSpeed and the version number are shown. When set to Hide Full Header, the entire Server header will not be shown in the response header.

                                                            Syntax

                                                            Select from drop down list

                                                            Tips

                                                            Set to Hide Version if you do not wish to expose the server version number.

                                                            Enable GeoLocation Lookup⇑

                                                            Description

                                                            Specifies whether to enable/disable IP Geolocation lookup. Can be set at server, virtual host, or context level. IP Geolocation is disabled by default when using value "Not Set".

                                                            Syntax

                                                            Select from radio box

                                                            See Also

                                                            Use Client IP in Header, DB File Path,

                                                            -

                                                            Use Client IP in Header⇑

                                                            Description

                                                            Specifies whether to use the IP address listed in the "X-Forwarded-For" HTTP request header for all IP address-related features, including connection/bandwidth throttling, access control, and IP geolocation.

                                                            This feature is useful if your web server is behind a load balancer or a proxy server. If you select "Trusted IP Only", then X-Forwarded-For IP will be used only when the request is coming from trusted IPs defined in the server-level Allowed List.

                                                            "Keep Header from Trusted IP" is the same as "Trusted IP Only", but the X-Forwarded-For header used for the backend will not be modified to include the connecting peer address.

                                                            Syntax

                                                            Select from drop down list

                                                            +

                                                            Use Client IP in Header⇑

                                                            Description

                                                            Specifies whether to use the first most valid IP IP address listed in the "X-Forwarded-For" HTTP request header for all IP address-related features, including connection/bandwidth throttling, access control, and IP geolocation.

                                                            This feature is useful if your web server is behind a load balancer or a proxy server. If you select Trusted IP Only, then X-Forwarded-For IP will be used only when the request is coming from trusted IPs defined in the server-level Allowed List.

                                                            Keep Header from Trusted IP is the same as Trusted IP Only, but the X-Forwarded-For header used for the backend will not be modified to include the connecting peer address.

                                                            Use Last IP (for AWS ELB) will use the last IP address in the "X-Forwarded-For" list. Select this option if you are using AWS Elastic Load Balancer or expect the real IP to appended to the end of the "X-Forwarded-For" list.

                                                            Syntax

                                                            Select from drop down list

                                                            Administrator Email⇑

                                                            Description

                                                            Specifies the server administrator's email address(es). If specified, administrators will be notified by email of important events (for example, when the LiteSpeed service is restarted automatically due to crash detection or when license is expiring).

                                                            Syntax

                                                            Comma delimited list of email address.

                                                            Tips

                                                            Email alert feature will only work if the server has an active MX server such as postfix, exim, or sendmail.

                                                            Index Files⇑

                                                            Description

                                                            Specifies names of index files that will be searched sequentially when a URL is mapped to a directory. You can customize it at the server, virtual host, and context level.

                                                            Syntax

                                                            Comma-delimited list of index filenames.

                                                            Tips

                                                            Only set index files that you need.

                                                            Auto Index⇑

                                                            Description

                                                            Specifies whether to generate a directory index on the fly when index files listed in Index Files are not available in a directory. This option is customizable at the virtual host and context level, and is inherited along the directory tree until it is explicitly overridden. You can customize the generated index page. Please check online wiki How-tos.

                                                            Syntax

                                                            Select from radio box

                                                            Tips

                                                            It is recommended to turn off Auto Index wherever possible to prevent revealing confidential data.

                                                            See Also

                                                            Index Files, Auto Index URI

                                                            diff --git a/dist/docs/ServLog_Help.html b/dist/docs/ServLog_Help.html index 774cb3e88..696416ce1 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. 7

                                                            +

                                                            Version 1.7  — Rev. 12

                                                              diff --git a/dist/docs/ServSecurity_Help.html b/dist/docs/ServSecurity_Help.html index e9b224ff3..c3dcabd58 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. 7

                                                              +

                                                              Version 1.7  — Rev. 12

                                                                @@ -104,6 +104,8 @@

                                                                Server Security

                                                                Table of Contents

                                                                CGI Daemon Socket | Max CGI Instances | Minimum UID | Minimum GID | Force GID | umask | CGI Priority | CPU Soft Limit (sec) | CPU Hard Limit | Memory Soft Limit (bytes) | Memory Hard Limit (bytes) | Process Soft Limit | Process Hard Limit | cgroups

                                                                reCAPTCHA Protection

                                                                Enable reCAPTCHA | Site Key | Secret Key | reCAPTCHA Type | Max Tries | Allowed Robot Hits | Bot White List | Connection Limit | SSL Connection Limit

                                                                +
                                                                Bubblewrap Container

                                                                +Bubblewrap Container | Bubblewrap Command

                                                                Access Denied Directories

                                                                Access Denied Directories

                                                                Access Control

                                                                @@ -151,6 +153,8 @@

                                                                Server Security

                                                                Table of Contents

                                                                Bot White List⇑

                                                                Description

                                                                List of custom user agents to allow access. Will be subject to the ‘good bots’ limitations, including allowedRobotHits.

                                                                Syntax

                                                                List of user agents, one per line. Regex is supported.

                                                                Connection Limit⇑

                                                                Description

                                                                The number of concurrent connections (SSL & non-SSL) needed to activate reCAPTCHA. reCAPTCHA will be used until concurrent connections drop below this number.

                                                                Default value is 15000.

                                                                Syntax

                                                                Integer number

                                                                SSL Connection Limit⇑

                                                                Description

                                                                The number of concurrent SSL connections needed to activate reCAPTCHA. reCAPTCHA will be used until concurrent connections drop below this number.

                                                                Default value is 10000.

                                                                Syntax

                                                                Integer number

                                                                +

                                                                Bubblewrap Container⇑

                                                                Description

                                                                Set to On if you wish to start CGI processes (including PHP programs) in a bubblewrap sandbox. See https://wiki.archlinux.org/index.php/Bubblewrap for details on using bubblewrap. Bubblewrap must be installed on your system prior to using this setting.

                                                                This setting cannot be turned on at the Virtual Host level if set to "Disabled" at the Server level.

                                                                Default values:
                                                                Server level: Disabled
                                                                VH level: Inherit Server level setting

                                                                Syntax

                                                                Select from drop down list

                                                                +

                                                                Bubblewrap Command⇑

                                                                Description

                                                                The full bubblewrap use command, including the bubblewrap program itself. More on configuring this command can be found here: https://openlitespeed.org/kb/bubblewrap-in-openlitespeed/ . If not specified, the default command listed below will be used.

                                                                Default value: /bin/bwrap --ro-bind /usr /usr --ro-bind /lib /lib --ro-bind-try /lib64 /lib64 --ro-bind /bin /bin --ro-bind /sbin /sbin --dir /var --dir /tmp --proc /proc --symlink../tmp var/tmp --dev /dev --ro-bind-try /etc/localtime /etc/localtime --ro-bind-try /etc/ld.so.cache /etc/ld.so.cache --ro-bind-try /etc/resolv.conf /etc/resolv.conf --ro-bind-try /etc/ssl /etc/ssl --ro-bind-try /etc/pki /etc/pki --ro-bind-try /etc/man_db.conf /etc/man_db.conf --ro-bind-try /home/$USER /home/$USER --bind-try /var/lib/mysql/mysql.sock /var/lib/mysql/mysql.sock --bind-try /home/mysql/mysql.sock /home/mysql/mysql.sock --bind-try /tmp/mysql.sock /tmp/mysql.sock --unshare-all --share-net --die-with-parent --dir /run/user/$UID ‘$PASSWD 65534’ ‘$GROUP 65534’

                                                                Access Denied Directories⇑

                                                                Description

                                                                Specifies directories that should be blocked from access. Add directories that contain sensitive data to this list to prevent accidentally exposing sensitive files to clients. Append a "*" to the path to include all sub-directories. If both Follow Symbolic Link and Check Symbolic Link are enabled, symbolic links will be checked against the denied directories.

                                                                Syntax

                                                                Comma-delimited list of directories

                                                                Tips

                                                                Of critical importance: This setting only prevents serving static files from these directories. This does not prevent exposure by external scripts such as PHP/Ruby/CGI.

                                                                Access Control⇑

                                                                Description

                                                                Specifies what sub networks and/or IP addresses can access the server. At the server level, this setting will affect all virtual hosts. You can also set up access control unique to each virtual host at the virtual host level. Virtual host level settings will NOT override server level settings.

                                                                Blocking/Allowing an IP is determined by the combination of the allowed list and the denied list. If you want to block only certain IPs or sub-networks, put * or ALL in the Allowed List and list the blocked IPs or sub-networks in the Denied List. If you want to allow only certain IPs or sub-networks, put * or ALL in the Denied List and list the allowed IPs or sub-networks in the Allowed List. The setting of the smallest scope that fits for an IP will be used to determine access.

                                                                Server Level: Trusted IPs or sub-networks must be specified in the Allowed List by adding a trailing "T". Trusted IPs or sub-networks are not affected by connection/throttling limits. Only server level access control can set up trusted IPs/sub-networks.

                                                                Tips

                                                                Use this at the server level for general restrictions that apply to all virtual hosts.

                                                                Allowed List⇑

                                                                Description

                                                                Specifies the list of IPs or sub-networks allowed. * or ALL are accepted.

                                                                Syntax

                                                                Comma delimited list of IP addresses or sub-networks. A trailing "T" can be used to indicate a trusted IP or sub-network, such as 192.168.1.*T.

                                                                Example

                                                                Sub-networks: 192.168.1.0/255.255.255.0, 192.168.1.0/24, 192.168.1, or 192.168.1.*
                                                                IPv6 addresses: ::1 or [::1]
                                                                IPv6 subnets: 3ffe:302:11:2:20f:1fff:fe29:717c/64 or [3ffe:302:11:2:20f:1fff:fe29:717c]/64

                                                                Tips

                                                                Trusted IPs or sub-networks set at the server level access control will be excluded from connection/throttling limits.

                                                                diff --git a/dist/docs/ServTuning_Help.html b/dist/docs/ServTuning_Help.html index af883bd14..d3fb529af 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. 7

                                                                +

                                                                Version 1.7  — Rev. 12

                                                                Max Request Header Size (bytes)⇑

                                                                Description

                                                                Specifies the maximum size of an HTTP request header including request URL. Hard limit is 16380 bytes.

                                                                Syntax

                                                                Integer number

                                                                Tips

                                                                Set it reasonably low to reduce memory usage and help identify bogus requests and DoS attacks.
                                                                4-8K is big enough for most web sites.

                                                                Max Request Body Size (bytes)⇑

                                                                Description

                                                                Specifies the maximum size of an HTTP request body. For a 32Bit OS, 2GB is the hard limit. For a 64Bit OS, it is virtually unlimited.

                                                                Syntax

                                                                Integer number

                                                                Tips

                                                                To help prevent DoS attacks, try to constrain this limit to only what is really needed. Your swapping space must have enough free space to accommodate this limit.

                                                                -

                                                                Max Dynamic Response Header Size (bytes)⇑

                                                                Description

                                                                Specifies the maximum header size of a dynamically generated response. Hard limit is 64KB.

                                                                Default value: 16KB

                                                                Syntax

                                                                Integer number

                                                                Tips

                                                                Set it reasonably low to help recognize bad responses dynamically generated by external applications.

                                                                +

                                                                Max Dynamic Response Header Size (bytes)⇑

                                                                Description

                                                                Specifies the maximum header size of a dynamically generated response. Hard limit is 64K.

                                                                Default value: 16K

                                                                Syntax

                                                                Integer number

                                                                Tips

                                                                Set it reasonably low to help recognize bad responses dynamically generated by external applications.

                                                                Max Dynamic Response Body Size (bytes)⇑

                                                                Description

                                                                Specifies the maximum body size of a dynamically generated response. Hard limit is 2047MB.

                                                                Syntax

                                                                Integer number

                                                                Tips

                                                                Set the limit reasonably low to help identify bad responses. It is not uncommon to malformed scripts to contain an infinite loop which leads to infinity-sized responses.

                                                                Max Cached Small File Size (bytes)⇑

                                                                Description

                                                                Specifies the largest static file that will be cached in a pre-allocated memory buffer. Static files can be served in four different ways: memory buffer cache, memory-mapped cache, plain read/write, and sendfile(). Files whose size is smaller than this setting are served from memory buffer cache. Files whose size is larger than this setting, but smaller than the Max MMAP File Size (bytes) will be served from memory-mapped cache. Files whose size is larger than the Max MMAP File Size (bytes) will be served via plain read/write or sendfile(). It is optimal to serve static files smaller than 4K from the memory buffer cache.

                                                                Syntax

                                                                Integer number

                                                                Total Small File Cache Size (bytes)⇑

                                                                Description

                                                                Specifies the total memory that can be allocated to the buffer cache in order to cache/serve small static files.

                                                                Syntax

                                                                Integer number

                                                                @@ -141,6 +141,7 @@

                                                                Server Tuning

                                                                Table of Contents

                                                                Static Cache Directory⇑

                                                                Description

                                                                Specifies the path of the directory used to store compressed files for static content.

                                                                Default value: Swapping Directory.

                                                                Syntax

                                                                Directory Path

                                                              Max Static File Size (bytes)⇑

                                                              Description

                                                              Specifies the maximum size of a static file for which the server will create a compressed file automatically.

                                                              Default value: 10M

                                                              Syntax

                                                              Number in bytes not less than 1K.

                                                              Tips

                                                              It is not recommended to have the server create/update compressed files for large files. Compressing blocks an entire server process and no further requests can be processed until the compression is completed.

                                                              Min Static File Size (bytes)⇑

                                                              Description

                                                              Specifies the minimum size of a static file for which the server will create a corresponding compressed file.

                                                              Default value: 200

                                                              Syntax

                                                              Number in bytes not less than 200.

                                                              Tips

                                                              It is not necessary to compress very small files as the bandwidth saving is negligible.

                                                              +

                                                              Default Cipher Suite⇑

                                                              Description

                                                              Default cipher suite for SSL certificates.

                                                              Default value: Server Internal Default (Based on current best practices)

                                                              Syntax

                                                              Colon-separated string of cipher specifications.

                                                              SSL Strong DH Key⇑

                                                              Description

                                                              Specifies whether to use 2048 or 1024 bit DH keys for SSL handshakes. If set to "Yes", 2048 bit DH keys will be used for 2048 bit SSL keys and certificates. 1024 bit DH keys will still be used in other situations. Default is "Yes".

                                                              Earlier versions of Java do not support DH key size higher than 1024 bits. If Java client compatibility is required, this should be set to "No".

                                                              Syntax

                                                              radio

                                                              Enable Multiple SSL Certificates⇑

                                                              Description

                                                              Allows listeners/vhosts to set multiple SSL certificates. If multiple certificates are enabled, the certificates/keys are expected to follow a naming scheme. If the cert is named server.crt, other possible cert names are server.crt.rsa, server.crt.dsa, server.crt.ecc. If "Not Set", defaults to "No".

                                                              Syntax

                                                              Select from radio box

                                                              Enable Session Cache⇑

                                                              Description

                                                              Enables session ID caching using OpenSSL's default setting. Server-level setting must be set to "Yes" for Virtual Host setting to take effect.

                                                              Default values:
                                                              Server-level: Yes
                                                              VH-Level: Yes

                                                              Syntax

                                                              Select from radio box

                                                              diff --git a/dist/docs/ServerStat_Help.html b/dist/docs/ServerStat_Help.html index cd0afffcf..307376d7f 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. 7

                                                              +

                                                              Version 1.7  — Rev. 12

                                                                @@ -117,7 +117,7 @@

                                                                Table of Contents

                                                                PID⇑

                                                                Description

                                                                PID (Process ID) of the current server process.

                                                                Tips

                                                                The PID will change each time the server is restarted.

                                                              Actions⇑

                                                              Description

                                                              Six actions are available from this menu: Graceful Restart, Toggle Debug Logging, Server Log Viewer, Real-Time Statistics, Version Manager, and Compile PHP.

                                                              Tips

                                                              The shell utility $SERVER_ROOT/bin/lswsctrl can be used to control the server processes as well, but requires a login shell.

                                                              Apply Changes/Graceful Restart⇑

                                                              Description

                                                              By clicking Graceful Restart, a new server process will be started. For Graceful Restart, the old server process will only exit after all requests to it have been finished (or the Graceful Restart Timeout (secs) limit has been reached). Configuration changes are applied at the next restart. Graceful Restart will apply these changes without any server downtime.

                                                              Tips

                                                              Graceful restart takes less than 2 seconds to generate a new server process.

                                                              -

                                                              Server Log Viewer⇑

                                                              Description

                                                              The Server Log Viewer is a convenient tool for browsing the current server log to check for errors or problems. The log viewer searches the server log file in blocks for the specified log level. The default block size is 20KB. You can use the Begin, End, Next, and Prev buttons to navigate a large log file.

                                                              Tips

                                                              The size of a dynamically generated page is limited by Max Dynamic Response Body Size (bytes). So if the block is too big, the page might be truncated.

                                                              +

                                                              Server Log Viewer⇑

                                                              Description

                                                              The Server Log Viewer is a convenient tool for browsing the current server log to check for errors or problems. The log viewer searches the server log file in blocks for the specified log level. The default block size is 20KB. You can use the Begin, End, Next, and Prev buttons to navigate a large log file.

                                                              Tips

                                                              The size of a dynamically generated page is limited by Max Dynamic Response Body Size (bytes). So if the block is too big, the page might be truncated.

                                                              Real-Time Statistics⇑

                                                              Description

                                                              The Real-Time Statistics link leads to a page with a real-time server status report. This is a convenient tool to monitor the system. The report shows a snapshot of your server statistics. The refresh rate for this snapshot is controlled by the Refresh Interval drop-down list in the upper righthand corner. The report contains the following sections:

                                                              • Server Health shows the basic server statistics, uptime, load, and anti-DDoS blocked IPs.
                                                              • Server lists current traffic throughput, connections, and requests statistics.
                                                              • Virtual Host shows request processing statuses and external application statuses for each virtual host.
                                                              • External Application lists the external applications currently running and their usage statistics. The CGI daemon process lscgid is always running as an external application.
                                                              Many of the rows in the Real-Time Statistics feature a graph icon. Clicking on this icon will open a graph of that row's statistics updated in real-time. In the Server section, next to Requests, there is a link labeled (Details). This link takes you to the Requests Snapshot, where you can view detailed information on which clients are making certain kinds of requests or which aspects of your site are bottlenecking. The fields in the blue area allow you to filter the snapshot to isolate certain parts of your server or look for clients that are performing certain actions.

                                                              Toggle Debug Logging⇑

                                                              Description

                                                              Toggle Debug Logging toggles the value of Debug Level between NONE and HIGH. As debug logging has an impact on performance and can fill up the hard drive quickly, so Debug Level should usually be set to NONE on a production server. This feature can be used instead to turn debug logging on and off quickly in order to debug a problem on a production server. Debug logging turned on or off in this way will not change anything shown in your server configurations.

                                                              Tips

                                                              Toggle Debug Logging will only work if Log Level is set to DEBUG. Important! Debug logging includes detailed information for each request and response. Active debug logging will severely degrade service performance and potentially saturate disk space in a very short time. This feature should only be used for a short period of time when trying to diagnose server issues.

                                                              See Also

                                                              Debug Level, Log Level

                                                              Name - Listener⇑

                                                              Description

                                                              The unique name that identifies this listener. This is the Listener Name you specified when setting up the listener.

                                                              diff --git a/dist/docs/Servlet_Context.html b/dist/docs/Servlet_Context.html index e5952a192..af1d964e9 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. 7

                                                              +

                                                              Version 1.7  — Rev. 12

                                                                diff --git a/dist/docs/Static_Context.html b/dist/docs/Static_Context.html index 7e57a06e7..70281d21b 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. 7

                                                                +

                                                                Version 1.7  — Rev. 12

                                                                  diff --git a/dist/docs/Templates_Help.html b/dist/docs/Templates_Help.html index 0353fae2e..d33e6b573 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. 7

                                                                  +

                                                                  Version 1.7  — Rev. 12

                                                                    diff --git a/dist/docs/VHGeneral_Help.html b/dist/docs/VHGeneral_Help.html index c42112a6e..20e838d53 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. 7

                                                                    +

                                                                    Version 1.7  — Rev. 12

                                                                      diff --git a/dist/docs/VHSSL_Help.html b/dist/docs/VHSSL_Help.html index 725b4ec63..51388e0da 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. 7

                                                                      +

                                                                      Version 1.7  — Rev. 12

                                                                        diff --git a/dist/docs/VHSecurity_Help.html b/dist/docs/VHSecurity_Help.html index 2c7144727..919199c33 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. 7

                                                                        +

                                                                        Version 1.7  — Rev. 12

                                                                        Max Tries⇑

                                                                        Description

                                                                        Max Tries specifies the maximum number of reCAPTCHA attempts permitted before denying the visitor.

                                                                        Default value is 3.

                                                                        Syntax

                                                                        Integer number

                                                                        Concurrent Request Limit⇑

                                                                        Description

                                                                        The number of concurrent requests needed to activate reCAPTCHA. reCAPTCHA will be used until concurrent requests drop below this number.

                                                                        Default value is 15000.

                                                                        Syntax

                                                                        Integer number

                                                                        +

                                                                        Bubblewrap Container⇑

                                                                        Description

                                                                        Set to On if you wish to start CGI processes (including PHP programs) in a bubblewrap sandbox. See https://wiki.archlinux.org/index.php/Bubblewrap for details on using bubblewrap. Bubblewrap must be installed on your system prior to using this setting.

                                                                        This setting cannot be turned on at the Virtual Host level if set to "Disabled" at the Server level.

                                                                        Default values:
                                                                        Server level: Disabled
                                                                        VH level: Inherit Server level setting

                                                                        Syntax

                                                                        Select from drop down list

                                                                        Access Control⇑

                                                                        Description

                                                                        Specifies what sub networks and/or IP addresses can access the server. At the server level, this setting will affect all virtual hosts. You can also set up access control unique to each virtual host at the virtual host level. Virtual host level settings will NOT override server level settings.

                                                                        Blocking/Allowing an IP is determined by the combination of the allowed list and the denied list. If you want to block only certain IPs or sub-networks, put * or ALL in the Allowed List and list the blocked IPs or sub-networks in the Denied List. If you want to allow only certain IPs or sub-networks, put * or ALL in the Denied List and list the allowed IPs or sub-networks in the Allowed List. The setting of the smallest scope that fits for an IP will be used to determine access.

                                                                        Server Level: Trusted IPs or sub-networks must be specified in the Allowed List by adding a trailing "T". Trusted IPs or sub-networks are not affected by connection/throttling limits. Only server level access control can set up trusted IPs/sub-networks.

                                                                        Tips

                                                                        Use this at the server level for general restrictions that apply to all virtual hosts.

                                                                        Allowed List⇑

                                                                        Description

                                                                        Specifies the list of IPs or sub-networks allowed. * or ALL are accepted.

                                                                        Syntax

                                                                        Comma delimited list of IP addresses or sub-networks. A trailing "T" can be used to indicate a trusted IP or sub-network, such as 192.168.1.*T.

                                                                        Example

                                                                        Sub-networks: 192.168.1.0/255.255.255.0, 192.168.1.0/24, 192.168.1, or 192.168.1.*
                                                                        IPv6 addresses: ::1 or [::1]
                                                                        IPv6 subnets: 3ffe:302:11:2:20f:1fff:fe29:717c/64 or [3ffe:302:11:2:20f:1fff:fe29:717c]/64

                                                                        Tips

                                                                        Trusted IPs or sub-networks set at the server level access control will be excluded from connection/throttling limits.

                                                                        Denied List⇑

                                                                        Description

                                                                        Specifies the list of IPs or sub-networks disallowed.

                                                                        Syntax

                                                                        Comma delimited list of IP addresses or sub-networks. * or ALL are accepted.

                                                                        Example

                                                                        Sub-networks: 192.168.1.0/255.255.255.0, 192.168.1.0/24, 192.168.1, or 192.168.1.*
                                                                        IPv6 addresses: ::1 or [::1]
                                                                        IPv6 subnets: 3ffe:302:11:2:20f:1fff:fe29:717c/64 or [3ffe:302:11:2:20f:1fff:fe29:717c]/64
                                                                        diff --git a/dist/docs/VHWebSocket_Help.html b/dist/docs/VHWebSocket_Help.html index c6003b3f0..718590e42 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. 7

                                                                        +

                                                                        Version 1.7  — Rev. 12

                                                                          diff --git a/dist/docs/VirtualHosts_Help.html b/dist/docs/VirtualHosts_Help.html index 574905f74..232210ab9 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. 7

                                                                          +

                                                                          Version 1.7  — Rev. 12

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

                                                                            OpenLiteSpeed Web Server Users' Manual

                                                                            -

                                                                            Version 1.7  — Rev. 7

                                                                            +

                                                                            Version 1.7  — Rev. 12

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

                                                                              OpenLiteSpeed Web Server Users' Manual

                                                                              -

                                                                              Version 1.7  — Rev. 7

                                                                              +

                                                                              Version 1.7  — Rev. 12

                                                                                diff --git a/dist/docs/css/hdoc.css b/dist/docs/css/hdoc.css index f03468ece..b6545ce88 100644 --- a/dist/docs/css/hdoc.css +++ b/dist/docs/css/hdoc.css @@ -161,7 +161,7 @@ a:hover{ color: #4caf50; } color: #d14; background-color: #f7f7f9; border: 1px solid #e1e1e8; - white-space: nowrap; + white-space: pre-wrap; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; diff --git a/dist/docs/index.html b/dist/docs/index.html index 2e47e78e0..74734694a 100644 --- a/dist/docs/index.html +++ b/dist/docs/index.html @@ -17,7 +17,7 @@

                                                                                OpenLiteSpeed Web Server Users' Manual

                                                                                -

                                                                                Version 1.7  — Rev. 7

                                                                                +

                                                                                Version 1.7  — Rev. 12

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



                                                                                  Users' Manual

                                                                                  - — Rev. 7 + — Rev. 12

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

                                                                                  OpenLiteSpeed Web Server Users' Manual

                                                                                  -

                                                                                  Version 1.7  — Rev. 7

                                                                                  +

                                                                                  Version 1.7  — Rev. 12

                                                                                  最大静的ファイルサイズ（バイト）⇑

                                                                                  説明

                                                                                  静的ファイルの最大サイズを指定します。 サーバーは自動的に圧縮ファイルを作成します。

                                                                                  構文

                                                                                  1K以上のバイト数

                                                                                  ヒント

                                                                                  [パフォーマンス]大規模なファイルに対してサーバーが圧縮ファイルを作成/更新することはお勧めできません。 圧縮は、サーバープロセス全体をブロックし、圧縮が完了するまで、それ以上の要求は処理できません。

                                                                                  最小静的ファイルサイズ（バイト）⇑

                                                                                  説明

                                                                                  静的ファイルの最小サイズを指定します。 サーバーは対応する圧縮ファイルを作成します。

                                                                                  構文

                                                                                  バイト数は200より小さくない。

                                                                                  ヒント

                                                                                  帯域幅の節約はごくわずかなため、非常に小さいファイルを圧縮する必要はありません。

                                                                                  +

                                                                                  Default Cipher Suite⇑

                                                                                  説明

                                                                                  Default cipher suite for SSL certificates.

                                                                                  Default value: Server Internal Default (Based on current best practices)

                                                                                  構文

                                                                                  Colon-separated string of cipher specifications.

                                                                                  SSL Strong DH Key⇑

                                                                                  説明

                                                                                  Specifies whether to use 2048 or 1024 bit DH keys for SSL handshakes. If set to "Yes", 2048 bit DH keys will be used for 2048 bit SSL keys and certificates. 1024 bit DH keys will still be used in other situations. Default is "Yes".

                                                                                  Earlier versions of Java do not support DH key size higher than 1024 bits. If Java client compatibility is required, this should be set to "No".

                                                                                  構文

                                                                                  radio

                                                                                  複数のSSL証明書を有効にする⇑

                                                                                  説明

                                                                                  リスナー/バーチャルホストが複数のSSL証明書を設定できるようにします。 複数の証明書が有効な場合、証明書/キーは命名規則に従うことが想定されます。 証明書の名前がserver.crtの場合、その他の可能な証明書名はserver.crt.rsa、server.crt.dsa、server.crt.eccです。 「未設定」の場合、デフォルトは「いいえ」です。

                                                                                  構文

                                                                                  ラジオボックスから選択

                                                                                  セッションキャッシュを有効にする⇑

                                                                                  説明

                                                                                  セッションIDキャッシングを有効にします。 「未設定」の場合、デフォルトは「いいえ」です。 （Opensslデフォルト）

                                                                                  構文

                                                                                  ラジオボックスから選択

                                                                                  diff --git a/dist/docs/ja-JP/VHSecurity_Help.html b/dist/docs/ja-JP/VHSecurity_Help.html index a1ea44524..8a843415c 100644 --- a/dist/docs/ja-JP/VHSecurity_Help.html +++ b/dist/docs/ja-JP/VHSecurity_Help.html @@ -83,6 +83,8 @@
                                                                                  Version 1.4  — Rev. 3
                                                                                  設定

                                                                                  バーチャルホストのセキュリティ

                                                                                  目次

                                                                                  reCAPTCHA Protection

                                                                                  Enable reCAPTCHA | Site Key | Secret Key | reCAPTCHA Type | Max Tries | Concurrent Request Limit

                                                                                  +
                                                                                  Bubblewrap Container

                                                                                  +Bubblewrap Container

                                                                                  アクセス制御

                                                                                  許可リスト | 拒否リスト

                                                                                  認可レルム

                                                                                  @@ -95,6 +97,7 @@

                                                                                  バーチャルホストのセキュリティ

                                                                                  目次

                                                                                  reCAPTCHA Type⇑

                                                                                  説明

                                                                                  Specify the reCAPTCHA type to use with the key pairs. If a key pair has not been provided and this setting is set to Not Set, a default key pair of type Invisible will be used.
                                                                                  Checkbox will display a checkbox reCAPTCHA for the visitor to validate.
                                                                                  Invisible will attempt to validate the reCAPTCHA automatically and if successful, will redirect to the desired page.

                                                                                  Default value is Invisible.

                                                                                  構文

                                                                                  ドロップダウンリストから選択

                                                                                Max Tries⇑

                                                                                説明

                                                                                Max Tries specifies the maximum number of reCAPTCHA attempts permitted before denying the visitor.

                                                                                Default value is 3.

                                                                                構文

                                                                                整数

                                                                                Concurrent Request Limit⇑

                                                                                説明

                                                                                The number of concurrent requests needed to activate reCAPTCHA. reCAPTCHA will be used until concurrent requests drop below this number.

                                                                                Default value is 15000.

                                                                                構文

                                                                                整数

                                                                                +

                                                                                Bubblewrap Container⇑

                                                                                説明

                                                                                Set to On if you wish to start CGI processes (including PHP programs) in a bubblewrap sandbox. See https://wiki.archlinux.org/index.php/Bubblewrap for details on using bubblewrap. Bubblewrap must be installed on your system prior to using this setting.

                                                                                This setting cannot be turned on at the Virtual Host level if set to "Disabled" at the Server level.

                                                                                Default values:
                                                                                Server level: Disabled
                                                                                VH level: Inherit Server level setting

                                                                                構文

                                                                                ドロップダウンリストから選択

                                                                                アクセス制御⇑

                                                                                説明

                                                                                どのサブネットワークおよび/またはIPアドレスがサーバーにアクセスできるかを指定します。 サーバレベルでは、この設定はすべてのバーチャルホストに影響します。 バーチャルホストレベルで各バーチャルホストに固有のアクセス制御を設定することもできます。 バーチャルホストレベルの設定はサーバーレベルの設定を上書きしません。

                                                                                ブロック/ IPの許可は、許可リストと拒否リストの組み合わせによって決まります。 特定のIPまたはサブネットワークのみをブロックする場合は、許可リストに*またはALLを入れ、ブロックされたIPまたはサブネットワークを拒否リスト。
                                                                                特定のIPまたはサブネットワークのみを許可する場合は、拒否リストに*またはALLを入れ、許可されたIPまたはサブネットワークを許可リスト。
                                                                                IPに適合する最小スコープの設定は、アクセスを決定するために使用されます。

                                                                                サーバーレベル：信頼できるIPまたはサブネットワークは、許可リストに、末尾の "T"を追加することで指定する必要があります。 信頼できるIPまたはサブネットワークは、接続/スロットリング制限の影響を受けません。 信頼できるIP/サブネットワークは、サーバーレベルのアクセス制御でのみ設定できます。

                                                                                ヒント

                                                                                [セキュリティ]すべてのバーチャルホストに適用される一般的な制限については、サーバーレベルでこれを使用してください。

                                                                                許可リスト⇑

                                                                                説明

                                                                                許可されるIPまたはサブネットワークのリストを指定します。 *またはALLが受け入れられます。

                                                                                構文

                                                                                IPアドレスまたはサブネットワークのカンマ区切りリスト。 末尾の「T」は、192.168.1.*Tなどの信頼できるIPまたはサブネットワークを示すために使用できます。

                                                                                例

                                                                                Sub-networks: 192.168.1.0/255.255.255.0, 192.168.1.0/24, 192.168.1, or 192.168.1.*
                                                                                IPv6 addresses: ::1 or [::1]
                                                                                IPv6 subnets: 3ffe:302:11:2:20f:1fff:fe29:717c/64 or [3ffe:302:11:2:20f:1fff:fe29:717c]/64

                                                                                ヒント

                                                                                [セキュリティ]サーバーレベルのアクセス制御で設定された信頼されたIPまたはサブネットワークは、接続/スロットリングの制限から除外されます。

                                                                                拒否リスト⇑

                                                                                説明

                                                                                許可されていないIPまたはサブネットワークのリストを指定します。

                                                                                構文

                                                                                IPアドレスまたはサブネットワークのカンマ区切りリスト。 *またはALLが受け入れられます。

                                                                                例

                                                                                Sub-networks: 192.168.1.0/255.255.255.0, 192.168.1.0/24, 192.168.1, or 192.168.1.*
                                                                                IPv6 addresses: ::1 or [::1]
                                                                                IPv6 subnets: 3ffe:302:11:2:20f:1fff:fe29:717c/64 or [3ffe:302:11:2:20f:1fff:fe29:717c]/64
                                                                                diff --git a/dist/docs/license.html b/dist/docs/license.html index 4344fdb76..4504d021b 100644 --- a/dist/docs/license.html +++ b/dist/docs/license.html @@ -17,7 +17,7 @@

                                                                                OpenLiteSpeed Web Server Users' Manual

                                                                                -

                                                                                Version 1.7  — Rev. 7

                                                                                +

                                                                                Version 1.7  — Rev. 12

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

                                                                                  OpenLiteSpeed Web Server Users' Manual

                                                                                  -

                                                                                  Version 1.7  — Rev. 7

                                                                                  +

                                                                                  Version 1.7  — Rev. 12

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

                                                                                    OpenLiteSpeed Web Server Users' Manual

                                                                                    -

                                                                                    Version 1.7  — Rev. 7

                                                                                    +

                                                                                    Version 1.7  — Rev. 12

                                                                                      diff --git a/dist/docs/zh-CN/AdminGeneral_Help.html b/dist/docs/zh-CN/AdminGeneral_Help.html index 9ee8361c6..53f57cc5f 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. 7

                                                                                      +

                                                                                      Version 1.7  — Rev. 12

                                                                                        diff --git a/dist/docs/zh-CN/AdminListeners_General_Help.html b/dist/docs/zh-CN/AdminListeners_General_Help.html index 9a576a5b2..41ff16a9b 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. 7

                                                                                        +

                                                                                        Version 1.7  — Rev. 12

                                                                                          diff --git a/dist/docs/zh-CN/AdminListeners_SSL_Help.html b/dist/docs/zh-CN/AdminListeners_SSL_Help.html index a8007c41f..28a319e9a 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. 7

                                                                                          +

                                                                                          Version 1.7  — Rev. 12

                                                                                            diff --git a/dist/docs/zh-CN/AdminSecurity_Help.html b/dist/docs/zh-CN/AdminSecurity_Help.html index b1280a194..6459c6cd2 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. 7

                                                                                            +

                                                                                            Version 1.7  — Rev. 12

                                                                                              diff --git a/dist/docs/zh-CN/App_Server_Context.html b/dist/docs/zh-CN/App_Server_Context.html index dcedc9cf7..69cfb7451 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. 7

                                                                                              +

                                                                                              Version 1.7  — Rev. 12

                                                                                                diff --git a/dist/docs/zh-CN/App_Server_Help.html b/dist/docs/zh-CN/App_Server_Help.html index 413a18116..fa87415df 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. 7

                                                                                                +

                                                                                                Version 1.7  — Rev. 12

                                                                                                  diff --git a/dist/docs/zh-CN/CGI_Context.html b/dist/docs/zh-CN/CGI_Context.html index da7d0ade9..a2bfa9ef4 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. 7

                                                                                                  +

                                                                                                  Version 1.7  — Rev. 12

                                                                                                    diff --git a/dist/docs/zh-CN/CompilePHP_Help.html b/dist/docs/zh-CN/CompilePHP_Help.html index e57c4c903..f5ac0ffc1 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. 7

                                                                                                    +

                                                                                                    Version 1.7  — Rev. 12

                                                                                                      diff --git a/dist/docs/zh-CN/Context_Help.html b/dist/docs/zh-CN/Context_Help.html index 23abfc79d..ff0e0c7d3 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. 7

                                                                                                      +

                                                                                                      Version 1.7  — Rev. 12

                                                                                                        diff --git a/dist/docs/zh-CN/ExtApp_Help.html b/dist/docs/zh-CN/ExtApp_Help.html index 0104dce2f..89c805ec6 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. 7

                                                                                                        +

                                                                                                        Version 1.7  — Rev. 12

                                                                                                          diff --git a/dist/docs/zh-CN/External_FCGI.html b/dist/docs/zh-CN/External_FCGI.html index 8f270bb6c..f97ace0cd 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. 7

                                                                                                          +

                                                                                                          Version 1.7  — Rev. 12

                                                                                                            diff --git a/dist/docs/zh-CN/External_FCGI_Auth.html b/dist/docs/zh-CN/External_FCGI_Auth.html index ec86db84c..c4463e1f2 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. 7

                                                                                                            +

                                                                                                            Version 1.7  — Rev. 12

                                                                                                              diff --git a/dist/docs/zh-CN/External_LB.html b/dist/docs/zh-CN/External_LB.html index eb7a2b86c..34aa9198c 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. 7

                                                                                                              +

                                                                                                              Version 1.7  — Rev. 12

                                                                                                                diff --git a/dist/docs/zh-CN/External_LSAPI.html b/dist/docs/zh-CN/External_LSAPI.html index 914e91906..d95d3dae3 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. 7

                                                                                                                +

                                                                                                                Version 1.7  — Rev. 12

                                                                                                                  diff --git a/dist/docs/zh-CN/External_PL.html b/dist/docs/zh-CN/External_PL.html index e3ea1b2b6..5e1b04bcf 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. 7

                                                                                                                  +

                                                                                                                  Version 1.7  — Rev. 12

                                                                                                                    diff --git a/dist/docs/zh-CN/External_Servlet.html b/dist/docs/zh-CN/External_Servlet.html index dcc2ed7e5..72f16e51d 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. 7

                                                                                                                    +

                                                                                                                    Version 1.7  — Rev. 12

                                                                                                                      diff --git a/dist/docs/zh-CN/External_WS.html b/dist/docs/zh-CN/External_WS.html index 8554cda88..0a5ae74e6 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. 7

                                                                                                                      +

                                                                                                                      Version 1.7  — Rev. 12

                                                                                                                        diff --git a/dist/docs/zh-CN/FCGI_Context.html b/dist/docs/zh-CN/FCGI_Context.html index 25ab53185..dcfb02b95 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. 7

                                                                                                                        +

                                                                                                                        Version 1.7  — Rev. 12

                                                                                                                          diff --git a/dist/docs/zh-CN/Java_Web_App_Context.html b/dist/docs/zh-CN/Java_Web_App_Context.html index 248c9c197..1d4a02ab8 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. 7

                                                                                                                          +

                                                                                                                          Version 1.7  — Rev. 12

                                                                                                                            diff --git a/dist/docs/zh-CN/LB_Context.html b/dist/docs/zh-CN/LB_Context.html index c4993a872..77f59198f 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. 7

                                                                                                                            +

                                                                                                                            Version 1.7  — Rev. 12

                                                                                                                              diff --git a/dist/docs/zh-CN/LSAPI_Context.html b/dist/docs/zh-CN/LSAPI_Context.html index c242c93b5..ea860fd78 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. 7

                                                                                                                              +

                                                                                                                              Version 1.7  — Rev. 12

                                                                                                                                diff --git a/dist/docs/zh-CN/Listeners_General_Help.html b/dist/docs/zh-CN/Listeners_General_Help.html index 6f5d1702c..28e13d9f5 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. 7

                                                                                                                                +

                                                                                                                                Version 1.7  — Rev. 12

                                                                                                                                  diff --git a/dist/docs/zh-CN/Listeners_SSL_Help.html b/dist/docs/zh-CN/Listeners_SSL_Help.html index cdb741d71..a3e3aea15 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. 7

                                                                                                                                  +

                                                                                                                                  Version 1.7  — Rev. 12

                                                                                                                                    diff --git a/dist/docs/zh-CN/Module_Context.html b/dist/docs/zh-CN/Module_Context.html index 0040491b4..91d6ba29c 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. 7

                                                                                                                                    +

                                                                                                                                    Version 1.7  — Rev. 12

                                                                                                                                      diff --git a/dist/docs/zh-CN/Module_Help.html b/dist/docs/zh-CN/Module_Help.html index db61a4cb1..7b635284a 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. 7

                                                                                                                                      +

                                                                                                                                      Version 1.7  — Rev. 12

                                                                                                                                        diff --git a/dist/docs/zh-CN/Proxy_Context.html b/dist/docs/zh-CN/Proxy_Context.html index ef1b42e1e..5e6c50a3e 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. 7

                                                                                                                                        +

                                                                                                                                        Version 1.7  — Rev. 12

                                                                                                                                          diff --git a/dist/docs/zh-CN/Redirect_Context.html b/dist/docs/zh-CN/Redirect_Context.html index 11b235cfd..1b51212bd 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. 7

                                                                                                                                          +

                                                                                                                                          Version 1.7  — Rev. 12

                                                                                                                                            diff --git a/dist/docs/zh-CN/Rewrite_Help.html b/dist/docs/zh-CN/Rewrite_Help.html index c06b42d44..b41122821 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. 7

                                                                                                                                            +

                                                                                                                                            Version 1.7  — Rev. 12

                                                                                                                                              diff --git a/dist/docs/zh-CN/ScriptHandler_Help.html b/dist/docs/zh-CN/ScriptHandler_Help.html index 991f51afc..292826f62 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. 7

                                                                                                                                              +

                                                                                                                                              Version 1.7  — Rev. 12

                                                                                                                                                diff --git a/dist/docs/zh-CN/ServGeneral_Help.html b/dist/docs/zh-CN/ServGeneral_Help.html index 05bc288db..fbc252c3f 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. 7

                                                                                                                                                +

                                                                                                                                                Version 1.7  — Rev. 12

                                                                                                                                                  diff --git a/dist/docs/zh-CN/ServLog_Help.html b/dist/docs/zh-CN/ServLog_Help.html index d2e52c6ec..fe0a25ae4 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. 7

                                                                                                                                                  +

                                                                                                                                                  Version 1.7  — Rev. 12

                                                                                                                                                    diff --git a/dist/docs/zh-CN/ServSecurity_Help.html b/dist/docs/zh-CN/ServSecurity_Help.html index c9896640c..d82e3e9c9 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. 7

                                                                                                                                                    +

                                                                                                                                                    Version 1.7  — Rev. 12

                                                                                                                                                      @@ -104,6 +104,8 @@

                                                                                                                                                      Server Security

                                                                                                                                                      Table of Contents

                                                                                                                                                      CGI守护进程套接字 | 最大CGI实例数量 | 最小的UID | 最小的GID | 强制GID | umask | CGI优先级 | CPU软限制 | CPU硬限制 | 内存软限制 | 内存硬限制 | 进程软限制 | 进程硬限制 | cgroups

                                                                                                                                                      reCAPTCHA Protection

                                                                                                                                                      Enable reCAPTCHA | Site Key | Secret Key | reCAPTCHA Type | Max Tries | Allowed Robot Hits | Bot White List | Connection Limit | SSL Connection Limit

                                                                                                                                                      +
                                                                                                                                                      Bubblewrap Container

                                                                                                                                                      +Bubblewrap Container | Bubblewrap Command

                                                                                                                                                      Access Denied Directories

                                                                                                                                                      拒绝访问的目录

                                                                                                                                                      登入限制

                                                                                                                                                      @@ -151,6 +153,8 @@

                                                                                                                                                      Server Security

                                                                                                                                                      Table of Contents

                                                                                                                                                      Bot White List⇑

                                                                                                                                                      Description

                                                                                                                                                      List of custom user agents to allow access. Will be subject to the ‘good bots’ limitations, including allowedRobotHits.

                                                                                                                                                      Syntax

                                                                                                                                                      List of user agents, one per line. Regex is supported.

                                                                                                                                                      Connection Limit⇑

                                                                                                                                                      Description

                                                                                                                                                      The number of concurrent connections (SSL & non-SSL) needed to activate reCAPTCHA. reCAPTCHA will be used until concurrent connections drop below this number.

                                                                                                                                                      Default value is 15000.

                                                                                                                                                      Syntax

                                                                                                                                                      无符号整数

                                                                                                                                                      SSL Connection Limit⇑

                                                                                                                                                      Description

                                                                                                                                                      The number of concurrent SSL connections needed to activate reCAPTCHA. reCAPTCHA will be used until concurrent connections drop below this number.

                                                                                                                                                      Default value is 10000.

                                                                                                                                                      Syntax

                                                                                                                                                      无符号整数

                                                                                                                                                      +

                                                                                                                                                      Bubblewrap Container⇑

                                                                                                                                                      Description

                                                                                                                                                      Set to On if you wish to start CGI processes (including PHP programs) in a bubblewrap sandbox. See https://wiki.archlinux.org/index.php/Bubblewrap for details on using bubblewrap. Bubblewrap must be installed on your system prior to using this setting.

                                                                                                                                                      This setting cannot be turned on at the Virtual Host level if set to "Disabled" at the Server level.

                                                                                                                                                      Default values:
                                                                                                                                                      Server level: Disabled
                                                                                                                                                      VH level: Inherit Server level setting

                                                                                                                                                      Syntax

                                                                                                                                                      Select from drop down list

                                                                                                                                                      +

                                                                                                                                                      Bubblewrap Command⇑

                                                                                                                                                      Description

                                                                                                                                                      The full bubblewrap use command, including the bubblewrap program itself. More on configuring this command can be found here: https://openlitespeed.org/kb/bubblewrap-in-openlitespeed/ . If not specified, the default command listed below will be used.

                                                                                                                                                      Default value: /bin/bwrap --ro-bind /usr /usr --ro-bind /lib /lib --ro-bind-try /lib64 /lib64 --ro-bind /bin /bin --ro-bind /sbin /sbin --dir /var --dir /tmp --proc /proc --symlink../tmp var/tmp --dev /dev --ro-bind-try /etc/localtime /etc/localtime --ro-bind-try /etc/ld.so.cache /etc/ld.so.cache --ro-bind-try /etc/resolv.conf /etc/resolv.conf --ro-bind-try /etc/ssl /etc/ssl --ro-bind-try /etc/pki /etc/pki --ro-bind-try /etc/man_db.conf /etc/man_db.conf --ro-bind-try /home/$USER /home/$USER --bind-try /var/lib/mysql/mysql.sock /var/lib/mysql/mysql.sock --bind-try /home/mysql/mysql.sock /home/mysql/mysql.sock --bind-try /tmp/mysql.sock /tmp/mysql.sock --unshare-all --share-net --die-with-parent --dir /run/user/$UID ‘$PASSWD 65534’ ‘$GROUP 65534’

                                                                                                                                                      拒绝访问的目录⇑

                                                                                                                                                      Description

                                                                                                                                                      指定应该拒绝访问的目录。 将包含敏感数据的目录加入到这个列表，以防止向客户端意外泄露敏感文件。 在路径后加一个“*”，可包含所有子目录。 如果跟随符号链接和检查符号链接都被启用， 符号链接也将被检查是否在被拒绝访问目录中。

                                                                                                                                                      Syntax

                                                                                                                                                      逗号分隔的目录列表

                                                                                                                                                      Tips

                                                                                                                                                      [安全建议] 至关重要: 此设置只能防止服务这些目录中的静态文件。 这不能防止外部脚本如PHP、Ruby、CGI造成的泄露。

                                                                                                                                                      登入限制⇑

                                                                                                                                                      Description

                                                                                                                                                      指定哪些子网络和/或IP地址可以访问该服务器。 这是影响所有的虚拟主机的服务器级别设置。您还可以为每个虚拟主机设置登入限制。虚拟主机的设置不会覆盖服务器设置。

                                                                                                                                                      是否阻止/允许一个IP是由允许列表与阻止列表共同决定。 如果你想阻止某个特定IP或子网，请在允许列表中写入* 或 ALL，并在拒绝列表中写入需要阻止的IP或子网。 如果你想允许某个特定的IP或子网，请在拒绝列表中写入* 或 ALL，并在允许列表中写入需要允许的IP或子网。 单个IP地址是被允许访问还是禁止访问取决于该IP符合的最小限制范围。

                                                                                                                                                      信任的IP或子网络可以在允许列表列表中添加后缀“T”来指定。受信任的IP或子网不受连接数/流量限制。 只有服务器级别的登入限制才可以设置受信任的IP或子网。

                                                                                                                                                      Tips

                                                                                                                                                      [安全建议] 用此项设置适用于所有虚拟主机的常规限制。

                                                                                                                                                      允许列表⇑

                                                                                                                                                      Description

                                                                                                                                                      指定允许的IP地址或子网的列表。 可以使用{VAL}*或{VAL}ALL。

                                                                                                                                                      Syntax

                                                                                                                                                      逗号分隔的IP地址或子网列表。 结尾加上“T”可以用来表示一个受信任的IP或子网，如{VAL}192.168.1.*T。

                                                                                                                                                      Example

                                                                                                                                                      子网: 192.168.1.0/255.255.255.0, 192.168.1.0/24, 192.168.1 或 192.168.1.*.
                                                                                                                                                      IPv6 地址: ::1 或 [::1]
                                                                                                                                                      IPv6 子网: 3ffe:302:11:2:20f:1fff:fe29:717c/64 或 [3ffe:302:11:2:20f:1fff:fe29:717c]/64.

                                                                                                                                                      Tips

                                                                                                                                                      [安全建议] 在服务器级别设置的受信任的IP或子网不受连接/节流限制。

                                                                                                                                                      diff --git a/dist/docs/zh-CN/ServTuning_Help.html b/dist/docs/zh-CN/ServTuning_Help.html index b89682b59..687ec79d3 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. 7

                                                                                                                                                      +

                                                                                                                                                      Version 1.7  — Rev. 12

                                                                                                                                                      静态文件最大尺寸⇑

                                                                                                                                                      Description

                                                                                                                                                      指定LiteSpeed可以自动创建压缩文件的静态文件最大尺寸。

                                                                                                                                                      Syntax

                                                                                                                                                      不小于1K的字节数。

                                                                                                                                                      Tips

                                                                                                                                                      [性能建议] 不建议使用LiteSpeed创建/更新较大文件的压缩文件。 压缩操作会占用整个服务器进程并且在压缩结束前新请求都无法被处理。

                                                                                                                                                      静态文件最小尺寸⇑

                                                                                                                                                      Description

                                                                                                                                                      指定LiteSpeed创建相应压缩文件的静态文件最小尺寸。

                                                                                                                                                      Syntax

                                                                                                                                                      不小于200的字节数。

                                                                                                                                                      Tips

                                                                                                                                                      因为流量节省可以忽略不计，所以压缩非常小的文件是没有必要的。

                                                                                                                                                      +

                                                                                                                                                      Default Cipher Suite⇑

                                                                                                                                                      Description

                                                                                                                                                      Default cipher suite for SSL certificates.

                                                                                                                                                      Default value: Server Internal Default (Based on current best practices)

                                                                                                                                                      Syntax

                                                                                                                                                      Colon-separated string of cipher specifications.

                                                                                                                                                      SSL Strong DH Key⇑

                                                                                                                                                      Description

                                                                                                                                                      Specifies whether to use 2048 or 1024 bit DH keys for SSL handshakes. If set to "Yes", 2048 bit DH keys will be used for 2048 bit SSL keys and certificates. 1024 bit DH keys will still be used in other situations. Default is "Yes".

                                                                                                                                                      Earlier versions of Java do not support DH key size higher than 1024 bits. If Java client compatibility is required, this should be set to "No".

                                                                                                                                                      Syntax

                                                                                                                                                      radio

                                                                                                                                                      Enable Multiple SSL Certificates⇑

                                                                                                                                                      Description

                                                                                                                                                      Allows listeners/vhosts to set multiple SSL certificates. If multiple certificates are enabled, the certificates/keys are expected to follow a naming scheme. If the cert is named server.crt, other possible cert names are server.crt.rsa, server.crt.dsa, server.crt.ecc. If "Not Set", defaults to "No".

                                                                                                                                                      Syntax

                                                                                                                                                      Select from radio box

                                                                                                                                                      Enable Session Cache⇑

                                                                                                                                                      Description

                                                                                                                                                      Enables session ID caching using OpenSSL's default setting. Server-level setting must be set to "Yes" for Virtual Host setting to take effect.

                                                                                                                                                      Default values:
                                                                                                                                                      Server-level: Yes
                                                                                                                                                      VH-Level: Yes

                                                                                                                                                      Syntax

                                                                                                                                                      Select from radio box

                                                                                                                                                      diff --git a/dist/docs/zh-CN/ServerStat_Help.html b/dist/docs/zh-CN/ServerStat_Help.html index 3ad7661e8..684d18fd1 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. 7

                                                                                                                                                      +

                                                                                                                                                      Version 1.7  — Rev. 12

                                                                                                                                                        @@ -117,7 +117,7 @@

                                                                                                                                                        Table of Contents

                                                                                                                                                        PID⇑

                                                                                                                                                        Description

                                                                                                                                                        PID (Process ID) of the current server process.

                                                                                                                                                        Tips

                                                                                                                                                        The PID will change each time the server is restarted.

                                                                                                                                                      Actions⇑

                                                                                                                                                      Description

                                                                                                                                                      Six actions are available from this menu: Graceful Restart, Toggle Debug Logging, Server Log Viewer, Real-Time Statistics, Version Manager, and Compile PHP.

                                                                                                                                                      Tips

                                                                                                                                                      The shell utility $SERVER_ROOT/bin/lswsctrl can be used to control the server processes as well, but requires a login shell.

                                                                                                                                                      Apply Changes/Graceful Restart⇑

                                                                                                                                                      Description

                                                                                                                                                      By clicking Graceful Restart, a new server process will be started. For Graceful Restart, the old server process will only exit after all requests to it have been finished (or the 平滑重启超时时长 limit has been reached). Configuration changes are applied at the next restart. Graceful Restart will apply these changes without any server downtime.

                                                                                                                                                      Tips

                                                                                                                                                      Graceful restart takes less than 2 seconds to generate a new server process.

                                                                                                                                                      -

                                                                                                                                                      Server Log Viewer⇑

                                                                                                                                                      Description

                                                                                                                                                      The Server Log Viewer is a convenient tool for browsing the current server log to check for errors or problems. The log viewer searches the server log file in blocks for the specified log level. The default block size is 20KB. You can use the Begin, End, Next, and Prev buttons to navigate a large log file.

                                                                                                                                                      Tips

                                                                                                                                                      The size of a dynamically generated page is limited by 动态回应主内容最大大小. So if the block is too big, the page might be truncated.

                                                                                                                                                      +

                                                                                                                                                      Server Log Viewer⇑

                                                                                                                                                      Description

                                                                                                                                                      The Server Log Viewer is a convenient tool for browsing the current server log to check for errors or problems. The log viewer searches the server log file in blocks for the specified log level. The default block size is 20KB. You can use the Begin, End, Next, and Prev buttons to navigate a large log file.

                                                                                                                                                      Tips

                                                                                                                                                      The size of a dynamically generated page is limited by 动态回应主内容最大大小. So if the block is too big, the page might be truncated.

                                                                                                                                                      Real-Time Statistics⇑

                                                                                                                                                      Description

                                                                                                                                                      The Real-Time Statistics link leads to a page with a real-time server status report. This is a convenient tool to monitor the system. The report shows a snapshot of your server statistics. The refresh rate for this snapshot is controlled by the Refresh Interval drop-down list in the upper righthand corner. The report contains the following sections:

                                                                                                                                                      • Server Health shows the basic server statistics, uptime, load, and anti-DDoS blocked IPs.
                                                                                                                                                      • Server lists current traffic throughput, connections, and requests statistics.
                                                                                                                                                      • Virtual Host shows request processing statuses and external application statuses for each virtual host.
                                                                                                                                                      • External Application lists the external applications currently running and their usage statistics. The CGI daemon process lscgid is always running as an external application.
                                                                                                                                                      Many of the rows in the Real-Time Statistics feature a graph icon. Clicking on this icon will open a graph of that row's statistics updated in real-time. In the Server section, next to Requests, there is a link labeled (Details). This link takes you to the Requests Snapshot, where you can view detailed information on which clients are making certain kinds of requests or which aspects of your site are bottlenecking. The fields in the blue area allow you to filter the snapshot to isolate certain parts of your server or look for clients that are performing certain actions.

                                                                                                                                                      Toggle Debug Logging⇑

                                                                                                                                                      Description

                                                                                                                                                      Toggle Debug Logging toggles the value of 调试级别 between NONE and HIGH. As debug logging has an impact on performance and can fill up the hard drive quickly, so 调试级别 should usually be set to NONE on a production server. This feature can be used instead to turn debug logging on and off quickly in order to debug a problem on a production server. Debug logging turned on or off in this way will not change anything shown in your server configurations.

                                                                                                                                                      Tips

                                                                                                                                                      Toggle Debug Logging will only work if 日志级别 is set to DEBUG. Important! Debug logging includes detailed information for each request and response. Active debug logging will severely degrade service performance and potentially saturate disk space in a very short time. This feature should only be used for a short period of time when trying to diagnose server issues.

                                                                                                                                                      See Also

                                                                                                                                                      调试级别, 日志级别

                                                                                                                                                      Name - Listener⇑

                                                                                                                                                      Description

                                                                                                                                                      The unique name that identifies this listener. This is the Listener Name you specified when setting up the listener.

                                                                                                                                                      diff --git a/dist/docs/zh-CN/Servlet_Context.html b/dist/docs/zh-CN/Servlet_Context.html index 3e37086a8..7f490deba 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. 7

                                                                                                                                                      +

                                                                                                                                                      Version 1.7  — Rev. 12

                                                                                                                                                        diff --git a/dist/docs/zh-CN/Static_Context.html b/dist/docs/zh-CN/Static_Context.html index 33bd44b25..6e28e9e22 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. 7

                                                                                                                                                        +

                                                                                                                                                        Version 1.7  — Rev. 12

                                                                                                                                                          diff --git a/dist/docs/zh-CN/Templates_Help.html b/dist/docs/zh-CN/Templates_Help.html index 7238ab267..5cdcaa3df 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. 7

                                                                                                                                                          +

                                                                                                                                                          Version 1.7  — Rev. 12

                                                                                                                                                            diff --git a/dist/docs/zh-CN/VHGeneral_Help.html b/dist/docs/zh-CN/VHGeneral_Help.html index ceec72297..30cf7ab07 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. 7

                                                                                                                                                            +

                                                                                                                                                            Version 1.7  — Rev. 12

                                                                                                                                                              diff --git a/dist/docs/zh-CN/VHSSL_Help.html b/dist/docs/zh-CN/VHSSL_Help.html index 4cae65235..d9623f431 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. 7

                                                                                                                                                              +

                                                                                                                                                              Version 1.7  — Rev. 12

                                                                                                                                                                diff --git a/dist/docs/zh-CN/VHSecurity_Help.html b/dist/docs/zh-CN/VHSecurity_Help.html index ceb3df743..7d0e26157 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. 7

                                                                                                                                                                +

                                                                                                                                                                Version 1.7  — Rev. 12

                                                                                                                                                                Max Tries⇑

                                                                                                                                                                Description

                                                                                                                                                                Max Tries specifies the maximum number of reCAPTCHA attempts permitted before denying the visitor.

                                                                                                                                                                Default value is 3.

                                                                                                                                                                Syntax

                                                                                                                                                                无符号整数

                                                                                                                                                                Concurrent Request Limit⇑

                                                                                                                                                                Description

                                                                                                                                                                The number of concurrent requests needed to activate reCAPTCHA. reCAPTCHA will be used until concurrent requests drop below this number.

                                                                                                                                                                Default value is 15000.

                                                                                                                                                                Syntax

                                                                                                                                                                无符号整数

                                                                                                                                                                +

                                                                                                                                                                Bubblewrap Container⇑

                                                                                                                                                                Description

                                                                                                                                                                Set to On if you wish to start CGI processes (including PHP programs) in a bubblewrap sandbox. See https://wiki.archlinux.org/index.php/Bubblewrap for details on using bubblewrap. Bubblewrap must be installed on your system prior to using this setting.

                                                                                                                                                                This setting cannot be turned on at the Virtual Host level if set to "Disabled" at the Server level.

                                                                                                                                                                Default values:
                                                                                                                                                                Server level: Disabled
                                                                                                                                                                VH level: Inherit Server level setting

                                                                                                                                                                Syntax

                                                                                                                                                                Select from drop down list

                                                                                                                                                                登入限制⇑

                                                                                                                                                                Description

                                                                                                                                                                指定哪些子网络和/或IP地址可以访问该服务器。 这是影响所有的虚拟主机的服务器级别设置。您还可以为每个虚拟主机设置登入限制。虚拟主机的设置不会覆盖服务器设置。

                                                                                                                                                                是否阻止/允许一个IP是由允许列表与阻止列表共同决定。 如果你想阻止某个特定IP或子网，请在允许列表中写入* 或 ALL，并在拒绝列表中写入需要阻止的IP或子网。 如果你想允许某个特定的IP或子网，请在拒绝列表中写入* 或 ALL，并在允许列表中写入需要允许的IP或子网。 单个IP地址是被允许访问还是禁止访问取决于该IP符合的最小限制范围。

                                                                                                                                                                信任的IP或子网络可以在允许列表列表中添加后缀“T”来指定。受信任的IP或子网不受连接数/流量限制。 只有服务器级别的登入限制才可以设置受信任的IP或子网。

                                                                                                                                                                Tips

                                                                                                                                                                [安全建议] 用此项设置适用于所有虚拟主机的常规限制。

                                                                                                                                                                允许列表⇑

                                                                                                                                                                Description

                                                                                                                                                                指定允许的IP地址或子网的列表。 可以使用{VAL}*或{VAL}ALL。

                                                                                                                                                                Syntax

                                                                                                                                                                逗号分隔的IP地址或子网列表。 结尾加上“T”可以用来表示一个受信任的IP或子网，如{VAL}192.168.1.*T。

                                                                                                                                                                Example

                                                                                                                                                                子网: 192.168.1.0/255.255.255.0, 192.168.1.0/24, 192.168.1 或 192.168.1.*.
                                                                                                                                                                IPv6 地址: ::1 或 [::1]
                                                                                                                                                                IPv6 子网: 3ffe:302:11:2:20f:1fff:fe29:717c/64 或 [3ffe:302:11:2:20f:1fff:fe29:717c]/64.

                                                                                                                                                                Tips

                                                                                                                                                                [安全建议] 在服务器级别设置的受信任的IP或子网不受连接/节流限制。

                                                                                                                                                                拒绝列表⇑

                                                                                                                                                                Description

                                                                                                                                                                指定不允许的IP地址或子网的列表。

                                                                                                                                                                Syntax

                                                                                                                                                                逗号分隔的IP地址或子网列表。 可以使用{VAL}*或{VAL}ALL。

                                                                                                                                                                Example

                                                                                                                                                                子网: 192.168.1.0/255.255.255.0, 192.168.1.0/24, 192.168.1 或 192.168.1.*.
                                                                                                                                                                IPv6 地址: ::1 或 [::1]
                                                                                                                                                                IPv6 子网: 3ffe:302:11:2:20f:1fff:fe29:717c/64 或 [3ffe:302:11:2:20f:1fff:fe29:717c]/64.
                                                                                                                                                                diff --git a/dist/docs/zh-CN/VHWebSocket_Help.html b/dist/docs/zh-CN/VHWebSocket_Help.html index 0733ffcb8..4f4517f37 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. 7

                                                                                                                                                                +

                                                                                                                                                                Version 1.7  — Rev. 12

                                                                                                                                                                  diff --git a/dist/docs/zh-CN/VirtualHosts_Help.html b/dist/docs/zh-CN/VirtualHosts_Help.html index 9383a04a5..e24dfc3da 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. 7

                                                                                                                                                                  +

                                                                                                                                                                  Version 1.7  — Rev. 12

                                                                                                                                                                    diff --git a/dist/docs/zh-CN/admin.html b/dist/docs/zh-CN/admin.html index f4c76b228..48a707b85 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. 7

                                                                                                                                                                    +

                                                                                                                                                                    Version 1.7  — Rev. 12

                                                                                                                                                                      diff --git a/dist/docs/zh-CN/config.html b/dist/docs/zh-CN/config.html index 392d399b8..a60e6f0ec 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. 7

                                                                                                                                                                      +

                                                                                                                                                                      Version 1.7  — Rev. 12

                                                                                                                                                                        diff --git a/dist/docs/zh-CN/index.html b/dist/docs/zh-CN/index.html index 58edbbcc2..613c37025 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. 7

                                                                                                                                                                        +

                                                                                                                                                                        Version 1.7  — Rev. 12

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



                                                                                                                                                                          Users' Manual

                                                                                                                                                                          - — Rev. 7 + — Rev. 12

                                                                                                                                                                          diff --git a/dist/docs/zh-CN/install.html b/dist/docs/zh-CN/install.html index 3952d778f..af4fe6b21 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. 7

                                                                                                                                                                          +

                                                                                                                                                                          Version 1.7  — Rev. 12

                                                                                                                                                                            diff --git a/dist/docs/zh-CN/intro.html b/dist/docs/zh-CN/intro.html index d4bbdf5fd..b7e2b6348 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. 7

                                                                                                                                                                            +

                                                                                                                                                                            Version 1.7  — Rev. 12

                                                                                                                                                                              diff --git a/dist/docs/zh-CN/license.html b/dist/docs/zh-CN/license.html index 0ded24470..ab1d59be3 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. 7

                                                                                                                                                                              +

                                                                                                                                                                              Version 1.7  — Rev. 12

                                                                                                                                                                                diff --git a/dist/docs/zh-CN/security.html b/dist/docs/zh-CN/security.html index dd0ca4ffa..9d1fae5c0 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. 7

                                                                                                                                                                                +

                                                                                                                                                                                Version 1.7  — Rev. 12

                                                                                                                                                                                  diff --git a/dist/docs/zh-CN/webconsole.html b/dist/docs/zh-CN/webconsole.html index 8b18ad528..6dc4b6c52 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. 7

                                                                                                                                                                                  +

                                                                                                                                                                                  Version 1.7  — Rev. 12

                                                                                                                                                                                    diff --git a/dist/fcgi-bin/RackRunner.rb b/dist/fcgi-bin/RackRunner.rb index 4b831be2c..15b2d5d63 100755 --- a/dist/fcgi-bin/RackRunner.rb +++ b/dist/fcgi-bin/RackRunner.rb @@ -38,8 +38,20 @@ module Rack module Handler class LiteSpeed def self.run(app, options=nil) - while LSAPI.accept != nil - serve app + if LSAPI.respond_to?("accept_new_connection") + while LSAPI.accept_new_connection != nil + fork do + LSAPI.postfork_child + while LSAPI.accept != nil + serve app + end + end + LSAPI.postfork_parent + end + else + while LSAPI.accept != nil + serve app + end end end diff --git a/dist/functions.sh b/dist/functions.sh index 1d8406b36..6a6fb5e5b 100755 --- a/dist/functions.sh +++ b/dist/functions.sh @@ -1129,14 +1129,33 @@ gen_selfsigned_cert_new() COMMNAME=`hostname` SSL_COUNTRY=US SSL_STATE="New Jersey" - SSL_LOCALITY=Virtual - SSL_ORG=LiteSpeedCommunity - SSL_ORGUNIT=Testing + csr="${SSL_HOSTNAME}.csr" key="${SSL_HOSTNAME}.key" cert="${SSL_HOSTNAME}.crt" - openssl req -subj "/CN=${COMMNAME}/O=webadmin/C=US/subjectAltName=DNS.1=${MYIP}/" -new -newkey rsa:2048 -sha256 -days 730 -nodes -x509 -keyout ${key} -out ${cert} - +# openssl req -subj "/CN=${COMMNAME}/O=webadmin/C=US/extendedKeyUsage=1.3.6.1.5.5.7.3.1/subjectAltName=DNS.1=${MYIP}/" -new -newkey rsa:2048 -sha256 -days 730 -nodes -x509 -keyout ${key} -out ${cert} +# + + cat << EOF > $csr +[req] +prompt=no +distinguished_name=openlitespeed +[openlitespeed] +commonName = ${COMMNAME} +countryName = ${SSL_COUNTRY} +localityName = Virtual +organizationName = LiteSpeedCommunity +organizationalUnitName = Testing +stateOrProvinceName = NJ +emailAddress = mail@${COMMNAME} +name = openlitespeed +initials = CP +dnQualifier = openlitespeed +[server_exts] +extendedKeyUsage=1.3.6.1.5.5.7.3.1 +EOF + openssl req -x509 -config $csr -extensions 'server_exts' -nodes -days 820 -newkey rsa:2048 -keyout ${key} -out ${cert} + rm -f $csr } gen_selfsigned_cert() diff --git a/dist/lsrecaptcha/_recaptcha.shtml b/dist/lsrecaptcha/_recaptcha.shtml index ac53e541d..3bc2c6b6f 100644 --- a/dist/lsrecaptcha/_recaptcha.shtml +++ b/dist/lsrecaptcha/_recaptcha.shtml @@ -2,6 +2,7 @@ + Bot Verification