stas 2004/07/09 01:01:22
Modified: . Changes
ModPerl-Registry/t/conf modperl_extra_startup.pl
lib/Apache PerlSections.pm compat.pm
src/modules/perl modperl_callback.c modperl_util.c
t/conf modperl_extra.pl
t/hooks/TestHooks startup.pm
t/htdocs/vhost startup.pl
t/response/TestAPI conn_rec.pm request_rec.pm server_rec.pm
t/response/TestDirective perlloadmodule3.pm
perlloadmodule4.pm perlloadmodule5.pm
perlloadmodule6.pm
t/response/TestModperl dir_config.pm merge.pm
t/response/TestModules proxy.pm
xs/Apache/Log Apache__Log.h
xs/Apache/ServerUtil Apache__ServerUtil.h
xs/maps apache_types.map modperl_functions.map
xs/tables/current/ModPerl FunctionTable.pm
Log:
In order to be consistent with Apache::RequestRec, Apache::Server is
now Apache::ServerRec and all methods/functions from Apache::Server
now live in Apache::ServerRec.
Revision Changes Path
1.406 +4 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -u -r1.405 -r1.406
--- Changes 7 Jul 2004 19:46:48 -0000 1.405
+++ Changes 9 Jul 2004 08:01:19 -0000 1.406
@@ -12,6 +12,10 @@
=item 1.99_15-dev
+In order to be consistent with Apache::RequestRec, Apache::Server is
+now Apache::ServerRec and all methods/functions from Apache::Server
+now live in Apache::ServerRec. [Stas]
+
Use a context-specific Perl_load_module() instead of load_module(), to
avoid the problem with 'load_module' symbol resolution on certain
platforms, where for some reason it doesn't get resolved at compile
1.17 +3 -3 modperl-2.0/ModPerl-Registry/t/conf/modperl_extra_startup.pl
Index: modperl_extra_startup.pl
===================================================================
RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/t/conf/modperl_extra_startup.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -u -r1.16 -r1.17
--- modperl_extra_startup.pl 8 Jul 2004 07:35:06 -0000 1.16
+++ modperl_extra_startup.pl 9 Jul 2004 08:01:20 -0000 1.17
@@ -5,14 +5,14 @@
use APR::Error;
use ModPerl::RegistryLoader ();
-use Apache::Server ();
+use Apache::ServerRec ();
use Apache::ServerUtil ();
use Apache::Process ();
use DirHandle ();
my $pool = Apache->server->process->pool;
-my $base_dir = Apache::Server::server_root_relative($pool, "cgi-bin");
+my $base_dir = Apache::ServerRec::server_root_relative($pool, "cgi-bin");
# test the scripts pre-loading by explicitly specifying uri => filename
my $rl = ModPerl::RegistryLoader->new(package => "ModPerl::Registry");
@@ -29,7 +29,7 @@
sub trans {
my $uri = shift;
$uri =~ s|^/registry_bb/|cgi-bin/|;
- return Apache::Server::server_root_relative($pool, $uri);
+ return Apache::ServerRec::server_root_relative($pool, $uri);
}
my $rl = ModPerl::RegistryLoader->new(
1.5 +1 -1 modperl-2.0/lib/Apache/PerlSections.pm
Index: PerlSections.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/Apache/PerlSections.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- PerlSections.pm 4 Mar 2004 06:01:05 -0000 1.4
+++ PerlSections.pm 9 Jul 2004 08:01:20 -0000 1.5
@@ -22,7 +22,7 @@
use Apache::CmdParms ();
use Apache::Directive ();
use APR::Table ();
-use Apache::Server ();
+use Apache::ServerRec ();
use Apache::ServerUtil ();
use Apache::Const -compile => qw(OK);
1.110 +3 -3 modperl-2.0/lib/Apache/compat.pm
Index: compat.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/Apache/compat.pm,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -u -r1.109 -r1.110
--- compat.pm 2 Jul 2004 20:42:58 -0000 1.109
+++ compat.pm 9 Jul 2004 08:01:20 -0000 1.110
@@ -37,7 +37,7 @@
use Apache::RequestRec ();
use Apache::SubRequest ();
use Apache::Connection ();
-use Apache::Server ();
+use Apache::ServerRec ();
use Apache::ServerUtil ();
use Apache::Access ();
use Apache::RequestIO ();
@@ -157,10 +157,10 @@
'Apache::server_root_relative' => <<'EOI',
{
- require Apache::Server;
+ require Apache::ServerRec;
require Apache::ServerUtil;
- my $orig_sub = *Apache::Server::server_root_relative{CODE};
+ my $orig_sub = *Apache::ServerRec::server_root_relative{CODE};
*Apache::server_root_relative = sub {
my $class = shift;
return Apache->server->server_root_relative(@_);
1.75 +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.74
retrieving revision 1.75
diff -u -u -r1.74 -r1.75
--- modperl_callback.c 7 Jul 2004 18:48:41 -0000 1.74
+++ modperl_callback.c 9 Jul 2004 08:01:20 -0000 1.75
@@ -249,12 +249,12 @@
"Apache::Pool", pconf,
"Apache::Pool", plog,
"Apache::Pool", ptemp,
- "Apache::Server", s, NULL);
+ "Apache::ServerRec", s, NULL);
break;
case MP_HANDLER_TYPE_PROCESS:
modperl_handler_make_args(aTHX_ &av_args,
"Apache::Pool", pconf,
- "Apache::Server", s, NULL);
+ "Apache::ServerRec", s, NULL);
break;
};
1.73 +2 -2 modperl-2.0/src/modules/perl/modperl_util.c
Index: modperl_util.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_util.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -u -r1.72 -r1.73
--- modperl_util.c 7 Jul 2004 19:46:48 -0000 1.72
+++ modperl_util.c 9 Jul 2004 08:01:20 -0000 1.73
@@ -233,7 +233,7 @@
}
break;
case 'S':
- if (strEQ(classname, "Server")) {
+ if (strEQ(classname, "ServerRec")) {
p = ((server_rec *)ptr)->process->pconf;
}
break;
@@ -713,7 +713,7 @@
}
/* this is used across server_root_relative() in the
- * Apache, Apache::Server, Apache::RequestRec, and
+ * Apache, Apache::ServerRec, Apache::RequestRec, and
* Apache::Connection classes
*/
SV *modperl_server_root_relative(pTHX_ SV *sv, const char *fname)
1.54 +3 -3 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.53
retrieving revision 1.54
diff -u -u -r1.53 -r1.54
--- modperl_extra.pl 8 Jul 2004 06:54:58 -0000 1.53
+++ modperl_extra.pl 9 Jul 2004 08:01:20 -0000 1.54
@@ -10,7 +10,7 @@
# XXX: temp workaround for t/filter/TestFilter/in_error.pm
use APR::Error;
-use Apache::Server ();
+use Apache::ServerRec ();
use Apache::ServerUtil ();
use Apache::Process ();
@@ -19,7 +19,7 @@
# perl core libs
my $pool = Apache->server->process->pool;
my $project_root = canonpath
- Apache::Server::server_root_relative($pool, "..");
+ Apache::ServerRec::server_root_relative($pool, "..");
my (@a, @b, @c);
for (@INC) {
if (m|^\Q$project_root\E|) {
@@ -60,7 +60,7 @@
my $apr_mods = scalar grep { /^APR/ } keys %INC;
Apache::Log->info("$ap_mods Apache:: modules loaded");
-Apache::Server->log->info("$apr_mods APR:: modules loaded");
+Apache::ServerRec->log->info("$apr_mods APR:: modules loaded");
{
my $server = Apache->server;
1.4 +1 -1 modperl-2.0/t/hooks/TestHooks/startup.pm
Index: startup.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/hooks/TestHooks/startup.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- startup.pm 9 Mar 2004 20:46:13 -0000 1.3
+++ startup.pm 9 Jul 2004 08:01:21 -0000 1.4
@@ -11,7 +11,7 @@
use Apache::TestTrace;
use APR::Table;
-use Apache::Server ();
+use Apache::ServerRec ();
use Apache::ServerUtil ();
use Apache::RequestRec ();
use Apache::RequestIO ();
1.4 +1 -1 modperl-2.0/t/htdocs/vhost/startup.pl
Index: startup.pl
===================================================================
RCS file: /home/cvs/modperl-2.0/t/htdocs/vhost/startup.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- startup.pl 5 Mar 2004 18:19:15 -0000 1.3
+++ startup.pl 9 Jul 2004 08:01:21 -0000 1.4
@@ -3,7 +3,7 @@
use Apache2;
use Apache::ServerUtil ();
-use Apache::Server ();
+use Apache::ServerRec ();
use File::Spec::Functions qw(catdir);
1.11 +1 -1 modperl-2.0/t/response/TestAPI/conn_rec.pm
Index: conn_rec.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/conn_rec.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -u -r1.10 -r1.11
--- conn_rec.pm 8 Jul 2004 05:29:42 -0000 1.10
+++ conn_rec.pm 9 Jul 2004 08:01:21 -0000 1.11
@@ -27,7 +27,7 @@
ok $c->pool->isa('APR::Pool');
- ok $c->base_server->isa('Apache::Server');
+ ok $c->base_server->isa('Apache::ServerRec');
ok $c->client_socket->isa('APR::Socket');
1.20 +1 -1 modperl-2.0/t/response/TestAPI/request_rec.pm
Index: request_rec.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/request_rec.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -u -r1.19 -r1.20
--- request_rec.pm 8 Jul 2004 05:29:42 -0000 1.19
+++ request_rec.pm 9 Jul 2004 08:01:21 -0000 1.20
@@ -42,7 +42,7 @@
ok $r->connection->isa('Apache::Connection');
- ok $r->server->isa('Apache::Server');
+ ok $r->server->isa('Apache::ServerRec');
for (qw(next prev main)) {
ok (! $r->$_()) || $r->$_()->isa('Apache::RequestRec');
1.9 +1 -1 modperl-2.0/t/response/TestAPI/server_rec.pm
Index: server_rec.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/server_rec.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- server_rec.pm 11 Apr 2002 11:08:43 -0000 1.8
+++ server_rec.pm 9 Jul 2004 08:01:21 -0000 1.9
@@ -7,7 +7,7 @@
use Apache::TestUtil;
use Apache::RequestRec ();
-use Apache::Server ();
+use Apache::ServerRec ();
use Apache::ServerUtil ();
use Apache::Const -compile => 'OK';
1.4 +1 -1 modperl-2.0/t/response/TestDirective/perlloadmodule3.pm
Index: perlloadmodule3.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlloadmodule3.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- perlloadmodule3.pm 18 Apr 2003 06:18:58 -0000 1.3
+++ perlloadmodule3.pm 9 Jul 2004 08:01:21 -0000 1.4
@@ -80,7 +80,7 @@
use Apache::RequestRec ();
use Apache::RequestIO ();
-use Apache::Server ();
+use Apache::ServerRec ();
use Apache::ServerUtil ();
use Apache::Module ();
1.4 +1 -1 modperl-2.0/t/response/TestDirective/perlloadmodule4.pm
Index: perlloadmodule4.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlloadmodule4.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- perlloadmodule4.pm 18 Apr 2003 06:18:58 -0000 1.3
+++ perlloadmodule4.pm 9 Jul 2004 08:01:21 -0000 1.4
@@ -41,7 +41,7 @@
use Apache::RequestRec ();
use Apache::RequestIO ();
-use Apache::Server ();
+use Apache::ServerRec ();
use Apache::ServerUtil ();
use Apache::Module ();
use Apache::Test;
1.5 +1 -1 modperl-2.0/t/response/TestDirective/perlloadmodule5.pm
Index: perlloadmodule5.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlloadmodule5.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- perlloadmodule5.pm 18 Apr 2003 06:18:58 -0000 1.4
+++ perlloadmodule5.pm 9 Jul 2004 08:01:21 -0000 1.5
@@ -39,7 +39,7 @@
use Apache::RequestRec ();
use Apache::RequestIO ();
-use Apache::Server ();
+use Apache::ServerRec ();
use Apache::ServerUtil ();
use Apache::Module ();
use Apache::Test;
1.4 +1 -1 modperl-2.0/t/response/TestDirective/perlloadmodule6.pm
Index: perlloadmodule6.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlloadmodule6.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- perlloadmodule6.pm 18 Apr 2003 06:18:58 -0000 1.3
+++ perlloadmodule6.pm 9 Jul 2004 08:01:21 -0000 1.4
@@ -29,7 +29,7 @@
use Apache::RequestRec ();
use Apache::RequestIO ();
-use Apache::Server ();
+use Apache::ServerRec ();
use Apache::ServerUtil ();
use Apache::Module ();
use Apache::Test;
1.8 +2 -2 modperl-2.0/t/response/TestModperl/dir_config.pm
Index: dir_config.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/dir_config.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- dir_config.pm 25 Nov 2003 20:31:29 -0000 1.7
+++ dir_config.pm 9 Jul 2004 08:01:21 -0000 1.8
@@ -3,7 +3,7 @@
use strict;
use warnings FATAL => 'all';
-use Apache::Server ();
+use Apache::ServerRec ();
use Apache::ServerUtil ();
use Apache::RequestUtil ();
use APR::Table ();
@@ -138,7 +138,7 @@
{
# base server test
my $bs = Apache->server;
- ok t_cmp('Apache::Server',
+ ok t_cmp('Apache::ServerRec',
($bs && ref($bs)),
"base server's object retrieval");
1.6 +1 -1 modperl-2.0/t/response/TestModperl/merge.pm
Index: merge.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/merge.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- merge.pm 3 Apr 2004 05:42:23 -0000 1.5
+++ merge.pm 9 Jul 2004 08:01:21 -0000 1.6
@@ -3,7 +3,7 @@
use strict;
use warnings FATAL => 'all';
-use Apache::Server ();
+use Apache::ServerRec ();
use Apache::ServerUtil ();
use Apache::RequestUtil ();
use APR::Table ();
1.5 +1 -1 modperl-2.0/t/response/TestModules/proxy.pm
Index: proxy.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestModules/proxy.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- proxy.pm 19 Feb 2004 14:07:15 -0000 1.4
+++ proxy.pm 9 Jul 2004 08:01:21 -0000 1.5
@@ -5,7 +5,7 @@
use Apache::Test;
-use Apache::Server ();
+use Apache::ServerRec ();
use Apache::RequestRec ();
use Apache::RequestIO ();
1.14 +1 -1 modperl-2.0/xs/Apache/Log/Apache__Log.h
Index: Apache__Log.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/Apache/Log/Apache__Log.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -u -r1.13 -r1.14
--- Apache__Log.h 4 Mar 2004 06:01:13 -0000 1.13
+++ Apache__Log.h 9 Jul 2004 08:01:21 -0000 1.14
@@ -114,7 +114,7 @@
#define mpxs_Apache__RequestRec_log(sv) \
mpxs_Apache__Log_log(aTHX_ sv, MP_LOG_REQUEST)
-#define mpxs_Apache__Server_log(sv) \
+#define mpxs_Apache__ServerRec_log(sv) \
mpxs_Apache__Log_log(aTHX_ sv, MP_LOG_SERVER)
static MP_INLINE SV *modperl_perl_do_join(pTHX_ SV **mark, SV **sp)
1.19 +7 -7 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.18
retrieving revision 1.19
diff -u -u -r1.18 -r1.19
--- Apache__ServerUtil.h 5 Mar 2004 18:19:15 -0000 1.18
+++ Apache__ServerUtil.h 9 Jul 2004 08:01:22 -0000 1.19
@@ -14,7 +14,7 @@
*/
static MP_INLINE
-int mpxs_Apache__Server_push_handlers(pTHX_ server_rec *s,
+int mpxs_Apache__ServerRec_push_handlers(pTHX_ server_rec *s,
const char *name,
SV *sv)
{
@@ -27,7 +27,7 @@
}
static MP_INLINE
-int mpxs_Apache__Server_set_handlers(pTHX_ server_rec *s,
+int mpxs_Apache__ServerRec_set_handlers(pTHX_ server_rec *s,
const char *name,
SV *sv)
{
@@ -39,7 +39,7 @@
}
static MP_INLINE
-SV *mpxs_Apache__Server_get_handlers(pTHX_ server_rec *s,
+SV *mpxs_Apache__ServerRec_get_handlers(pTHX_ server_rec *s,
const char *name)
{
MpAV **handp =
@@ -51,20 +51,20 @@
s->process->pconf);
}
-#define mpxs_Apache__Server_dir_config(s, key, sv_val) \
+#define mpxs_Apache__ServerRec_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()
-#define mpxs_Apache__Server_server_root_relative(sv, fname) \
+#define mpxs_Apache__ServerRec_server_root_relative(sv, fname) \
modperl_server_root_relative(aTHX_ sv, fname);
#define mpxs_Apache_server_root_relative(sv, fname) \
modperl_server_root_relative(aTHX_ sv, fname);
static MP_INLINE
-int mpxs_Apache__Server_is_perl_option_enabled(pTHX_ server_rec *s,
+int mpxs_Apache__ServerRec_is_perl_option_enabled(pTHX_ server_rec *s,
const char *name)
{
return modperl_config_is_perl_option_enabled(aTHX_ NULL, s, name);
@@ -72,7 +72,7 @@
static MP_INLINE
-void mpxs_Apache__Server_add_config(pTHX_ server_rec *s, SV *lines)
+void mpxs_Apache__ServerRec_add_config(pTHX_ server_rec *s, SV *lines)
{
const char *errmsg = modperl_config_insert_server(aTHX_ s, lines);
if (errmsg) {
1.10 +1 -1 modperl-2.0/xs/maps/apache_types.map
Index: apache_types.map
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/maps/apache_types.map,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -u -r1.9 -r1.10
--- apache_types.map 24 Aug 2002 17:16:45 -0000 1.9
+++ apache_types.map 9 Jul 2004 08:01:22 -0000 1.10
@@ -1,6 +1,6 @@
########## Apache types ##########
-struct server_rec | Apache::Server
+struct server_rec | Apache::ServerRec
struct server_addr_rec | Apache::ServerAddr
struct conn_rec | Apache::Connection
struct request_rec | Apache::RequestRec
1.77 +7 -7 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.76
retrieving revision 1.77
diff -u -u -r1.76 -r1.77
--- modperl_functions.map 7 Jul 2004 05:06:40 -0000 1.76
+++ modperl_functions.map 9 Jul 2004 08:01:22 -0000 1.77
@@ -71,13 +71,13 @@
MODULE=Apache::ServerUtil PACKAGE=guess
- mpxs_Apache__Server_push_handlers
- mpxs_Apache__Server_set_handlers
- mpxs_Apache__Server_get_handlers
- mpxs_Apache__Server_is_perl_option_enabled
- mpxs_Apache__Server_add_config
+ mpxs_Apache__ServerRec_push_handlers
+ mpxs_Apache__ServerRec_set_handlers
+ mpxs_Apache__ServerRec_get_handlers
+ mpxs_Apache__ServerRec_is_perl_option_enabled
+ mpxs_Apache__ServerRec_add_config
-PACKAGE=Apache::Server
+MODULE=Apache::ServerUtil PACKAGE=Apache::ServerRec
SV *:DEFINE_dir_config | | server_rec *:s, char *:key=NULL, SV *:sv_val=Nullsv
SV *:DEFINE_server_root_relative | | SV *:p, const char *:fname=""
@@ -126,7 +126,7 @@
DEFINE_log_rerror | MPXS_Apache__Log_log_xerror | ...
DEFINE_log_error | MPXS_Apache__Log_log_error | ...
-PACKAGE=Apache::Server
+PACKAGE=Apache::ServerRec
SV *:DEFINE_log | | SV *:obj
DEFINE_log_serror | MPXS_Apache__Log_log_xerror | ...
DEFINE_log_error | MPXS_Apache__Log_log_error | ...
1.170 +19 -19 modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm
Index: FunctionTable.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -u -r1.169 -r1.170
--- FunctionTable.pm 9 Jul 2004 06:09:09 -0000 1.169
+++ FunctionTable.pm 9 Jul 2004 08:01:22 -0000 1.170
@@ -2,7 +2,7 @@
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Thu Jul 8 23:06:59 2004
+# ! Thu Jul 8 23:58:04 2004
# ! do NOT edit, any changes will be lost !
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -6667,20 +6667,7 @@
},
{
'return_type' => 'void',
- 'name' => 'mpxs_Apache__ServerUtil_BOOT',
- 'attr' => [
- 'static'
- ],
- 'args' => [
- {
- 'type' => 'PerlInterpreter *',
- 'name' => 'my_perl'
- }
- ]
- },
- {
- 'return_type' => 'void',
- 'name' => 'mpxs_Apache__Server_add_config',
+ 'name' => 'mpxs_Apache__ServerRec_add_config',
'args' => [
{
'type' => 'PerlInterpreter *',
@@ -6698,7 +6685,7 @@
},
{
'return_type' => 'SV *',
- 'name' => 'mpxs_Apache__Server_get_handlers',
+ 'name' => 'mpxs_Apache__ServerRec_get_handlers',
'args' => [
{
'type' => 'PerlInterpreter *',
@@ -6716,7 +6703,7 @@
},
{
'return_type' => 'int',
- 'name' => 'mpxs_Apache__Server_is_perl_option_enabled',
+ 'name' => 'mpxs_Apache__ServerRec_is_perl_option_enabled',
'args' => [
{
'type' => 'PerlInterpreter *',
@@ -6734,7 +6721,7 @@
},
{
'return_type' => 'int',
- 'name' => 'mpxs_Apache__Server_push_handlers',
+ 'name' => 'mpxs_Apache__ServerRec_push_handlers',
'args' => [
{
'type' => 'PerlInterpreter *',
@@ -6756,7 +6743,7 @@
},
{
'return_type' => 'int',
- 'name' => 'mpxs_Apache__Server_set_handlers',
+ 'name' => 'mpxs_Apache__ServerRec_set_handlers',
'args' => [
{
'type' => 'PerlInterpreter *',
@@ -6773,6 +6760,19 @@
{
'type' => 'SV *',
'name' => 'sv'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'void',
+ 'name' => 'mpxs_Apache__ServerUtil_BOOT',
+ 'attr' => [
+ 'static'
+ ],
+ 'args' => [
+ {
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
}
]
},
