FCGI-Fix für Charset-Encoding nur bei UTF-8-Installationen anwenden

Andernfalls würden ISO-encodierte Strings vom Fix nochmal nach UTF-8
encodiert und danach erst ausgeliefert.

diff --git a/SL/FCGIFixes.pm b/SL/FCGIFixes.pm
index 47393aad656129b6769c7440b76a2d981717113f..d341f4a975c03628d45866bc8781f3e65d1e3e13 100644 (file)
--- a/SL/FCGIFixes.pm
+++ b/SL/FCGIFixes.pm
@@ -25,6 +25,7 @@ use version;
 
 sub fix_print_and_internal_encoding_after_0_68 {
   return if version->new("$FCGI::VERSION")->numify <= version->new("0.68")->numify;
+  return if lc($::dbcharset) !~ m/^(?:utf-?8|unicode)$/;
 
   my $encoder             = Encode::find_encoding('UTF-8');
   my $original_fcgi_print = \&FCGI::Stream::PRINT;

diff --git a/dispatcher.fpl b/dispatcher.fpl
index ba5f288d1b2f4cc40091ce285396bddeaa03e9a9..7d2dfb5be9f4bfce7adb8870c0453c46a030e5af 100755 (executable)
--- a/dispatcher.fpl
+++ b/dispatcher.fpl
@@ -6,10 +6,10 @@ use FCGI;
 use SL::Dispatcher;
 use SL::FCGIFixes;
 
-SL::FCGIFixes::apply_fixes();
-
 our $dispatcher = SL::Dispatcher->new('FastCGI');
-$dispatcher->pre_startup;
+$dispatcher->pre_startup_setup;
+SL::FCGIFixes::apply_fixes();
+$dispatcher->pre_startup_checks;
 
 my $request = FCGI::Request();
 $dispatcher->handle_request($request) while $request->Accept() >= 0;