IO:: PRINT returns a bool, not no of bytes written, pointed out by chansen

[catagits/fcgi2.git] / perl / FCGI.XL

diff --git a/perl/FCGI.XL b/perl/FCGI.XL
index 2586164..a7d0213 100644 (file)
--- a/perl/FCGI.XL
+++ b/perl/FCGI.XL
@@ -12,7 +12,7 @@ unless ($] >= 5.005) {
 print OUT while <DATA>;
 close OUT;
 __END__
-/* $Id: FCGI.XL,v 1.7 2001/10/11 19:36:04 skimo Exp $ */
+/* $Id: FCGI.XL,v 1.10 2003/06/22 00:24:11 robs Exp $ */
 
 #include "EXTERN.h"
 #include "perl.h"
@@ -141,9 +141,15 @@ FCGI_UndoBinding(FCGP_Request* request)
     sfdcdelfcgi(sfdisc(IoOFP(request->io[1]), SF_POPDISC));
     sfdcdelfcgi(sfdisc(IoOFP(request->io[2]), SF_POPDISC));
 #else
+#  ifdef USE_PERLIO
+    sv_unmagic((SV *)GvIOp(request->gv[0]), 'q');
+    sv_unmagic((SV *)GvIOp(request->gv[1]), 'q');
+    sv_unmagic((SV *)GvIOp(request->gv[2]), 'q');
+#  else
     sv_unmagic((SV *)request->gv[0], 'q');
     sv_unmagic((SV *)request->gv[1], 'q');
     sv_unmagic((SV *)request->gv[2], 'q');
+#  endif
 #endif
     request->bound = FALSE;
 }
@@ -158,9 +164,25 @@ FCGI_Bind(FCGP_Request* request)
     sfdisc(IoOFP(request->io[1]), sfdcnewfcgi(request->requestPtr->out));
     sfdisc(IoOFP(request->io[2]), sfdcnewfcgi(request->requestPtr->err));
 #else
+#  ifdef USE_PERLIO
+    /* For tied filehandles, we apply tiedscalar magic to the IO
+       slot of the GP rather than the GV itself. */
+
+    if (!GvIOp(request->gv[1]))
+       GvIOp(request->gv[1]) = newIO();
+    if (!GvIOp(request->gv[2]))
+       GvIOp(request->gv[2]) = newIO();
+    if (!GvIOp(request->gv[0]))
+       GvIOp(request->gv[0]) = newIO();
+
+    sv_magic((SV *)GvIOp(request->gv[1]), request->svout, 'q', Nullch, 0);
+    sv_magic((SV *)GvIOp(request->gv[2]), request->sverr, 'q', Nullch, 0);
+    sv_magic((SV *)GvIOp(request->gv[0]), request->svin, 'q', Nullch, 0);
+#  else
     sv_magic((SV *)request->gv[1], request->svout, 'q', Nullch, 0);
     sv_magic((SV *)request->gv[2], request->sverr, 'q', Nullch, 0);
     sv_magic((SV *)request->gv[0], request->svin, 'q', Nullch, 0);
+#  endif
 #endif
     request->bound = TRUE;
 }
@@ -465,8 +487,10 @@ Detach(request)
     PROTOTYPE: $
 
     CODE:
-    if (request->accepted && request->bound)
-       FCGI_UndoBinding(request);
+    if (request->accepted && request->bound) {
+        FCGI_UndoBinding(request);
+        FCGX_Detach(request->requestPtr);
+    }
 
 void
 Attach(request)
@@ -475,8 +499,10 @@ Attach(request)
     PROTOTYPE: $
 
     CODE:
-    if (request->accepted && !request->bound)
-       FCGI_Bind(request);
+    if (request->accepted && !request->bound) {
+        FCGI_Bind(request);
+        FCGX_Attach(request->requestPtr);
+    }
 
 void
 LastCall(request)
@@ -507,7 +533,7 @@ MODULE = FCGI               PACKAGE = FCGI::Stream
 
 #ifndef USE_SFIO
 
-void
+int
 PRINT(stream, ...)
        FCGI::Stream    stream;
 
@@ -515,13 +541,22 @@ PRINT(stream, ...)
        int     n;
 
        CODE:
-       for (n = 1; n < items; ++n) {
+    for (n = 1; n < items; ++n) {
             STRLEN len;
-            register char *tmps = (char *)SvPV(ST(n),len);
-            FCGX_PutStr(tmps, len, stream);
-       }
+            register char *tmps; 
+#ifdef DO_UTF8
+            if (DO_UTF8(ST(n)) && !sv_utf8_downgrade(ST(n), 1))
+                croak("Wide character in FCGI::Stream::PRINT");
+#endif
+            tmps = (char *)SvPV(ST(n),len);
+               FCGX_PutStr(tmps, len, stream);
+    }
        if (SvTRUEx(perl_get_sv("|", FALSE))) 
            FCGX_FFlush(stream);
+    RETVAL = 1;
+
+    OUTPUT:
+    RETVAL
 
 int
 WRITE(stream, bufsv, len, ...)
@@ -537,6 +572,10 @@ WRITE(stream, bufsv, len, ...)
 
        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)
@@ -546,7 +585,7 @@ WRITE(stream, bufsv, len, ...)
            ST(0) = &PL_sv_undef;
        else {
            ST(0) = sv_newmortal();
-           sv_setpvf(ST(0), "%c", n);
+           sv_setiv(ST(0), n);
        }
 
 int
@@ -561,6 +600,10 @@ READ(stream, bufsv, len, ...)
 
        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);