Skip to content

Commit

Permalink
#IP-1667 Fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
nuxwin committed Nov 27, 2016
1 parent 92493c3 commit e82912f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG
Expand Up @@ -18,6 +18,7 @@ LISTENER

YOUTRACK
#IP-1665 Allow underscore in CNAME-record
#IP-1667 ITK httpd server implementation - Variables not replaced in vhost template

------------------------------------------------------------------------------------------------------------------------
1.3.8
Expand Down
9 changes: 9 additions & 0 deletions engine/PerlLib/Servers/httpd/apache_itk.pm
Expand Up @@ -1402,6 +1402,15 @@ sub _addCfg

$self->setData( $data );

if ($data->{'FORWARD'} eq 'no' && $data->{'PHP_SUPPORT'} eq 'yes') {
$self->setData(
{
EMAIL_DOMAIN => $data->{'DOMAIN_NAME'},
TMPDIR => $data->{'HOME_DIR'}.'/phptmp'
}
);
}

my $net = iMSCP::Net->getInstance();
my $isApache24 = version->parse( "$self->{'config'}->{'HTTPD_VERSION'}" ) >= version->parse( '2.4.0' );

Expand Down
2 changes: 1 addition & 1 deletion engine/PerlLib/Servers/httpd/apache_itk/installer.pm
Expand Up @@ -102,7 +102,7 @@ Please, choose the PHP configuration level you want use. Available levels are:
\\Z4Per user:\\Zn Changes made through the PHP Editor apply to all domains
\\Z4Per domain:\\Zn Changes made through the PHP editor apply to selected domain, including its subdomains
\\Z4Per site:\\Zn Change made through PHP the editor apply to selected domain only
\\Z4Per site:\\Zn Change made through the PHP editor apply to selected domain only
EOF
}

Expand Down

0 comments on commit e82912f

Please sign in to comment.