From 123cc695c33dd3f8a5dba3173a022cdbe348267e Mon Sep 17 00:00:00 2001
From: dairiki <dairiki@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Tue, 18 Mar 2003 21:40:05 +0000
Subject: [PATCH] Copy Lawrence's memo on USE_PATH_INFO/AcceptPathInfo to
 configurator.php (as promised).

Plus slight clarification of default (auto-detect) behavior.


git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@2728 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 configurator.php | 25 ++++++++++++++++++-------
 index.php        |  9 +++++++--
 2 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/configurator.php b/configurator.php
index 584a4f527..2800e8cf3 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.17 2003-03-17 21:24:52 dairiki Exp $ -->
+<!-- $Id: configurator.php,v 1.18 2003-03-18 21:40:05 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">
@@ -245,7 +245,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.17 2003-03-17 21:24:52 dairiki Exp $');", "");
+rcs_id('\$Id: configurator.php,v 1.18 2003-03-18 21:40:05 dairiki Exp $');", "");
 
 
 $properties["Part One"] =
@@ -1015,11 +1015,22 @@ $properties["Use PATH_INFO"] =
 new boolean_define_commented_optional('USE_PATH_INFO', 
                     array('true'  => 'use PATH_INFO',
 			  'false' => 'do not use PATH_INFO'), "
-Define to 'true' to use PATH_INFO to pass the pagenames.
-e.g. http://www.some.where/index.php/HomePage instead
-of http://www.some.where/index.php?pagename=HomePage
-FIXME: more docs (maybe in README). Default: true");
-
+PhpWiki will try to use short urls to pages, eg 
+http://www.example.com/index.php/HomePage
+If you want to use urls like 
+http://www.example.com/index.php?pagename=HomePage
+then define 'USE_PATH_INFO' as false by uncommenting the line below.
+NB:  If you are using Apache >= 2.0.30, then you may need to to use
+the directive \"AcceptPathInfo On\" in your Apache configuration file
+(or in an appropriate <.htaccess> file) for the short urls to work:  
+See http://httpd.apache.org/docs-2.0/mod/core.html#acceptpathinfo
+
+See also http://phpwiki.sourceforge.net/phpwiki/PrettyWiki for more ideas
+on prettifying your urls.
+
+Default: PhpWiki will try to divine whether use of PATH_INFO
+is supported in by your webserver/PHP configuration, and will
+use PATH_INFO if it thinks that is possible.");
 
 
 $properties["Virtual Path"] =
diff --git a/index.php b/index.php
index d884d8142..dabdc2775 100644
--- a/index.php
+++ b/index.php
@@ -61,7 +61,7 @@ if (!defined('DEBUG')) define ('DEBUG', 1);
 
 define ('PHPWIKI_VERSION', '1.3.5pre');
 require "lib/prepend.php";
-rcs_id('$Id: index.php,v 1.110 2003-03-18 20:51:10 lakka Exp $');
+rcs_id('$Id: index.php,v 1.111 2003-03-18 21:40:04 dairiki Exp $');
 
 /////////////////////////////////////////////////////////////////////
 //
@@ -677,7 +677,9 @@ $KeywordLinkRegexp = '(?<=^Category|^Topic)[[:upper:]].*$';
  * See also http://phpwiki.sourceforge.net/phpwiki/PrettyWiki for more ideas
  * on prettifying your urls.
  *
- * Default: true
+ * Default: PhpWiki will try to divine whether use of PATH_INFO
+ * is supported in by your webserver/PHP configuration, and will
+ * use PATH_INFO if it thinks that is possible.
  */
 //if (!defined('USE_PATH_INFO')) define('USE_PATH_INFO', false);
 
@@ -770,6 +772,9 @@ if (defined('VIRTUAL_PATH') and defined('USE_PATH_INFO')) {
 // End:   
 
 // $Log: not supported by cvs2svn $
+// Revision 1.110  2003/03/18 20:51:10  lakka
+// Revised comments on use of USE_PATH_INFO with Apache 2
+//
 // Revision 1.109  2003/03/17 21:24:50  dairiki
 // Fix security bugs in the RawHtml plugin.
 //
-- 
2.45.0

