diff --git a/CMakeLists.txt b/CMakeLists.txt index 0469a696..aa2335b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,8 +11,8 @@ set(openlitespeed_VERSION SET(CMAKE_INCLUDE_CURRENT_DIR ON) -include_directories( include ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/include/) -link_directories( ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/lib/) +include_directories( include ${PROJECT_SOURCE_DIR}/../thirdparty/include/) +link_directories( ${PROJECT_SOURCE_DIR}/../thirdparty/lib/) SET (CMAKE_C_COMPILER "/usr/bin/clang") SET (CMAKE_CXX_COMPILER "/usr/bin/clang++") diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0 index a15c9387..1ea7d447 100644 --- a/autom4te.cache/output.0 +++ b/autom4te.cache/output.0 @@ -16222,15 +16222,9 @@ _ACEOF save_CPPFLAGS="$CPPFLAGS" fi - for ac_header in IP2Location.h IP2Loc_DBInterface.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - + ac_fn_c_check_header_mongrel "$LINENO" "IP2Location.h" "ac_cv_header_IP2Location_h" "$ac_includes_default" +if test "x$ac_cv_header_IP2Location_h" = xyes; then : + else if test "x$ip2location_dir" != "x" @@ -16247,7 +16241,6 @@ else fi -done if test "x$need_ip2location" != "xno" diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1 index 65504a52..3bf35aa9 100644 --- a/autom4te.cache/output.1 +++ b/autom4te.cache/output.1 @@ -16218,15 +16218,9 @@ _ACEOF save_CPPFLAGS="$CPPFLAGS" fi - for ac_header in IP2Location.h IP2Loc_DBInterface.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - + ac_fn_c_check_header_mongrel "$LINENO" "IP2Location.h" "ac_cv_header_IP2Location_h" "$ac_includes_default" +if test "x$ac_cv_header_IP2Location_h" = xyes; then : + else if test "x$ip2location_dir" != "x" @@ -16243,7 +16237,6 @@ else fi -done if test "x$need_ip2location" != "xno" diff --git a/autom4te.cache/traces.0 b/autom4te.cache/traces.0 index 5ffd0f2b..1c51f73f 100644 --- a/autom4te.cache/traces.0 +++ b/autom4te.cache/traces.0 @@ -2873,7 +2873,7 @@ m4trace:ax_check_ip2location.m4:4: -1- AC_DEFUN([AC_IP2LOCATION_CHECK], [ save_CPPFLAGS="$CPPFLAGS" fi - AC_CHECK_HEADERS(IP2Location.h IP2Loc_DBInterface.h ,, + AC_CHECK_HEADER(IP2Location.h,, [ if test "x$ip2location_dir" != "x" then diff --git a/autom4te.cache/traces.1 b/autom4te.cache/traces.1 index a56ae578..e2336bcb 100644 --- a/autom4te.cache/traces.1 +++ b/autom4te.cache/traces.1 @@ -754,10 +754,6 @@ m4trace:configure.ac:335: -1- AC_DEFINE_TRACE_LITERAL([USE_IP2LOCATION]) m4trace:configure.ac:335: -1- m4_pattern_allow([^USE_IP2LOCATION$]) m4trace:configure.ac:335: -1- AH_OUTPUT([USE_IP2LOCATION], [/* Defined to compile with IP2Location included */ @%:@undef USE_IP2LOCATION]) -m4trace:configure.ac:336: -1- AH_OUTPUT([HAVE_IP2LOCATION_H], [/* Define to 1 if you have the header file. */ -@%:@undef HAVE_IP2LOCATION_H]) -m4trace:configure.ac:336: -1- AH_OUTPUT([HAVE_IP2LOC_DBINTERFACE_H], [/* Define to 1 if you have the header file. */ -@%:@undef HAVE_IP2LOC_DBINTERFACE_H]) m4trace:configure.ac:336: -1- AC_SUBST([IP2LOCATION_INCLUDES]) m4trace:configure.ac:336: -1- AC_SUBST_TRACE([IP2LOCATION_INCLUDES]) m4trace:configure.ac:336: -1- m4_pattern_allow([^IP2LOCATION_INCLUDES$]) diff --git a/ax_check_ip2location.m4 b/ax_check_ip2location.m4 index 070cf456..1b553ca8 100644 --- a/ax_check_ip2location.m4 +++ b/ax_check_ip2location.m4 @@ -15,7 +15,7 @@ AC_DEFUN([AC_IP2LOCATION_CHECK],[ save_CPPFLAGS="$CPPFLAGS" fi - AC_CHECK_HEADERS(IP2Location.h IP2Loc_DBInterface.h ,, + AC_CHECK_HEADER(IP2Location.h,, [ if test "x$ip2location_dir" != "x" then diff --git a/configure b/configure index acf24ed3..c13dca18 100755 --- a/configure +++ b/configure @@ -16218,14 +16218,8 @@ _ACEOF save_CPPFLAGS="$CPPFLAGS" fi - for ac_header in IP2Location.h IP2Loc_DBInterface.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF + ac_fn_c_check_header_mongrel "$LINENO" "IP2Location.h" "ac_cv_header_IP2Location_h" "$ac_includes_default" +if test "x$ac_cv_header_IP2Location_h" = xyes; then : else @@ -16243,7 +16237,6 @@ else fi -done if test "x$need_ip2location" != "xno" diff --git a/dist/admin/html.open/res/lang/en-US_tips.php b/dist/admin/html.open/res/lang/en-US_tips.php index 870dbcc0..35ce8f60 100644 --- a/dist/admin/html.open/res/lang/en-US_tips.php +++ b/dist/admin/html.open/res/lang/en-US_tips.php @@ -148,7 +148,7 @@ $_tipsdb['ciphers'] = new DAttrHelp("Ciphers", 'Specifies the cipher suite to be $_tipsdb['clientVerify'] = new DAttrHelp("Client Verification", ' Specifies the type of client certifcate authentication. Available types are: The default is "None".', '"None" or "Require" are recommended.', 'Select from drop down list', ''); -$_tipsdb['compilerflags'] = new DAttrHelp("Compiler Flags", 'Add additional compiler flags, like optimized compiler options.', '', 'Supported flags are CFLAGS, CXXFLAGS, CPPFLAGS, LDFLAGS. Use a space to separate different flags. Use single quotes (not double quotes) for flag values.', 'CFLAGS='-O3 -msse2 -msse3 -msse4.1 -msse4.2 -msse4 -mavx''); +$_tipsdb['compilerflags'] = new DAttrHelp("Compiler Flags", 'Add additional compiler flags, like optimized compiler options.', '', 'Supported flags are CFLAGS, CXXFLAGS, CPPFLAGS, LDFLAGS. Use a space to separate different flags. Use single quotes (not double quotes) for flag values.', 'CFLAGS='-O3 -msse2 -msse3 -msse4.1 -msse4.2 -msse4 -mavx''); $_tipsdb['compressibleTypes'] = new DAttrHelp("Compressible Types", 'Specifies what MIME types are allowed to be compressed.', ' Only allow types that will benefit from GZIP compression. Binary files such as gif/png/jpeg images and flash files do not benefit from compression.', 'MIME type list separated by commas. Wild card "*" and negate sign "!" are allowed, such as text/*, !text/js.', 'If you want to compress text/* but not text/css, you can have a rule like text/*, !text/css. "!" will exclude that MIME type.'); @@ -310,7 +310,7 @@ $_tipsdb['indexUseServer'] = new DAttrHelp("Use Server Index Files", 'Specifies $_tipsdb['initTimeout'] = new DAttrHelp("Initial Request Timeout (secs)", 'Specifies the maximum time in seconds the server will wait for the external application to respond to the first request over a new established connection. If the server does not receive any data from the external application within this timeout limit, it will mark this connection as bad. This helps to identify communication problems with external applications as quickly as possible. If some requests take longer to process, increase this limit to avoid 503 error messages.', '', 'Integer number', ''); -$_tipsdb['installpathprefix'] = new DAttrHelp("Installation Path Prefix", 'Sets the value for the "--prefix" configure option. The default installation location is under LiteSpeed Web Server's install directory.', 'LiteSpeed Web Server can use multiple PHP versions at the same time. If you are installing multiple versions, you should give them different prefixes.', 'path', '/usr/local/lsws/lsphp5'); +$_tipsdb['installpathprefix'] = new DAttrHelp("Installation Path Prefix", 'Sets the value for the "--prefix" configure option. The default installation location is under LiteSpeed Web Server's install directory.', 'LiteSpeed Web Server can use multiple PHP versions at the same time. If you are installing multiple versions, you should give them different prefixes.', 'path', '/usr/local/lsws/lsphp5'); $_tipsdb['instances'] = new DAttrHelp("Instances", 'Specifies the maximum instances of the external application the server will create. It is required if "Auto Start" is enabled. Most FastCGI/LSAPI applications can only process one request per process instance and for those types of applications, instances should be set to match the value of "Max Connections". Some FastCGI/LSAPI applications can spawn multiple child processes to handle multiple requests concurrently. For these types of applications, instances should be set to "1" and environment variables used to control how many child processes the application can spawn.', '', 'Integer number', ''); @@ -660,7 +660,7 @@ $_tipsdb['vstatus'] = new DAttrHelp("Status - Virtual Host", 'The current status $_tipsdb['wsaddr'] = new DAttrHelp("Address", 'A unique socket address used by the WebSocket backend. IPv4 sockets, IPv6 sockets, and Unix Domain Sockets (UDS) are supported. IPv4 and IPv6 sockets can be used for communication over the network. UDS can only be used when the WebSocket backend resides on the same machine as the server.', ' If the WebSocket backend runs on the same machine, UDS is preferred. If you have to use an IPv4 or IPv6 socket, set the IP address to localhost or 127.0.0.1, so the WebSocket backend is inaccessible from other machines.
Unix Domain Sockets generally provide higher performance than IPv4 or IPv6 sockets.', 'IPv4 or IPV6 address:port or UDS://path', '127.0.0.1:5434
UDS://tmp/lshttpd/php.sock.'); -$_tipsdb['wsuri'] = new DAttrHelp("URI", 'Specifies the URI(s) that will use this WebSocket backend. Traffic to this URI will only be forwarded to the WebSocket backend when it contains a WebSocket upgrade request.

Traffic without this upgrade request will automatically be forwarded to the Context that this URI belongs to. If no Context exists for this URI, LSWS will treat this traffic as though it is accessing a static context with the location $DOC_ROOT/URI.', '', 'The URI can be a plain URI (starting with "/") or a Perl-compatible regular expression URI (starting with "exp:"). If a plain URI ends with a "/", then this WebSocket backend will include all sub-URIs under this URI.', 'Using the WebSocket proxy in conjunction with a Context allows you to serve different kinds of traffic in different ways on the same page, thus optimizing performance. You can send WebSocket traffic to the WebSocket backend, while setting up a static context so that LSWS can serve the page's static content, or an LSAPI context so LSWS will serve PHP content (both of which LSWS does more efficiently than the WebSocket backend).'); +$_tipsdb['wsuri'] = new DAttrHelp("URI", 'Specifies the URI(s) that will use this WebSocket backend. Traffic to this URI will only be forwarded to the WebSocket backend when it contains a WebSocket upgrade request.

Traffic without this upgrade request will automatically be forwarded to the Context that this URI belongs to. If no Context exists for this URI, LSWS will treat this traffic as though it is accessing a static context with the location $DOC_ROOT/URI.', '', 'A plain URI (starting with "/"). If the URI ends with a "/", then this WebSocket backend will include all sub-URIs under this URI.', 'Using the WebSocket proxy in conjunction with a Context allows you to serve different kinds of traffic in different ways on the same page, thus optimizing performance. You can send WebSocket traffic to the WebSocket backend, while setting up a static context so that LSWS can serve the page's static content, or an LSAPI context so LSWS will serve PHP content (both of which LSWS does more efficiently than the WebSocket backend).'); $_tipsdb['EDTP:UDBgroup'] = array('If you enter group information here, the group DB will not be checked.','You can enter multiple groups, use comma to separate. Space will be treated as part of a group name.'); 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 eb8dcdb7..c1666540 100644 --- a/dist/admin/html.open/res/lang/zh-CN_tips.php +++ b/dist/admin/html.open/res/lang/zh-CN_tips.php @@ -148,7 +148,7 @@ $_tipsdb['ciphers'] = new DAttrHelp("Ciphers", 'Specifies the cipher suite to be $_tipsdb['clientVerify'] = new DAttrHelp("Client Verification", ' Specifies the type of client certifcate authentication. Available types are: The default is "None".', '"None" or "Require" are recommended.', 'Select from drop down list', ''); -$_tipsdb['compilerflags'] = new DAttrHelp("Compiler Flags", 'Add additional compiler flags, like optimized compiler options.', '', 'Supported flags are CFLAGS, CXXFLAGS, CPPFLAGS, LDFLAGS. Use a space to separate different flags. Use single quotes (not double quotes) for flag values.', 'CFLAGS='-O3 -msse2 -msse3 -msse4.1 -msse4.2 -msse4 -mavx''); +$_tipsdb['compilerflags'] = new DAttrHelp("Compiler Flags", 'Add additional compiler flags, like optimized compiler options.', '', 'Supported flags are CFLAGS, CXXFLAGS, CPPFLAGS, LDFLAGS. Use a space to separate different flags. Use single quotes (not double quotes) for flag values.', 'CFLAGS='-O3 -msse2 -msse3 -msse4.1 -msse4.2 -msse4 -mavx''); $_tipsdb['compressibleTypes'] = new DAttrHelp("压缩类型", '指定允许哪些MIME类型进行压缩。', '[性能建议] 只允许特定类型进行GZIP压缩。 二进制文件如gif/png/jpeg图片文件及flash文件无法从压缩中获益。', '以逗号分隔的MIME类型列表。通配符“*”和 否定符号“！”是允许的，如text/*, !text/js。', 'If you want to compress text/* but not text/css, you can have a rule like text/*, !text/css. "!" will exclude that MIME type.'); @@ -310,7 +310,7 @@ $_tipsdb['indexUseServer'] = new DAttrHelp("使用服务器索引文件", '指 $_tipsdb['initTimeout'] = new DAttrHelp("Initial Request Timeout (secs)", 'Specifies the maximum time in seconds the server will wait for the external application to respond to the first request over a new established connection. If the server does not receive any data from the external application within this timeout limit, it will mark this connection as bad. This helps to identify communication problems with external applications as quickly as possible. If some requests take longer to process, increase this limit to avoid 503 error messages.', '', '无符号整数', ''); -$_tipsdb['installpathprefix'] = new DAttrHelp("Installation Path Prefix", 'Sets the value for the "--prefix" configure option. The default installation location is under LiteSpeed Web Server's install directory.', 'LiteSpeed Web Server can use multiple PHP versions at the same time. If you are installing multiple versions, you should give them different prefixes.', 'path', '/usr/local/lsws/lsphp5'); +$_tipsdb['installpathprefix'] = new DAttrHelp("Installation Path Prefix", 'Sets the value for the "--prefix" configure option. The default installation location is under LiteSpeed Web Server's install directory.', 'LiteSpeed Web Server can use multiple PHP versions at the same time. If you are installing multiple versions, you should give them different prefixes.', 'path', '/usr/local/lsws/lsphp5'); $_tipsdb['instances'] = new DAttrHelp("Instances", 'Specifies the maximum instances of the external application the server will create. It is required if "Auto Start" is enabled. Most FastCGI/LSAPI applications can only process one request per process instance and for those types of applications, instances should be set to match the value of "Max Connections". Some FastCGI/LSAPI applications can spawn multiple child processes to handle multiple requests concurrently. For these types of applications, instances should be set to "1" and environment variables used to control how many child processes the application can spawn.', '', '无符号整数', ''); @@ -660,7 +660,7 @@ $_tipsdb['vstatus'] = new DAttrHelp("Status - Virtual Host", 'The current status $_tipsdb['wsaddr'] = new DAttrHelp("Address", 'A unique socket address used by the WebSocket backend. IPv4 sockets, IPv6 sockets, and Unix Domain Sockets (UDS) are supported. IPv4 and IPv6 sockets can be used for communication over the network. UDS can only be used when the WebSocket backend resides on the same machine as the server.', ' If the WebSocket backend runs on the same machine, UDS is preferred. If you have to use an IPv4 or IPv6 socket, set the IP address to localhost or 127.0.0.1, so the WebSocket backend is inaccessible from other machines.
Unix Domain Sockets generally provide higher performance than IPv4 or IPv6 sockets.', 'IPv4 or IPV6 address:port or UDS://path', '127.0.0.1:5434
UDS://tmp/lshttpd/php.sock.'); -$_tipsdb['wsuri'] = new DAttrHelp("URI", 'Specifies the URI(s) that will use this WebSocket backend. Traffic to this URI will only be forwarded to the WebSocket backend when it contains a WebSocket upgrade request.

Traffic without this upgrade request will automatically be forwarded to the Context that this URI belongs to. If no Context exists for this URI, LSWS will treat this traffic as though it is accessing a static context with the location $DOC_ROOT/URI.', '', 'The URI can be a plain URI (starting with "/") or a Perl-compatible regular expression URI (starting with "exp:"). If a plain URI ends with a "/", then this WebSocket backend will include all sub-URIs under this URI.', 'Using the WebSocket proxy in conjunction with a Context allows you to serve different kinds of traffic in different ways on the same page, thus optimizing performance. You can send WebSocket traffic to the WebSocket backend, while setting up a static context so that LSWS can serve the page's static content, or an LSAPI context so LSWS will serve PHP content (both of which LSWS does more efficiently than the WebSocket backend).'); +$_tipsdb['wsuri'] = new DAttrHelp("URI", 'Specifies the URI(s) that will use this WebSocket backend. Traffic to this URI will only be forwarded to the WebSocket backend when it contains a WebSocket upgrade request.

Traffic without this upgrade request will automatically be forwarded to the Context that this URI belongs to. If no Context exists for this URI, LSWS will treat this traffic as though it is accessing a static context with the location $DOC_ROOT/URI.', '', 'A plain URI (starting with "/"). If the URI ends with a "/", then this WebSocket backend will include all sub-URIs under this URI.', 'Using the WebSocket proxy in conjunction with a Context allows you to serve different kinds of traffic in different ways on the same page, thus optimizing performance. You can send WebSocket traffic to the WebSocket backend, while setting up a static context so that LSWS can serve the page's static content, or an LSAPI context so LSWS will serve PHP content (both of which LSWS does more efficiently than the WebSocket backend).'); $_tipsdb['EDTP:UDBgroup'] = array('If you enter group information here, the group DB will not be checked.','You can enter multiple groups, use comma to separate. Space will be treated as part of a group name.'); diff --git a/dist/docs/AdminGeneral_Help.html b/dist/docs/AdminGeneral_Help.html index 674c2624..2f316579 100644 --- a/dist/docs/AdminGeneral_Help.html +++ b/dist/docs/AdminGeneral_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

OpenLiteSpeed Web Server Users' Manual

-
Version 1.4  — Rev. 7
+
Version 1.4  — Rev. 8
    diff --git a/dist/docs/AdminListeners_General_Help.html b/dist/docs/AdminListeners_General_Help.html index 114bcc93..fa8ed184 100644 --- a/dist/docs/AdminListeners_General_Help.html +++ b/dist/docs/AdminListeners_General_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

    OpenLiteSpeed Web Server Users' Manual

    -
    Version 1.4  — Rev. 7
    +
    Version 1.4  — Rev. 8
      diff --git a/dist/docs/AdminListeners_SSL_Help.html b/dist/docs/AdminListeners_SSL_Help.html index 3e2f50bb..40c059e0 100644 --- a/dist/docs/AdminListeners_SSL_Help.html +++ b/dist/docs/AdminListeners_SSL_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

      OpenLiteSpeed Web Server Users' Manual

      -
      Version 1.4  — Rev. 7
      +
      Version 1.4  — Rev. 8
        diff --git a/dist/docs/AdminSecurity_Help.html b/dist/docs/AdminSecurity_Help.html index 1d1135e5..b0899077 100644 --- a/dist/docs/AdminSecurity_Help.html +++ b/dist/docs/AdminSecurity_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

        OpenLiteSpeed Web Server Users' Manual

        -
        Version 1.4  — Rev. 7
        +
        Version 1.4  — Rev. 8
          diff --git a/dist/docs/CGI_Context.html b/dist/docs/CGI_Context.html index fc9f6b35..29276b2d 100644 --- a/dist/docs/CGI_Context.html +++ b/dist/docs/CGI_Context.html @@ -14,7 +14,7 @@ openlitespeed logo

          OpenLiteSpeed Web Server Users' Manual

          -
          Version 1.4  — Rev. 7
          +
          Version 1.4  — Rev. 8
            diff --git a/dist/docs/CompilePHP_Help.html b/dist/docs/CompilePHP_Help.html index 062f0262..fd388f79 100644 --- a/dist/docs/CompilePHP_Help.html +++ b/dist/docs/CompilePHP_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

            OpenLiteSpeed Web Server Users' Manual

            -
            Version 1.4  — Rev. 7
            +
            Version 1.4  — Rev. 8
              diff --git a/dist/docs/Context_Help.html b/dist/docs/Context_Help.html index 63008dba..704c152b 100644 --- a/dist/docs/Context_Help.html +++ b/dist/docs/Context_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

              OpenLiteSpeed Web Server Users' Manual

              -
              Version 1.4  — Rev. 7
              +
              Version 1.4  — Rev. 8
                diff --git a/dist/docs/ExtApp_Help.html b/dist/docs/ExtApp_Help.html index b94f4bbb..e40c9e80 100644 --- a/dist/docs/ExtApp_Help.html +++ b/dist/docs/ExtApp_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                OpenLiteSpeed Web Server Users' Manual

                -
                Version 1.4  — Rev. 7
                +
                Version 1.4  — Rev. 8
                  diff --git a/dist/docs/External_FCGI.html b/dist/docs/External_FCGI.html index ea651650..666ccec3 100644 --- a/dist/docs/External_FCGI.html +++ b/dist/docs/External_FCGI.html @@ -14,7 +14,7 @@ openlitespeed logo

                  OpenLiteSpeed Web Server Users' Manual

                  -
                  Version 1.4  — Rev. 7
                  +
                  Version 1.4  — Rev. 8
                    diff --git a/dist/docs/External_FCGI_Auth.html b/dist/docs/External_FCGI_Auth.html index 66d7bdf2..166eb311 100644 --- a/dist/docs/External_FCGI_Auth.html +++ b/dist/docs/External_FCGI_Auth.html @@ -14,7 +14,7 @@ openlitespeed logo

                    OpenLiteSpeed Web Server Users' Manual

                    -
                    Version 1.4  — Rev. 7
                    +
                    Version 1.4  — Rev. 8
                      diff --git a/dist/docs/External_LB.html b/dist/docs/External_LB.html index 248d787d..37015345 100644 --- a/dist/docs/External_LB.html +++ b/dist/docs/External_LB.html @@ -14,7 +14,7 @@ openlitespeed logo

                      OpenLiteSpeed Web Server Users' Manual

                      -
                      Version 1.4  — Rev. 7
                      +
                      Version 1.4  — Rev. 8
                        diff --git a/dist/docs/External_LSAPI.html b/dist/docs/External_LSAPI.html index 2427fb0f..24686511 100644 --- a/dist/docs/External_LSAPI.html +++ b/dist/docs/External_LSAPI.html @@ -14,7 +14,7 @@ openlitespeed logo

                        OpenLiteSpeed Web Server Users' Manual

                        -
                        Version 1.4  — Rev. 7
                        +
                        Version 1.4  — Rev. 8
                          diff --git a/dist/docs/External_PL.html b/dist/docs/External_PL.html index 3f18b0d0..b9ffeaad 100644 --- a/dist/docs/External_PL.html +++ b/dist/docs/External_PL.html @@ -14,7 +14,7 @@ openlitespeed logo

                          OpenLiteSpeed Web Server Users' Manual

                          -
                          Version 1.4  — Rev. 7
                          +
                          Version 1.4  — Rev. 8
                            diff --git a/dist/docs/External_Servlet.html b/dist/docs/External_Servlet.html index b9f87b3a..2baa4f28 100644 --- a/dist/docs/External_Servlet.html +++ b/dist/docs/External_Servlet.html @@ -14,7 +14,7 @@ openlitespeed logo

                            OpenLiteSpeed Web Server Users' Manual

                            -
                            Version 1.4  — Rev. 7
                            +
                            Version 1.4  — Rev. 8
                              diff --git a/dist/docs/External_WS.html b/dist/docs/External_WS.html index 7eb03958..2e7ec544 100644 --- a/dist/docs/External_WS.html +++ b/dist/docs/External_WS.html @@ -14,7 +14,7 @@ openlitespeed logo

                              OpenLiteSpeed Web Server Users' Manual

                              -
                              Version 1.4  — Rev. 7
                              +
                              Version 1.4  — Rev. 8
                                diff --git a/dist/docs/FCGI_Context.html b/dist/docs/FCGI_Context.html index 58c57885..c82127ae 100644 --- a/dist/docs/FCGI_Context.html +++ b/dist/docs/FCGI_Context.html @@ -14,7 +14,7 @@ openlitespeed logo

                                OpenLiteSpeed Web Server Users' Manual

                                -
                                Version 1.4  — Rev. 7
                                +
                                Version 1.4  — Rev. 8
                                  diff --git a/dist/docs/Java_Web_App_Context.html b/dist/docs/Java_Web_App_Context.html index 10279c79..f49b6772 100644 --- a/dist/docs/Java_Web_App_Context.html +++ b/dist/docs/Java_Web_App_Context.html @@ -14,7 +14,7 @@ openlitespeed logo

                                  OpenLiteSpeed Web Server Users' Manual

                                  -
                                  Version 1.4  — Rev. 7
                                  +
                                  Version 1.4  — Rev. 8
                                    diff --git a/dist/docs/LB_Context.html b/dist/docs/LB_Context.html index 6d1ca6f9..ca045c36 100644 --- a/dist/docs/LB_Context.html +++ b/dist/docs/LB_Context.html @@ -14,7 +14,7 @@ openlitespeed logo

                                    OpenLiteSpeed Web Server Users' Manual

                                    -
                                    Version 1.4  — Rev. 7
                                    +
                                    Version 1.4  — Rev. 8
                                      diff --git a/dist/docs/LSAPI_Context.html b/dist/docs/LSAPI_Context.html index 946737ff..42f4ea41 100644 --- a/dist/docs/LSAPI_Context.html +++ b/dist/docs/LSAPI_Context.html @@ -14,7 +14,7 @@ openlitespeed logo

                                      OpenLiteSpeed Web Server Users' Manual

                                      -
                                      Version 1.4  — Rev. 7
                                      +
                                      Version 1.4  — Rev. 8
                                        diff --git a/dist/docs/Listeners_General_Help.html b/dist/docs/Listeners_General_Help.html index 10fc4189..17d5fc3d 100644 --- a/dist/docs/Listeners_General_Help.html +++ b/dist/docs/Listeners_General_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                        OpenLiteSpeed Web Server Users' Manual

                                        -
                                        Version 1.4  — Rev. 7
                                        +
                                        Version 1.4  — Rev. 8
                                          diff --git a/dist/docs/Listeners_SSL_Help.html b/dist/docs/Listeners_SSL_Help.html index 16105498..e51ae7e4 100644 --- a/dist/docs/Listeners_SSL_Help.html +++ b/dist/docs/Listeners_SSL_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                          OpenLiteSpeed Web Server Users' Manual

                                          -
                                          Version 1.4  — Rev. 7
                                          +
                                          Version 1.4  — Rev. 8
                                            diff --git a/dist/docs/Module_Context.html b/dist/docs/Module_Context.html index b102c8f1..edb9851e 100644 --- a/dist/docs/Module_Context.html +++ b/dist/docs/Module_Context.html @@ -14,7 +14,7 @@ openlitespeed logo

                                            OpenLiteSpeed Web Server Users' Manual

                                            -
                                            Version 1.4  — Rev. 7
                                            +
                                            Version 1.4  — Rev. 8
                                              diff --git a/dist/docs/Module_Help.html b/dist/docs/Module_Help.html index 0f5a1411..ebb12b6f 100644 --- a/dist/docs/Module_Help.html +++ b/dist/docs/Module_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                              OpenLiteSpeed Web Server Users' Manual

                                              -
                                              Version 1.4  — Rev. 7
                                              +
                                              Version 1.4  — Rev. 8
                                                diff --git a/dist/docs/Proxy_Context.html b/dist/docs/Proxy_Context.html index a9c7e95d..2e76a355 100644 --- a/dist/docs/Proxy_Context.html +++ b/dist/docs/Proxy_Context.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                OpenLiteSpeed Web Server Users' Manual

                                                -
                                                Version 1.4  — Rev. 7
                                                +
                                                Version 1.4  — Rev. 8
                                                  diff --git a/dist/docs/Rails_Context.html b/dist/docs/Rails_Context.html index 1bf79683..998e9fea 100644 --- a/dist/docs/Rails_Context.html +++ b/dist/docs/Rails_Context.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                  OpenLiteSpeed Web Server Users' Manual

                                                  -
                                                  Version 1.4  — Rev. 7
                                                  +
                                                  Version 1.4  — Rev. 8
                                                    diff --git a/dist/docs/Rails_Help.html b/dist/docs/Rails_Help.html index 54000b6f..d3e22831 100644 --- a/dist/docs/Rails_Help.html +++ b/dist/docs/Rails_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                    OpenLiteSpeed Web Server Users' Manual

                                                    -
                                                    Version 1.4  — Rev. 7
                                                    +
                                                    Version 1.4  — Rev. 8
                                                      diff --git a/dist/docs/Redirect_Context.html b/dist/docs/Redirect_Context.html index 68729706..62959914 100644 --- a/dist/docs/Redirect_Context.html +++ b/dist/docs/Redirect_Context.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                      OpenLiteSpeed Web Server Users' Manual

                                                      -
                                                      Version 1.4  — Rev. 7
                                                      +
                                                      Version 1.4  — Rev. 8
                                                        diff --git a/dist/docs/Rewrite_Help.html b/dist/docs/Rewrite_Help.html index 04f9bee3..c79d04d4 100644 --- a/dist/docs/Rewrite_Help.html +++ b/dist/docs/Rewrite_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                        OpenLiteSpeed Web Server Users' Manual

                                                        -
                                                        Version 1.4  — Rev. 7
                                                        +
                                                        Version 1.4  — Rev. 8
                                                          diff --git a/dist/docs/ScriptHandler_Help.html b/dist/docs/ScriptHandler_Help.html index 90eb14fd..615d8e22 100644 --- a/dist/docs/ScriptHandler_Help.html +++ b/dist/docs/ScriptHandler_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                          OpenLiteSpeed Web Server Users' Manual

                                                          -
                                                          Version 1.4  — Rev. 7
                                                          +
                                                          Version 1.4  — Rev. 8
                                                            diff --git a/dist/docs/ServGeneral_Help.html b/dist/docs/ServGeneral_Help.html index f7644137..6848a9ad 100644 --- a/dist/docs/ServGeneral_Help.html +++ b/dist/docs/ServGeneral_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                            OpenLiteSpeed Web Server Users' Manual

                                                            -
                                                            Version 1.4  — Rev. 7
                                                            +
                                                            Version 1.4  — Rev. 8
                                                              diff --git a/dist/docs/ServLog_Help.html b/dist/docs/ServLog_Help.html index 96aaa34e..9243e75b 100644 --- a/dist/docs/ServLog_Help.html +++ b/dist/docs/ServLog_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                              OpenLiteSpeed Web Server Users' Manual

                                                              -
                                                              Version 1.4  — Rev. 7
                                                              +
                                                              Version 1.4  — Rev. 8
                                                                diff --git a/dist/docs/ServSecurity_Help.html b/dist/docs/ServSecurity_Help.html index 26b6be42..3214ad6e 100644 --- a/dist/docs/ServSecurity_Help.html +++ b/dist/docs/ServSecurity_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                OpenLiteSpeed Web Server Users' Manual

                                                                -
                                                                Version 1.4  — Rev. 7
                                                                +
                                                                Version 1.4  — Rev. 8
                                                                  diff --git a/dist/docs/ServTuning_Help.html b/dist/docs/ServTuning_Help.html index 44fa208a..d75112fd 100644 --- a/dist/docs/ServTuning_Help.html +++ b/dist/docs/ServTuning_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                  OpenLiteSpeed Web Server Users' Manual

                                                                  -
                                                                  Version 1.4  — Rev. 7
                                                                  +
                                                                  Version 1.4  — Rev. 8
                                                                    diff --git a/dist/docs/ServerStat_Help.html b/dist/docs/ServerStat_Help.html index b3d254be..b41e7525 100644 --- a/dist/docs/ServerStat_Help.html +++ b/dist/docs/ServerStat_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                    OpenLiteSpeed Web Server Users' Manual

                                                                    -
                                                                    Version 1.4  — Rev. 7
                                                                    +
                                                                    Version 1.4  — Rev. 8
                                                                      diff --git a/dist/docs/Servlet_Context.html b/dist/docs/Servlet_Context.html index ae4949d9..0e225a9b 100644 --- a/dist/docs/Servlet_Context.html +++ b/dist/docs/Servlet_Context.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                      OpenLiteSpeed Web Server Users' Manual

                                                                      -
                                                                      Version 1.4  — Rev. 7
                                                                      +
                                                                      Version 1.4  — Rev. 8
                                                                        diff --git a/dist/docs/Static_Context.html b/dist/docs/Static_Context.html index fccd13a1..c3175555 100644 --- a/dist/docs/Static_Context.html +++ b/dist/docs/Static_Context.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                        OpenLiteSpeed Web Server Users' Manual

                                                                        -
                                                                        Version 1.4  — Rev. 7
                                                                        +
                                                                        Version 1.4  — Rev. 8
                                                                          diff --git a/dist/docs/Templates_Help.html b/dist/docs/Templates_Help.html index 933e4431..ddd40b52 100644 --- a/dist/docs/Templates_Help.html +++ b/dist/docs/Templates_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                          OpenLiteSpeed Web Server Users' Manual

                                                                          -
                                                                          Version 1.4  — Rev. 7
                                                                          +
                                                                          Version 1.4  — Rev. 8
                                                                            diff --git a/dist/docs/VHGeneral_Help.html b/dist/docs/VHGeneral_Help.html index a0607ccc..258dd236 100644 --- a/dist/docs/VHGeneral_Help.html +++ b/dist/docs/VHGeneral_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                            OpenLiteSpeed Web Server Users' Manual

                                                                            -
                                                                            Version 1.4  — Rev. 7
                                                                            +
                                                                            Version 1.4  — Rev. 8
                                                                              diff --git a/dist/docs/VHSSL_Help.html b/dist/docs/VHSSL_Help.html index 8990a181..bbada525 100644 --- a/dist/docs/VHSSL_Help.html +++ b/dist/docs/VHSSL_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                              OpenLiteSpeed Web Server Users' Manual

                                                                              -
                                                                              Version 1.4  — Rev. 7
                                                                              +
                                                                              Version 1.4  — Rev. 8
                                                                                diff --git a/dist/docs/VHSecurity_Help.html b/dist/docs/VHSecurity_Help.html index a6ddf7df..b1813dea 100644 --- a/dist/docs/VHSecurity_Help.html +++ b/dist/docs/VHSecurity_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                OpenLiteSpeed Web Server Users' Manual

                                                                                -
                                                                                Version 1.4  — Rev. 7
                                                                                +
                                                                                Version 1.4  — Rev. 8
                                                                                  diff --git a/dist/docs/VHWebSocket_Help.html b/dist/docs/VHWebSocket_Help.html index 8147cee7..76e2c688 100644 --- a/dist/docs/VHWebSocket_Help.html +++ b/dist/docs/VHWebSocket_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                  OpenLiteSpeed Web Server Users' Manual

                                                                                  -
                                                                                  Version 1.4  — Rev. 7
                                                                                  +
                                                                                  Version 1.4  — Rev. 8
                                                                                    @@ -88,7 +88,7 @@ communication to the appropriate backend stipulated in the {ITEM=wsaddr} field.<

                                                                                    Table of Contents

                                                                                    Web Socket Proxy

                                                                                    URI | Address

                                                                                    -

                                                                                    URI⇑

                                                                                    Description

                                                                                    Specifies the URI(s) that will use this WebSocket backend. Traffic to this URI will only be forwarded to the WebSocket backend when it contains a WebSocket upgrade request.

                                                                                    Traffic without this upgrade request will automatically be forwarded to the Context that this URI belongs to. If no Context exists for this URI, LSWS will treat this traffic as though it is accessing a static context with the location $DOC_ROOT/URI.

                                                                                    Syntax

                                                                                    The URI can be a plain URI (starting with "/") or a Perl-compatible regular expression URI (starting with "exp:"). If a plain URI ends with a "/", then this WebSocket backend will include all sub-URIs under this URI.

                                                                                    Example

                                                                                    Using the WebSocket proxy in conjunction with a Context allows you to serve different kinds of traffic in different ways on the same page, thus optimizing performance. You can send WebSocket traffic to the WebSocket backend, while setting up a static context so that LSWS can serve the page's static content, or an LSAPI context so LSWS will serve PHP content (both of which LSWS does more efficiently than the WebSocket backend).
                                                                                    +

                                                                                    URI⇑

                                                                                    Description

                                                                                    Specifies the URI(s) that will use this WebSocket backend. Traffic to this URI will only be forwarded to the WebSocket backend when it contains a WebSocket upgrade request.

                                                                                    Traffic without this upgrade request will automatically be forwarded to the Context that this URI belongs to. If no Context exists for this URI, LSWS will treat this traffic as though it is accessing a static context with the location $DOC_ROOT/URI.

                                                                                    Syntax

                                                                                    A plain URI (starting with "/"). If the URI ends with a "/", then this WebSocket backend will include all sub-URIs under this URI.

                                                                                    Example

                                                                                    Using the WebSocket proxy in conjunction with a Context allows you to serve different kinds of traffic in different ways on the same page, thus optimizing performance. You can send WebSocket traffic to the WebSocket backend, while setting up a static context so that LSWS can serve the page's static content, or an LSAPI context so LSWS will serve PHP content (both of which LSWS does more efficiently than the WebSocket backend).

                                                                                    Address⇑

                                                                                    Description

                                                                                    A unique socket address used by the WebSocket backend. IPv4 sockets, IPv6 sockets, and Unix Domain Sockets (UDS) are supported. IPv4 and IPv6 sockets can be used for communication over the network. UDS can only be used when the WebSocket backend resides on the same machine as the server.

                                                                                    Syntax

                                                                                    IPv4 or IPV6 address:port or UDS://path

                                                                                    Example

                                                                                    127.0.0.1:5434
                                                                                    UDS://tmp/lshttpd/php.sock.

                                                                                    Tips

                                                                                    If the WebSocket backend runs on the same machine, UDS is preferred. If you have to use an IPv4 or IPv6 socket, set the IP address to localhost or 127.0.0.1, so the WebSocket backend is inaccessible from other machines.
                                                                                    Unix Domain Sockets generally provide higher performance than IPv4 or IPv6 sockets.

                                                                                    diff --git a/dist/docs/VirtualHosts_Help.html b/dist/docs/VirtualHosts_Help.html index ddebed5a..330683c1 100644 --- a/dist/docs/VirtualHosts_Help.html +++ b/dist/docs/VirtualHosts_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                    OpenLiteSpeed Web Server Users' Manual

                                                                                    -
                                                                                    Version 1.4  — Rev. 7
                                                                                    +
                                                                                    Version 1.4  — Rev. 8
                                                                                      diff --git a/dist/docs/admin.html b/dist/docs/admin.html index 97d18a3a..f4f0c4c6 100644 --- a/dist/docs/admin.html +++ b/dist/docs/admin.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                      OpenLiteSpeed Web Server Users' Manual

                                                                                      -
                                                                                      Version 1.4  — Rev. 7
                                                                                      +
                                                                                      Version 1.4  — Rev. 8
                                                                                        diff --git a/dist/docs/config.html b/dist/docs/config.html index 117bb2a9..5d2702db 100644 --- a/dist/docs/config.html +++ b/dist/docs/config.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                        OpenLiteSpeed Web Server Users' Manual

                                                                                        -
                                                                                        Version 1.4  — Rev. 7
                                                                                        +
                                                                                        Version 1.4  — Rev. 8
                                                                                          diff --git a/dist/docs/index.html b/dist/docs/index.html index 10b203ab..63fbc82b 100644 --- a/dist/docs/index.html +++ b/dist/docs/index.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                          OpenLiteSpeed Web Server Users' Manual

                                                                                          -
                                                                                          Version 1.4  — Rev. 7
                                                                                          +
                                                                                          Version 1.4  — Rev. 8
                                                                                            @@ -83,7 +83,7 @@

                                                                                            OpenLiteSpeed Web Server 1.4

                                                                                            Users' Manual

                                                                                            -

                                                                                            — Rev. 7

                                                                                            +

                                                                                            — Rev. 8

                                                                                            diff --git a/dist/docs/install.html b/dist/docs/install.html index b3784fcc..aaa60d7f 100644 --- a/dist/docs/install.html +++ b/dist/docs/install.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                            OpenLiteSpeed Web Server Users' Manual

                                                                                            -
                                                                                            Version 1.4  — Rev. 7
                                                                                            +
                                                                                            Version 1.4  — Rev. 8
                                                                                              diff --git a/dist/docs/intro.html b/dist/docs/intro.html index 7a2b96d9..8c28090e 100644 --- a/dist/docs/intro.html +++ b/dist/docs/intro.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                              OpenLiteSpeed Web Server Users' Manual

                                                                                              -
                                                                                              Version 1.4  — Rev. 7
                                                                                              +
                                                                                              Version 1.4  — Rev. 8
                                                                                                diff --git a/dist/docs/license.html b/dist/docs/license.html index 67256e78..89b19a80 100644 --- a/dist/docs/license.html +++ b/dist/docs/license.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                OpenLiteSpeed Web Server Users' Manual

                                                                                                -
                                                                                                Version 1.4  — Rev. 7
                                                                                                +
                                                                                                Version 1.4  — Rev. 8
                                                                                                  diff --git a/dist/docs/security.html b/dist/docs/security.html index bdac415c..bf1a6042 100644 --- a/dist/docs/security.html +++ b/dist/docs/security.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                  OpenLiteSpeed Web Server Users' Manual

                                                                                                  -
                                                                                                  Version 1.4  — Rev. 7
                                                                                                  +
                                                                                                  Version 1.4  — Rev. 8
                                                                                                    diff --git a/dist/docs/webconsole.html b/dist/docs/webconsole.html index c29d2b2d..1ba9220e 100644 --- a/dist/docs/webconsole.html +++ b/dist/docs/webconsole.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                    OpenLiteSpeed Web Server Users' Manual

                                                                                                    -
                                                                                                    Version 1.4  — Rev. 7
                                                                                                    +
                                                                                                    Version 1.4  — Rev. 8
                                                                                                      diff --git a/dist/docs/zh-CN/AdminGeneral_Help.html b/dist/docs/zh-CN/AdminGeneral_Help.html index 5536437a..b65f369f 100644 --- a/dist/docs/zh-CN/AdminGeneral_Help.html +++ b/dist/docs/zh-CN/AdminGeneral_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                      OpenLiteSpeed Web Server Users' Manual

                                                                                                      -
                                                                                                      Version 1.4  — Rev. 7
                                                                                                      +
                                                                                                      Version 1.4  — Rev. 8
                                                                                                        diff --git a/dist/docs/zh-CN/AdminListeners_General_Help.html b/dist/docs/zh-CN/AdminListeners_General_Help.html index 8740faa7..40ba569a 100644 --- a/dist/docs/zh-CN/AdminListeners_General_Help.html +++ b/dist/docs/zh-CN/AdminListeners_General_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                        OpenLiteSpeed Web Server Users' Manual

                                                                                                        -
                                                                                                        Version 1.4  — Rev. 7
                                                                                                        +
                                                                                                        Version 1.4  — Rev. 8
                                                                                                          diff --git a/dist/docs/zh-CN/AdminListeners_SSL_Help.html b/dist/docs/zh-CN/AdminListeners_SSL_Help.html index 6f67c7a1..e29ecdfa 100644 --- a/dist/docs/zh-CN/AdminListeners_SSL_Help.html +++ b/dist/docs/zh-CN/AdminListeners_SSL_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                          OpenLiteSpeed Web Server Users' Manual

                                                                                                          -
                                                                                                          Version 1.4  — Rev. 7
                                                                                                          +
                                                                                                          Version 1.4  — Rev. 8
                                                                                                            diff --git a/dist/docs/zh-CN/AdminSecurity_Help.html b/dist/docs/zh-CN/AdminSecurity_Help.html index 40c5f4b5..6588060a 100644 --- a/dist/docs/zh-CN/AdminSecurity_Help.html +++ b/dist/docs/zh-CN/AdminSecurity_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                            OpenLiteSpeed Web Server Users' Manual

                                                                                                            -
                                                                                                            Version 1.4  — Rev. 7
                                                                                                            +
                                                                                                            Version 1.4  — Rev. 8
                                                                                                              diff --git a/dist/docs/zh-CN/CGI_Context.html b/dist/docs/zh-CN/CGI_Context.html index caa111d0..0a4d292f 100644 --- a/dist/docs/zh-CN/CGI_Context.html +++ b/dist/docs/zh-CN/CGI_Context.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                              OpenLiteSpeed Web Server Users' Manual

                                                                                                              -
                                                                                                              Version 1.4  — Rev. 7
                                                                                                              +
                                                                                                              Version 1.4  — Rev. 8
                                                                                                                diff --git a/dist/docs/zh-CN/CompilePHP_Help.html b/dist/docs/zh-CN/CompilePHP_Help.html index 9834b114..6555e57e 100644 --- a/dist/docs/zh-CN/CompilePHP_Help.html +++ b/dist/docs/zh-CN/CompilePHP_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                OpenLiteSpeed Web Server Users' Manual

                                                                                                                -
                                                                                                                Version 1.4  — Rev. 7
                                                                                                                +
                                                                                                                Version 1.4  — Rev. 8
                                                                                                                  diff --git a/dist/docs/zh-CN/Context_Help.html b/dist/docs/zh-CN/Context_Help.html index 3d9dab52..e22f13d0 100644 --- a/dist/docs/zh-CN/Context_Help.html +++ b/dist/docs/zh-CN/Context_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                  OpenLiteSpeed Web Server Users' Manual

                                                                                                                  -
                                                                                                                  Version 1.4  — Rev. 7
                                                                                                                  +
                                                                                                                  Version 1.4  — Rev. 8
                                                                                                                    diff --git a/dist/docs/zh-CN/ExtApp_Help.html b/dist/docs/zh-CN/ExtApp_Help.html index fbc34aa3..f700ff0f 100644 --- a/dist/docs/zh-CN/ExtApp_Help.html +++ b/dist/docs/zh-CN/ExtApp_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                    OpenLiteSpeed Web Server Users' Manual

                                                                                                                    -
                                                                                                                    Version 1.4  — Rev. 7
                                                                                                                    +
                                                                                                                    Version 1.4  — Rev. 8
                                                                                                                      diff --git a/dist/docs/zh-CN/External_FCGI.html b/dist/docs/zh-CN/External_FCGI.html index adadf4e9..49162c67 100644 --- a/dist/docs/zh-CN/External_FCGI.html +++ b/dist/docs/zh-CN/External_FCGI.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                      OpenLiteSpeed Web Server Users' Manual

                                                                                                                      -
                                                                                                                      Version 1.4  — Rev. 7
                                                                                                                      +
                                                                                                                      Version 1.4  — Rev. 8
                                                                                                                        diff --git a/dist/docs/zh-CN/External_FCGI_Auth.html b/dist/docs/zh-CN/External_FCGI_Auth.html index 16bfb4fa..76879796 100644 --- a/dist/docs/zh-CN/External_FCGI_Auth.html +++ b/dist/docs/zh-CN/External_FCGI_Auth.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                        OpenLiteSpeed Web Server Users' Manual

                                                                                                                        -
                                                                                                                        Version 1.4  — Rev. 7
                                                                                                                        +
                                                                                                                        Version 1.4  — Rev. 8
                                                                                                                          diff --git a/dist/docs/zh-CN/External_LB.html b/dist/docs/zh-CN/External_LB.html index 7ffbbce1..95229589 100644 --- a/dist/docs/zh-CN/External_LB.html +++ b/dist/docs/zh-CN/External_LB.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                          OpenLiteSpeed Web Server Users' Manual

                                                                                                                          -
                                                                                                                          Version 1.4  — Rev. 7
                                                                                                                          +
                                                                                                                          Version 1.4  — Rev. 8
                                                                                                                            diff --git a/dist/docs/zh-CN/External_LSAPI.html b/dist/docs/zh-CN/External_LSAPI.html index 2fc85b2e..9228a430 100644 --- a/dist/docs/zh-CN/External_LSAPI.html +++ b/dist/docs/zh-CN/External_LSAPI.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                            OpenLiteSpeed Web Server Users' Manual

                                                                                                                            -
                                                                                                                            Version 1.4  — Rev. 7
                                                                                                                            +
                                                                                                                            Version 1.4  — Rev. 8
                                                                                                                              diff --git a/dist/docs/zh-CN/External_PL.html b/dist/docs/zh-CN/External_PL.html index cfbb1eeb..5c335373 100644 --- a/dist/docs/zh-CN/External_PL.html +++ b/dist/docs/zh-CN/External_PL.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                              OpenLiteSpeed Web Server Users' Manual

                                                                                                                              -
                                                                                                                              Version 1.4  — Rev. 7
                                                                                                                              +
                                                                                                                              Version 1.4  — Rev. 8
                                                                                                                                diff --git a/dist/docs/zh-CN/External_Servlet.html b/dist/docs/zh-CN/External_Servlet.html index 6248ecd4..cd1f2491 100644 --- a/dist/docs/zh-CN/External_Servlet.html +++ b/dist/docs/zh-CN/External_Servlet.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                OpenLiteSpeed Web Server Users' Manual

                                                                                                                                -
                                                                                                                                Version 1.4  — Rev. 7
                                                                                                                                +
                                                                                                                                Version 1.4  — Rev. 8
                                                                                                                                  diff --git a/dist/docs/zh-CN/External_WS.html b/dist/docs/zh-CN/External_WS.html index 8cd7c864..fdf1723e 100644 --- a/dist/docs/zh-CN/External_WS.html +++ b/dist/docs/zh-CN/External_WS.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                  OpenLiteSpeed Web Server Users' Manual

                                                                                                                                  -
                                                                                                                                  Version 1.4  — Rev. 7
                                                                                                                                  +
                                                                                                                                  Version 1.4  — Rev. 8
                                                                                                                                    diff --git a/dist/docs/zh-CN/FCGI_Context.html b/dist/docs/zh-CN/FCGI_Context.html index ee463a03..b7ee68ff 100644 --- a/dist/docs/zh-CN/FCGI_Context.html +++ b/dist/docs/zh-CN/FCGI_Context.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                    OpenLiteSpeed Web Server Users' Manual

                                                                                                                                    -
                                                                                                                                    Version 1.4  — Rev. 7
                                                                                                                                    +
                                                                                                                                    Version 1.4  — Rev. 8
                                                                                                                                      diff --git a/dist/docs/zh-CN/Java_Web_App_Context.html b/dist/docs/zh-CN/Java_Web_App_Context.html index 741fdb4d..f4251912 100644 --- a/dist/docs/zh-CN/Java_Web_App_Context.html +++ b/dist/docs/zh-CN/Java_Web_App_Context.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                      OpenLiteSpeed Web Server Users' Manual

                                                                                                                                      -
                                                                                                                                      Version 1.4  — Rev. 7
                                                                                                                                      +
                                                                                                                                      Version 1.4  — Rev. 8
                                                                                                                                        diff --git a/dist/docs/zh-CN/LB_Context.html b/dist/docs/zh-CN/LB_Context.html index cb568019..cf127eb1 100644 --- a/dist/docs/zh-CN/LB_Context.html +++ b/dist/docs/zh-CN/LB_Context.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                        OpenLiteSpeed Web Server Users' Manual

                                                                                                                                        -
                                                                                                                                        Version 1.4  — Rev. 7
                                                                                                                                        +
                                                                                                                                        Version 1.4  — Rev. 8
                                                                                                                                          diff --git a/dist/docs/zh-CN/LSAPI_Context.html b/dist/docs/zh-CN/LSAPI_Context.html index 2d912e8b..64620b38 100644 --- a/dist/docs/zh-CN/LSAPI_Context.html +++ b/dist/docs/zh-CN/LSAPI_Context.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                          OpenLiteSpeed Web Server Users' Manual

                                                                                                                                          -
                                                                                                                                          Version 1.4  — Rev. 7
                                                                                                                                          +
                                                                                                                                          Version 1.4  — Rev. 8
                                                                                                                                            diff --git a/dist/docs/zh-CN/Listeners_General_Help.html b/dist/docs/zh-CN/Listeners_General_Help.html index 36d63d8c..c55dccc6 100644 --- a/dist/docs/zh-CN/Listeners_General_Help.html +++ b/dist/docs/zh-CN/Listeners_General_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                            OpenLiteSpeed Web Server Users' Manual

                                                                                                                                            -
                                                                                                                                            Version 1.4  — Rev. 7
                                                                                                                                            +
                                                                                                                                            Version 1.4  — Rev. 8
                                                                                                                                              diff --git a/dist/docs/zh-CN/Listeners_SSL_Help.html b/dist/docs/zh-CN/Listeners_SSL_Help.html index 97248c1b..01ca63e2 100644 --- a/dist/docs/zh-CN/Listeners_SSL_Help.html +++ b/dist/docs/zh-CN/Listeners_SSL_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                              OpenLiteSpeed Web Server Users' Manual

                                                                                                                                              -
                                                                                                                                              Version 1.4  — Rev. 7
                                                                                                                                              +
                                                                                                                                              Version 1.4  — Rev. 8
                                                                                                                                                diff --git a/dist/docs/zh-CN/Module_Context.html b/dist/docs/zh-CN/Module_Context.html index 06a07115..f22ee7c1 100644 --- a/dist/docs/zh-CN/Module_Context.html +++ b/dist/docs/zh-CN/Module_Context.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                -
                                                                                                                                                Version 1.4  — Rev. 7
                                                                                                                                                +
                                                                                                                                                Version 1.4  — Rev. 8
                                                                                                                                                  diff --git a/dist/docs/zh-CN/Module_Help.html b/dist/docs/zh-CN/Module_Help.html index 39f05fd7..1d84a864 100644 --- a/dist/docs/zh-CN/Module_Help.html +++ b/dist/docs/zh-CN/Module_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                  OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                  -
                                                                                                                                                  Version 1.4  — Rev. 7
                                                                                                                                                  +
                                                                                                                                                  Version 1.4  — Rev. 8
                                                                                                                                                    diff --git a/dist/docs/zh-CN/Proxy_Context.html b/dist/docs/zh-CN/Proxy_Context.html index 620b9413..3c0e5031 100644 --- a/dist/docs/zh-CN/Proxy_Context.html +++ b/dist/docs/zh-CN/Proxy_Context.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                    OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                    -
                                                                                                                                                    Version 1.4  — Rev. 7
                                                                                                                                                    +
                                                                                                                                                    Version 1.4  — Rev. 8
                                                                                                                                                      diff --git a/dist/docs/zh-CN/Rails_Context.html b/dist/docs/zh-CN/Rails_Context.html index 79575e83..635fb383 100644 --- a/dist/docs/zh-CN/Rails_Context.html +++ b/dist/docs/zh-CN/Rails_Context.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                      OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                      -
                                                                                                                                                      Version 1.4  — Rev. 7
                                                                                                                                                      +
                                                                                                                                                      Version 1.4  — Rev. 8
                                                                                                                                                        diff --git a/dist/docs/zh-CN/Rails_Help.html b/dist/docs/zh-CN/Rails_Help.html index 4895f2a9..e63382fb 100644 --- a/dist/docs/zh-CN/Rails_Help.html +++ b/dist/docs/zh-CN/Rails_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                        OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                        -
                                                                                                                                                        Version 1.4  — Rev. 7
                                                                                                                                                        +
                                                                                                                                                        Version 1.4  — Rev. 8
                                                                                                                                                          diff --git a/dist/docs/zh-CN/Redirect_Context.html b/dist/docs/zh-CN/Redirect_Context.html index b31bc934..9c3ee67b 100644 --- a/dist/docs/zh-CN/Redirect_Context.html +++ b/dist/docs/zh-CN/Redirect_Context.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                          OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                          -
                                                                                                                                                          Version 1.4  — Rev. 7
                                                                                                                                                          +
                                                                                                                                                          Version 1.4  — Rev. 8
                                                                                                                                                            diff --git a/dist/docs/zh-CN/Rewrite_Help.html b/dist/docs/zh-CN/Rewrite_Help.html index d4fb6b84..99725feb 100644 --- a/dist/docs/zh-CN/Rewrite_Help.html +++ b/dist/docs/zh-CN/Rewrite_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                            OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                            -
                                                                                                                                                            Version 1.4  — Rev. 7
                                                                                                                                                            +
                                                                                                                                                            Version 1.4  — Rev. 8
                                                                                                                                                              diff --git a/dist/docs/zh-CN/ScriptHandler_Help.html b/dist/docs/zh-CN/ScriptHandler_Help.html index 8ce6e1f0..fc24d575 100644 --- a/dist/docs/zh-CN/ScriptHandler_Help.html +++ b/dist/docs/zh-CN/ScriptHandler_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                              OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                              -
                                                                                                                                                              Version 1.4  — Rev. 7
                                                                                                                                                              +
                                                                                                                                                              Version 1.4  — Rev. 8
                                                                                                                                                                diff --git a/dist/docs/zh-CN/ServGeneral_Help.html b/dist/docs/zh-CN/ServGeneral_Help.html index d0985b51..17f240b9 100644 --- a/dist/docs/zh-CN/ServGeneral_Help.html +++ b/dist/docs/zh-CN/ServGeneral_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                                OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                -
                                                                                                                                                                Version 1.4  — Rev. 7
                                                                                                                                                                +
                                                                                                                                                                Version 1.4  — Rev. 8
                                                                                                                                                                  diff --git a/dist/docs/zh-CN/ServLog_Help.html b/dist/docs/zh-CN/ServLog_Help.html index e30fb9ef..06dc3854 100644 --- a/dist/docs/zh-CN/ServLog_Help.html +++ b/dist/docs/zh-CN/ServLog_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                                  OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                  -
                                                                                                                                                                  Version 1.4  — Rev. 7
                                                                                                                                                                  +
                                                                                                                                                                  Version 1.4  — Rev. 8
                                                                                                                                                                    diff --git a/dist/docs/zh-CN/ServSecurity_Help.html b/dist/docs/zh-CN/ServSecurity_Help.html index 7f350506..76e62604 100644 --- a/dist/docs/zh-CN/ServSecurity_Help.html +++ b/dist/docs/zh-CN/ServSecurity_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                                    OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                    -
                                                                                                                                                                    Version 1.4  — Rev. 7
                                                                                                                                                                    +
                                                                                                                                                                    Version 1.4  — Rev. 8
                                                                                                                                                                      diff --git a/dist/docs/zh-CN/ServTuning_Help.html b/dist/docs/zh-CN/ServTuning_Help.html index 53c8b276..878dead7 100644 --- a/dist/docs/zh-CN/ServTuning_Help.html +++ b/dist/docs/zh-CN/ServTuning_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                                      OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                      -
                                                                                                                                                                      Version 1.4  — Rev. 7
                                                                                                                                                                      +
                                                                                                                                                                      Version 1.4  — Rev. 8
                                                                                                                                                                        diff --git a/dist/docs/zh-CN/ServerStat_Help.html b/dist/docs/zh-CN/ServerStat_Help.html index 2342b788..969fdc75 100644 --- a/dist/docs/zh-CN/ServerStat_Help.html +++ b/dist/docs/zh-CN/ServerStat_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                                        OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                        -
                                                                                                                                                                        Version 1.4  — Rev. 7
                                                                                                                                                                        +
                                                                                                                                                                        Version 1.4  — Rev. 8
                                                                                                                                                                          diff --git a/dist/docs/zh-CN/Servlet_Context.html b/dist/docs/zh-CN/Servlet_Context.html index 615ada3d..f9f09e4a 100644 --- a/dist/docs/zh-CN/Servlet_Context.html +++ b/dist/docs/zh-CN/Servlet_Context.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                                          OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                          -
                                                                                                                                                                          Version 1.4  — Rev. 7
                                                                                                                                                                          +
                                                                                                                                                                          Version 1.4  — Rev. 8
                                                                                                                                                                            diff --git a/dist/docs/zh-CN/Static_Context.html b/dist/docs/zh-CN/Static_Context.html index 41f7577b..1736b55f 100644 --- a/dist/docs/zh-CN/Static_Context.html +++ b/dist/docs/zh-CN/Static_Context.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                                            OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                            -
                                                                                                                                                                            Version 1.4  — Rev. 7
                                                                                                                                                                            +
                                                                                                                                                                            Version 1.4  — Rev. 8
                                                                                                                                                                              diff --git a/dist/docs/zh-CN/Templates_Help.html b/dist/docs/zh-CN/Templates_Help.html index 74ec65d9..318c4815 100644 --- a/dist/docs/zh-CN/Templates_Help.html +++ b/dist/docs/zh-CN/Templates_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                                              OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                              -
                                                                                                                                                                              Version 1.4  — Rev. 7
                                                                                                                                                                              +
                                                                                                                                                                              Version 1.4  — Rev. 8
                                                                                                                                                                                diff --git a/dist/docs/zh-CN/VHGeneral_Help.html b/dist/docs/zh-CN/VHGeneral_Help.html index 8fbae2c2..3d21ea92 100644 --- a/dist/docs/zh-CN/VHGeneral_Help.html +++ b/dist/docs/zh-CN/VHGeneral_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                                                OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                -
                                                                                                                                                                                Version 1.4  — Rev. 7
                                                                                                                                                                                +
                                                                                                                                                                                Version 1.4  — Rev. 8
                                                                                                                                                                                  diff --git a/dist/docs/zh-CN/VHSSL_Help.html b/dist/docs/zh-CN/VHSSL_Help.html index 3c15309b..44197f12 100644 --- a/dist/docs/zh-CN/VHSSL_Help.html +++ b/dist/docs/zh-CN/VHSSL_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                                                  OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                  -
                                                                                                                                                                                  Version 1.4  — Rev. 7
                                                                                                                                                                                  +
                                                                                                                                                                                  Version 1.4  — Rev. 8
                                                                                                                                                                                    diff --git a/dist/docs/zh-CN/VHSecurity_Help.html b/dist/docs/zh-CN/VHSecurity_Help.html index 418a2db6..0c81a255 100644 --- a/dist/docs/zh-CN/VHSecurity_Help.html +++ b/dist/docs/zh-CN/VHSecurity_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                                                    OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                    -
                                                                                                                                                                                    Version 1.4  — Rev. 7
                                                                                                                                                                                    +
                                                                                                                                                                                    Version 1.4  — Rev. 8
                                                                                                                                                                                      diff --git a/dist/docs/zh-CN/VHWebSocket_Help.html b/dist/docs/zh-CN/VHWebSocket_Help.html index c25cfd5f..603af702 100644 --- a/dist/docs/zh-CN/VHWebSocket_Help.html +++ b/dist/docs/zh-CN/VHWebSocket_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                                                      OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                      -
                                                                                                                                                                                      Version 1.4  — Rev. 7
                                                                                                                                                                                      +
                                                                                                                                                                                      Version 1.4  — Rev. 8
                                                                                                                                                                                        @@ -88,7 +88,7 @@ communication to the appropriate backend stipulated in the {ITEM=wsaddr} field.<

                                                                                                                                                                                        Table of Contents

                                                                                                                                                                                        Web Socket Proxy

                                                                                                                                                                                        URI | Address

                                                                                                                                                                                        -

                                                                                                                                                                                        URI⇑

                                                                                                                                                                                        Description

                                                                                                                                                                                        Specifies the URI(s) that will use this WebSocket backend. Traffic to this URI will only be forwarded to the WebSocket backend when it contains a WebSocket upgrade request.

                                                                                                                                                                                        Traffic without this upgrade request will automatically be forwarded to the Context that this URI belongs to. If no Context exists for this URI, LSWS will treat this traffic as though it is accessing a static context with the location $DOC_ROOT/URI.

                                                                                                                                                                                        Syntax

                                                                                                                                                                                        The URI can be a plain URI (starting with "/") or a Perl-compatible regular expression URI (starting with "exp:"). If a plain URI ends with a "/", then this WebSocket backend will include all sub-URIs under this URI.

                                                                                                                                                                                        Example

                                                                                                                                                                                        Using the WebSocket proxy in conjunction with a Context allows you to serve different kinds of traffic in different ways on the same page, thus optimizing performance. You can send WebSocket traffic to the WebSocket backend, while setting up a static context so that LSWS can serve the page's static content, or an LSAPI context so LSWS will serve PHP content (both of which LSWS does more efficiently than the WebSocket backend).
                                                                                                                                                                                        +

                                                                                                                                                                                        URI⇑

                                                                                                                                                                                        Description

                                                                                                                                                                                        Specifies the URI(s) that will use this WebSocket backend. Traffic to this URI will only be forwarded to the WebSocket backend when it contains a WebSocket upgrade request.

                                                                                                                                                                                        Traffic without this upgrade request will automatically be forwarded to the Context that this URI belongs to. If no Context exists for this URI, LSWS will treat this traffic as though it is accessing a static context with the location $DOC_ROOT/URI.

                                                                                                                                                                                        Syntax

                                                                                                                                                                                        A plain URI (starting with "/"). If the URI ends with a "/", then this WebSocket backend will include all sub-URIs under this URI.

                                                                                                                                                                                        Example

                                                                                                                                                                                        Using the WebSocket proxy in conjunction with a Context allows you to serve different kinds of traffic in different ways on the same page, thus optimizing performance. You can send WebSocket traffic to the WebSocket backend, while setting up a static context so that LSWS can serve the page's static content, or an LSAPI context so LSWS will serve PHP content (both of which LSWS does more efficiently than the WebSocket backend).

                                                                                                                                                                                        Address⇑

                                                                                                                                                                                        Description

                                                                                                                                                                                        A unique socket address used by the WebSocket backend. IPv4 sockets, IPv6 sockets, and Unix Domain Sockets (UDS) are supported. IPv4 and IPv6 sockets can be used for communication over the network. UDS can only be used when the WebSocket backend resides on the same machine as the server.

                                                                                                                                                                                        Syntax

                                                                                                                                                                                        IPv4 or IPV6 address:port or UDS://path

                                                                                                                                                                                        Example

                                                                                                                                                                                        127.0.0.1:5434
                                                                                                                                                                                        UDS://tmp/lshttpd/php.sock.

                                                                                                                                                                                        Tips

                                                                                                                                                                                        If the WebSocket backend runs on the same machine, UDS is preferred. If you have to use an IPv4 or IPv6 socket, set the IP address to localhost or 127.0.0.1, so the WebSocket backend is inaccessible from other machines.
                                                                                                                                                                                        Unix Domain Sockets generally provide higher performance than IPv4 or IPv6 sockets.

                                                                                                                                                                                        diff --git a/dist/docs/zh-CN/VirtualHosts_Help.html b/dist/docs/zh-CN/VirtualHosts_Help.html index 3ea60f6a..66355a93 100644 --- a/dist/docs/zh-CN/VirtualHosts_Help.html +++ b/dist/docs/zh-CN/VirtualHosts_Help.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                                                        OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                        -
                                                                                                                                                                                        Version 1.4  — Rev. 7
                                                                                                                                                                                        +
                                                                                                                                                                                        Version 1.4  — Rev. 8
                                                                                                                                                                                          diff --git a/dist/docs/zh-CN/admin.html b/dist/docs/zh-CN/admin.html index 8462d74e..83bf5795 100644 --- a/dist/docs/zh-CN/admin.html +++ b/dist/docs/zh-CN/admin.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                                                          OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                          -
                                                                                                                                                                                          Version 1.4  — Rev. 7
                                                                                                                                                                                          +
                                                                                                                                                                                          Version 1.4  — Rev. 8
                                                                                                                                                                                            diff --git a/dist/docs/zh-CN/config.html b/dist/docs/zh-CN/config.html index 2c713b88..2634011a 100644 --- a/dist/docs/zh-CN/config.html +++ b/dist/docs/zh-CN/config.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                                                            OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                            -
                                                                                                                                                                                            Version 1.4  — Rev. 7
                                                                                                                                                                                            +
                                                                                                                                                                                            Version 1.4  — Rev. 8
                                                                                                                                                                                              diff --git a/dist/docs/zh-CN/index.html b/dist/docs/zh-CN/index.html index 89ec1966..af798b9a 100644 --- a/dist/docs/zh-CN/index.html +++ b/dist/docs/zh-CN/index.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                                                              OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                              -
                                                                                                                                                                                              Version 1.4  — Rev. 7
                                                                                                                                                                                              +
                                                                                                                                                                                              Version 1.4  — Rev. 8
                                                                                                                                                                                                @@ -83,7 +83,7 @@

                                                                                                                                                                                                OpenLiteSpeed Web Server 1.4

                                                                                                                                                                                                Users' Manual

                                                                                                                                                                                                -

                                                                                                                                                                                                — Rev. 7

                                                                                                                                                                                                +

                                                                                                                                                                                                — Rev. 8

                                                                                                                                                                                                diff --git a/dist/docs/zh-CN/install.html b/dist/docs/zh-CN/install.html index bfcd5375..caf20a33 100644 --- a/dist/docs/zh-CN/install.html +++ b/dist/docs/zh-CN/install.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                                                                OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                                -
                                                                                                                                                                                                Version 1.4  — Rev. 7
                                                                                                                                                                                                +
                                                                                                                                                                                                Version 1.4  — Rev. 8
                                                                                                                                                                                                  diff --git a/dist/docs/zh-CN/intro.html b/dist/docs/zh-CN/intro.html index d39c884b..c18b2a5a 100644 --- a/dist/docs/zh-CN/intro.html +++ b/dist/docs/zh-CN/intro.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                                                                  OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                                  -
                                                                                                                                                                                                  Version 1.4  — Rev. 7
                                                                                                                                                                                                  +
                                                                                                                                                                                                  Version 1.4  — Rev. 8
                                                                                                                                                                                                    diff --git a/dist/docs/zh-CN/license.html b/dist/docs/zh-CN/license.html index 8264d350..e5dd6f27 100644 --- a/dist/docs/zh-CN/license.html +++ b/dist/docs/zh-CN/license.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                                                                    OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                                    -
                                                                                                                                                                                                    Version 1.4  — Rev. 7
                                                                                                                                                                                                    +
                                                                                                                                                                                                    Version 1.4  — Rev. 8
                                                                                                                                                                                                      diff --git a/dist/docs/zh-CN/security.html b/dist/docs/zh-CN/security.html index 8a65db66..ac45cbe1 100644 --- a/dist/docs/zh-CN/security.html +++ b/dist/docs/zh-CN/security.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                                                                      OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                                      -
                                                                                                                                                                                                      Version 1.4  — Rev. 7
                                                                                                                                                                                                      +
                                                                                                                                                                                                      Version 1.4  — Rev. 8
                                                                                                                                                                                                        diff --git a/dist/docs/zh-CN/webconsole.html b/dist/docs/zh-CN/webconsole.html index 21f0e6d9..76ebbb02 100644 --- a/dist/docs/zh-CN/webconsole.html +++ b/dist/docs/zh-CN/webconsole.html @@ -14,7 +14,7 @@ openlitespeed logo

                                                                                                                                                                                                        OpenLiteSpeed Web Server Users' Manual

                                                                                                                                                                                                        -
                                                                                                                                                                                                        Version 1.4  — Rev. 7
                                                                                                                                                                                                        +
                                                                                                                                                                                                        Version 1.4  — Rev. 8
                                                                                                                                                                                                          diff --git a/src/config.h.in b/src/config.h.in index c39c8b79..57d9cb16 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -57,12 +57,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the header file. */ -#undef HAVE_IP2LOCATION_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_IP2LOC_DBINTERFACE_H - /* Define to 1 if you have the header file. */ #undef HAVE_LAUXLIB_H diff --git a/src/http/clientinfo.h b/src/http/clientinfo.h index 0fd4326a..88fd4503 100644 --- a/src/http/clientinfo.h +++ b/src/http/clientinfo.h @@ -18,6 +18,7 @@ #ifndef CLIENTINFO_H #define CLIENTINFO_H +#include #include #include diff --git a/src/http/httpcgitool.cpp b/src/http/httpcgitool.cpp index 166d64eb..10fedf1a 100644 --- a/src/http/httpcgitool.cpp +++ b/src/http/httpcgitool.cpp @@ -109,6 +109,8 @@ int HttpCgiTool::processHeaderLine(HttpExtConnector *pExtConn, case HttpRespHeaders::H_CONTENT_TYPE: if (pReq->getStatusCode() == SC_304) return 0; + + HttpCgiTool::processExpires(pReq, pResp, pValue); p = (char *)memchr(pValue, ';', pLineEnd - pValue); if (pReq->gzipAcceptable() == GZIP_REQUIRED) { @@ -146,6 +148,8 @@ int HttpCgiTool::processHeaderLine(HttpExtConnector *pExtConn, str.append("\r\n", 2); buf.parseAdd(str.c_str(), str.len()); } + + return 0; case HttpRespHeaders::H_CONTENT_ENCODING: if (pReq->getStatusCode() == SC_304 @@ -756,6 +760,27 @@ int HttpCgiTool::addHttpHeaderEnv(IEnv *pEnv, HttpReq *pReq) return 0; } +int HttpCgiTool::processExpires(HttpReq *pReq, HttpResp *pResp, const char *pValue) +{ + HttpContext *pContext = &(pReq->getVHost()->getRootContext()); + const MimeSetting *pMIMESetting = pContext->lookupMimeSetting((char *)pValue); + int enbale = pContext->getExpires().isEnabled(); + if (enbale) + { + ExpiresCtrl *pExpireDefault = NULL;//&pContext->getExpires(); + if (pMIMESetting) + pExpireDefault = (ExpiresCtrl *)pMIMESetting->getExpires(); + + if (pExpireDefault == NULL) + pExpireDefault = &pContext->getExpires(); + + if (pExpireDefault->getBase()) + pResp->addExpiresHeader(pExpireDefault->getAge()); + } + + return 0; +} + //Fix me: Xuedong copy this new function from litespeed side, since this function // is calling the new function "void setContentTypeHeaderInfo( int offset, int len )" diff --git a/src/http/httpcgitool.h b/src/http/httpcgitool.h index 2758f904..49893844 100644 --- a/src/http/httpcgitool.h +++ b/src/http/httpcgitool.h @@ -36,6 +36,8 @@ class HttpCgiTool public: static int processContentType(HttpReq *pReq, HttpResp *pResp, const char *pValue, int valLen); + static int processExpires(HttpReq *pReq, HttpResp *pResp, const char *pValue); + static int processHeaderLine(HttpExtConnector *pLB, const char *pValue, const char *pLineEnd, int &status); static int parseRespHeader(HttpExtConnector *pLB, diff --git a/src/http/httpresp.cpp b/src/http/httpresp.cpp index ab146163..307bc7e5 100644 --- a/src/http/httpresp.cpp +++ b/src/http/httpresp.cpp @@ -17,6 +17,8 @@ *****************************************************************************/ #include "httpresp.h" +#include + // #include //setheader commented out. #include #include @@ -56,15 +58,17 @@ void HttpResp::appendContentLenHeader() } } +int HttpResp::addExpiresHeader(int age) +{ + char sTemp[RFC_1123_TIME_LEN + 1] = {0}; + getRespHeaders().add(HttpRespHeaders::H_CACHE_CTRL, "public, max-age=", 16); + int n = ls_snprintf(sTemp, RFC_1123_TIME_LEN, "%d", age); + getRespHeaders().appendLastVal(sTemp, n); -// void HttpResp::outputHeader() -// { -// m_respHeaders.getHeaders(&m_iovec); -// int bufSize = m_iovec.bytes(); -// m_iHeaderLeft += bufSize; -// m_iHeaderTotalLen = m_iHeaderLeft; -// } - + DateTime::getRFCTime(DateTime::s_curTime + age, sTemp); + getRespHeaders().add(HttpRespHeaders::H_EXPIRES, sTemp, RFC_1123_TIME_LEN); + return 0; +} int HttpResp::appendHeader(const char *pName, int nameLen, const char *pValue, int valLen) diff --git a/src/http/httpresp.h b/src/http/httpresp.h index 43677f87..d44ec874 100644 --- a/src/http/httpresp.h +++ b/src/http/httpresp.h @@ -25,6 +25,8 @@ #define LSI_RSP_BODY_SIZE_CHUNKED (-1) #define LSI_RSP_BODY_SIZE_UNKNOWN (-2) +class ExpiresCtrl; + class HttpReq; typedef struct ls_xpool_s ls_xpool_t; @@ -94,6 +96,10 @@ public: } + int addExpiresHeader(int age); + + + off_t getTotalLen() { return m_lEntityFinished + m_respHeaders.getTotalLen(); } //int isRespHeaderBuilt() { return m_respHeaders.isRespHeadersBuilt(); } diff --git a/src/http/httpsession.cpp b/src/http/httpsession.cpp index b1b1d497..4a7fb633 100644 --- a/src/http/httpsession.cpp +++ b/src/http/httpsession.cpp @@ -545,7 +545,8 @@ int HttpSession::reqBodyDone() } - if (getFlag(HSF_REQ_WAIT_FULL_BODY) == HSF_REQ_WAIT_FULL_BODY) + if (getFlag(HSF_REQ_WAIT_FULL_BODY) == HSF_REQ_WAIT_FULL_BODY + && (m_iFlag & HSF_URI_MAPPED)) { ret = handlerProcess(m_request.getHttpHandler()); if (ret) @@ -749,7 +750,7 @@ int HttpSession::restartHandlerProcess() (LsiSession *)this); m_iFlag &= ~(HSF_RESP_HEADER_DONE | HSF_RESP_WAIT_FULL_BODY | - HSF_RESP_FLUSHED + HSF_RESP_FLUSHED | HSF_URI_MAPPED | HSF_HANDLER_DONE); if (m_pHandler) @@ -1326,6 +1327,7 @@ int HttpSession::redirect(const char *pNewURL, int len, int alloc) m_request.setContext(NULL); m_response.reset(); m_processState = HSPS_PROCESS_NEW_URI; + m_iFlag &= ~HSF_URI_MAPPED; return smProcessReq(); } @@ -2179,6 +2181,7 @@ void HttpSession::closeConnection() if (m_sessionHooks.isEnabled(LSI_HKPT_HTTP_END)) m_sessionHooks.runCallbackNoParam(LSI_HKPT_HTTP_END, (LsiSession *)this); } + m_iFlag &= ~HSF_URI_MAPPED; m_request.keepAlive(0); @@ -3277,9 +3280,9 @@ void HttpSession::prepareHeaders() * 1000000 01000000 11000000 00100000 * */ -void HttpSession::addBittoCookie(AutoStr2 &cookie, uint32_t bit) +void HttpSession::addBittoCookie(AutoStr2 &cookie, int bit) { - uint32_t i; + int i; int len = cookie.len(); char s[3] = {'0', '0', 0}; @@ -3300,7 +3303,7 @@ void HttpSession::addBittoCookie(AutoStr2 &cookie, uint32_t bit) /** * 1 fot true, 0 for false */ -int HttpSession::isCookieHaveBit(const char *cookie, uint32_t bit) +int HttpSession::isCookieHaveBit(const char *cookie, int bit) { int size = strlen(cookie); if (bit / 8 >= size/2) @@ -3339,7 +3342,7 @@ int HttpSession::pushToClient(const char *pUri, int uriLen, AutoStr2 &cookie) buf[uriLen] = 0; HttpVHost *pVHost = (HttpVHost *) m_request.getVHost(); - uint32_t id = pVHost->getIdBitOfUrl(pUri); + int id = pVHost->getIdBitOfUrl(pUri); if (id == -1) id = pVHost->addUrlToUrlIdHash(pUri); @@ -4395,6 +4398,7 @@ int HttpSession::smProcessReq() break; //fall through case HSPS_HKPT_URI_MAP: + m_iFlag |= HSF_URI_MAPPED; ret = runEventHkpt(LSI_HKPT_URI_MAP, HSPS_FILE_MAP); if (ret || m_processState != HSPS_FILE_MAP) break; diff --git a/src/http/httpsession.h b/src/http/httpsession.h index 7c8d5df4..6498d4c5 100644 --- a/src/http/httpsession.h +++ b/src/http/httpsession.h @@ -116,7 +116,7 @@ enum HSPState #define HSF_SUSPENDED (1<<15) #define HSF_SC_404 (1<<16) #define HSF_AIO_READING (1<<17) - +#define HSF_URI_MAPPED (1<<18) #define HSF_STX_FILE_CACHE_READY (1<<19) @@ -237,8 +237,8 @@ public: void extCmdDone(); - void addBittoCookie(AutoStr2 &cookie, uint32_t bit); - int isCookieHaveBit(const char *cookies, uint32_t bit); + void addBittoCookie(AutoStr2 &cookie, int bit); + int isCookieHaveBit(const char *cookies, int bit); int pushToClient(const char *pUri, int uriLen, AutoStr2 &cookie); void processLinkHeader(const char* pValue, int valLen, AutoStr2 &cookie); diff --git a/src/http/httpvhost.cpp b/src/http/httpvhost.cpp index 895d81fd..b1f8a167 100644 --- a/src/http/httpvhost.cpp +++ b/src/http/httpvhost.cpp @@ -2739,9 +2739,9 @@ void HttpVHost::removeurlStaticFile(static_file_data_t *data) /** * return the just assigned id */ -uint32_t HttpVHost::addUrlToUrlIdHash(const char *url) +int HttpVHost::addUrlToUrlIdHash(const char *url) { - uint32_t size = m_pUrlIdHash->size(); + int size = m_pUrlIdHash->size(); url_id_data_t *data = new url_id_data_t; data->id = size; data->url.setStr(url); diff --git a/src/http/httpvhost.h b/src/http/httpvhost.h index a710cae3..545ecac4 100644 --- a/src/http/httpvhost.h +++ b/src/http/httpvhost.h @@ -488,7 +488,7 @@ public: static_file_data_t *getUrlStaticFileData(const char *url); void urlStaticFileHashClean(); - uint32_t addUrlToUrlIdHash(const char *url); + int addUrlToUrlIdHash(const char *url); /** * return the bit of the url added to the hash diff --git a/src/http/sendfileinfo.cpp b/src/http/sendfileinfo.cpp index 23a88bb2..d624814d 100644 --- a/src/http/sendfileinfo.cpp +++ b/src/http/sendfileinfo.cpp @@ -72,11 +72,11 @@ void SendFileInfo::release() { if (m_pFileData) { - if (m_pFileData->decRef() == 0) + if (m_pFileData->decRef() <= 0) m_pFileData->setLastAccess(DateTime::s_curTime); //m_pFileData->keepOrigFileClosed(); } - if (m_pECache && m_pECache->decRef() == 0) + if (m_pECache && m_pECache->decRef() <= 0) { if (m_pECache->getfd() != -1) m_pECache->closefd(); diff --git a/src/http/staticfilecachedata.cpp b/src/http/staticfilecachedata.cpp index df39c69f..dd57665b 100644 --- a/src/http/staticfilecachedata.cpp +++ b/src/http/staticfilecachedata.cpp @@ -255,12 +255,13 @@ const char *FileCacheDataEx::getCacheData( else { assert(m_fd != -1); - off_t off = ls_fio_lseek(m_fd, offset, SEEK_SET); -// LS_DBG_H( "lseek() return %d", (int)off ); - if (off == offset) - wanted = ls_fio_read(m_fd, pBuf, len); - else - wanted = -1; +// off_t off = ls_fio_lseek(m_fd, offset, SEEK_SET); +// // LS_DBG_H( "lseek() return %d", (int)off ); +// if (off == offset) +// wanted = ls_fio_read(m_fd, pBuf, len); +// else +// wanted = -1; + wanted = pread(m_fd, pBuf, len, offset); return pBuf; } diff --git a/src/http/staticfilehandler.cpp b/src/http/staticfilehandler.cpp index 0be77d1b..38400441 100644 --- a/src/http/staticfilehandler.cpp +++ b/src/http/staticfilehandler.cpp @@ -124,7 +124,6 @@ static int addExpiresHeader(HttpResp *pResp, StaticFileCacheData *pData, { case EXPIRES_ACCESS: age = pExpires->getAge(); - expire = DateTime::s_curTime + age; break; case EXPIRES_MODIFY: expire = pData->getLastMod() + pExpires->getAge(); @@ -134,14 +133,7 @@ static int addExpiresHeader(HttpResp *pResp, StaticFileCacheData *pData, return 0; } - char sTemp[RFC_1123_TIME_LEN + 1] = {0}; - HttpRespHeaders &buf = pResp->getRespHeaders(); - buf.add(HttpRespHeaders::H_CACHE_CTRL, "public, max-age=", 16); - int n = ls_snprintf(sTemp, RFC_1123_TIME_LEN, "%d", age); - buf.appendLastVal(sTemp, n); - - DateTime::getRFCTime(expire, sTemp); - buf.add(HttpRespHeaders::H_EXPIRES, sTemp, RFC_1123_TIME_LEN); + pResp->addExpiresHeader(age); return 0; } diff --git a/src/lsiapi/lsiapilib.cpp b/src/lsiapi/lsiapilib.cpp index ec4f0bfe..5680e9d9 100644 --- a/src/lsiapi/lsiapilib.cpp +++ b/src/lsiapi/lsiapilib.cpp @@ -1340,6 +1340,7 @@ static int set_req_wait_full_body(const lsi_session_t *session) HttpSession *pSession = (HttpSession *)((LsiSession *)session); if (pSession == NULL) return LS_FAIL; + log(session, LSI_LOG_DEBUG, "set_req_wait_full_body called\n"); pSession->setFlag(HSF_REQ_WAIT_FULL_BODY); return LS_OK; } diff --git a/src/main/httpserver.cpp b/src/main/httpserver.cpp index b0cc60b9..2d1ea75e 100644 --- a/src/main/httpserver.cpp +++ b/src/main/httpserver.cpp @@ -15,10 +15,11 @@ * You should have received a copy of the GNU General Public License * * along with this program. If not, see http://www.gnu.org/licenses/. * *****************************************************************************/ -#include "httpserver.h" #include +#include "httpserver.h" + #include #include diff --git a/src/modules/modsecurity-ls/CMakeLists.txt b/src/modules/modsecurity-ls/CMakeLists.txt index 801000e9..b7bb3fe8 100644 --- a/src/modules/modsecurity-ls/CMakeLists.txt +++ b/src/modules/modsecurity-ls/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -Wall -lxml2 -lcurl") -include_directories(ModSecurity/headers/) +include_directories(${PROJECT_SOURCE_DIR}/../thirdparty/ModSecurity/headers/) execute_process( COMMAND getconf LFS_CFLAGS OUTPUT_VARIABLE LFS_CFLAGS ) @@ -14,5 +14,5 @@ add_library(mod_security SHARED mod_security.cpp ) -target_link_libraries(mod_security ${PROJECT_SOURCE_DIR}/src/modules/modsecurity-ls/ModSecurity/src/.libs/libmodsecurity.a ) +target_link_libraries(mod_security ${PROJECT_SOURCE_DIR}/../thirdparty/ModSecurity/src/.libs/libmodsecurity.a ) set_target_properties(mod_security PROPERTIES PREFIX "") diff --git a/src/modules/modsecurity-ls/dllibmodsecurity.sh b/src/modules/modsecurity-ls/dllibmodsecurity.sh index f92a0ccb..3399039d 100755 --- a/src/modules/modsecurity-ls/dllibmodsecurity.sh +++ b/src/modules/modsecurity-ls/dllibmodsecurity.sh @@ -57,6 +57,10 @@ if [ ! -f $MOD_SEC_HOME/modsecurity/modsecurity.h ] ; then automake pcre-devel" elif [ $APP_MGR_CMD = 'yum' ] ; then OS_VERSION=`cat /etc/centos-release | awk '{print $3}' | cut -c1` + if [ $OS_VERSION = 'r' ] ; then + #Centos 7 or later? + OS_VERSION=`cat /etc/centos-release | awk '{print $4}' | cut -c1` + fi if [ $OS_VERSION -le 6 ] ; then echo 'CentOS 6 and below requires manual compilation as the packages' echo 'are too out dated.' @@ -109,7 +113,7 @@ if [ ! -f $MOD_SEC_HOME/modsecurity/modsecurity.h ] ; then $EXEC $PKGS echo "Install packages done, exit code $?" - git clone https://github.com/SpiderLabs/ModSecurity + git clone https://github.com/SpiderLabs/ModSecurity cd ModSecurity git checkout -b v3/master origin/v3/master ./build.sh diff --git a/src/modules/pagespeed/CMakeLists.txt b/src/modules/pagespeed/CMakeLists.txt index 34e87d23..15555417 100644 --- a/src/modules/pagespeed/CMakeLists.txt +++ b/src/modules/pagespeed/CMakeLists.txt @@ -14,21 +14,20 @@ else() endif() -include_directories(./;../;../../;../../util/; - ./psol/include/; - ./psol/include/url; - ./psol/include/third_party/apr/src/include/; - ./psol/include/third_party/aprutil/src/include/; - ./psol/include/third_party/chromium/src/; - ./psol/include/third_party/protobuf/src/; - ./psol/include/third_party/protobuf/src/src; - ./psol/include/third_party/google-sparsehash/src/; - ./psol/include/third_party/re2/src/; - ./psol/include/out/Debug/obj/gen/protoc_out/instaweb/; - ./psol/include/third_party/apr/gen/arch/linux/${OSVERSION}/include/; - ./psol/include/third_party/aprutil/gen/arch/linux/${OSVERSION}/include/; - ./psol/include/third_party/css_parser/src; - ./psol/include/third_party/google-sparsehash/gen/arch/linux/${OSVERSION}/include/) +set(PSOL_LIB ${PROJECT_SOURCE_DIR}/../thirdparty/psol) + +include_directories( + ${PSOL_LIB}/include + ${PSOL_LIB}/include/url + ${PSOL_LIB}/include/third_party/apr/src/include + ${PSOL_LIB}/include/third_party/chromium/src + ${PSOL_LIB}/include/third_party/protobuf/src/src + ${PSOL_LIB}/include/third_party/google-sparsehash/src + ${PSOL_LIB}/include/third_party/re2/src + ${PSOL_LIB}/include/out/Debug/obj/gen/protoc_out/instaweb + ${PSOL_LIB}/include/third_party/apr/gen/arch/linux/${OSVERSION}/include + ${PSOL_LIB}/include/third_party/css_parser/src + ${PSOL_LIB}/include/third_party/google-sparsehash/gen/arch/linux/${OSVERSION}/include/) execute_process( COMMAND getconf LFS_CFLAGS OUTPUT_VARIABLE LFS_CFLAGS ) @@ -45,6 +44,6 @@ add_library(modpagespeed SHARED pagespeed.cpp log_message_handler.cpp ls_uamatcher.cpp ) -target_link_libraries(modpagespeed ${PROJECT_SOURCE_DIR}/src/modules/pagespeed/psol/lib/Debug/linux/${OSVERSION}/pagespeed_automatic.a) +target_link_libraries(modpagespeed ${PSOL_LIB}/lib/Debug/linux/${OSVERSION}/pagespeed_automatic.a) set_target_properties(modpagespeed PROPERTIES PREFIX "") diff --git a/src/modules/pagespeed/Makefile.f b/src/modules/pagespeed/Makefile.f index 140a242f..48060528 100644 --- a/src/modules/pagespeed/Makefile.f +++ b/src/modules/pagespeed/Makefile.f @@ -50,7 +50,7 @@ SOURCES =pagespeed.cpp log_message_handler.cpp ls_message_handler.cpp \ ls_base_fetch.cpp \ ls_uamatcher.cpp -DLPSOL:= $(shell ./dlpsol.sh ) +DLPSOL:= $(shell ./dlpsol.sh 1) $(shell rm *.o ../../util/*.o) OBJECTS=$(SOURCES:.cpp=.o) diff --git a/src/modules/pagespeed/dlpsol.sh b/src/modules/pagespeed/dlpsol.sh index ffb599b4..ffd30539 100755 --- a/src/modules/pagespeed/dlpsol.sh +++ b/src/modules/pagespeed/dlpsol.sh @@ -2,14 +2,23 @@ # # This script is to download PSOL and extract it to right location # -# + +pushd . cd `dirname "$0"` -PSOLVERSION=1.11.33.4 +if [ ! -d ../../../../thirdparty ] ; then + mkdir ../../../../thirdparty +fi + +if [ ! -d ./psol ] ; then + ln -sf ../../../../thirdparty/psol psol +fi if [ ! -f psol/include/out/Release/obj/gen/net/instaweb/public/version.h ] ; then + PSOLVERSION=1.11.33.4 + USEOLDLIB=no GCCVER=`gcc -dumpfullversion -dumpversion` @@ -33,15 +42,20 @@ if [ ! -f psol/include/out/Release/obj/gen/net/instaweb/public/version.h ] ; the TARGET=$PSOLVERSION.tar.gz - if [ ! -f ../../../../$TARGET ]; then - curl -O -k https://dl.google.com/dl/page-speed/psol/$TARGET - mv $TARGET ../../../.. + pushd . + cd ../../../../thirdparty + + DL=`which curl` + DLCMD="$DL -O -k " + if [ ! -f $TARGET ] ; then + $DLCMD https://dl.google.com/dl/page-speed/psol/$TARGET fi - tar -xzvf ../../../../$TARGET # expands to psol/ - + tar -xzvf $TARGET # expands to psol/ + popd + if [ "x$USEOLDLIB" = "xyes" ] ; then - + #fix a file which stop the compiling of pagespeed module echo . cat << EOF > psol/include/pagespeed/kernel/base/scoped_ptr.h @@ -64,5 +78,6 @@ public: EOF fi fi -cd - +popd + diff --git a/src/modules/pagespeed/pagespeed.cpp b/src/modules/pagespeed/pagespeed.cpp index 3f9a06bb..a024870b 100644 --- a/src/modules/pagespeed/pagespeed.cpp +++ b/src/modules/pagespeed/pagespeed.cpp @@ -29,13 +29,13 @@ #include "ls_rewrite_options.h" #include "ls_server_context.h" #include "ls_uamatcher.h" +#include "ls_base_fetch.h" #include #include -#include "autostr.h" -#include "stringtool.h" -#include -#include "ls_base_fetch.h" +#include +#include +#include #include #include #include @@ -43,8 +43,7 @@ #include #include "log_message_handler.h" #include -#include -#include "../../src/http/serverprocessconfig.h" +#include "http/serverprocessconfig.h" #include "net/instaweb/http/public/async_fetch.h" #include "net/instaweb/http/public/cache_url_async_fetcher.h" diff --git a/src/spdy/h2stream.cpp b/src/spdy/h2stream.cpp index 01b4e3b8..0becb72f 100644 --- a/src/spdy/h2stream.cpp +++ b/src/spdy/h2stream.cpp @@ -306,9 +306,16 @@ int H2Stream::onWrite() setFlag(HIO_FLAG_BUFF_FULL, 0); if (isWantWrite()) + { + if (!getHandler()) + { + setFlag(HIO_FLAG_WANT_WRITE, 0); + return 0; + } getHandler()->onWriteEx(); - if (isWantWrite()) - m_pH2Conn->setPendingWrite(); + if (isWantWrite()) + m_pH2Conn->setPendingWrite(); + } return 0; } diff --git a/src/util/httpfetch.cpp b/src/util/httpfetch.cpp index 0d0706b2..62171f61 100644 --- a/src/util/httpfetch.cpp +++ b/src/util/httpfetch.cpp @@ -130,6 +130,11 @@ void HttpFetch::reset() free(m_pExtraReqHdrs); m_pExtraReqHdrs = NULL; } + if (m_pAdnsReq) + { + m_pAdnsReq->setCallback(NULL); + m_pAdnsReq = NULL; + } releaseResult(); m_iStatusCode = 0; m_iReqBufLen = 0; diff --git a/test/spdy/pushtest.cpp b/test/spdy/pushtest.cpp index 73d080f1..5e4675bb 100644 --- a/test/spdy/pushtest.cpp +++ b/test/spdy/pushtest.cpp @@ -30,7 +30,7 @@ TEST(VHOST_URL_HASH) int id = vhost->getIdBitOfUrl(url); CHECK(id == -1); - uint32_t id1 = vhost->addUrlToUrlIdHash(url); + int id1 = vhost->addUrlToUrlIdHash(url); CHECK(id1 == 0); id = vhost->getIdBitOfUrl(url); CHECK(id == id1); @@ -57,8 +57,8 @@ TEST(VHOST_URL_HASH) id = vhost->getIdBitOfUrl(url); CHECK(id == id1); - char *s="abcdefghji"; - char *s2="jklmnopqrest"; + const char *s="abcdefghji"; + const char *s2="jklmnopqrest"; char ss[3] = {0}; for(int i=0; i<10; ++i)