dougm 01/10/09 11:01:21
Modified: t/conf modperl_extra.pl
xs/Apache/ServerUtil Apache__ServerUtil.h
xs/maps modperl_functions.map
Log:
add Apache->server method
Revision Changes Path
1.9 +10 -0 modperl-2.0/t/conf/modperl_extra.pl
Index: modperl_extra.pl
===================================================================
RCS file: /home/cvs/modperl-2.0/t/conf/modperl_extra.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- modperl_extra.pl 2001/09/28 17:15:08 1.8
+++ modperl_extra.pl 2001/10/09 18:01:21 1.9
@@ -3,6 +3,7 @@
use Apache::RequestUtil ();
use Apache::Server ();
+use Apache::ServerUtil ();
use Apache::Connection ();
use Apache::Log ();
@@ -22,6 +23,15 @@
Apache::Log->info("$ap_mods Apache:: modules loaded");
Apache::Server->log->info("$apr_mods APR:: modules loaded");
+
+{
+ my $server = Apache->server;
+ my $vhosts = 0;
+ for (my $s = $server->next; $s; $s = $s->next) {
+ $vhosts++;
+ }
+ $server->log->info("base server + $vhosts vhosts ready to run tests");
+}
sub ModPerl::Test::read_post {
my $r = shift;
1.3 +3 -0 modperl-2.0/xs/Apache/ServerUtil/Apache__ServerUtil.h
Index: Apache__ServerUtil.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/Apache/ServerUtil/Apache__ServerUtil.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Apache__ServerUtil.h 2001/09/28 20:13:08 1.2
+++ Apache__ServerUtil.h 2001/10/09 18:01:21 1.3
@@ -41,3 +41,6 @@
#define mpxs_Apache__Server_dir_config(s, key, sv_val) \
modperl_dir_config(aTHX_ NULL, s, key, sv_val)
+
+#define mpxs_Apache_server(classname) \
+modperl_global_get_server_rec()
1.24 +4 -1 modperl-2.0/xs/maps/modperl_functions.map
Index: modperl_functions.map
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/maps/modperl_functions.map,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- modperl_functions.map 2001/10/08 23:44:17 1.23
+++ modperl_functions.map 2001/10/09 18:01:21 1.24
@@ -43,8 +43,11 @@
mpxs_Apache__Server_set_handlers
mpxs_Apache__Server_get_handlers
-MODULE=Apache::ServerUtil PACKAGE=Apache::Server
+PACKAGE=Apache::Server
SV *:DEFINE_dir_config | | server_rec *:s, char *:key=NULL, SV *:sv_val=&PL_sv_no
+
+PACKAGE=Apache
+ server_rec *:DEFINE_server | | SV *:classname=Nullsv
MODULE=Apache::Filter
modperl_filter_attributes | MPXS_ | ... | MODIFY_CODE_ATTRIBUTES
