Merge pull request #429 from plack/server-encode-utf8

Encode strings as UTF-8 when it has wide characters
plack · Sep 23, 2013 · 6053f8c · 6053f8c
2 parents 4b6481a + 86602ce
commit 6053f8c
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/lib/HTTP/Server/PSGI.pm b/lib/HTTP/Server/PSGI.pm
@@ -280,6 +280,7 @@ sub write_timeout {
 sub write_all {
     my ($self, $sock, $buf, $timeout) = @_;
     return 0 unless defined $buf;
+    _encode($buf);
     my $off = 0;
     while (my $len = length($buf) - $off) {
         my $ret = $self->write_timeout($sock, $buf, $len, $off, $timeout)
@@ -289,6 +290,14 @@ sub write_all {
     return length $buf;
 }
 
+# syswrite() will crash when given wide characters
+sub _encode {
+    if ($_[0] =~ /[^\x00-\xff]/) {
+        Carp::carp("Wide character outside byte range in response. Encoding data as UTF-8");
+        utf8::encode($_[0]);
+    }
+}
+
 1;
 
 __END__