INN commit: trunk (CONTRIBUTORS innd/perl.c lib/perl.c nnrpd/perl.c)

[INN Commit]

    Date: Monday, May 5, 2008 @ 01:38:38
  Author: iulius
Revision: 7814

Perl 5.10 support for INN.
Thanks, Jakub Bogusz, for the patch.

Modified:
  trunk/CONTRIBUTORS
  trunk/innd/perl.c
  trunk/lib/perl.c
  trunk/nnrpd/perl.c

--------------+
 CONTRIBUTORS |    2 +-
 innd/perl.c  |    3 ++-
 lib/perl.c   |   16 ++++++++++------
 nnrpd/perl.c |    3 ++-
 4 files changed, 15 insertions(+), 9 deletions(-)

Modified: CONTRIBUTORS
===================================================================
--- CONTRIBUTORS	2008-04-30 07:08:14 UTC (rev 7813)
+++ CONTRIBUTORS	2008-05-05 08:38:38 UTC (rev 7814)
@@ -266,4 +266,4 @@
 Chris Caputo, Thomas Parleman, Adam J. Richter, Jim Dutton, Julien Elie,
 Ray Miller, Andreas M. Kirchwitz, Andrey Yakovlev, Christoph Biedl,
 Kai Gallasch, Ollivier Robert, Ivan Shmakov, Kachun Lee, Kirill Berezin,
-D. Stussy, Alan Schwartz, Shalon Wood, Nick Couchman
+D. Stussy, Alan Schwartz, Shalon Wood, Nick Couchman, Jakub Bogusz

Modified: innd/perl.c
===================================================================
--- innd/perl.c	2008-04-30 07:08:14 UTC (rev 7813)
+++ innd/perl.c	2008-05-05 08:38:38 UTC (rev 7814)
@@ -255,6 +255,7 @@
 PLstats(void)
 {
     dSP;
+    char *argv[] = { NULL };
     
     if (perl_get_cv("filter_stats", false) == NULL)
         return NULL;
@@ -264,7 +265,7 @@
 
 	ENTER;
 	SAVETMPS;
-	perl_call_argv("filter_stats", G_EVAL | G_NOARGS, NULL);
+	perl_call_argv("filter_stats", G_EVAL | G_NOARGS, argv);
 	SPAGAIN;
         result = POPp;
         if (result != NULL && *result)

Modified: lib/perl.c
===================================================================
--- lib/perl.c	2008-04-30 07:08:14 UTC (rev 7813)
+++ lib/perl.c	2008-05-05 08:38:38 UTC (rev 7814)
@@ -65,6 +65,7 @@
 PerlFilter(bool value)
 {
     dSP;
+    char *argv[] = { NULL };
 
     if (value == PerlFilterActive)
         return true;
@@ -74,7 +75,7 @@
         if (perl_get_cv("filter_end", false) != NULL) {
             ENTER;
             SAVETMPS;
-            perl_call_argv("filter_end", G_EVAL | G_DISCARD | G_NOARGS, NULL);
+            perl_call_argv("filter_end", G_EVAL | G_DISCARD | G_NOARGS, argv);
             if (SvTRUE(ERRSV)) {
                 syslog (L_ERROR, "SERVER perl function filter_end died: %s",
                         SvPV(ERRSV, PL_na));
@@ -175,11 +176,10 @@
     ENTER ;
     SAVETMPS ;
     
-    argv[0] = filterfile ;
-    argv[1] = NULL ;
-    
+    argv[0] = NULL;
+
     if (perl_get_cv("filter_before_reload", false) != NULL)    {
-        perl_call_argv("filter_before_reload",G_EVAL|G_DISCARD|G_NOARGS,NULL);
+        perl_call_argv("filter_before_reload", G_EVAL|G_DISCARD|G_NOARGS, argv);
         if (SvTRUE(ERRSV))     /* check $@ */ {
             syslog (L_ERROR,"SERVER perl function filter_before_reload died: %s",
                     SvPV(ERRSV, PL_na)) ;
@@ -188,6 +188,9 @@
         }
     }
 
+    argv[0] = filterfile ;
+    argv[1] = NULL ;
+    
     PerlSilence();
     perl_call_argv ("_load_", 0, argv) ;
     PerlUnSilence();
@@ -212,8 +215,9 @@
         PerlFilter (false) ;
     }
     
+    argv[0] = NULL;
     if (perl_get_cv("filter_after_reload", false) != NULL) {
-        perl_call_argv("filter_after_reload", G_EVAL|G_DISCARD|G_NOARGS, NULL);
+        perl_call_argv("filter_after_reload", G_EVAL|G_DISCARD|G_NOARGS, argv);
         if (SvTRUE(ERRSV))     /* check $@ */ {
             syslog (L_ERROR,"SERVER perl function filter_after_reload died: %s",
                     SvPV(ERRSV, PL_na)) ;

Modified: nnrpd/perl.c
===================================================================
--- nnrpd/perl.c	2008-04-30 07:08:14 UTC (rev 7813)
+++ nnrpd/perl.c	2008-05-05 08:38:38 UTC (rev 7814)
@@ -64,6 +64,7 @@
    HE            *scan;
    SV            *modswitch;
    int            OtherSize;
+   char *argv[] = { NULL };
 
    if(!PerlLoaded) {
        loadPerl();
@@ -113,7 +114,7 @@
    sv_setpv(body, article);
 
    /* Call the filtering function */
-   rc = perl_call_argv("filter_post", G_EVAL|G_SCALAR, NULL);
+   rc = perl_call_argv("filter_post", G_EVAL|G_SCALAR, argv);
 
    SPAGAIN;