[gentoo-commits] gentoo-projects commit in forums/htdocs/includes: functions.php

[Robin H. Johnson (robbat2)]

robbat2     08/11/24 06:09:44

  Modified:             functions.php
  Log:
  If running phpBB on Apache behind a Squid reverse proxy that provides the HTTPS, you need to use "cache_peer ... front-end-https" in Squid, as well as check the HTTP_FRONT_END_HTTPS variable inside PHP to safely detect HTTPS.

Revision  Changes    Path
1.24                 forums/htdocs/includes/functions.php

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions.php?r1=1.23&r2=1.24

Index: functions.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/functions.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -p -w -b -B -u -u -r1.23 -r1.24
--- functions.php	9 Sep 2007 11:08:20 -0000	1.23
+++ functions.php	24 Nov 2008 06:09:44 -0000	1.24
@@ -7,7 +7,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: functions.php,v 1.23 2007/09/09 11:08:20 tomk Exp $
+ *   $Id: functions.php,v 1.24 2008/11/24 06:09:44 robbat2 Exp $
  *
  *
  ***************************************************************************/
@@ -1066,7 +1066,7 @@ function redirect($url)
 		message_die(GENERAL_ERROR, 'Tried to redirect to potentially insecure url.');
 	}
 
-	$server_protocol = (isset($_SERVER['HTTPS']) || $board_config['cookie_secure']) ? 'https://' : 'http://';
+	$server_protocol = (isset($_SERVER['HTTPS']) || isset($_SERVER["HTTP_FRONT_END_HTTPS"]) || $board_config['cookie_secure']) ? 'https://' : 'http://';
 	$server_name = preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name']));
 	$server_port = ($board_config['server_port'] <> 80) ? ':' . trim($board_config['server_port']) : '';
 	$script_name = preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['script_path']));