[dw-free] http://bugs.dwscoalition.org/show_bug.cgi?id=1133

[mark]

[commit: http://hg.dwscoalition.org/dw-free/rev/04ccfef357b5]

http://bugs.dwscoalition.org/show_bug.cgi?id=1133

Fix redirection of embedded domain so it doesn't redirect anymore, also fix
doubled slash.

Patch by exor674.

Files modified:

• cgi-bin/Apache/LiveJournal.pm

--------------------------------------------------------------------------------
diff -r 9cd1f04529af -r 04ccfef357b5 cgi-bin/Apache/LiveJournal.pm
--- a/cgi-bin/Apache/LiveJournal.pm	Sun Jul 12 21:03:08 2009 +0000
+++ b/cgi-bin/Apache/LiveJournal.pm	Sun Jul 12 21:05:12 2009 +0000
@@ -354,7 +354,8 @@ sub trans
     }
 
     # handle alternate domains
-    if ( $host ne $LJ::DOMAIN && $host ne $LJ::DOMAIN_WEB ) {
+    if ( $host ne $LJ::DOMAIN && $host ne $LJ::DOMAIN_WEB && 
+           !( $LJ::EMBED_MODULE_DOMAIN && $host =~ /$LJ::EMBED_MODULE_DOMAIN$/ ) ) {
         my $which_alternate_domain = undef;
         foreach my $other_host ( @LJ::ALTERNATE_DOMAINS ) {
             $which_alternate_domain = $other_host
@@ -369,7 +370,7 @@ sub trans
             if ( $LJ::DOMAIN_WEB && $host eq $LJ::DOMAIN ) {
                 $host = $LJ::DOMAIN_WEB;
             }
-            $root .= "$host/";
+            $root .= "$host";
 
             if ( $r->method eq "GET" ) {
                 my $url = "$root$uri";
--------------------------------------------------------------------------------