Merge branch 'content-length-in-bytes' into devel

Fixes #980
PerlDancer · Mar 20, 2014 · 63b78bb · 63b78bb
2 parents 363467e + e51be92
commit 63b78bb
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 3 deletions.
diff --git a/lib/Dancer/Handler.pm b/lib/Dancer/Handler.pm
@@ -154,8 +154,10 @@ sub render_response {
             $response->header( 'Content-Type' => "$ctype; charset=$charset" )
               if $ctype !~ /$charset/;
         }
-        $response->header( 'Content-Length' => length($content) )
-          if !defined $response->header('Content-Length');
+        if (!defined $response->header('Content-Length')) {
+            use bytes; # turn off character semantics
+            $response->header( 'Content-Length' => length($content) );
+        }
         $content = [$content];
     }
     else {

diff --git a/t/12_response/04_charset_server.t b/t/12_response/04_charset_server.t
@@ -20,7 +20,7 @@ plan skip_all => "HTTP::Request::Common is needed for this test"
 
 use LWP::UserAgent;
 
-plan tests => 6;
+plan tests => 10;
 
 Test::TCP::test_tcp(
     client => sub {
@@ -54,3 +54,66 @@ Test::TCP::test_tcp(
         Dancer->dance();
     },
 );
+
+Test::TCP::test_tcp(
+    client => sub {
+        my $port = shift;
+        my $ua = LWP::UserAgent->new;
+
+        my $req = HTTP::Request::Common::GET(
+            "http://127.0.0.1:$port/unicode-content-length");
+        my $res = $ua->request($req);
+
+        is $res->content_type, 'text/html';
+        # UTF-8 seems to be Dancer's default encoding
+        my $v = "\x{100}0123456789";
+        utf8::encode($v);
+        is $res->content, $v;
+    },
+    server => sub {
+        my $port = shift;
+
+        use lib "t/lib";
+        use TestAppUnicode;
+        Dancer::Config->load;
+
+        set(
+            # no charset
+            environment  => 'production',
+            port         => $port,
+            startup_info => 0,
+        );
+        Dancer->dance;
+    },
+);
+
+
+Test::TCP::test_tcp(
+    client => sub {
+        my $port = shift;
+        my $ua = LWP::UserAgent->new;
+
+        my $req = HTTP::Request::Common::GET(
+            "http://127.0.0.1:$port/unicode-content-length-json");
+        my $res = $ua->request($req);
+
+        is $res->content_type, 'application/json';
+        is_deeply(from_json($res->content), { test => "\x{100}" });
+    },
+    server => sub {
+        my $port = shift;
+
+        use lib "t/lib";
+        use TestAppUnicode;
+        Dancer::Config->load;
+
+        set(
+            # no charset
+            environment  => 'production',
+            port         => $port,
+            startup_info => 0,
+            serializer   => 'JSON',
+        );
+        Dancer->dance;
+    },
+);
diff --git a/t/lib/TestAppUnicode.pm b/t/lib/TestAppUnicode.pm
@@ -31,5 +31,13 @@ get '/form' => sub {
     })."\x{E9} - string1: ".params->{'string1'}
 };
 
+get '/unicode-content-length' => sub {
+    "\x{100}0123456789";
+};
+
+get '/unicode-content-length-json' => sub {
+    { test => "\x{100}" };
+};
+
 
 1;