geoff 2004/03/05 10:19:15
Modified: . Changes lib/Apache Status.pm compat.pm src/modules/perl modperl_util.c t/htdocs/vhost startup.pl t/response/TestAPI server_const.pm server_util.pm t/response/TestCompat apache.pm xs/Apache/ServerUtil Apache__ServerUtil.h xs/maps apache_functions.map modperl_functions.map Log: back out Apache:: -> Apache::Server method shuffling until we get the namespace issues completely sorted out Revision Changes Path 1.342 +7 -12 modperl-2.0/Changes Index: Changes =================================================================== RCS file: /home/cvs/modperl-2.0/Changes,v retrieving revision 1.341 retrieving revision 1.342 diff -u -r1.341 -r1.342 --- Changes 5 Mar 2004 02:42:32 -0000 1.341 +++ Changes 5 Mar 2004 18:19:15 -0000 1.342 @@ -128,18 +128,13 @@ PerlModule/PerlLoadModule/PerlRequre under threaded mpms w/ PerlOptions +Parent/+Clone in Vhosts + TestVhost::config test. [Stas] -moved many functions out of the Apache:: namespace: - Apache::unescape_url() is now Apache::URI::unescape_url() - Apache::log_pid() is now Apache::Log::log_pid() - Apache::LOG_MARK() is now Apache::Log::LOG_MARK() - Apache::method_register() is now Apache::Server::method_register() - Apache::get_server_built() is now Apache::Server::get_server_built() - Apache::get_server_version() is now Apache::Server::get_server_version() - Apache::server_root() is now Apache::Server::server_root() - Apache::server_root_relative() is now Apache::Server::server_root_relative() - Apache::exists_config_define() is now Apache::Server::exists_config_define() - Apache::add_version_component() is now Apache::Server::add_version_component() - Apache::get_status_line() is now Apache::Server::get_status_line() +Implemented Apache::get_server_version and Apache::get_server_built +as constant subroutines [Geoffrey Young] + +Moved some functions out of the Apache:: namespace: + Apache::unescape_url() is now Apache::URI::unescape_url() + Apache::log_pid() is now Apache::Log::log_pid() + Apache::LOG_MARK() is now Apache::Log::LOG_MARK() [Geoffrey Young] if MP_AP_PREFIX is used apxs and apr-config from the apache build tree 1.20 +1 -1 modperl-2.0/lib/Apache/Status.pm Index: Status.pm =================================================================== RCS file: /home/cvs/modperl-2.0/lib/Apache/Status.pm,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- Status.pm 4 Mar 2004 06:01:05 -0000 1.19 +++ Status.pm 5 Mar 2004 18:19:15 -0000 1.20 @@ -162,7 +162,7 @@ sub header { my $r = shift; my $start = scalar localtime $^T; - my $srv = Apache::Server::get_server_version(); + my $srv = Apache::get_server_version(); $r->content_type("text/html"); my $v = $^V ? sprintf "v%vd", $^V : $]; $r->print(<<"EOF"); 1.105 +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.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- compat.pm 4 Mar 2004 06:01:05 -0000 1.104 +++ compat.pm 5 Mar 2004 18:19:15 -0000 1.105 @@ -252,7 +252,7 @@ package Apache::Server; # XXX: is that good enough? see modperl/src/modules/perl/mod_perl.c:367 -our $CWD = Apache::Server::server_root; +our $CWD = Apache::server_root; our $AddPerlVersion = 1; @@ -296,7 +296,7 @@ sub define { shift if @_ == 2; - Apache::Server::exists_config_define(@_); + exists_config_define(@_); } sub log_error { @@ -350,7 +350,7 @@ #no need to support in 2.0 sub export {} -sub SERVER_VERSION { Apache::Server::get_server_version() } +sub SERVER_VERSION { Apache::get_server_version() } package Apache::RequestRec; 1.64 +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.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- modperl_util.c 4 Mar 2004 06:01:07 -0000 1.63 +++ modperl_util.c 5 Mar 2004 18:19:15 -0000 1.64 @@ -844,10 +844,10 @@ apr_pool_t *p; if (!sv_isobject(sv)) { - Perl_croak(aTHX_ "usage: Apache::Server::server_root_relative(obj, name)"); + Perl_croak(aTHX_ "usage: Apache::server_root_relative(obj, name)"); } - p = modperl_sv2pool(aTHX_ sv, get_cv("Apache::Server::server_root_relative", 0)); + p = modperl_sv2pool(aTHX_ sv, get_cv("Apache::server_root_relative", 0)); if (p == NULL) { MP_TRACE_a(MP_FUNC, 1.3 +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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- startup.pl 22 Jan 2004 21:57:49 -0000 1.2 +++ startup.pl 5 Mar 2004 18:19:15 -0000 1.3 @@ -12,7 +12,7 @@ # and not the vhost's one. needs to be fixed. my $s = Apache->server; -my $vhost_doc_root = catdir Apache::Server::server_root, qw(htdocs vhost); +my $vhost_doc_root = catdir Apache::server_root, qw(htdocs vhost); # testing $s->add_config() in vhost my $conf = <<"EOC"; 1.3 +6 -6 modperl-2.0/t/response/TestAPI/server_const.pm Index: server_const.pm =================================================================== RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/server_const.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- server_const.pm 19 Jan 2004 18:47:32 -0000 1.2 +++ server_const.pm 5 Mar 2004 18:19:15 -0000 1.3 @@ -29,17 +29,17 @@ # test Apache::Server constant subroutines ok t_cmp(canonpath($root), - canonpath(Apache::Server::server_root), - 'Apache::Server::server_root()'); + canonpath(Apache::server_root), + 'Apache::server_root()'); ok t_cmp($built, - Apache::Server::get_server_built, - 'Apache::Server::get_server_built()'); + Apache::get_server_built, + 'Apache::get_server_built()'); ok t_cmp($version, - Apache::Server::get_server_version, - 'Apache::Server::get_server_version()'); + Apache::get_server_version, + 'Apache::get_server_version()'); Apache::OK; } 1.14 +17 -17 modperl-2.0/t/response/TestAPI/server_util.pm Index: server_util.pm =================================================================== RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/server_util.pm,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- server_util.pm 23 Jan 2004 02:02:41 -0000 1.13 +++ server_util.pm 5 Mar 2004 18:19:15 -0000 1.14 @@ -55,8 +55,8 @@ (scalar keys %status_lines) + 11; # syntax - an object or pool is required - t_debug("Apache::Server::server_root_relative() died"); - eval { my $dir = Apache::Server::server_root_relative() }; + t_debug("Apache::server_root_relative() died"); + eval { my $dir = Apache::server_root_relative() }; t_debug("\$\@: $@"); ok $@; @@ -72,9 +72,9 @@ foreach my $p (keys %pools) { ok t_cmp(catfile($serverroot, 'conf'), - canonpath(Apache::Server::server_root_relative($pools{$p}, + canonpath(Apache::server_root_relative($pools{$p}, 'conf')), - "Apache::Server::server_root_relative($p, 'conf')"); + "Apache:::server_root_relative($p, 'conf')"); } # dig out the pool from valid objects @@ -88,11 +88,11 @@ # syntax - unrecognized objects don't segfault { my $obj = bless {}, 'Apache::Foo'; - eval { Apache::Server::server_root_relative($obj, 'conf') }; + eval { Apache::server_root_relative($obj, 'conf') }; ok t_cmp(qr/server_root_relative.*no .* key/, $@, - "Apache::Server::server_root_relative(\$obj, 'conf')"); + "Apache::server_root_relative(\$obj, 'conf')"); } # no file argument gives ServerRoot @@ -101,13 +101,13 @@ '$r->server_root_relative()'); ok t_cmp(canonpath($serverroot), - canonpath(Apache::Server::server_root_relative($r->pool)), - 'Apache::Server::server_root_relative($r->pool)'); + canonpath(Apache::server_root_relative($r->pool)), + 'Apache::server_root_relative($r->pool)'); - # Apache::Server::server_root is also the ServerRoot constant - ok t_cmp(canonpath(Apache::Server::server_root), + # Apache::server_root is also the ServerRoot constant + ok t_cmp(canonpath(Apache::server_root), canonpath($r->server_root_relative), - 'Apache::Server::server_root'); + 'Apache::server_root'); { # absolute paths should resolve to themselves @@ -119,16 +119,16 @@ } t_debug('registering method FOO'); - ok Apache::Server::method_register($r->server->process->pconf, 'FOO'); + ok Apache::method_register($r->server->process->pconf, 'FOO'); - t_debug('Apache::Server::exists_config_define'); - ok Apache::Server::exists_config_define('MODPERL2'); - ok ! Apache::Server::exists_config_define('FOO'); + t_debug('Apache::exists_config_define'); + ok Apache::exists_config_define('MODPERL2'); + ok ! Apache::exists_config_define('FOO'); while (my($code, $line) = each %status_lines) { ok t_cmp($line, - Apache::Server::get_status_line($code), - "Apache::Server::get_status_line($code)"); + Apache::get_status_line($code), + "Apache::get_status_line($code)"); } Apache::OK; 1.11 +1 -1 modperl-2.0/t/response/TestCompat/apache.pm Index: apache.pm =================================================================== RCS file: /home/cvs/modperl-2.0/t/response/TestCompat/apache.pm,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- apache.pm 23 Jan 2004 00:15:18 -0000 1.10 +++ apache.pm 5 Mar 2004 18:19:15 -0000 1.11 @@ -31,7 +31,7 @@ "Apache::module('mod_ne_exists.c')"); - ok t_cmp(Apache::Server::exists_config_define('MODPERL2'), + ok t_cmp(Apache::exists_config_define('MODPERL2'), Apache->define('MODPERL2'), 'Apache->define'); 1.18 +6 -3 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.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- Apache__ServerUtil.h 4 Mar 2004 06:01:13 -0000 1.17 +++ Apache__ServerUtil.h 5 Mar 2004 18:19:15 -0000 1.18 @@ -60,6 +60,9 @@ #define mpxs_Apache__Server_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, const char *name) @@ -79,12 +82,12 @@ static void mpxs_Apache__ServerUtil_BOOT(pTHX) { - newCONSTSUB(PL_defstash, "Apache::Server::server_root", + newCONSTSUB(PL_defstash, "Apache::server_root", newSVpv(ap_server_root, 0)); - newCONSTSUB(PL_defstash, "Apache::Server::get_server_built", + newCONSTSUB(PL_defstash, "Apache::get_server_built", newSVpv(ap_get_server_built(), 0)); - newCONSTSUB(PL_defstash, "Apache::Server::get_server_version", + newCONSTSUB(PL_defstash, "Apache::get_server_version", newSVpv(ap_get_server_version(), 0)); } 1.78 +7 -9 modperl-2.0/xs/maps/apache_functions.map Index: apache_functions.map =================================================================== RCS file: /home/cvs/modperl-2.0/xs/maps/apache_functions.map,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- apache_functions.map 9 Feb 2004 19:25:01 -0000 1.77 +++ apache_functions.map 5 Mar 2004 18:19:15 -0000 1.78 @@ -40,7 +40,9 @@ ap_get_server_name ap_get_server_port !ap_content_type_tolower + ap_get_status_line ap_is_initial_req + ap_method_register >ap_method_registry_init >ap_process_request_internal ?ap_get_mime_headers @@ -152,25 +154,21 @@ -ap_scan_script_header_err_brigade MODULE=Apache::ServerUtil PACKAGE=guess BOOT=1 + ap_add_version_component ap_error_log2stderr ?ap_replace_stderr_log #MODULE=Apache::ServerConfig + ap_exists_config_define #XXX: thought this might be useful #however it is not exported on win32 !ap_get_local_host - ap_psignature | | r,prefix -~ap_server_root_relative - -PACKAGE=Apache::Server - ap_method_register - ap_exists_config_define - ap_add_version_component - ap_get_status_line ~ap_get_server_built ~ap_get_server_version ~ap_server_root - + ap_psignature | | r,prefix +~ap_server_root_relative + MODULE=Apache::Connection PACKAGE=guess #XXX: thought this might be useful for protocol modules #however it is not exported on win32 1.70 +1 -0 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.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- modperl_functions.map 9 Feb 2004 19:05:59 -0000 1.69 +++ modperl_functions.map 5 Mar 2004 18:19:15 -0000 1.70 @@ -79,6 +79,7 @@ PACKAGE=Apache server_rec *:DEFINE_server | | SV *:classname=Nullsv + SV *:DEFINE_server_root_relative | | SV *:p, const char *:fname="" MODULE=Apache::Connection mpxs_Apache__Connection_client_socket | | c, s=NULL