Merge remote-tracking branch 'upstream/master' into 335_phpmyadmin_sso_broken
This commit is contained in:
commit
caae003c60
|
@ -11,7 +11,7 @@
|
|||
php_admin_value sendmail_path '/usr/lib/alternc/sendmail "%%mail_account%%" '
|
||||
php_admin_flag mail.add_x_header on
|
||||
Options +MultiViews -FollowSymLinks +SymLinksIfOwnerMatch
|
||||
AllowOverride AuthConfig FileInfo Limit Options Indexes
|
||||
AllowOverride AuthConfig FileInfo Limit Options Indexes Options=All,MultiViews
|
||||
</Directory>
|
||||
|
||||
</VirtualHost>
|
||||
|
@ -29,7 +29,7 @@
|
|||
php_admin_value sendmail_path '/usr/lib/alternc/sendmail "%%mail_account%%" '
|
||||
php_admin_flag mail.add_x_header on
|
||||
Options +MultiViews -FollowSymLinks +SymLinksIfOwnerMatch
|
||||
AllowOverride AuthConfig FileInfo Limit Options Indexes
|
||||
AllowOverride AuthConfig FileInfo Limit Options Indexes Options=All,MultiViews
|
||||
</Directory>
|
||||
|
||||
SSLEngine On
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
php_admin_value sendmail_path '/usr/lib/alternc/sendmail "%%mail_account%%" '
|
||||
php_admin_flag mail.add_x_header on
|
||||
Options -MultiViews -FollowSymLinks +SymLinksIfOwnerMatch
|
||||
AllowOverride AuthConfig FileInfo Limit Options Indexes
|
||||
AllowOverride AuthConfig FileInfo Limit Options Indexes Options=All,MultiViews
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
Require all granted
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
php_admin_value sendmail_path '/usr/lib/alternc/sendmail "%%mail_account%%" '
|
||||
php_admin_flag mail.add_x_header on
|
||||
Options +MultiViews -FollowSymLinks +SymLinksIfOwnerMatch
|
||||
AllowOverride AuthConfig FileInfo Limit Options Indexes
|
||||
AllowOverride AuthConfig FileInfo Limit Options Indexes Options=All,MultiViews
|
||||
</Directory>
|
||||
|
||||
SSLEngine On
|
||||
|
|
Loading…
Reference in New Issue