sourcegarden (fwd)
-- Forwarded message -- Date: Thu, 1 Feb 2001 18:52:02 +0100 From: Emmanuel Pierre <[EMAIL PROTECTED]> To: [EMAIL PROTECTED] Subject: sourcegarden hi doug, I have a forbidden on this site pointed by perl.apache.org http://modperl.sourcegarden.org/ Cordialement, Emmanuel PIERRE Directeur Informatique et développements _ APR-Job & www.jobscout24.fr - Meet your future _ HumanLine France SAS 9, rue de Lens 92000 Nanterre tel: +33 1 47 81 02 41 fax: +33 1 46 49 05 26 [EMAIL PROTECTED]
cvs commit: modperl-2.0/src/modules/perl modperl_callback.c modperl_config.c modperl_filter.c modperl_gtop.c modperl_interp.c
dougm 01/02/08 11:42:31
Modified:src/modules/perl modperl_callback.c modperl_config.c
modperl_filter.c modperl_gtop.c modperl_interp.c
Log:
adjust to recent apr name changes
Revision ChangesPath
1.16 +2 -2 modperl-2.0/src/modules/perl/modperl_callback.c
Index: modperl_callback.c
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_callback.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- modperl_callback.c2001/01/02 06:40:19 1.15
+++ modperl_callback.c2001/02/08 19:42:02 1.16
@@ -30,8 +30,8 @@
break;
};
-apr_register_cleanup(p, (void*)handler,
- modperl_handler_cleanup, apr_null_cleanup);
+apr_pool_cleanup_register(p, (void*)handler,
+ modperl_handler_cleanup, apr_pool_cleanup_null);
return handler;
}
1.17 +4 -4 modperl-2.0/src/modules/perl/modperl_config.c
Index: modperl_config.c
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_config.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- modperl_config.c 2001/01/18 18:44:00 1.16
+++ modperl_config.c 2001/02/08 19:42:05 1.17
@@ -6,13 +6,13 @@
modperl_handler_t *h = modperl_handler_new(p, (void*)name,
MP_HANDLER_TYPE_CHAR);
if (!*handlers) {
-*handlers = apr_make_array(p, 1, sizeof(modperl_handler_t *));
+*handlers = apr_array_make(p, 1, sizeof(modperl_handler_t *));
MP_TRACE_d(MP_FUNC, "created handler stack\n");
}
/* XXX parse_handler if Perl is running */
-*(modperl_handler_t **)apr_push_array(*handlers) = h;
+*(modperl_handler_t **)apr_array_push(*handlers) = h;
MP_TRACE_d(MP_FUNC, "pushed handler: %s\n", h->name);
return NULL;
@@ -50,7 +50,7 @@
}
#define scfg_push_argv(arg) \
-*(const char **)apr_push_array(scfg->argv) = arg
+*(const char **)apr_array_push(scfg->argv) = arg
modperl_srv_config_t *modperl_srv_config_new(apr_pool_t *p)
{
@@ -61,7 +61,7 @@
MpSrvENABLED_On(scfg); /* mod_perl enabled by default */
MpSrvHOOKS_ALL_On(scfg); /* all hooks enabled by default */
-scfg->argv = apr_make_array(p, 2, sizeof(char *));
+scfg->argv = apr_array_make(p, 2, sizeof(char *));
scfg_push_argv((char *)ap_server_argv0);
1.4 +2 -2 modperl-2.0/src/modules/perl/modperl_filter.c
Index: modperl_filter.c
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- modperl_filter.c 2001/01/20 21:19:08 1.3
+++ modperl_filter.c 2001/02/08 19:42:08 1.4
@@ -6,7 +6,7 @@
const char *buf, apr_ssize_t len)
{
apr_bucket_brigade *bb = apr_brigade_create(wb->pool);
-apr_bucket *bucket = apr_bucket_create_transient(buf, len);
+apr_bucket *bucket = apr_bucket_transient_create(buf, len);
APR_BRIGADE_INSERT_TAIL(bb, bucket);
return ap_pass_brigade(wb->filters, bb);
}
@@ -133,7 +133,7 @@
MP_INLINE static apr_status_t send_eos(ap_filter_t *f)
{
apr_bucket_brigade *bb = apr_brigade_create(f->r->pool);
-apr_bucket *b = apr_bucket_create_eos();
+apr_bucket *b = apr_bucket_eos_create();
APR_BRIGADE_INSERT_TAIL(bb, b);
return ap_pass_brigade(f->next, bb);
}
1.5 +2 -2 modperl-2.0/src/modules/perl/modperl_gtop.c
Index: modperl_gtop.c
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_gtop.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- modperl_gtop.c2000/08/14 03:10:45 1.4
+++ modperl_gtop.c2001/02/08 19:42:11 1.5
@@ -42,8 +42,8 @@
gtop->pid = getpid();
glibtop_init();
-apr_register_cleanup(p, NULL,
- modperl_gtop_exit, apr_null_cleanup);
+apr_pool_cleanup_register(p, NULL,
+ modperl_gtop_exit, apr_pool_cleanup_null);
return gtop;
}
1.17 +10 -9 modperl-2.0/src/modules/perl/modperl_interp.c
Index: modperl_interp.c
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_interp.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- modperl_interp.c 2000/08/14 03:10:45 1.16
+++ modperl_interp.c 2001/
cvs commit: modperl-2.0/lib/Apache Build.pm
dougm 01/02/08 11:30:56
Modified:lib/Apache Build.pm
Log:
version has moved to ap_release.h
Revision ChangesPath
1.30 +1 -1 modperl-2.0/lib/Apache/Build.pm
Index: Build.pm
===
RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Build.pm 2001/02/08 19:20:18 1.29
+++ Build.pm 2001/02/08 19:30:44 1.30
@@ -534,7 +534,7 @@
return $v;
}
-open my $fh, "$dir/httpd.h" or return undef;
+open my $fh, "$dir/ap_release.h" or return undef;
my $version;
while(<$fh>) {
cvs commit: modperl-2.0/src/modules/perl modperl_types.h
dougm 01/02/08 11:20:48
Modified:lib/Apache Build.pm
lib/ModPerl MM.pm
src/modules/perl modperl_types.h
Log:
various changes for the xs generator
Revision ChangesPath
1.29 +7 -7 modperl-2.0/lib/Apache/Build.pm
Index: Build.pm
===
RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Build.pm 2001/01/21 20:51:35 1.28
+++ Build.pm 2001/02/08 19:20:18 1.29
@@ -308,9 +308,9 @@
}
sub file_path {
-my($self, $file) = @_;
-return $file if $file =~ m:^/:;
-join '/', $self->{cwd}, $file;
+my $self = shift;
+my @files = map { m:^/: ? $_ : join('/', $self->{cwd}, $_) } @_;
+return wantarray ? @files : $files[0];
}
sub freeze {
@@ -336,6 +336,8 @@
sub save {
my($self, $file) = @_;
+delete $INC{$bpm};
+
$file ||= $self->default_file('build_config');
$file = $self->file_path($file);
@@ -359,7 +361,7 @@
1;
EOF
-close $fh;
+close $fh or die "failed to write $file: $!";
}
#--- attribute access ---
@@ -586,8 +588,6 @@
(my $c = $xs) =~ s:.*/(\w+)\.xs$:$1.c:;
push @files, $c;
-$xs = "../../../$xs"; #XXX
-
push @xs_targ, < \$*.xsc && \$(MODPERL_MV) \$*.xsc \$@
@@ -775,7 +775,7 @@
my $self = shift;
my $src = $self->dir;
my $os = is_win32 ? 'win32' : 'unix';
-my @inc = $self->file_path("src/modules/perl");
+my @inc = $self->file_path("src/modules/perl", "xs");
my $ainc = $self->apxs('-q' => 'INCLUDEDIR');
if (-d $ainc) {
1.5 +13 -5 modperl-2.0/lib/ModPerl/MM.pm
Index: MM.pm
===
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/MM.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MM.pm 2001/01/02 06:40:19 1.4
+++ MM.pm 2001/02/08 19:20:28 1.5
@@ -4,6 +4,7 @@
use warnings;
use ExtUtils::MakeMaker ();
use ExtUtils::Install ();
+use Cwd ();
#to override MakeMaker MOD_INSTALL macro
sub mod_install {
@@ -54,10 +55,17 @@
my $build = build_config();
my_import();
my @opts = (INC => $build->inc, CCFLAGS => $build->ap_ccopts);
-my $typemap = $build->file_path('src/modules/perl/typemap');
-if (-e $typemap) {
-push @opts, TYPEMAPS => [$typemap];
+
+my @typemaps;
+my $pwd = Cwd::fastcwd();
+for ('xs', $pwd, "$pwd/..") {
+my $typemap = $build->file_path("$_/typemap");
+if (-e $typemap) {
+push @typemaps, $typemap;
+}
}
+push @opts, TYPEMAPS => \@typemaps if @typemaps;
+
ExtUtils::MakeMaker::WriteMakefile(@opts, @_);
}
@@ -90,8 +98,8 @@
$self->{HAS_LINK_CODE} = 0;
print "$name will be linked static\n";
#propagate static xs module to src/modules/perl/Makefile
-$build->{XS}->{$name} = join '/',
- $self->{BASEEXT}, $xs;
+$build->{XS}->{$name} =
+ join '/', Cwd::fastcwd(), $xs;
$build->save;
}
}
1.20 +0 -14 modperl-2.0/src/modules/perl/modperl_types.h
Index: modperl_types.h
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_types.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- modperl_types.h 2001/01/20 21:19:09 1.19
+++ modperl_types.h 2001/02/08 19:20:40 1.20
@@ -6,20 +6,6 @@
typedef apr_array_header_t MpAV;
typedef apr_table_tMpHV;
-/* xs typemap */
-
-typedef request_rec * Apache;
-typedef request_rec * Apache__SubRequest;
-typedef conn_rec* Apache__Connection;
-typedef server_rec * Apache__Server;
-
-typedef cmd_parms * Apache__CmdParms;
-typedef module * Apache__Module;
-typedef command_rec * Apache__Command;
-
-typedef apr_table_t * Apache__table;
-typedef apr_pool_t* Apache__Pool;
-
/* mod_perl structures */
typedef struct {
January 2001 mod_perl numbers
Hi Doug, The mod_perl figures for January 2001 are: mod_perl: 2001011 Domains, 225123 IP Addresses Yours, Matt. -- Matthew Hunt http://www.netcraft.com/ [EMAIL PROTECTED] Voice +44 (0)1225 867975Fax +44 (0)1225 867700 Netcraft, Treenwood House, Rowden Lane, Bradford on Avon, BA15 2AZ, UK
