Skip to content

Commit 593d982

Browse files
author
thom
committed
Remove SPDY/HTTP2 optional function(#5646)
1 parent 0ecbb35 commit 593d982

File tree

11 files changed

+35
-85
lines changed

11 files changed

+35
-85
lines changed

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,6 @@ ALTER TABLE `mail_user` ADD `disableindexer-worker` ENUM('n','y') CHARACTER SET
3535

3636
-- add SSHFP and DNAME record
3737
ALTER TABLE `dns_rr` CHANGE `type` `type` ENUM('A','AAAA','ALIAS','CNAME','DNAME','CAA','DS','HINFO','LOC','MX','NAPTR','NS','PTR','RP','SRV','SSHFP','TXT','TLSA','DNSKEY') NULL DEFAULT NULL AFTER `name`;
38+
39+
-- remove SPDY option
40+
ALTER TABLE `web_domain` DROP COLUMN `enable_spdy`;

‎install/sql/ispconfig3.sql‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2070,7 +2070,6 @@ CREATE TABLE `web_domain` (
20702070
`traffic_quota_lock` enum('n','y') NOT NULL default 'n',
20712071
`fastcgi_php_version` varchar(255) DEFAULT NULL,
20722072
`proxy_directives` mediumtext,
2073-
`enable_spdy` ENUM('y','n') NULL DEFAULT 'n',
20742073
`last_quota_notification` date NULL default NULL,
20752074
`rewrite_rules` mediumtext,
20762075
`added_date` date NULL DEFAULT NULL,

‎install/tpl/apache_apps.vhost.master‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
<VirtualHost {tmpl_var name='apps_vhost_ip'}:{tmpl_var name='apps_vhost_port'}>
1111
ServerAdmin webmaster@localhost
1212
{tmpl_var name='apps_vhost_servername'}
13-
13+
1414
<FilesMatch "\.ph(p3?|tml)$">
1515
SetHandler None
1616
</FilesMatch>
17-
17+
1818
<IfModule mod_headers.c>
1919
RequestHeader unset Proxy early
2020
</IfModule>
21-
21+
2222
{tmpl_if name="enable_spdy" op="==" value="y"}
2323
<IfModule spdy_module>
2424
SpdyEnabled on
@@ -39,7 +39,7 @@
3939
</tmpl_if>
4040
</Directory>
4141
</IfModule>
42-
42+
4343
<IfModule mod_php7.c>
4444
DocumentRoot {tmpl_var name='apps_vhost_dir'}
4545
AddType application/x-httpd-php .php
@@ -54,7 +54,7 @@
5454
</tmpl_if>
5555
</Directory>
5656
</IfModule>
57-
57+
5858
<IfModule mod_fcgid.c>
5959
DocumentRoot {tmpl_var name='apps_vhost_dir'}
6060
SuexecUserGroup ispapps ispapps
@@ -87,5 +87,3 @@
8787

8888

8989
</VirtualHost>
90-
91-

‎install/tpl/server.ini.master‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ php_ini_path_apache=/etc/php5/apache2/php.ini
9494
php_ini_path_cgi=/etc/php5/cgi/php.ini
9595
check_apache_config=y
9696
enable_sni=y
97-
enable_spdy=n
9897
skip_le_check=n
9998
enable_ip_wildcard=y
10099
overtraffic_notify_admin=y

‎interface/web/admin/form/server_config.tform.php‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1317,15 +1317,6 @@
13171317
'width' => '40',
13181318
'maxlength' => '255'
13191319
),
1320-
'enable_spdy' => array (
1321-
'datatype' => 'VARCHAR',
1322-
'formtype' => 'CHECKBOX',
1323-
'default' => 'y',
1324-
'value' => array (
1325-
0 => 'n',
1326-
1 => 'y'
1327-
)
1328-
),
13291320
'apps_vhost_enabled' => array (
13301321
'datatype' => 'VARCHAR',
13311322
'formtype' => 'CHECKBOX',

‎interface/web/admin/templates/server_config_web_edit.htm‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ <h4 class="panel-title">
163163
<div class="form-group">
164164
<label class="col-sm-3 control-label">{tmpl_var name='overquota_db_notify_client_txt'}</label>
165165
<div class="col-sm-9">
166-
{tmpl_var name='overquota_db_notify_client'}
166+
{tmpl_var name='overquota_db_notify_client'}
167167
</div>
168168
</div>
169169
<div class="form-group">
@@ -197,14 +197,6 @@ <h4 class="panel-title">
197197
{tmpl_var name='enable_sni'}
198198
</div>
199199
</div>
200-
<div class="form-group">
201-
<label class="col-sm-3 control-label">
202-
<tmpl_var name="enable_spdy_txt">
203-
</label>
204-
<div class="col-sm-9">
205-
<tmpl_var name="enable_spdy">
206-
</div>
207-
</div>
208200
<div class="form-group">
209201
<label for="CA_path" class="col-sm-3 control-label">{tmpl_var name='CA_path_txt'}</label>
210202
<div class="col-sm-9"><input type="text" name="CA_path" id="CA_path" value="{tmpl_var name='CA_path'}" autocomplete="new-password" class="form-control" /></div></div>
@@ -257,7 +249,7 @@ <h4 class="panel-title">
257249
<div class="form-group">
258250
<label for="connect_userid_to_webid_start" class="col-sm-3 control-label">{tmpl_var name='connect_userid_to_webid_start_txt'}</label>
259251
<div class="col-sm-9"><input type="text" name="connect_userid_to_webid_start" id="connect_userid_to_webid_start" value="{tmpl_var name='connect_userid_to_webid_start'}" class="form-control" /></div></div>
260-
252+
261253
<!-- End content -->
262254
</div>
263255
</div>
@@ -361,7 +353,7 @@ <h4 class="panel-title">
361353
<div class="form-group">
362354
<label for="apps_vhost_servername" class="col-sm-3 control-label">{tmpl_var name='apps_vhost_servername_txt'}</label>
363355
<div class="col-sm-9"><input type="text" name="apps_vhost_servername" id="apps_vhost_servername" value="{tmpl_var name='apps_vhost_servername'}" class="form-control" /></div></div>
364-
356+
365357
<!-- End content -->
366358
</div>
367359
</div>
@@ -389,15 +381,15 @@ <h4 class="panel-title">
389381
<div class="form-group">
390382
<label for="awstats_buildstaticpages_pl" class="col-sm-3 control-label">{tmpl_var name='awstats_buildstaticpages_pl_txt'}</label>
391383
<div class="col-sm-9"><input type="text" name="awstats_buildstaticpages_pl" id="awstats_buildstaticpages_pl" value="{tmpl_var name='awstats_buildstaticpages_pl'}" class="form-control" /></div></div>
392-
384+
393385
<!-- End content -->
394386
</div>
395387
</div>
396388
</div>
397389
</div>
398-
390+
399391
<input type="hidden" name="id" value="{tmpl_var name='id'}">
400-
392+
401393
<div class="clear"><div class="right">
402394
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_config_edit.php">{tmpl_var name='btn_save_txt'}</button>
403395
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
@@ -410,7 +402,7 @@ <h4 class="panel-title">
410402
serverType = $(this).val();
411403
adjustForm();
412404
});
413-
405+
414406
function adjustForm(){
415407
if(serverType == "nginx"){
416408
jQuery('.nginx').show();

‎interface/web/sites/form/web_vhost_domain.tform.php‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -591,15 +591,6 @@
591591
'default' => '',
592592
'value' => array('' => 'none_txt', 'save' => 'save_certificate_txt', 'create' => 'create_certificate_txt', 'del' => 'delete_certificate_txt')
593593
),
594-
'enable_spdy' => array (
595-
'datatype' => 'VARCHAR',
596-
'formtype' => 'CHECKBOX',
597-
'default' => 'n',
598-
'value' => array (
599-
0 => 'n',
600-
1 => 'y'
601-
)
602-
),
603594
//#################################
604595
// END Datatable fields
605596
//#################################

‎interface/web/sites/templates/web_vhost_domain_ssl.htm‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,7 @@
6262
{tmpl_var name='ssl_action'}
6363
</select></div>
6464
</div>
65-
{tmpl_if name="is_spdy_enabled"}
66-
<div class="form-group">
67-
<label class="col-sm-3 control-label">{tmpl_var name='enable_spdy_txt'}</label>
68-
<div class="col-sm-9">
69-
{tmpl_var name="enable_spdy"}
70-
</div>
71-
</div>
72-
{/tmpl_if}
73-
65+
7466

7567
<input type="hidden" name="id" value="{tmpl_var name='id'}">
7668

@@ -91,11 +83,11 @@
9183
$('#load_data').click(function(){
9284
loadClientData();
9385
});
94-
95-
86+
87+
9688
function loadClientData() {
9789
var web_id = $("input[name=id]").val();
98-
90+
9991
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {'web_id': web_id, 'type': "getclientssldata"}, function(data) {
10092
$('#ssl_organisation').val(data['company_name']);
10193
$('#ssl_locality').val(data['city']);

‎interface/web/sites/web_vhost_domain_edit.php‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,6 @@ function onShowEnd() {
840840

841841
$app->tpl->setVar('vhostdomain_type', $this->_vhostdomain_type, true);
842842

843-
$app->tpl->setVar('is_spdy_enabled', ($web_config['enable_spdy'] === 'y'));
844843
$app->tpl->setVar('is_pagespeed_enabled', ($web_config['nginx_enable_pagespeed'] === 'y'));
845844
$app->tpl->setVar("is_admin", $is_admin);
846845

@@ -950,10 +949,8 @@ function onShowEnd() {
950949
}
951950
$app->tpl->setLoop('folder_directive_snippets', $folder_directive_snippets);
952951
if(is_array($web_config[$server_id])) {
953-
$app->tpl->setVar('is_spdy_enabled', ($web_config[$server_id]['enable_spdy'] === 'y'));
954952
$app->tpl->setVar('is_pagespeed_enabled', ($web_config[$server_id]['nginx_enable_pagespeed']));
955953
} else {
956-
$app->tpl->setVar('is_spdy_enabled', ($web_config['enable_spdy'] === 'y'));
957954
$app->tpl->setVar('is_pagespeed_enabled', ($web_config['nginx_enable_pagespeed']));
958955
}
959956

@@ -1325,10 +1322,6 @@ function onSubmit() {
13251322
$app->tform->errorMessage .= $app->tform->lng("invalid_custom_php_ini_settings_txt").'<br>';
13261323
}
13271324
}
1328-
1329-
if($web_config['enable_spdy'] === 'n') {
1330-
unset($app->tform->formDef["tabs"]['ssl']['fields']['enable_spdy']);
1331-
}
13321325
// if($this->dataRecord["directive_snippets_id"] < 1) $this->dataRecord["enable_pagespeed"] = 'n';
13331326

13341327
//print_r($_POST['folder_directive_snippets']);

‎server/conf/apache_apps.vhost.master‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,11 @@
1414
<FilesMatch "\.ph(p3?|tml)$">
1515
SetHandler None
1616
</FilesMatch>
17-
17+
1818
<IfModule mod_headers.c>
1919
RequestHeader unset Proxy early
2020
</IfModule>
2121

22-
{tmpl_if name="enable_spdy" op="==" value="y"}
23-
<IfModule spdy_module>
24-
SpdyEnabled on
25-
</IfModule>
26-
{/tmpl_if}
27-
2822
<IfModule mod_php5.c>
2923
DocumentRoot {tmpl_var name='apps_vhost_dir'}
3024
AddType application/x-httpd-php .php
@@ -39,7 +33,7 @@
3933
</tmpl_if>
4034
</Directory>
4135
</IfModule>
42-
36+
4337
<IfModule mod_php7.c>
4438
DocumentRoot {tmpl_var name='apps_vhost_dir'}
4539
AddType application/x-httpd-php .php
@@ -54,7 +48,7 @@
5448
</tmpl_if>
5549
</Directory>
5650
</IfModule>
57-
51+
5852
<IfModule mod_fcgid.c>
5953
DocumentRoot {tmpl_var name='apps_vhost_dir'}
6054
SuexecUserGroup ispapps ispapps
@@ -85,5 +79,3 @@
8579
{/tmpl_if}
8680

8781
</VirtualHost>
88-
89-

0 commit comments

Comments
 (0)