r52860 - in /branches/upstream/libfcgi-perl/current: ChangeLog FCGI.PL FCGI.XL MANIFEST META.yml os_unix.c version.pm

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Mon Feb 15 23:51:37 UTC 2010


Author: jawnsy-guest
Date: Mon Feb 15 23:51:33 2010
New Revision: 52860

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=52860
Log:
[svn-upgrade] Integrating new upstream version, libfcgi-perl (0.69)

Modified:
    branches/upstream/libfcgi-perl/current/ChangeLog
    branches/upstream/libfcgi-perl/current/FCGI.PL
    branches/upstream/libfcgi-perl/current/FCGI.XL
    branches/upstream/libfcgi-perl/current/MANIFEST
    branches/upstream/libfcgi-perl/current/META.yml
    branches/upstream/libfcgi-perl/current/os_unix.c
    branches/upstream/libfcgi-perl/current/version.pm

Modified: branches/upstream/libfcgi-perl/current/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfcgi-perl/current/ChangeLog?rev=52860&op=diff
==============================================================================
--- branches/upstream/libfcgi-perl/current/ChangeLog (original)
+++ branches/upstream/libfcgi-perl/current/ChangeLog Mon Feb 15 23:51:33 2010
@@ -1,3 +1,19 @@
+Version 0.69 --     15 Feb 2010  <mst at shadowcat.co.uk> Matt S Trout
+    o No changes since the previous development release.
+
+Version 0.68_02 --   13 Jan 2010  <mst at shadowcat.co.uk> Matt S Trout
+    o Make the PRINT method return a boolean value rather than the
+	  number of bytes written, previous patch was incorrect.
+
+Version 0.68_01 --   10 Jan 2010  <mst at shadowcat.co.uk> Matt S Trout
+    o Force signal handler installation so that we correctly install handlers
+      for SIGPIPE. Fixes RT#5100 <bobtfish at bobtfish.net>
+    o Make the PRINT method return the number of bytes written rather than
+      undef to be consistent with the IO:: interface. Fixes RT#24347
+      <David Dick>
+    o Fix UTF-8 double encoding when FCGI is passed octets by downgrading
+      them into bytes correctly. Fixes RT#52400 <chansen at cpan.org>
+
 Version 0.68 --     31 Dec 2009  <mst at shadowcat.co.uk> Matt S Trout
     o No changes since the previous development release.
 

Modified: branches/upstream/libfcgi-perl/current/FCGI.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfcgi-perl/current/FCGI.PL?rev=52860&op=diff
==============================================================================
--- branches/upstream/libfcgi-perl/current/FCGI.PL (original)
+++ branches/upstream/libfcgi-perl/current/FCGI.PL Mon Feb 15 23:51:33 2010
@@ -262,8 +262,9 @@
 sub PRINT {
     my ($stream) = shift;
     for (@_) {
-	$stream->{src}->write($stream->{type}, $_, length($_));
-    }
+        $stream->{src}->write($stream->{type}, $_, length($_));
+    }
+    return 1;
 }
 
 sub CLOSE {

Modified: branches/upstream/libfcgi-perl/current/FCGI.XL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfcgi-perl/current/FCGI.XL?rev=52860&op=diff
==============================================================================
--- branches/upstream/libfcgi-perl/current/FCGI.XL (original)
+++ branches/upstream/libfcgi-perl/current/FCGI.XL Mon Feb 15 23:51:33 2010
@@ -533,21 +533,31 @@
 
 #ifndef USE_SFIO
 
-void
+SV *
 PRINT(stream, ...)
 	FCGI::Stream	stream;
 
 	PREINIT:
-	int	n;
+    int n;
+    STRLEN len;
+    register char *str;
+    bool ok = TRUE;
 
 	CODE:
-	for (n = 1; n < items; ++n) {
-            STRLEN len;
-            register char *tmps = (char *)SvPV(ST(n),len);
-            FCGX_PutStr(tmps, len, stream);
-	}
-	if (SvTRUEx(perl_get_sv("|", FALSE))) 
-	    FCGX_FFlush(stream);
+    for (n = 1; ok && n < items; ++n) {
+#ifdef DO_UTF8
+        if (DO_UTF8(ST(n)) && !sv_utf8_downgrade(ST(n), 1))
+            croak("Wide character in FCGI::Stream::PRINT");
+#endif
+        str = (char *)SvPV(ST(n),len);
+        if (FCGX_PutStr(str, len, stream) < 0)
+            ok = FALSE;
+    }
+
+	if (ok && SvTRUEx(perl_get_sv("|", FALSE)) && FCGX_FFlush(stream) < 0)
+	    ok = FALSE;
+
+    RETVAL = ok ? &PL_sv_yes : &PL_sv_undef;
 
 int
 WRITE(stream, bufsv, len, ...)
@@ -563,6 +573,10 @@
 
 	CODE:
 	offset = (items == 4) ? (int)SvIV(ST(3)) : 0;
+#ifdef DO_UTF8
+    if (DO_UTF8(bufsv) && !sv_utf8_downgrade(bufsv, 1))
+         croak("Wide character in FCGI::Stream::WRITE");
+#endif
 	buf = SvPV(bufsv, blen);
 	if (offset < 0) offset += blen;
 	if (len > blen - offset)
@@ -572,7 +586,7 @@
 	    ST(0) = &PL_sv_undef;
 	else {
 	    ST(0) = sv_newmortal();
-	    sv_setpvf(ST(0), "%c", n);
+	    sv_setiv(ST(0), n);
 	}
 
 int
@@ -587,6 +601,10 @@
 
 	CODE:
 	offset = (items == 4) ? (int)SvIV(ST(3)) : 0;
+#ifdef DO_UTF8
+    if (DO_UTF8(bufsv) && !sv_utf8_downgrade(bufsv, 1))
+         croak("Wide character in FCGI::Stream::READ");
+#endif
 	if (! SvOK(bufsv))
 	    sv_setpvn(bufsv, "", 0);
 	buf = SvGROW(bufsv, len+offset+1);

Modified: branches/upstream/libfcgi-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfcgi-perl/current/MANIFEST?rev=52860&op=diff
==============================================================================
--- branches/upstream/libfcgi-perl/current/MANIFEST (original)
+++ branches/upstream/libfcgi-perl/current/MANIFEST Mon Feb 15 23:51:33 2010
@@ -15,7 +15,7 @@
 typemap
 version.pm
 META.yml                                 Module meta-data (added by MakeMaker)
--e LICENSE.TERMS
+LICENSE.TERMS
 fcgiapp.c
 os_unix.c
 os_win32.c

Modified: branches/upstream/libfcgi-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfcgi-perl/current/META.yml?rev=52860&op=diff
==============================================================================
--- branches/upstream/libfcgi-perl/current/META.yml (original)
+++ branches/upstream/libfcgi-perl/current/META.yml Mon Feb 15 23:51:33 2010
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               FCGI
-version:            0.68
+version:            0.69
 abstract:           Fast CGI module
 author:
     - Sven Verdoolaege (skimo at kotnet.org)

Modified: branches/upstream/libfcgi-perl/current/os_unix.c
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfcgi-perl/current/os_unix.c?rev=52860&op=diff
==============================================================================
--- branches/upstream/libfcgi-perl/current/os_unix.c (original)
+++ branches/upstream/libfcgi-perl/current/os_unix.c Mon Feb 15 23:51:33 2010
@@ -181,7 +181,7 @@
     FD_ZERO(&readFdSetPost);
     FD_ZERO(&writeFdSetPost);
 
-    OS_InstallSignalHandlers(FALSE);
+    OS_InstallSignalHandlers(TRUE);
 
     libInitialized = TRUE;
 

Modified: branches/upstream/libfcgi-perl/current/version.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfcgi-perl/current/version.pm?rev=52860&op=diff
==============================================================================
--- branches/upstream/libfcgi-perl/current/version.pm (original)
+++ branches/upstream/libfcgi-perl/current/version.pm Mon Feb 15 23:51:33 2010
@@ -1,3 +1,3 @@
 package FCGI;
 
-$VERSION = '0.68';
+$VERSION = '0.69';




More information about the Pkg-perl-cvs-commits mailing list