Integrate mainline into perlio

p4raw-id: //depot/perlio@16064

diff --cc ext/Encode/t/perlio.t
Simple merge

diff --cc ext/PerlIO/encoding/encoding.xs
index 09eeb45,23de989..a864c8a
--- 1/ext/PerlIO/encoding/encoding.xs
--- 2/ext/PerlIO/encoding/encoding.xs
+++ b/ext/PerlIO/encoding/encoding.xs
@@@ -302,15 -237,8 +302,15 @@@ PerlIOEncode_fill(pTHX_ PerlIO * f
            if (SvLEN(e->dataSV) && SvPVX(e->dataSV)) {
                Safefree(SvPVX(e->dataSV));
            }
-           if (use > e->base.bufsiz) {
+           if (use > (SSize_t)e->base.bufsiz) {
 -             use = e->base.bufsiz;
 +              if (e->flags & NEEDS_LINES) {
 +                  /* Have to grow buffer */
 +                  e->base.bufsiz = use;
 +                  PerlIOEncode_get_base(aTHX_ f);
 +              }
 +              else {
 +                  use = e->base.bufsiz;
 +              }
            }
            SvPVX(e->dataSV) = (char *) ptr;
            SvLEN(e->dataSV) = 0;  /* Hands off sv.c - it isn't yours */

diff --cc perl.h
Simple merge