[Rt-commit] r3708 - in rt/branches/3.4-RELEASE: . lib/RT/Interface/Web sbin

[glasser at bestpractical.com]

Author: glasser
Date: Mon Aug 22 16:05:46 2005
New Revision: 3708

Modified:
   rt/branches/3.4-RELEASE/   (props changed)
   rt/branches/3.4-RELEASE/lib/RT/Interface/Web/Standalone.pm
   rt/branches/3.4-RELEASE/sbin/rt-test-dependencies.in
Log:
 r40177 at tin-foil:  glasser | 2005-08-18 18:49:13 -0400
 Updates to the standalone server to not dupe as much code, but may be rolled back if HSSM needs to be.


Modified: rt/branches/3.4-RELEASE/lib/RT/Interface/Web/Standalone.pm
==============================================================================
--- rt/branches/3.4-RELEASE/lib/RT/Interface/Web/Standalone.pm	(original)
+++ rt/branches/3.4-RELEASE/lib/RT/Interface/Web/Standalone.pm	Mon Aug 22 16:05:46 2005
@@ -5,41 +5,20 @@
 use RT::Interface::Web::Handler;
 use RT::Interface::Web;
 
+sub handler_class { "RT::Interface::Web::Handler" }
 
-sub new_handler {
-   my $m;
-   $m=  RT::Interface::Web::Handler->new(@RT::MasonParameters,
-   # Override mason's default output method so 
-   # we can change the binmode to our encoding if
-   # we happen to be handed character data instead
-   # of binary data.
-   # 
-   # Cloned from HTML::Mason::CGIHandler
-    out_method => 
-      sub {
-            my $m = HTML::Mason::Request->instance;
-            my $r = $m->cgi_request;
-            # Send headers if they have not been sent by us or by user.
-            # We use instance here because if we store $request we get a
-            # circular reference and a big memory leak.
-                unless ($m->{'http_header_sent'}) {
-                       $r->send_http_header();
-                }
-            {
-            if ($r->content_type =~ /charset=([\w-]+)$/ ) {
-                my $enc = $1;
-                binmode *STDOUT, ":encoding($enc)";
-            }
-            # We could perhaps install a new, faster out_method here that
-            # wouldn't have to keep checking whether headers have been
-            # sent and what the $r->method is.  That would require
-            # additions to the Request interface, though.
-             print STDOUT grep {defined} @_;
-            }
-        }
-    );
-        return ($m); 
-}
+sub setup_escapes {
+    my $self = shift;
+    my $handler = shift;
+
+    # Override HTTP::Server::Simple::Mason's version of this method to do
+    # nothing.  (RT::Interface::Web::Handler does this already for us in
+    # NewHandler.)
+} 
+
+sub default_mason_config {
+    return @RT::MasonParameters;
+} 
 
 sub handle_request {
 

Modified: rt/branches/3.4-RELEASE/sbin/rt-test-dependencies.in
==============================================================================
--- rt/branches/3.4-RELEASE/sbin/rt-test-dependencies.in	(original)
+++ rt/branches/3.4-RELEASE/sbin/rt-test-dependencies.in	Mon Aug 22 16:05:46 2005
@@ -197,7 +197,7 @@
 Apache::Session 1.53
 XML::RSS 1.05
 HTTP::Server::Simple 0.07
-HTTP::Server::Simple::Mason 0.07
+HTTP::Server::Simple::Mason 0.09
 Text::WikiFormat
 .