Skip to content

Commit dec0dfa

Browse files
tbrehmtbrehm
committed
Merged revisions 2916-2941 from stable branch.
1 parent f038c0a commit dec0dfa

27 files changed

+73
-51
lines changed

‎install/install.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,10 @@
281281
swriteln('Installing ISPConfig');
282282

283283
//** Customize the port ISPConfig runs on
284-
$conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', '8080');
284+
$ispconfig_vhost_port = $inst->free_query('ISPConfig Port', '8080');
285+
if($conf['apache']['installed'] == true) $conf['apache']['vhost_port'] = $ispconfig_vhost_port;
286+
if($conf['nginx']['installed'] == true) $conf['nginx']['vhost_port'] = $ispconfig_vhost_port;
287+
unset($ispconfig_vhost_port);
285288

286289
if(strtolower($inst->simple_query('Do you want a secure (SSL) connection to the ISPConfig web interface',array('y','n'),'y')) == 'y') {
287290
$inst->make_ispconfig_ssl_cert();

‎install/sql/ispconfig3.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1939,6 +1939,6 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
19391939
-- Dumping data for table `sys_config`
19401940
--
19411941

1942-
INSERT INTO sys_config VALUES ('1','db','db_version','3.0.4.2');
1942+
INSERT INTO sys_config VALUES ('1','db','db_version','3.0.4.3');
19431943

19441944
SET FOREIGN_KEY_CHECKS = 1;

‎install/tpl/apache_apps.vhost.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
DocumentRoot {apps_vhost_dir}
1616
AddType application/x-httpd-php .php
1717
<Directory {apps_vhost_dir}>
18+
# php_admin_value open_basedir "{apps_vhost_dir}:/usr/share:/tmp"
1819
Options FollowSymLinks
1920
AllowOverride None
2021
Order allow,deny

‎install/tpl/apache_ispconfig.vhost.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ NameVirtualHost *:{vhost_port}
2727
DocumentRoot /usr/local/ispconfig/interface/web/
2828
AddType application/x-httpd-php .php
2929
<Directory /usr/local/ispconfig/interface/web>
30+
# php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp"
3031
Options FollowSymLinks
3132
AllowOverride None
3233
Order allow,deny

‎install/tpl/apps_php_fpm_pool.conf.master‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ user = {fpm_user}
99
group = {fpm_group}
1010

1111
pm = dynamic
12-
pm.max_children = 50
13-
pm.start_servers = 20
14-
pm.min_spare_servers = 5
15-
pm.max_spare_servers = 35
12+
pm.max_children = 10
13+
pm.start_servers = 2
14+
pm.min_spare_servers = 1
15+
pm.max_spare_servers = 5
1616

1717
chdir = /
1818

19+
; php_admin_value[open_basedir] = /var/www/apps:/srv/www/apps:/usr/share
1920
php_admin_flag[magic_quotes_gpc] = off

‎install/tpl/config.inc.php.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
5656

5757
//** Application
5858
define('ISPC_APP_TITLE', 'ISPConfig');
59-
define('ISPC_APP_VERSION', '3.0.4.2');
59+
define('ISPC_APP_VERSION', '3.0.4.3');
6060
define('DEVSYSTEM', 0);
6161

6262

‎install/tpl/nginx_apps.vhost.master‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ server {
55

66
root {apps_vhost_dir};
77

8+
client_max_body_size 20M;
9+
810
location / {
911
index index.php index.html;
1012
}
@@ -41,12 +43,12 @@ server {
4143
# To access phpMyAdmin, the default user (like www-data on Debian/Ubuntu) must be used
4244
fastcgi_pass 127.0.0.1:9000;
4345
fastcgi_index index.php;
44-
fastcgi_param SCRIPT_FILENAME $request_filename;
45-
fastcgi_param PATH_INFO $fastcgi_script_name;
46+
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
4647
fastcgi_buffer_size 128k;
4748
fastcgi_buffers 256 4k;
4849
fastcgi_busy_buffers_size 256k;
4950
fastcgi_temp_file_write_size 256k;
51+
fastcgi_read_timeout 240;
5052
}
5153
location ~* ^/phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ {
5254
root /usr/share/;
@@ -66,8 +68,7 @@ server {
6668
# To access SquirrelMail, the default user (like www-data on Debian/Ubuntu) must be used
6769
fastcgi_pass 127.0.0.1:9000;
6870
fastcgi_index index.php;
69-
fastcgi_param SCRIPT_FILENAME $request_filename;
70-
fastcgi_param PATH_INFO $fastcgi_script_name;
71+
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
7172
fastcgi_buffer_size 128k;
7273
fastcgi_buffers 256 4k;
7374
fastcgi_busy_buffers_size 256k;

‎install/tpl/nginx_ispconfig.vhost.master‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ server {
88

99
root /usr/local/ispconfig/interface/web/;
1010

11+
client_max_body_size 20M;
12+
1113
location / {
1214
index index.php index.html;
1315
}

‎install/tpl/php_fpm_pool.conf.master‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ user = {fpm_user}
99
group = {fpm_group}
1010

1111
pm = dynamic
12-
pm.max_children = 50
13-
pm.start_servers = 20
14-
pm.min_spare_servers = 5
15-
pm.max_spare_servers = 35
12+
pm.max_children = 10
13+
pm.start_servers = 2
14+
pm.min_spare_servers = 1
15+
pm.max_spare_servers = 5
1616

1717
chdir = /
1818

19+
; php_admin_value[open_basedir] = /usr/local/ispconfig/interface:/usr/share
1920
php_admin_value[session.save_path] = /usr/local/ispconfig/server/temp
2021
php_admin_flag[magic_quotes_gpc] = off

‎interface/lib/classes/listform.inc.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ public function decode($record)
295295
case 'DATETSTAMP':
296296
if ($record[$key] > 0) {
297297
// is value int?
298-
if (preg_match("/^[0-9]+[.]?[0-9]*$/", $record[$key], $p)) {
298+
if (preg_match("/^[0-9]+[\.]?[0-9]*$/", $record[$key], $p)) {
299299
$record[$key] = date($this->lng('conf_format_dateshort'), $record[$key]);
300300
} else {
301301
$record[$key] = date($this->lng('conf_format_dateshort'), strtotime($record[$key]));
@@ -305,7 +305,7 @@ public function decode($record)
305305
case 'DATE':
306306
if ($record[$key] > 0) {
307307
// is value int?
308-
if (preg_match("/^[0-9]+[.]?[0-9]*$/", $record[$key], $p)) {
308+
if (preg_match("/^[0-9]+[\.]?[0-9]*$/", $record[$key], $p)) {
309309
$record[$key] = date($this->lng('conf_format_dateshort'), $record[$key]);
310310
} else {
311311
$record[$key] = date($this->lng('conf_format_dateshort'), strtotime($record[$key]));
@@ -316,7 +316,7 @@ public function decode($record)
316316
case 'DATETIME':
317317
if ($record[$key] > 0) {
318318
// is value int?
319-
if (preg_match("/^[0-9]+[.]?[0-9]*$/", $record[$key], $p)) {
319+
if (preg_match("/^[0-9]+[\.]?[0-9]*$/", $record[$key], $p)) {
320320
$record[$key] = date($this->lng('conf_format_datetime'), $record[$key]);
321321
} else {
322322
$record[$key] = date($this->lng('conf_format_datetime'), strtotime($record[$key]));

0 commit comments

Comments
 (0)