From c8bd3c10a891f3676cabf242ba57ccfdfd6f21bc Mon Sep 17 00:00:00 2001
From: dairiki <dairiki@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Fri, 7 Mar 2003 02:48:23 +0000
Subject: [PATCH] Add option to prevent HTTP redirect.

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@2705 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 configurator.php | 21 +++++++++++++++++++--
 index.php        | 22 ++++++++++++++++++++--
 2 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/configurator.php b/configurator.php
index ffe21227b..728b06cc6 100644
--- a/configurator.php
+++ b/configurator.php
@@ -20,7 +20,7 @@ printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", 'iso-8859-1');
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<!-- $Id: configurator.php,v 1.12 2003-03-04 20:01:03 dairiki Exp $ -->
+<!-- $Id: configurator.php,v 1.13 2003-03-07 02:48:23 dairiki Exp $ -->
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <title>Configuration tool for PhpWiki 1.3.x</title>
 <style type="text/css" media="screen">
@@ -270,7 +270,7 @@ $properties["Part Null Settings"] =
 new unchangeable_variable('_partnullsettings', "
 define ('PHPWIKI_VERSION', '1.3.5pre');
 require \"lib/prepend.php\";
-rcs_id('\$Id: configurator.php,v 1.12 2003-03-04 20:01:03 dairiki Exp $');", "");
+rcs_id('\$Id: configurator.php,v 1.13 2003-03-07 02:48:23 dairiki Exp $');", "");
 
 
 $properties["Part One"] =
@@ -1107,6 +1107,23 @@ $properties["Pagename of Recent Changes"] =
 new _define_optional('RECENT_CHANGES', 'RecentChanges', "
 Page name of RecentChanges page.  Used for RSS Auto-discovery.");
 
+$properties["Disable HTTP Redirects"] =
+new boolean_define_commented_optional
+('DISABLE_HTTP_REDIRECT',
+ array('false' => 'Enable HTTP Redirects',
+       'true' => 'Disable HTTP Redirects'),
+"
+(You probably don't need to touch this.)
+
+PhpWiki uses HTTP redirects for some of it's functionality.
+(e.g. after saving changes, PhpWiki redirects your browser to
+view the page you just saved.)
+
+Some web service providers (notably free European Lycos) don't seem to
+allow these redirects.  (On Lycos the result in an \"Internal Server Error\"
+report.)  In that case you can set DISABLE_HTTP_REDIRECT to true.
+(In which case, PhpWiki will revert to sneakier tricks to try to
+redirect the browser...)");
 
 $end = "
 
diff --git a/index.php b/index.php
index 03291e146..6d9861fdb 100644
--- a/index.php
+++ b/index.php
@@ -81,7 +81,7 @@ define ('DEBUG', 1);
 
 define ('PHPWIKI_VERSION', '1.3.5pre');
 require "lib/prepend.php";
-rcs_id('$Id: index.php,v 1.105 2003-03-04 02:08:08 dairiki Exp $');
+rcs_id('$Id: index.php,v 1.106 2003-03-07 02:48:23 dairiki Exp $');
 
 /////////////////////////////////////////////////////////////////////
 //
@@ -722,7 +722,22 @@ define('INTERWIKI_MAP_FILE', "lib/interwiki.map");
  
 if (!defined('RECENT_CHANGES')) define ('RECENT_CHANGES', 'RecentChanges');
 
-
+/*
+ * Disable HTTP redirects.
+ *
+ * (You probably don't need to touch this.)
+ *
+ * PhpWiki uses HTTP redirects for some of it's functionality.
+ * (e.g. after saving changes, PhpWiki redirects your browser to
+ * view the page you just saved.)
+ *
+ * Some web service providers (notably free European Lycos) don't seem to
+ * allow these redirects.  (On Lycos the result in an "Internal Server Error"
+ * report.)  In that case you can set DISABLE_HTTP_REDIRECT to true.
+ * (In which case, PhpWiki will revert to sneakier tricks to try to
+ * redirect the browser...)
+ */
+//if (!defined('DISABLE_HTTP_REDIRECT')) define ('DISABLE_HTTP_REDIRECT', true);
 
 ////////////////////////////////////////////////////////////////
 // Check if we were included by some other wiki version 
@@ -758,6 +773,9 @@ if (defined('VIRTUAL_PATH') and defined('USE_PATH_INFO')) {
 // End:   
 
 // $Log: not supported by cvs2svn $
+// Revision 1.105  2003/03/04 02:08:08  dairiki
+// Fix and document the WIKIDB_NOCACHE_MARKUP config define.
+//
 // Revision 1.104  2003/02/26 02:55:52  dairiki
 // New config settings in index.php to control cache control strictness.
 //
-- 
2.45.0

