r62522 - in /trunk/libhttp-server-simple-mason-perl: ./ debian/ debian/patches/ debian/source/ lib/HTTP/Server/Simple/
angelabad-guest at users.alioth.debian.org
angelabad-guest at users.alioth.debian.org
Mon Sep 13 12:10:23 UTC 2010
Author: angelabad-guest
Date: Mon Sep 13 12:09:22 2010
New Revision: 62522
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=62522
Log:
* New upstream release
* debian/copyright: Update license and copyright information
* Switch to dpkg-source format 3.0 (quilt)
* debian/patches/fix_spelling_errors: Fix spelling error in manpage
* Bump Standards-Version to 3.9.1 (no changes)
Added:
trunk/libhttp-server-simple-mason-perl/debian/patches/
trunk/libhttp-server-simple-mason-perl/debian/patches/fix_spelling_errors
trunk/libhttp-server-simple-mason-perl/debian/patches/series
trunk/libhttp-server-simple-mason-perl/debian/source/
trunk/libhttp-server-simple-mason-perl/debian/source/format
Modified:
trunk/libhttp-server-simple-mason-perl/Changes
trunk/libhttp-server-simple-mason-perl/Makefile.PL
trunk/libhttp-server-simple-mason-perl/debian/changelog
trunk/libhttp-server-simple-mason-perl/debian/control
trunk/libhttp-server-simple-mason-perl/debian/copyright
trunk/libhttp-server-simple-mason-perl/lib/HTTP/Server/Simple/Mason.pm
Modified: trunk/libhttp-server-simple-mason-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-server-simple-mason-perl/Changes?rev=62522&op=diff
==============================================================================
--- trunk/libhttp-server-simple-mason-perl/Changes (original)
+++ trunk/libhttp-server-simple-mason-perl/Changes Mon Sep 13 12:09:22 2010
@@ -1,3 +1,7 @@
+0.14 Sun Sep 5 09:24:13 EDT 2010
+
+ * encode out string only if the string is in utf8
+
0.13 Fri Oct 9 15:01:07 EDT 2009
* Better cleanup temp files after tests
Modified: trunk/libhttp-server-simple-mason-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-server-simple-mason-perl/Makefile.PL?rev=62522&op=diff
==============================================================================
--- trunk/libhttp-server-simple-mason-perl/Makefile.PL (original)
+++ trunk/libhttp-server-simple-mason-perl/Makefile.PL Mon Sep 13 12:09:22 2010
@@ -5,9 +5,10 @@
author('Jesse Vincent <jesse at bestpractical.com>');
license('perl');
abstract('A simple mason server');
-requires( HTTP::Server::Simple => 0.04,
- HTML::Mason => 1.25,
- Hook::LexWrap => 0
- );
+requires(
+ 'HTTP::Server::Simple' => 0.04,
+ 'HTML::Mason' => 1.25,
+ 'Hook::LexWrap' => 0,
+);
&WriteAll;
Modified: trunk/libhttp-server-simple-mason-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-server-simple-mason-perl/debian/changelog?rev=62522&op=diff
==============================================================================
--- trunk/libhttp-server-simple-mason-perl/debian/changelog (original)
+++ trunk/libhttp-server-simple-mason-perl/debian/changelog Mon Sep 13 12:09:22 2010
@@ -1,3 +1,13 @@
+libhttp-server-simple-mason-perl (0.14-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/copyright: Update license and copyright information
+ * Switch to dpkg-source format 3.0 (quilt)
+ * debian/patches/fix_spelling_errors: Fix spelling error in manpage
+ * Bump Standards-Version to 3.9.1 (no changes)
+
+ -- Angel Abad <angelabad at gmail.com> Mon, 13 Sep 2010 14:06:31 +0200
+
libhttp-server-simple-mason-perl (0.13-1) unstable; urgency=low
[ Salvatore Bonaccorso ]
Modified: trunk/libhttp-server-simple-mason-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-server-simple-mason-perl/debian/control?rev=62522&op=diff
==============================================================================
--- trunk/libhttp-server-simple-mason-perl/debian/control (original)
+++ trunk/libhttp-server-simple-mason-perl/debian/control Mon Sep 13 12:09:22 2010
@@ -8,7 +8,7 @@
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Alejandro Garrido Mota <garridomota at gmail.com>,
Angel Abad <angelabad at gmail.com>
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
Homepage: http://search.cpan.org/dist/HTTP-Server-Simple-Mason/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libhttp-server-simple-mason-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libhttp-server-simple-mason-perl/
Modified: trunk/libhttp-server-simple-mason-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-server-simple-mason-perl/debian/copyright?rev=62522&op=diff
==============================================================================
--- trunk/libhttp-server-simple-mason-perl/debian/copyright (original)
+++ trunk/libhttp-server-simple-mason-perl/debian/copyright Mon Sep 13 12:09:22 2010
@@ -1,35 +1,36 @@
-Format-Specification:
- http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Jesse Vincent <jesse at bestpractical.com>
-Upstream-Source: http://search.cpan.org/dist/HTTP-Server-Simple-Mason/
-Upstream-Name: HTTP-Server-Simple-Mason
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Jesse Vincent <jesse at bestpractical.com>
+Source: http://search.cpan.org/dist/HTTP-Server-Simple-Mason/
+Name: HTTP-Server-Simple-Mason
Files: *
Copyright: 2001-2005, Jesse Vincent <jesse at bestpractical.com>
-License-Alias: Perl
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
-Files: inc/*
-Copyright: 2002 - 2009, Brian Ingerson, Audrey Tang and Adam Kennedy.
-License-Alias: Perl
-License: Artistic | GPL-1+
+Files: inc/Module/*
+Copyright: 2002-2009, Adam Kennedy <adamk at cpan.org>
+ 2002-2009, Audrey Tang <autrijus at autrijus.org>
+ 2002-2009, Brian Ingerson <ingy at cpan.org>
+License: Artistic or GPL-1+
Files: debian/*
-Copyright: 2009, Alejandro Garrido Mota <garridomota at gmail.com>
- 2009, Angel Abad <angelabad at gmail.com>
+Copyright: 2009, 2010, Angel Abad <angelabad at gmail.com>
+ 2009, Alejandro Garrido Mota <garridomota at gmail.com>
2009, Salvatore Bonaccorso <salvatore.bonaccorso at gmail.com>
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
License: Artistic
- This program is free software; you can redistribute it and/or modify
- it under the terms of the Artistic License, which comes with Perl.
- On Debian GNU/Linux systems, the complete text of the Artistic License
- can be found in `/usr/share/common-licenses/Artistic'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian GNU/Linux systems, the complete text of the Artistic License
+ can be found in `/usr/share/common-licenses/Artistic'.
License: GPL-1+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 1, or (at your option)
- any later version.
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ .
+ On Debian GNU/Linux systems, the complete text of version 1 of the
+ General Public License can be found in `/usr/share/common-licenses/GPL-1'.
Added: trunk/libhttp-server-simple-mason-perl/debian/patches/fix_spelling_errors
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-server-simple-mason-perl/debian/patches/fix_spelling_errors?rev=62522&op=file
==============================================================================
--- trunk/libhttp-server-simple-mason-perl/debian/patches/fix_spelling_errors (added)
+++ trunk/libhttp-server-simple-mason-perl/debian/patches/fix_spelling_errors Mon Sep 13 12:09:22 2010
@@ -1,0 +1,15 @@
+Author: Angel Abad <angelabad at gmail.com>
+Subject: Fix spelling error in manpage
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=61300
+
+--- a/lib/HTTP/Server/Simple/Mason.pm
++++ b/lib/HTTP/Server/Simple/Mason.pm
+@@ -155,7 +155,7 @@
+ =head2 handle_error ERROR
+
+ If the call to C<handle_request> dies, C<handle_error> is called with the
+-exception (that is, C<$@>). By default, it does nothing; it can be overriden
++exception (that is, C<$@>). By default, it does nothing; it can be overridden
+ by your subclass.
+
+ =cut
Added: trunk/libhttp-server-simple-mason-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-server-simple-mason-perl/debian/patches/series?rev=62522&op=file
==============================================================================
--- trunk/libhttp-server-simple-mason-perl/debian/patches/series (added)
+++ trunk/libhttp-server-simple-mason-perl/debian/patches/series Mon Sep 13 12:09:22 2010
@@ -1,0 +1,1 @@
+fix_spelling_errors
Added: trunk/libhttp-server-simple-mason-perl/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-server-simple-mason-perl/debian/source/format?rev=62522&op=file
==============================================================================
--- trunk/libhttp-server-simple-mason-perl/debian/source/format (added)
+++ trunk/libhttp-server-simple-mason-perl/debian/source/format Mon Sep 13 12:09:22 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
Modified: trunk/libhttp-server-simple-mason-perl/lib/HTTP/Server/Simple/Mason.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-server-simple-mason-perl/lib/HTTP/Server/Simple/Mason.pm?rev=62522&op=diff
==============================================================================
--- trunk/libhttp-server-simple-mason-perl/lib/HTTP/Server/Simple/Mason.pm (original)
+++ trunk/libhttp-server-simple-mason-perl/lib/HTTP/Server/Simple/Mason.pm Mon Sep 13 12:09:22 2010
@@ -1,7 +1,7 @@
package HTTP::Server::Simple::Mason;
use base qw/HTTP::Server::Simple::CGI/;
use strict;
-our $VERSION = '0.13';
+our $VERSION = '0.14';
=head1 NAME
@@ -202,15 +202,26 @@
$r->content_type('text/html; charset=utf-8')
unless $r->content_type;
- if ($r->content_type =~ /charset=([\w-]+)$/ ) {
+ if ( $r->content_type =~ /charset=([\w-]+)$/ ) {
my $enc = $1;
- if (lc($enc) =~ /^utf-?8$/) {
- binmode *STDOUT, ':utf8'; # faster than :encoding
- }
- else {
- binmode *STDOUT, ":encoding($enc)";
+ if ( lc $enc !~ /utf-?8$/ ) {
+ for my $str (@_) {
+ next unless $str;
+
+ # only encode perl internal strings
+ next unless utf8::is_utf8($str);
+ $str = Encode::encode( $enc, $str );
+ }
}
}
+
+ # default to utf8 encoding
+ for my $str (@_) {
+ next unless $str;
+ next unless utf8::is_utf8($str);
+ $str = Encode::encode( 'utf8', $str );
+ }
+
# 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
More information about the Pkg-perl-cvs-commits
mailing list