Check in 1.2.7

CMakeLists.txt

@@ -4,8 +4,8 @@ Project(openlitespeed)
 INCLUDE( ${PROJECT_SOURCE_DIR}/CMakeModules/common.cmake)
 
 set(openlitespeed_MAJOR_VERSION 1)
-set(openlitespeed_MINOR_VERSION 1)
-set(openlitespeed_PATCH_VERSION 0)
+set(openlitespeed_MINOR_VERSION 2)
+set(openlitespeed_PATCH_VERSION 7)
 set(openlitespeed_VERSION
   ${FOOBAR_MAJOR_VERSION}.${FOOBAR_MINOR_VERSION}.${FOOBAR_PATCH_VERSION})
 

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.2.6.
+# Generated by GNU Autoconf 2.69 for openlitespeed 1.2.7.
 #
 # Report bugs to <[email protected]>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='openlitespeed'
 PACKAGE_TARNAME='openlitespeed'
-PACKAGE_VERSION='1.2.6'
-PACKAGE_STRING='openlitespeed 1.2.6'
+PACKAGE_VERSION='1.2.7'
+PACKAGE_STRING='openlitespeed 1.2.7'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL='http://www.litespeedtech.com/'
 
@@ -1307,7 +1307,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.2.6 to adapt to many kinds of systems.
+\`configure' configures openlitespeed 1.2.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1373,7 +1373,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of openlitespeed 1.2.6:";;
+     short | recursive ) echo "Configuration of openlitespeed 1.2.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1495,7 +1495,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-openlitespeed configure 1.2.6
+openlitespeed configure 1.2.7
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2132,7 +2132,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.2.6, which was
+It was created by openlitespeed $as_me 1.2.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2959,7 +2959,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='openlitespeed'
- VERSION='1.2.6'
+ VERSION='1.2.7'
 
 
 # Some tools Automake needs.
@@ -7635,7 +7635,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.2.6, which was
+This file was extended by openlitespeed $as_me 1.2.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7702,7 +7702,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.2.6
+openlitespeed config.status 1.2.7
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.in

@@ -5,8 +5,8 @@ m4_include(ax_lib_expat.m4)
 
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.69])
-AC_INIT([openlitespeed],[1.2.6],[[email protected]],[openlitespeed],[http://www.litespeedtech.com/])
-AM_INIT_AUTOMAKE([1.2.6 foreign no-define ])
+AC_INIT([openlitespeed],[1.2.7],[[email protected]],[openlitespeed],[http://www.litespeedtech.com/])
+AM_INIT_AUTOMAKE([1.2.7 foreign no-define ])
 
 AM_CONFIG_HEADER(src/config.h:src/config.h.in)
 

dist/VERSION

@@ -1 +1 @@
-1.2.6
+1.2.7

dist/admin/html.open/classes/ows/DTblDef.php

@@ -543,7 +543,7 @@ protected function add_SERV_TUNING_GZIP($id)
 			new DAttr('gzipCompressLevel', 'uint', 'Compression Level (Dynamic Content)', 'text', true, 1, 9),
 			new DAttr('compressibleTypes', 'parse', 'Compressible Types', 'textarea', true, $parseFormat, $parseHelp, 'rows="5" cols="50"', 1),
 			new DAttr('gzipAutoUpdateStatic', 'bool', 'Auto Update Static File', 'radio'),
-			new DAttr('gzipCacheDir', 'cust', 'Static GZIP Cache Directory', 'text', false, 1, 'rw', $this->_options['text_size']),
+			new DAttr('gzipCacheDir', 'cust', 'Static GZIP Cache Directory', 'text', true, 1, 'rw', $this->_options['text_size']),
 
 			new DAttr('gzipStaticCompressLevel', 'uint', 'Compression Level (Static File)', 'text', true, 1, 9),
 			new DAttr('gzipMaxFileSize', 'uint', 'Max Static File Size (bytes)', 'text', true, '1K'),

dist/admin/html.open/classes/ws/DTblDef.php

@@ -631,7 +631,7 @@ protected function add_SERV_TUNING_GZIP($id)
 			new DAttr('gzipCompressLevel', 'uint', 'Compression Level (Dynamic Content)', 'text', true, 1, 9),
 			new DAttr('compressibleTypes', 'parse', 'Compressible Types', 'textarea', true, $parseFormat, $parseHelp, 'rows="5" cols="50"', 1),
 			new DAttr('gzipAutoUpdateStatic', 'bool', 'Auto Update Static File', 'radio'),
-			new DAttr('gzipCacheDir', 'cust', 'Static GZIP Cache Directory', 'text', false, 1, 'rw', $this->_options['text_size']),
+			new DAttr('gzipCacheDir', 'cust', 'Static GZIP Cache Directory', 'text', true, 1, 'rw', $this->_options['text_size']),
 
 			new DAttr('gzipStaticCompressLevel', 'uint', 'Compression Level (Static File)', 'text', true, 1, 9),
 			new DAttr('gzipMaxFileSize', 'uint', 'Max Static File Size (bytes)', 'text', true, '1K'),

dist/admin/html.open/utility/build_php/buildconf.inc.php

@@ -11,18 +11,17 @@
 
 $PHP_VER = array('5'=>
 		 array(
-		 	'5.5.3',
-		 	'5.4.19',
+		 	'5.5.6',
+		 	'5.4.22',
 		 	'5.3.27',
 			'5.2.17'),
 		 '4'=>
 		 array('4.4.9'));
-
-
-define ('LSAPI_VERSION', '6.3');
+
+define ('LSAPI_VERSION', '6.6');
 define ('SUHOSIN_VERSION', '0.9.33');
 define ('APC_VERSION', '3.1.9');
-define ('XCACHE_VERSION', '3.0.3');
+define ('XCACHE_VERSION', '3.1.0');
 define ('MEMCACHE_VERSION', '2.2.7');
 //define ('MEMCACHED_VERSION', '1.0.2');
 

dist/conf/httpd_config.conf.in

@@ -146,8 +146,8 @@ extProcessor{
     backlog                             100 
     instances                     1 
     priority                 0 
-    memSoftLimit             480M 
-    memHardLimit             500M 
+    memSoftLimit             2047M 
+    memHardLimit             2047M 
     procSoftLimit             400 
     procHardLimit             500 
 }
@@ -173,8 +173,8 @@ railsDefaults{
     runOnStartUp             1
     extMaxIdleTime           300
     priority                 3 
-    memSoftLimit             150M 
-    memHardLimit             200M 
+    memSoftLimit             2047M 
+    memHardLimit             2047M 
     procSoftLimit            500 
     procHardLimit            600 
 }

dist/conf/httpd_config.xml.in

@@ -85,10 +85,10 @@
             <runOnStartUp></runOnStartUp>
             <extMaxIdleTime></extMaxIdleTime>
             <priority>0</priority>
-            <memSoftLimit>450M</memSoftLimit>
-            <memHardLimit>500M</memHardLimit>
-            <procSoftLimit>300</procSoftLimit>
-            <procHardLimit>400</procHardLimit>
+            <memSoftLimit>2047M</memSoftLimit>
+            <memHardLimit>2047M</memHardLimit>
+            <procSoftLimit>400</procSoftLimit>
+            <procHardLimit>500</procHardLimit>
         </extProcessor>
     </extProcessorList>
     <scriptHandlerList>
@@ -114,10 +114,10 @@
     <runOnStartUp>1</runOnStartUp>
     <extMaxIdleTime>300</extMaxIdleTime>
     <priority>3</priority>
-    <memSoftLimit>550M</memSoftLimit>
-    <memHardLimit>600M</memHardLimit>
-    <procSoftLimit>300</procSoftLimit>
-    <procHardLimit>400</procHardLimit>
+    <memSoftLimit>2047M</memSoftLimit>
+    <memHardLimit>2047M</memHardLimit>
+    <procSoftLimit>400</procSoftLimit>
+    <procHardLimit>500</procHardLimit>
   </railsDefaults>
 
     <tuning>

dist/conf/mime.properties

@@ -132,3 +132,8 @@ xwd     = image/x-xwindowdump
 xyz     = chemical/x-pdb
 zip     = application/zip
 z       = application/compress
+eot     = application/vnd.ms-fontobject
+ttf, ttc = application/x-font-ttf
+otf     = font/opentype
+woff    = application/x-font-woff
+

dist/docs/ServerStat_Help.html

@@ -44,18 +44,18 @@ <h5>Version 1.2 Rev. 2 </h5>
 </ul>
 </div></div>
 <div class="contentwrapper"><div class="nav-bar"><div class="prev">&nbsp;</div><div class="center"><a href="admin.html">Administration</a></div><div class="next">&nbsp;</div></div>
-<h1>WebAdmin Console - Service Manager</h1><p>This is a web interface to monitor and control the server and virtual hosts. 
-It provides the following features:
-<ul>
-<li>Display the current status of the server, listeners and virtual hosts.</li>
-<li>Apply configuration changes with a graceful server restart.</li>
-<li>Enable/disable the service of a particular virtual host.</li>
-<li>View the server log through the log viewer.</li>
-<li>Monitor real-time server statistics.</li>
-<li>Download new versions or switch between installed versions.</li>
+<h1>WebAdmin Console - Service Manager</h1><p>The Service Manager acts as a control room for monitoring the server and controlling certain 
+top-level functions. It provides the following features:
+(The Service Manager can be accessed by clicking on the Actions menu or from home page.)
+<ul>
+<li>Monitor the current status of the server, listeners, and virtual hosts.</li>
+<li>Apply configuration changes with a graceful restart.</li>
+<li>Enable or disable a particular virtual host.</li>
+<li>View the server log through the log viewer.</li>
+<li>Monitor real-time server statistics.</li>
 </ul></p>
 <h4>Table of Contents</h4><section class="toc"><section class="toc-row"><header>Server</header><p>
-<a href="#sname">Name - Server</a>&nbsp;|&nbsp;<a href="#pid">PID</a>&nbsp;|&nbsp;<a href="#servAction">Actions</a>&nbsp;|&nbsp;<a href="#restart">Apply Changes/Graceful Restart</a>&nbsp;|&nbsp;<a href="#viewlog">Server Log Viewer</a>&nbsp;|&nbsp;<a href="#realtimerpt">Real-Time Statistics</a>&nbsp;|&nbsp;<a href="#toggleDebugLog">Toggle Debug Logging</a>&nbsp;|&nbsp;<a href="#vermgr">Version Management</a>&nbsp;|&nbsp;</p></section>
+<a href="#sname">Name - Server</a>&nbsp;|&nbsp;<a href="#pid">PID</a>&nbsp;|&nbsp;<a href="#servAction">Actions</a>&nbsp;|&nbsp;<a href="#restart">Apply Changes/Graceful Restart</a>&nbsp;|&nbsp;<a href="#viewlog">Server Log Viewer</a>&nbsp;|&nbsp;<a href="#realtimerpt">Real-Time Statistics</a>&nbsp;|&nbsp;<a href="#toggleDebugLog">Toggle Debug Logging</a>&nbsp;|&nbsp;</p></section>
 <section class="toc-row"><header>Listeners</header><p>
 <a href="#lname">Name - Listener</a>&nbsp;|&nbsp;<a href="#lstatus">Status - Listener</a>&nbsp;|&nbsp;<a href="#lmap">Virtual Host Mappings</a>&nbsp;|&nbsp;</p></section>
 <section class="toc-row"><header>Virtual Hosts</header><p>
@@ -68,7 +68,6 @@ <h4>Table of Contents</h4><section class="toc"><section class="toc-row"><header>
 <div class="helpitem"><a name="viewlog"></a><table width="100%" class="ht" border="0" cellpadding="5" cellspacing="0"> <tr class="ht-title"><td><div>Server Log Viewer<span class="top"><a href="#top"><img border=0 height=13 width=13 alt="Go to top" src="img/top.gif"></a></span></div></td></tr> <tr><td><span class="ht-label">Description: </span>The Server Log Viewer is a convenient tool for browsing the  current server log to check for errors or problems.  The log viewer  searches the server log file in blocks for the specified log level.    The default block size is 20KB. You can use the <span class="val">Begin</span>,   <span class="val">End</span>, <span class="val">Next</span>, and <span class="val">Prev</span> buttons to navigate a large log file.</td></tr> <tr><td><span class="ht-label">Tips: </span>The size of a dynamically generated page is limited by <span class="tagI"><a href="ServTuning_Help.html#maxDynRespSize">Max Dynamic Response Body Size</a></span>.   So if the block is too big, the page might be truncated.</td></tr> </table> </div>
 <div class="helpitem"><a name="realtimerpt"></a><table width="100%" class="ht" border="0" cellpadding="5" cellspacing="0"> <tr class="ht-title"><td><div>Real-Time Statistics<span class="top"><a href="#top"><img border=0 height=13 width=13 alt="Go to top" src="img/top.gif"></a></span></div></td></tr> <tr><td><span class="ht-label">Description: </span>The Real-Time Statistics link leads to a page with a real-time server status report. This is a convenient tool to monitor the system.    The report shows a snapshot of your server statistics. The refresh rate for this snapshot  is controlled by the Refresh Interval drop-down list in the upper righthand corner.   The report contains the following sections: <ul><li>Server Health shows the basic server statistics, uptime, load, and anti-DDoS blocked IPs.</li>   <li>Server lists current traffic throughput, connections, and requests statistics.</li>  <li>Virtual Host shows request processing statuses and external application statuses for each virtual host.</li>  <li>External Application lists the external applications currently running and their usage statistics.   The CGI daemon process lscgid is always running as an external application.</li> </ul>   Many of the rows in the Real-Time Statistics feature a graph icon.  Clicking on this icon will open a graph of that row's statistics updated in real-time.   In the Server section, next to Requests, there is a link labeled (Details).  This link takes you to the Requests Snapshot, where you can view detailed information  on which clients are making certain kinds of requests or which aspects of your site  are bottlenecking. The fields in the blue area allow you to filter the snapshot to isolate  certain parts of your server or look for clients that are performing certain actions.</td></tr> </table> </div>
 <div class="helpitem"><a name="toggleDebugLog"></a><table width="100%" class="ht" border="0" cellpadding="5" cellspacing="0"> <tr class="ht-title"><td><div>Toggle Debug Logging<span class="top"><a href="#top"><img border=0 height=13 width=13 alt="Go to top" src="img/top.gif"></a></span></div></td></tr> <tr><td><span class="ht-label">Description: </span>Toggle Debug Logging toggles the value of <span class="tagI"><a href="ServGeneral_Help.html#log_debugLevel">Debug Level</a></span> between <span class="val">NONE</span> and <span class="val">HIGH</span>.  As debug logging has an impact on performance and can fill up the hard drive quickly, so <span class="tagI"><a href="ServGeneral_Help.html#log_debugLevel">Debug Level</a></span> should usually be set to <span class="val">NONE</span> on a production server.  This feature can be used instead to turn debug logging on and off quickly  in order to debug a problem on a production server. Debug logging turned on or  off in this way will not change anything shown in your server configurations.</td></tr> <tr><td><span class="ht-label">Tips: </span><span class="tagI"><a href="#toggleDebugLog">Toggle Debug Logging</a></span> will only work if <span class="tagI"><a href="ServGeneral_Help.html#log_logLevel">Log Level</a></span>  is set to <span class="val">DEBUG</span>.  [Performance] Important! Debug logging includes detailed information for each  request and response. Active debug logging will severely degrade service performance and potentially saturate disk space in a very short time. This feature should only be  used for a short period of time when trying to diagnose server issues.</td></tr> <tr><td><span class="ht-label">See Also: </span><span class="tagI"><a href="ServGeneral_Help.html#log_debugLevel">Debug Level</a></span>, <span class="tagI"><a href="ServGeneral_Help.html#log_logLevel">Log Level</a></span></td></tr> </table> </div>
-<div class="helpitem"><a name="vermgr"></a><table width="100%" class="ht" border="0" cellpadding="5" cellspacing="0"> <tr class="ht-title"><td><div>Version Management<span class="top"><a href="#top"><img border=0 height=13 width=13 alt="Go to top" src="img/top.gif"></a></span></div></td></tr> <tr><td><span class="ht-label">Description: </span>Version Management (found by clicking on the the version number at  the top of the page) is a convenient tool to manage LSWS versions. It shows license info and information on all installed versions and available new releases.   <ul><li>If is a new version has been released on the LiteSpeed website, and <span class="tagI"><a href="ServGeneral_Help.html#autoUpdateInterval">Check For Update</a></span> is  enabled, the new version will be listed with a <span class="val">Download</span> link. If <span class="tagI"><a href="ServGeneral_Help.html#autoUpdateDownloadPkg">Download Updates</a></span> is enabled, new versions will be automatically downloaded and the new version  will be listed with an <span class="val">Upgrade</span> link. Upgrade  installs the new package and restarts the web server. </li> <li>You return to a previous version by clicking the <span class="val">Switch To</span> link. This will restart the web server with that version.</li> <li>If you are sure that you no longer need an old installation, you can remove it by clicking the <span class="val">Delete</span> link. This will permanently remove that copy.</li></ul>  Please note, service will not be interrupted during an upgrade or restart.</td></tr> <tr><td><span class="ht-label">See Also: </span><span class="tagI"><a href="ServGeneral_Help.html#autoUpdateDownloadPkg">Download Updates</a></span>, <span class="tagI"><a href="ServGeneral_Help.html#autoUpdateInterval">Check For Update</a></span></td></tr> </table> </div>
 <div class="helpitem"><a name="lname"></a><table width="100%" class="ht" border="0" cellpadding="5" cellspacing="0"> <tr class="ht-title"><td><div>Name - Listener<span class="top"><a href="#top"><img border=0 height=13 width=13 alt="Go to top" src="img/top.gif"></a></span></div></td></tr> <tr><td><span class="ht-label">Description: </span>The unique name that identifies this listener. This is the  <span class="tagI"><a href="Listeners_Help.html#listenerName">Listener Name</a></span> you specified when setting up the listener.</td></tr> </table> </div>
 <div class="helpitem"><a name="lstatus"></a><table width="100%" class="ht" border="0" cellpadding="5" cellspacing="0"> <tr class="ht-title"><td><div>Status - Listener<span class="top"><a href="#top"><img border=0 height=13 width=13 alt="Go to top" src="img/top.gif"></a></span></div></td></tr> <tr><td><span class="ht-label">Description: </span>The current status of this listener. The status is either <span class="val">Running</span> or <span class="val">Error</span>.</td></tr> <tr><td><span class="ht-label">Tips: </span>If the listener is in the <span class="val">Error</span> state, you can view the server log to find out why.</td></tr> </table> </div>
 <div class="helpitem"><a name="lmap"></a><table width="100%" class="ht" border="0" cellpadding="5" cellspacing="0"> <tr class="ht-title"><td><div>Virtual Host Mappings<span class="top"><a href="#top"><img border=0 height=13 width=13 alt="Go to top" src="img/top.gif"></a></span></div></td></tr> <tr><td><span class="ht-label">Description: </span>Virtual Host Mappings shows currently established mappings to virtual hosts from this listener.  The virtual host name is in brackets and is followed by the matching domain name(s) for this listener.</td></tr> <tr><td><span class="ht-label">Tips: </span>If a virtual host has not been loaded successfully (fatal errors in the  virtual host configuration), the mapping to that virtual host will not be displayed.</td></tr> </table> </div>