Mailing List Archive: cvs commit: modperl/t/internal stacked.t

dougm 98/06/12 11:29:11

Modified: . Makefile.PL ToDo apache-modlist.html
t/internal stacked.t
Log:
map ADD_MODULE to proper apaci --option=...
thanks to Ralf for his hints!

Revision Changes Path
1.47 +15 -0 modperl/Makefile.PL

Index: Makefile.PL
===================================================================
RCS file: /export/home/cvs/modperl/Makefile.PL,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Makefile.PL 1998/06/11 22:12:51 1.46
+++ Makefile.PL 1998/06/12 18:29:07 1.47
@@ -738,6 +738,16 @@
if($APACHE_PREFIX and $APACI_ARGS !~ /--prefix=/) {
$cmd .= " --prefix=$APACHE_PREFIX";
}
+ if($ADD_MODULE) {
+ for (split ",", $ADD_MODULE) {
+ if(/([a-zA-Z0-9][a-zA-Z0-9_]*)/) {
+ $cmd .= " --enable-module=$1";
+ }
+ elsif(m:(src/modules/[^/]+/[a-zA-Z0-9][a-zA-Z0-9_]*):) {
+ $cmd .= " --activate-module=$1";
+ }
+ }
+ }
print "(cd $APACHE_ROOT && $cmd)\n";
system "(cd $APACHE_ROOT && $cmd)";
}
@@ -1046,9 +1056,14 @@
sub MY::test {
my $self = shift;
my $test = $self->MM::test;
+ my $mmn = magic_number($APACHE_SRC);
return <<'EOF' if $USE_APXS;
test:
@echo "Can't make test with APXS (yet)"
+EOF
+ return <<'EOF' if $USE_DSO and ($mmn <= 19980527);
+test:
+ @echo "Can't make test with DSO (yet)"
EOF

my $script = "t/TEST";

1.33 +20 -0 modperl/ToDo

Index: ToDo
===================================================================
RCS file: /export/home/cvs/modperl/ToDo,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ToDo 1998/06/07 17:58:41 1.32
+++ ToDo 1998/06/12 18:29:08 1.33
@@ -142,6 +142,26 @@
---------------------------------------------------------------------------
NEW STUFF
---------------------------------------------------------------------------
+- Apache::read_client_block should use safemalloc/safefree, rather
+ than palloc, so memory is released after each read(), rather than at
+ the end of a request. (e.g. so file uploads don't cause too much growth)
+
+--- Apache.xs 1998/06/05 02:08:17 1.30
++++ Apache.xs 1998/06/12 14:18:22
+@@ -911,11 +911,12 @@
+ long nrd = 0;
+
+ PPCODE:
+- buffer = (char*)palloc(r->pool, bufsiz);
++ buffer = (char*)safemalloc(bufsiz);
+ PERL_READ_FROM_CLIENT;
+ if ( nrd > 0 ) {
+ XPUSHs(sv_2mortal(newSViv((long)nrd)));
+ sv_setpvn((SV*)ST(1), buffer, nrd);
++ safefree(buffer);
+ SvTAINTED_on((SV*)ST(1));
+ }
+ else {

- option to set uid/gid before running any Perl code (copy-n-paste
from http_main.c)

1.21 +4 -2 modperl/apache-modlist.html

Index: apache-modlist.html
===================================================================
RCS file: /export/home/cvs/modperl/apache-modlist.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- apache-modlist.html 1998/06/09 16:53:08 1.20
+++ apache-modlist.html 1998/06/12 18:29:08 1.21
@@ -1,13 +1,13 @@
<html>
<head>
<title>The Apache/Perl Module List</title>
-
+
</head>
<body>
<h1>The Apache/Perl Module List</h1>

Maintained by <a href="mailto:dougm@osf.org">Doug MacEachern</a>,
-<br><i> $Revision: 1.20 $ $Date: 1998/06/09 16:53:08 $</i>
+<br><i> $Revision: 1.21 $ $Date: 1998/06/12 18:29:08 $</i>

<h3>Contents</h3>
<a href="#intro">Introduction</a><br>
@@ -75,6 +75,7 @@
ePerl Rdpr Fast emulated Embedded Perl (ePerl) RSE
FTP i Full-fledged FTP proxy PMKANE
GzipChain bmpf Compress files on the fly ANDK
+IDC_HTX i PTI
JavaScript bdpf Generate JavaScript code ABH
ModuleDoc bdpf Self documentation for Apache C modules DOUGM
OutputChain bmpO Chain output of stacked handlers JANPAZ
@@ -253,6 +254,7 @@
PETERSON Jonathan Peterson <jon@amxstudios.com>
PLISTER Peter Lister <p.lister@cranfield.ac.uk>
PMKANE Patrick Michael Kane <modus@pr.es.to>
+PTI Peter Tillemans <pti@pandora.be>
RMANGI Rick Mangi <rmangi@tgix.com>
ROBH Rob Hartill <robh@imdb.com>
RSE Ralf S. Engelschall <rse@engelschall.com>

1.3 +2 -1 modperl/t/internal/stacked.t

Index: stacked.t
===================================================================
RCS file: /export/home/cvs/modperl/t/internal/stacked.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- stacked.t 1998/04/28 02:26:26 1.2
+++ stacked.t 1998/06/12 18:29:10 1.3
@@ -1,6 +1,7 @@
use Apache::test;

-skip_test unless $net::callback_hooks{PERL_STACKED_HANDLERS};
+skip_test unless $net::callback_hooks{PERL_STACKED_HANDLERS} and
+ $net::callback_hooks{PERL_FIXUP};
die "can't open http://$net::httpserver/$net::perldir/stacked\n"
unless simple_fetch "/stacked";
print fetch "/chain/";