From fea974d01416c9ecb57f801b1796d1332918063a Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 23 Jan 2012 09:53:52 -0500
Subject: [PATCH] Fixed: FS#1997 - Check encoding of the subject in ispconfig mail sending function.
---
install/sql/ispconfig3.sql | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index f613e98..cdf6295 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -131,7 +131,7 @@
`limit_client` int(11) NOT NULL DEFAULT '0',
`limit_mailmailinglist` int(11) NOT NULL DEFAULT '-1',
`limit_openvz_vm` int(11) NOT NULL DEFAULT '0',
- `limit_openvz_vm_template` int(11) NOT NULL DEFAULT '0',
+ `limit_openvz_vm_template_id` int(11) NOT NULL DEFAULT '0',
`parent_client_id` int(11) unsigned NOT NULL DEFAULT '0',
`username` varchar(64) DEFAULT NULL,
`password` varchar(64) DEFAULT NULL,
@@ -194,7 +194,7 @@
`limit_client` int(11) NOT NULL default '0',
`limit_mailmailinglist` int(11) NOT NULL default '-1',
`limit_openvz_vm` int(11) NOT NULL DEFAULT '0',
- `limit_openvz_vm_template` int(11) NOT NULL DEFAULT '0',
+ `limit_openvz_vm_template_id` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`template_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1026,7 +1026,7 @@
`shell` varchar(255) NOT NULL default '/bin/bash',
`dir` varchar(255) default NULL,
`chroot` varchar(255) NOT NULL,
- `ssh_rsa` VARCHAR( 600 ) NOT NULL default '',
+ `ssh_rsa` text NOT NULL,
PRIMARY KEY (`shell_user_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1513,6 +1513,10 @@
`apache_directives` mediumtext,
`nginx_directives` mediumtext,
`php_fpm_use_socket` ENUM('n','y') NOT NULL DEFAULT 'n',
+ `pm_max_children` int(11) NOT NULL DEFAULT '50',
+ `pm_start_servers` int(11) NOT NULL DEFAULT '20',
+ `pm_min_spare_servers` int(11) NOT NULL DEFAULT '5',
+ `pm_max_spare_servers` int(11) NOT NULL DEFAULT '35',
`php_open_basedir` mediumtext,
`custom_php_ini` mediumtext,
`backup_interval` VARCHAR( 255 ) NOT NULL DEFAULT 'none',
@@ -1914,6 +1918,6 @@
-- Dumping data for table `sys_config`
--
-INSERT INTO sys_config VALUES ('1','db','db_version','3.0.3.3');
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.4.2');
SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
--
Gitblit v1.9.1