svn commit: r1429 - branches/1.0.x: . lib

Author: cmpilato
Date: 2006-09-27 18:13:36-0700
New Revision: 1429

Modified:
   branches/1.0.x/CHANGES
   branches/1.0.x/lib/viewvc.py
   branches/1.0.x/viewvc.conf.dist

Log:
Backport to the 1.0.x branch r1428 from trunk, whose log message read
thusly:

   Update the PHP CGI hack and add a comment to the config file pointing
   out the CLI/CGI distinction. Thanks to Mark <mark@xxxxxxxxxxx> and
   Brian G. Peterson <brian@xxxxxxxxxxxxx> for bringing this issue up
   on the users' list.
   
   * lib/viewvc.py
     (markup_stream_php): update the cgi hack
   
   * viewvc.conf.dist
     (utilities.php): add comment

Additionally:

* CHANGES
  Note this change.


Modified: branches/1.0.x/CHANGES
Url: 
http://viewvc.tigris.org/source/browse/viewvc/branches/1.0.x/CHANGES?view=diff&rev=1429&p1=branches/1.0.x/CHANGES&p2=branches/1.0.x/CHANGES&r1=1428&r2=1429
==============================================================================
--- branches/1.0.x/CHANGES      (original)
+++ branches/1.0.x/CHANGES      2006-09-27 18:13:36-0700
@@ -6,6 +6,7 @@
   * make RSS URL method match the method used to generate it (issue #245)
   * fix Subversion annotation to run non-interactively, preventing hangs
   * fix bug in custom syntax highlighter fallback logic
+  * fix bug in PHP CGI hack to avoid force-cgi-redirect errors
 
 Version 1.0.1 (released 20-Jul-2006)
 

Modified: branches/1.0.x/lib/viewvc.py
Url: 
http://viewvc.tigris.org/source/browse/viewvc/branches/1.0.x/lib/viewvc.py?view=diff&rev=1429&p1=branches/1.0.x/lib/viewvc.py&p2=branches/1.0.x/lib/viewvc.py&r1=1428&r2=1429
==============================================================================
--- branches/1.0.x/lib/viewvc.py        (original)
+++ branches/1.0.x/lib/viewvc.py        2006-09-27 18:13:36-0700
@@ -1313,18 +1313,15 @@
   if not cfg.options.use_php:
     return None
 
-  sys.stdout.flush()
-
-  # clearing the following environment variables prevents a 
-  # "No input file specified" error from the php cgi executable
-  # when ViewVC is running under a cgi environment. when the
-  # php cli executable is used they can be left alone
-  #
-  #os.putenv("GATEWAY_INTERFACE", "")
-  #os.putenv("PATH_TRANSLATED", "")
-  #os.putenv("REQUEST_METHOD", "")
-  #os.putenv("SERVER_NAME", "")
-  #os.putenv("SERVER_SOFTWARE", "")
+  # The following HACK may be be used to allow a PHP CGI executable to be
+  # invoked instead of a CLI executable, on systems that do not have PHP's
+  # CLI (command line interface) installed. Just uncomment the following lines:
+  #os.unsetenv("SERVER_SOFTWARE")
+  #os.unsetenv("SERVER_NAME")
+  #os.unsetenv("GATEWAY_INTERFACE")
+  #os.unsetenv("REQUEST_METHOD")
+  #os.unsetenv("SCRIPT_FILENAME")
+  #os.unsetenv("PATH_TRANSLATED")
 
   return MarkupPHP(cfg.options.php_exe_path, fp)
 

Modified: branches/1.0.x/viewvc.conf.dist
Url: 
http://viewvc.tigris.org/source/browse/viewvc/branches/1.0.x/viewvc.conf.dist?view=diff&rev=1429&p1=branches/1.0.x/viewvc.conf.dist&p2=branches/1.0.x/viewvc.conf.dist&r1=1428&r2=1429
==============================================================================
--- branches/1.0.x/viewvc.conf.dist     (original)
+++ branches/1.0.x/viewvc.conf.dist     2006-09-27 18:13:36-0700
@@ -459,6 +459,10 @@
 use_php = 0
 
 # path to php executable
+# (This should be set to the path of a PHP CLI executable, not the path
+# to a CGI executable. If you use a CGI executable, you may see "no input file
+# specified" or "force-cgi-redirect" errors instead of colorized source. The
+# output of "php -v" tells you whether an given executable is CLI or CGI.)
 php_exe_path = php
 # php_exe_path = /usr/local/bin/php
 # php_exe_path = C:\Program Files\php\cli\php.exe