Check in 1.5.8

litespeedtech · Nov 5, 2019 · 90b31c1 · 90b31c1
1 parent b7a42b3
commit 90b31c1
Show file tree

Hide file tree

Showing 64 changed files with 549 additions and 1,081 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -241,7 +241,6 @@ IS_LSCPD = @IS_LSCPD@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBBROTLI = @LIBBROTLI@
-LIBGEOIP = @LIBGEOIP@
 LIBMMDB = @LIBMMDB@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@

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.5.7.
+# Generated by GNU Autoconf 2.69 for openlitespeed 1.5.8.
 #
 # Report bugs to <info@litespeedtech.com>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='openlitespeed'
 PACKAGE_TARNAME='openlitespeed'
-PACKAGE_VERSION='1.5.7'
-PACKAGE_STRING='openlitespeed 1.5.7'
+PACKAGE_VERSION='1.5.8'
+PACKAGE_STRING='openlitespeed 1.5.8'
 PACKAGE_BUGREPORT='info@litespeedtech.com'
 PACKAGE_URL='http://www.litespeedtech.com/'
 
@@ -664,7 +664,6 @@ USE_DYN_OSSL_FALSE
 USE_DYN_OSSL_TRUE
 OPENLSWS_BSSL
 LIBMMDB
-LIBGEOIP
 LIBBROTLI
 HAVE_LIBLUA_FALSE
 HAVE_LIBLUA_TRUE
@@ -833,7 +832,6 @@ enable_debug
 enable_profiling
 with_lua
 with_brotli
-enable_iptogeo
 with_iptogeo2
 with_bssl
 enable_recaptcha
@@ -1401,7 +1399,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.5.7 to adapt to many kinds of systems.
+\`configure' configures openlitespeed 1.5.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1471,7 +1469,7 @@ fi
 
 if test -n "$ac_init_help"; then
  case $ac_init_help in
- short | recursive ) echo "Configuration of openlitespeed 1.5.7:";;
+ short | recursive ) echo "Configuration of openlitespeed 1.5.8:";;
  esac
  cat <<\_ACEOF
 
@@ -1500,9 +1498,6 @@ Optional Features:
  default)
  --enable-profiling Enable cpu profiling (profiling is disabled by
  default)
- --enable-iptogeo=[yes/no]
- Enable iptogeo which need to have Geoip library
- installed [default=yes]
  --enable-recaptcha=[yes/no]
  Enable recaptcha [default=yes]
  --disable-rpath Disable rpath (It is 'no' by default)
@@ -1630,7 +1625,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-openlitespeed configure 1.5.7
+openlitespeed configure 1.5.8
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2304,7 +2299,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.5.7, which was
+It was created by openlitespeed $as_me 1.5.8, which was
 generated by GNU Autoconf 2.69. Invocation command line was
 
  $ $0 $@
@@ -3170,7 +3165,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='openlitespeed'
- VERSION='1.5.7'
+ VERSION='1.5.8'
 
 
 # Some tools Automake needs.
@@ -16102,30 +16097,6 @@ echo "LIBBROTLI=$LIBBROTLI"
 
 
 
-LIBGEOIP=" -lGeoIP "
-OPENLSWS_IPTOGEO=yes
-# Check whether --enable-iptogeo was given.
-if test "${enable_iptogeo+set}" = set; then :
- enableval=$enable_iptogeo; OPENLSWS_IPTOGEO="$enableval"
-fi
-
-
-if test "$OPENLSWS_IPTOGEO" = "no" ; then
- echo "iptogeo disabled!!!"
- LIBGEOIP=
-else
-
-cat >>confdefs.h <<_ACEOF
-#define ENABLE_IPTOGEO 1
-_ACEOF
-
- LIBGEOIP=" -lGeoIP "
- echo "iptogeo enabled!!!"
-fi
-echo "LIBGEOIP=$LIBGEOIP"
-
-
-
 LIBMMDB=
 OPENLSWS_IPTOGEO2=no
 
@@ -18945,7 +18916,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.5.7, which was
+This file was extended by openlitespeed $as_me 1.5.8, which was
 generated by GNU Autoconf 2.69. Invocation command line was
 
  CONFIG_FILES = $CONFIG_FILES
@@ -19012,7 +18983,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.5.7
+openlitespeed config.status 1.5.8
 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.5.7],[info@litespeedtech.com],[openlitespeed],[http://www.litespeedtech.com/])
+AC_INIT([openlitespeed],[1.5.8],[info@litespeedtech.com],[openlitespeed],[http://www.litespeedtech.com/])
 AM_INIT_AUTOMAKE([1.0 foreign no-define ])
 
 AC_CONFIG_HEADERS(src/config.h:src/config.h.in)
@@ -267,25 +267,6 @@ echo "LIBBROTLI=$LIBBROTLI"
 AC_SUBST([LIBBROTLI])
 
 
-LIBGEOIP=" -lGeoIP "
-OPENLSWS_IPTOGEO=yes
-AC_ARG_ENABLE([iptogeo],
- [AS_HELP_STRING([--enable-iptogeo=@<:@yes/no@:>@],
- [Enable iptogeo which need to have Geoip library installed @<:@default=yes@:>@])],
- [OPENLSWS_IPTOGEO="$enableval"], [])
-
-if test "$OPENLSWS_IPTOGEO" = "no" ; then 
- echo "iptogeo disabled!!!"
- LIBGEOIP=
-else
- AC_DEFINE_UNQUOTED([ENABLE_IPTOGEO], [1], [Defined to compile with iptogeo enabled])
- LIBGEOIP=" -lGeoIP "
- echo "iptogeo enabled!!!"
-fi
-echo "LIBGEOIP=$LIBGEOIP"
-AC_SUBST([LIBGEOIP])
-
-
 LIBMMDB=
 OPENLSWS_IPTOGEO2=no
 AC_ARG_WITH(iptogeo2,

diff --git a/dist/VERSION b/dist/VERSION
@@ -1 +1 @@
-1.5.7
+1.5.8
diff --git a/dist/add-ons/webcachemgr/src/Context/Context.php b/dist/add-ons/webcachemgr/src/Context/Context.php
@@ -64,13 +64,13 @@ class Context
  protected function __construct( ContextOption $contextOption )
  {
  $this->options = $contextOption;
- $this->dataDir = realpath(__DIR__ . '/../../../..') . '/admin/lscdata';
 
  $this->init();
  }
 
  protected function init()
  {
+ $this->dataDir = realpath(__DIR__ . '/../../../..') . '/admin/lscdata';
  $this->dataFile = $this->dataDir . '/lscm.data';
  $this->customDataFile = $this->dataDir . '/lscm.data.cust';
  $this->isRoot = $this->options->isRoot();

diff --git a/dist/add-ons/webcachemgr/src/Context/RootCLIContextOption.php b/dist/add-ons/webcachemgr/src/Context/RootCLIContextOption.php
@@ -20,8 +20,8 @@ public function __construct()
  $invokerName = 'lscmctl';
  $invokerType = parent::FROM_CLI;
  $isRoot = parent::IS_ROOT;
- $logFileLvl = Logger::L_DEBUG;//INFO;
- $logEchoLvl = Logger::L_DEBUG;//INFO;
+ $logFileLvl = Logger::L_INFO;
+ $logEchoLvl = Logger::L_INFO;
  $bufferedWrite = true;
  $bufferedEcho = false;
  parent::__construct($invokerName, $invokerType, $isRoot, $logFileLvl,

diff --git a/dist/add-ons/webcachemgr/src/Context/RootPanelContextOption.php b/dist/add-ons/webcachemgr/src/Context/RootPanelContextOption.php
@@ -24,7 +24,7 @@ public function __construct( $panelName )
  $invokerName = $panelName;
  $invokerType = parent::FROM_CONTROL_PANEL;
  $isRoot = parent::IS_ROOT;
- $logFileLvl = Logger::L_DEBUG;//INFO;
+ $logFileLvl = Logger::L_INFO;
  $logEchoLvl = Logger::L_NONE;
  $bufferedWrite = true;
  $bufferedEcho = true;

diff --git a/dist/add-ons/webcachemgr/src/Panel/ControlPanel.php b/dist/add-ons/webcachemgr/src/Panel/ControlPanel.php
@@ -19,20 +19,55 @@ abstract class ControlPanel
 
  /**
  * @deprecated
+ *
+ * @var string
  */
  const PANEL_CPANEL = 'whm';
 
  /**
  * @deprecated
+ *
+ * @var string
  */
  const PANEL_PLESK = 'plesk';
 
+ /**
+ * @var string
+ */
  const PANEL_API_VERSION = '1.9';
+
+ /**
+ * @since 1.9
+ * @var int
+ */
  const PANEL_API_VERSION_SUPPORTED = 0;
+
+ /**
+ * @since 1.9
+ * @var int
+ */
  const PANEL_API_VERSION_TOO_LOW = 1;
+
+ /**
+ * @since 1.9
+ * @var int
+ */
  const PANEL_API_VERSION_TOO_HIGH = 2;
+
+ /**
+ * @since 1.9
+ * @var int
+ */
  const PANEL_API_VERSION_UNKNOWN = 3;
+
+ /**
+ * @var int
+ */
  const PHP_TIMEOUT = 10;
+
+ /**
+ * @var string
+ */
  const NOT_SET = '__LSC_NOTSET__';
 
  /**

diff --git a/dist/add-ons/webcachemgr/src/Util.php b/dist/add-ons/webcachemgr/src/Util.php
@@ -433,9 +433,4 @@ public static function rrmdir( $dir, $keepParent = false )
  return false;
  }
 
- public static function writeToTestLog($msg)
- {
- file_put_contents('/tmp/test.log', "{$msg}\n", FILE_APPEND);
- }
-
 }
diff --git a/dist/add-ons/webcachemgr/src/WPCaller.php b/dist/add-ons/webcachemgr/src/WPCaller.php
@@ -1095,7 +1095,7 @@ private function initWp()
  */
  global $wpdb;
 
- error_reporting(E_ALL & ~E_WARNING);
+ error_reporting(E_ALL);
 
  /**
  * Attempt to override any WordPress memory limits.

diff --git a/dist/add-ons/webcachemgr/src/WPInstallStorage.php b/dist/add-ons/webcachemgr/src/WPInstallStorage.php
@@ -282,7 +282,6 @@ public function getWorkingQueue()
  }
 
  /**
- * Note: look into possibly removing this later.
  *
  * @param WPInstall $wpInstall
  */

diff --git a/dist/admin/html.open/lib/DTblDefBase.php b/dist/admin/html.open/lib/DTblDefBase.php
@@ -991,7 +991,7 @@ protected function add_L_SSL_FEATURE($id)
  $this->_attrs['ssl_renegProtection'],
  $this->_attrs['sslSessionCache'],
  $this->_attrs['sslSessionTickets'],
- self::NewCheckBoxAttr('enableSpdy', DMsg::ALbl('l_enablespdy'), array('1' => 'SPDY/2', '2' => 'SPDY/3', '4' => 'HTTP/2', '0' => DMsg::ALbl('o_none'))),
+ self::NewCheckBoxAttr('enableSpdy', DMsg::ALbl('l_enablespdy'), array('1' => 'SPDY/2', '2' => 'SPDY/3', '4' => 'HTTP/2', '8'=>'HTTP/3', '0' => DMsg::ALbl('o_none'))),
  self::NewBoolAttr('enableQuic', DMsg::ALbl('l_allowquic'), true, 'allowQuic'),
  );
  $this->_tblDef[$id] = DTbl::NewRegular($id, DMsg::ALbl('l_securityandfeatures'), $attrs);
@@ -1003,7 +1003,8 @@ protected function add_VT_SSL_FEATURE($id)
  $this->_attrs['ssl_renegProtection'],
  $this->_attrs['sslSessionCache'],
  $this->_attrs['sslSessionTickets'],
- self::NewCheckBoxAttr('enableSpdy', DMsg::ALbl('l_enablespdy'), array('1' => 'SPDY/2', '2' => 'SPDY/3', '4' => 'HTTP/2', '0' => DMsg::ALbl('o_none'))),
+
+ self::NewCheckBoxAttr('enableSpdy', DMsg::ALbl('l_enablespdy'), array('1' => 'SPDY/2', '2' => 'SPDY/3', '4' => 'HTTP/2', '8'=>'HTTP/3', '0' => DMsg::ALbl('o_none'))),
  self::NewBoolAttr('enableQuic', DMsg::ALbl('l_enablequic'), true, 'vhEnableQuic'),
  );
  $this->_tblDef[$id] = DTbl::NewRegular($id, DMsg::UIStr('tab_sec'), $attrs);

diff --git a/dist/admin/html.open/lib/util/build_php/BuildConfig.php b/dist/admin/html.open/lib/util/build_php/BuildConfig.php
@@ -25,8 +25,8 @@ public static function GetVersion($field)
 
  case self::PHP_VERSION: return
  array(
- '7.3.9',
- '7.2.22',
+ '7.3.11',
+ '7.2.24',
  '7.1.32',
  '7.0.33',
  '5.6.40',

diff --git a/dist/admin/html.open/res/lang/en-US_msg.php b/dist/admin/html.open/res/lang/en-US_msg.php
@@ -257,7 +257,7 @@
 $_gmsg['l_enablerailshosting'] = 'Enable Shared Hosting';
 $_gmsg['l_enablerewrite'] = 'Enable Rewrite';
 $_gmsg['l_enablescript'] = 'Enable Scripts/ExtApps';
-$_gmsg['l_enablespdy'] = 'Enable SPDY/HTTP2';
+$_gmsg['l_enablespdy'] = 'Enable SPDY/HTTP2/HTTP3';
 $_gmsg['l_enablestapling'] = 'Enable OCSP Stapling';
 $_gmsg['l_enablestderrlog'] = 'Enable stderr Log';
 $_gmsg['l_env'] = 'Environment';

diff --git a/dist/admin/html.open/res/lang/en-US_tips.php b/dist/admin/html.open/res/lang/en-US_tips.php
@@ -220,7 +220,7 @@
 
 $_tipsdb['enableScript'] = new DAttrHelp("Enable Script", 'Specifies whether scripting (non-static pages) is allowed in this virtual host. If disabled, CGI, FastCGI, LSAPI, Servlet engines and other scripting languages will not be allowed in this virtual host. Therefore, if you want to use a script handler, you need to enable it here as well.', '', 'Select from radio box', '');
 
-$_tipsdb['enableSpdy'] = new DAttrHelp("Enable SPDY/HTTP2", 'HTTP/2 and SPDY are new versions of the HTTP network protocol with the goal of reducing page load times. More information can be found at <a href=&quot;http://en.wikipedia.org/wiki/HTTP/2&quot;>http://en.wikipedia.org/wiki/HTTP/2</a>.', 'This setting can be set at the listener and virtual host levels.', 'Check the protocol(s) you wish to enable. Leaving all boxes unchecked will enable SPDY and HTTP/2 support (the default). If you wish to disable SPDY and HTTP/2, check &quot;None&quot; only and leave all other boxes unchecked.', '');
+$_tipsdb['enableSpdy'] = new DAttrHelp("Enable SPDY/HTTP2/HTTP3", 'Selectively enable HTTP/3, HTTP/2, and SPDY HTTP network protocols.<br/><br/>If you wish to disable SPDY, HTTP/2, and HTTP3, check &quot;None&quot; and leave all other boxes unchecked.<br/><br/>Default value: All enabled', 'This setting can be set at the listener and virtual host levels.', 'Select from checkbox', '');
 
 $_tipsdb['enableStapling'] = new DAttrHelp("Enable OCSP Stapling", 'Determines whether to enable OCSP stapling, a more efficient way of verifying public key certificates.', '', 'Select from radio box', '');
 

diff --git a/dist/admin/html.open/res/lang/zh-CN_tips.php b/dist/admin/html.open/res/lang/zh-CN_tips.php
@@ -220,7 +220,7 @@
 
 $_tipsdb['enableScript'] = new DAttrHelp("启用脚本", '指定在这个虚拟主机中是否允许运行脚本（非静态页面）。 如果禁用，CGI, FastCGI, LSAPI, Servlet引擎 和其他脚本语言都将在这个虚拟机中不被允许使用。 因此如果你希望使用一个脚本处理程序，你需要启用本项。', '', '布尔值', '');
 
-$_tipsdb['enableSpdy'] = new DAttrHelp("Enable SPDY/HTTP2", 'HTTP/2 and SPDY are new versions of the HTTP network protocol with the goal of reducing page load times. More information can be found at <a href=&quot;http://en.wikipedia.org/wiki/HTTP/2&quot;>http://en.wikipedia.org/wiki/HTTP/2</a>.', 'This setting can be set at the listener and virtual host levels.', 'Check the protocol(s) you wish to enable. Leaving all boxes unchecked will enable SPDY and HTTP/2 support (the default). If you wish to disable SPDY and HTTP/2, check &quot;None&quot; only and leave all other boxes unchecked.', '');
+$_tipsdb['enableSpdy'] = new DAttrHelp("Enable SPDY/HTTP2/HTTP3", 'Selectively enable HTTP/3, HTTP/2, and SPDY HTTP network protocols.<br/><br/>If you wish to disable SPDY, HTTP/2, and HTTP3, check &quot;None&quot; and leave all other boxes unchecked.<br/><br/>Default value: All enabled', 'This setting can be set at the listener and virtual host levels.', 'Select from checkbox', '');
 
 $_tipsdb['enableStapling'] = new DAttrHelp("Enable OCSP Stapling", 'Determines whether to enable OCSP stapling, a more efficient way of verifying public key certificates.', '', 'Select from radio box', '');