[Rt-commit] [svn] r1257 - in rt: . branches branches/3.2-RELEASE/bin branches/3.2-RELEASE/lib/RT/Interface/Web

[autrijus at pallas.eruditorum.org]

Author: autrijus
Date: Thu Jul 15 20:58:55 2004
New Revision: 1257

Modified:
   rt/   (props changed)
   rt/branches/3.2-RELEASE/bin/standalone_httpd.in
   rt/branches/3.2-RELEASE/lib/RT/Interface/Web/Handler.pm
   rt/branches/README.LAYOUT
Log:
 ----------------------------------------------------------------------
 r6136 at not:  autrijus | 2004-07-15T21:53:07.355306Z
 
 * revert the inadvertant change and merge wordings from cvs.html
 ----------------------------------------------------------------------
 r6137 at not:  autrijus | 2004-07-15T22:04:22.132548Z
 
 * Make standalone_httpd use $RT::Mason::Handler like other mason_handler progs
 * Eliminate -w warning emitted from Handler.pm.
 ----------------------------------------------------------------------


Modified: rt/branches/3.2-RELEASE/bin/standalone_httpd.in
==============================================================================
--- rt/branches/3.2-RELEASE/bin/standalone_httpd.in	(original)
+++ rt/branches/3.2-RELEASE/bin/standalone_httpd.in	Thu Jul 15 20:58:55 2004
@@ -1,6 +1,9 @@
 #!@PERL@ -w
 
+package RT::Mason;
+
 use strict;
+use vars '$Handler';
 
 require ('@RT_BIN_PATH@/webmux.pl');
 
@@ -11,8 +14,6 @@
 RT::Init();
 
 my $port = shift || '8080';
-if ( @RT::MasonParameters) {} # Shut up the warnings;
-my $h = &RT::Interface::Web::Handler::NewCGIHandler(@RT::MasonParameters);
 
 main_loop($port);
 
@@ -72,13 +73,13 @@
 
             print "HTTP/1.0 200 OK\n";    # probably OK by now
 
-            if ( ( !$h->interp->comp_exists( $cgi->path_info ) )
-                && ($h->interp->comp_exists( $cgi->path_info . "/index.html" ) )
+            if ( ( !$Handler->interp->comp_exists( $cgi->path_info ) )
+                && ($Handler->interp->comp_exists( $cgi->path_info . "/index.html" ) )
               ) {
                 $cgi->path_info( $cgi->path_info . "/index.html" );
             }
 
-            eval { $h->handle_cgi_object($cgi); };
+            eval { $Handler->handle_cgi_object($cgi); };
             $RT::Logger->crit($@) if ($@);
 
             if ( $RT::Handle->TransactionDepth ) {

Modified: rt/branches/3.2-RELEASE/lib/RT/Interface/Web/Handler.pm
==============================================================================
--- rt/branches/3.2-RELEASE/lib/RT/Interface/Web/Handler.pm	(original)
+++ rt/branches/3.2-RELEASE/lib/RT/Interface/Web/Handler.pm	Thu Jul 15 20:58:55 2004
@@ -27,7 +27,7 @@
     if ($MasonX::Apache2Handler::VERSION) {
         goto &NewApache2Handler;
     }
-    elsif ($mod_perl::VERSION >= 1.9908) {
+    elsif ($mod_perl::VERSION and $mod_perl::VERSION >= 1.9908) {
 	require Apache::RequestUtil;
 	no warnings 'redefine';
 	my $sub = *Apache::request{CODE};

Modified: rt/branches/README.LAYOUT
==============================================================================
--- rt/branches/README.LAYOUT	(original)
+++ rt/branches/README.LAYOUT	Thu Jul 15 20:58:55 2004
@@ -22,18 +22,19 @@
 
 
 Level tags:
-    EXPERIMENTAL: Revision-numbered snaps. Codename based labels.
-        - Not to be relied upon
+    EXPERIMENTAL: Codename based labels
+        - Not to be relied upon.
         - Has all the latest cool features, which may not make it into a release.
     TESTING: Odd minor version
-        - Featureset slush.
-        - Recommended for new development and test deployments
+        - Feature set slush.
+        - Recommended for new development and test deployments.
     RELEASE: Even minor version number
         - All bugfixes, minor features.
         - NO SCHEMA CHANGES.
-        - Loc-string changes discouraged.
+        - Localized string changes discouraged.
         - Recommended for production deployment.
-    MAINT: Even minor version number; always older than the current RELEASE 
-        - only critical bugfixes. No loc-string changes unless critical.
-        - Supported by Best Practical.
+        - Commercially supported by Best Practical.
+    MAINT: Even minor version number; always older than the current RELEASE
+        - Only critical bugfixes. No localized string changes unless critical.
+        - Commercially supported by Best Practical.
         - Not for new installations.