Merge branch 'master' into trunk

This commit is contained in:
root 2019-05-20 16:05:51 +03:00
commit 524c7ea6cd
2 changed files with 6 additions and 10 deletions

View File

@ -1,8 +1,6 @@
LoadModule ssl_module modules/mod_ssl.so
LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
LoadModule headers_module modules/mod_headers.so
Listen 443
LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so
LoadModule socache_shmcb_module /usr/lib/apache2/modules/mod_socache_shmcb.so
LoadModule headers_module /usr/lib/apache2/modules/mod_headers.so
<IfModule mod_ssl.c>
<VirtualHost *:443>

View File

@ -1,8 +1,6 @@
LoadModule ssl_module modules/mod_ssl.so
LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
LoadModule headers_module modules/mod_headers.so
Listen 443
LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so
LoadModule socache_shmcb_module /usr/lib/apache2/modules/mod_socache_shmcb.so
LoadModule headers_module /usr/lib/apache2/modules/mod_headers.so
<IfModule mod_ssl.c>
<VirtualHost *:443>