Integrate from maint-5.8 : changes 18290-1, 18293-5, 18297

[p5sagit/p5-mst-13.2.git] / taint.c

diff --git a/taint.c b/taint.c
index ac7a841..4ca7ba7 100644 (file)
--- a/taint.c
+++ b/taint.c
@@ -57,7 +57,7 @@ Perl_taint_proper(pTHX_ const char *f, const char *s)
            ug = " while running with -T switch";
        if (PL_unsafe || PL_taint_warn) {
             if(ckWARN(WARN_TAINT))
-                Perl_warner(aTHX_ WARN_TAINT, f, s, ug);
+                Perl_warner(aTHX_ packWARN(WARN_TAINT), f, s, ug);
         }
         else {
             Perl_croak(aTHX_ f, s, ug);
@@ -129,7 +129,7 @@ Perl_taint_env(pTHX)
        PL_tainted = was_tainted;
        if (t < e && isALNUM(*t))
            t++;
-       while (t < e && (isALNUM(*t) || *t == '-' || *t == ':'))
+       while (t < e && (isALNUM(*t) || strchr("-_.+", *t)))
            t++;
        if (t < e) {
            TAINT;