From aefbf93541a97d877a0dc189239045de4cc22aca Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Wed, 20 Jan 2016 11:39:31 +0100 Subject: [PATCH 1/4] Bump version --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index af40027b0..c21a47f4c 100644 --- a/boot.php +++ b/boot.php @@ -17,7 +17,7 @@ require_once('include/dbstructure.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_CODENAME', 'Lily of the valley'); -define ( 'FRIENDICA_VERSION', '3.4.3' ); +define ( 'FRIENDICA_VERSION', '3.4.3-2' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1191 ); define ( 'EOL', "
\r\n" ); From 2ca9d011fe2118293a53b0fda068b3ec27d34c4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= Date: Sat, 30 Jan 2016 23:21:03 +0100 Subject: [PATCH 2/4] add simple option for HTTPS in .htaccess people have it easier to just uncomment 2 lines if they want such an important feature --- .htaccess | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.htaccess b/.htaccess index 1b63f9ad6..8c8a8861c 100644 --- a/.htaccess +++ b/.htaccess @@ -30,5 +30,9 @@ Deny from all RewriteCond %{REQUEST_FILENAME} !-d RewriteRule ^(.*)$ index.php?pagename=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA] + # If you want to restrict access to your Friendica site to HTTPS only, + # uncommment the following lines + RewriteCond %{HTTPS} !=on + RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [R=301,L] From e80d5a7f23143d10ff6043a00fc06f36e239e9ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= Date: Sat, 30 Jan 2016 23:22:40 +0100 Subject: [PATCH 3/4] additional blank line --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 8c8a8861c..a2c3c8914 100644 --- a/.htaccess +++ b/.htaccess @@ -34,5 +34,6 @@ Deny from all # uncommment the following lines RewriteCond %{HTTPS} !=on RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [R=301,L] + From 545e4f645e274af0e29a7e70159f0750b7ef8b30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= Date: Sun, 31 Jan 2016 16:20:06 +0100 Subject: [PATCH 4/4] really uncomment the lines. --- .htaccess | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.htaccess b/.htaccess index a2c3c8914..d2aaa4e13 100644 --- a/.htaccess +++ b/.htaccess @@ -32,8 +32,8 @@ Deny from all # If you want to restrict access to your Friendica site to HTTPS only, # uncommment the following lines - RewriteCond %{HTTPS} !=on - RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [R=301,L] + #RewriteCond %{HTTPS} !=on + #RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [R=301,L]