Check in 1.7.17

litespeedtech · Jun 20, 2023 · 4272885 · 4272885
1 parent 305e410
commit 4272885
Show file tree

Hide file tree

Showing 150 changed files with 1,972 additions and 1,329 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ INCLUDE(GNUInstallDirs)
 
 set(openlitespeed_MAJOR_VERSION 1)
 set(openlitespeed_MINOR_VERSION 7)
-set(openlitespeed_PATCH_VERSION 16)
+set(openlitespeed_PATCH_VERSION 17)
 set(openlitespeed_VERSION
     ${openlitespeed_MAJOR_VERSION}.${openlitespeed_MINOR_VERSION}.${openlitespeed_PATCH_VERSION})
 

diff --git a/build.sh b/build.sh
@@ -20,7 +20,6 @@
 ###    Author: dxu@litespeedtech.com (David Shue)
 
 VERSION=1.0.1
-moduledir="modreqparser modinspector uploadprogress "
 OS=`uname`
 ARCH=`arch`
 ISLINUX=no
@@ -390,6 +389,7 @@ updateModuleCMakelistfile()
     if [ "${OS}" = "Darwin" ] ; then
         echo Mac OS bypass all module right now
     else
+        moduledir="modreqparser modinspector uploadprogress "
         for module in ${moduledir}; do
             echo "add_subdirectory(${module})" >> src/modules/CMakeLists.txt
         done
@@ -420,11 +420,11 @@ cpModuleSoFiles()
         cp -f build/src/modules/${module}/*.so dist/modules/
     done
 
-    if [ -e src/modules/modsecurity-ls/mod_security.so ] ; then
+    if [ -e build/src/modules/modsecurity-ls/mod_security.so ] ; then
         cp -f build/src/modules/modsecurity-ls/mod_security.so dist/modules/
     fi
 
-    if [ -e src/modules/pagespeed/modpagespeed.so ] ; then
+    if [ -e build/src/modules/pagespeed/modpagespeed.so ] ; then
         cp -f build/src/modules/pagespeed/modpagespeed.so dist/modules/
     fi
 }
@@ -536,6 +536,12 @@ ln -sf ../../../../third-party/src/ModSecurity .
 cd ../../../
 #Done of modsecurity
 
+cd src/modules/lsrecaptcha
+export GOPATH=$CUR_PATH/src/modules/lsrecaptcha
+go build lsrecaptcha
+cp lsrecaptcha ../../../dist/lsrecaptcha/_recaptcha
+cd ../../../
+
 fixshmdir
 
 if [ "x$1" == "xDebug" ]; then

diff --git a/configure b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for openlitespeed 1.7.16.
+# Generated by GNU Autoconf 2.69 for openlitespeed 1.7.17.
 #
 # Report bugs to <info@litespeedtech.com>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='openlitespeed'
 PACKAGE_TARNAME='openlitespeed'
-PACKAGE_VERSION='1.7.16'
-PACKAGE_STRING='openlitespeed 1.7.16'
+PACKAGE_VERSION='1.7.17'
+PACKAGE_STRING='openlitespeed 1.7.17'
 PACKAGE_BUGREPORT='info@litespeedtech.com'
 PACKAGE_URL='http://www.litespeedtech.com/'
 
@@ -1398,7 +1398,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures openlitespeed 1.7.16 to adapt to many kinds of systems.
+\`configure' configures openlitespeed 1.7.17 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1468,7 +1468,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of openlitespeed 1.7.16:";;
+     short | recursive ) echo "Configuration of openlitespeed 1.7.17:";;
    esac
   cat <<\_ACEOF
 
@@ -1629,7 +1629,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-openlitespeed configure 1.7.16
+openlitespeed configure 1.7.17
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2303,7 +2303,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by openlitespeed $as_me 1.7.16, which was
+It was created by openlitespeed $as_me 1.7.17, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3169,7 +3169,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='openlitespeed'
- VERSION='1.7.16'
+ VERSION='1.7.17'
 
 
 # Some tools Automake needs.
@@ -19578,7 +19578,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by openlitespeed $as_me 1.7.16, which was
+This file was extended by openlitespeed $as_me 1.7.17, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19645,7 +19645,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-openlitespeed config.status 1.7.16
+openlitespeed config.status 1.7.17
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
@@ -7,7 +7,7 @@ m4_include(ax_check_libudns.m4)
 m4_include(ax_check_ip2location.m4)
 
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([openlitespeed],[1.7.16],[info@litespeedtech.com],[openlitespeed],[http://www.litespeedtech.com/])
+AC_INIT([openlitespeed],[1.7.17],[info@litespeedtech.com],[openlitespeed],[http://www.litespeedtech.com/])
 AM_INIT_AUTOMAKE([1.0 foreign no-define subdir-objects])
 
 AC_CONFIG_HEADERS(src/config.h:src/config.h.in)

diff --git a/dist/VERSION b/dist/VERSION
@@ -1 +1 @@
-1.7.16
+1.7.17
diff --git a/dist/add-ons/webcachemgr/VERSION b/dist/add-ons/webcachemgr/VERSION
@@ -1 +1 @@
-1.14.1.2
+1.14.5
diff --git a/dist/add-ons/webcachemgr/src/CliController.php b/dist/add-ons/webcachemgr/src/CliController.php
@@ -4,7 +4,7 @@
  * LiteSpeed Web Server Cache Manager
  *
  * @author Michael Alegre
- * @copyright (c) 2018-2022 LiteSpeed Technologies, Inc.
+ * @copyright (c) 2018-2023 LiteSpeed Technologies, Inc.
  * ******************************************* */
 
 namespace Lsc\Wp;
@@ -251,6 +251,10 @@ private function printStatusMsg( WPInstall $wpInstall )
      *     non-empty directory.
      * @throws LSCMException  Thrown indirectly by
      *     ControlPanel::getClassInstance() call.
+     * @throws LSCMException  Thrown indirectly by
+     *     $controlPanel->getServerCacheRoot() call.
+     * @throws LSCMException  Thrown indirectly by
+     *     $controlPanel->getVHCacheRoot() call.
      */
     private function handleSetCacheRootInput( array &$args )
     {
@@ -787,6 +791,10 @@ private function handleAddInstallsInput( array &$args )
      *
      * @throws LSCMException  Thrown indirectly by
      *     ControlPanel::getClassInstance() call.
+     * @throws LSCMException  Thrown indirectly by
+     *     $controlPanel->getServerCacheRoot() call.
+     * @throws LSCMException  Thrown indirectly by
+     *     $controlPanel->getVHCacheRoot() call.
      */
     private function displayCacheRoots()
     {
@@ -849,7 +857,8 @@ private function parseCommands( array $args )
 
         $cmd = array_shift($args);
 
-        switch ($cmd) {
+        switch ( $cmd ) {
+
             case 'setcacheroot':
 
                 if ( $panelClassName == 'custom' ) {
@@ -927,6 +936,9 @@ private function parseCommands( array $args )
      *     $controlPanel->setServerCacheRoot() call.
      * @throws LSCMException  Thrown indirectly by
      *     $controlPanel->setVHCacheRoot() call.
+     * @throws LSCMException  Thrown indirectly by Util::restartLsws() call.
+     * @throws LSCMException  Thrown indirectly by
+     *     $controlPanel->getVHCacheRoot() call.
      */
     private function doCacheRootCommand( $action )
     {
@@ -1072,12 +1084,12 @@ private function doVersionCommand()
     {
         $pluginVerInstance = PluginVersion::getInstance();
 
-        switch ($this->versionCmd) {
+        switch ( $this->versionCmd ) {
 
             case 'list':
-                $allowedVers = $pluginVerInstance->getAllowedVersions();
 
-                echo "Available versions are: \n" . implode("\n",$allowedVers)
+                echo "Available versions are: \n"
+                    . implode("\n",$pluginVerInstance->getAllowedVersions())
                     . "\n";
                 break;
 
@@ -1102,9 +1114,10 @@ private function doVersionCommand()
                 break;
 
             case 'active':
-                $currVer = $pluginVerInstance->getCurrentVersion();
 
-                echo "Current active version is $currVer.\n";
+                echo "Current active version is "
+                    . $pluginVerInstance->getCurrentVersion()
+                    .  ".\n";
                 break;
 
             default:
@@ -1158,7 +1171,7 @@ private function doWPInstallStorageAction()
 
             echo "\nPerforming $action operation. Please be patient...\n\n";
 
-            switch ($action) {
+            switch ( $action ) {
 
                 case UserCommand::CMD_UPGRADE:
                 case UserCommand::CMD_MASS_UPGRADE:
@@ -1169,6 +1182,7 @@ private function doWPInstallStorageAction()
                         $pluginVerInstance->getShortVersions()
                     );
                     $extraArgs[] = $pluginVerInstance->getCurrentVersion();
+
                     break;
 
                 case UserCommand::CMD_DASH_NOTIFY:
@@ -1190,11 +1204,13 @@ private function doWPInstallStorageAction()
                     );
 
                     $extraArgs[] = base64_encode($msgInfoJSON);
+
                     break;
 
                 case WPInstallStorage::CMD_ADD_CUST_WPINSTALLS:
                     $list = array();
                     $extraArgs[] = $this->input['addInstallsInfo'];
+
                     break;
 
                 case WPInstallStorage::CMD_SCAN2:
@@ -1228,6 +1244,7 @@ private function doWPInstallStorageAction()
 
                     $originalAction = $action;
                     $action = WPInstallStorage::CMD_ADD_NEW_WPINSTALL;
+
                     break;
 
                 // no default case
@@ -1299,13 +1316,11 @@ private function runCommand()
 
     public static function run()
     {
-        try
-        {
+        try {
             $cli = new self();
             $cli->runCommand();
         }
-        catch ( Exception $e )
-        {
+        catch ( Exception $e ) {
             echo "[ERROR] {$e->getMessage()}\n\n";
             exit(1);
         }

diff --git a/dist/add-ons/webcachemgr/src/DashNotifier.php b/dist/add-ons/webcachemgr/src/DashNotifier.php
@@ -4,7 +4,7 @@
  * LiteSpeed Web Server WordPress Dash Notifier
  *
  * @author LiteSpeed Technologies, Inc. (https://www.litespeedtech.com)
- * @copyright (c) 2019-2022
+ * @copyright (c) 2019-2023
  * *******************************************
  */
 
@@ -247,7 +247,7 @@ public static function doNotify( $jsonInfo )
             /**
              * Used to pass info to the Dash Notifier Plugin.
              */
-            define( 'DASH_NOTIFIER_MSG', $jsonInfo);
+            define( 'DASH_NOTIFIER_MSG', $jsonInfo, false);
 
             if ( !is_plugin_active(self::DASH_PLUGIN) ) {