stas 2004/07/14 00:27:00
Modified: t/response/TestAPI rutil.pm server_util.pm xs/Apache/ServerUtil Apache__ServerUtil.h xs/maps apache_functions.map . Changes Log: Apache::RequestUtil::method_register($s->process->pconf, 'FOO'); is now $s->method_register('FOO') Revision Changes Path 1.17 +1 -4 modperl-2.0/t/response/TestAPI/rutil.pm Index: rutil.pm =================================================================== RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/rutil.pm,v retrieving revision 1.16 retrieving revision 1.17 diff -u -u -r1.16 -r1.17 --- rutil.pm 8 Jul 2004 05:29:42 -0000 1.16 +++ rutil.pm 14 Jul 2004 07:27:00 -0000 1.17 @@ -19,7 +19,7 @@ sub handler { my $r = shift; - plan $r, tests => (scalar keys %status_lines) + 8; + plan $r, tests => (scalar keys %status_lines) + 7; ok $r->default_type; @@ -45,9 +45,6 @@ $line, "Apache::RequestUtil::get_status_line($code)"); } - - t_debug('registering method FOO'); - ok Apache::RequestUtil::method_register($r->server->process->pconf, 'FOO'); Apache::OK; } 1.22 +5 -1 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.21 retrieving revision 1.22 diff -u -u -r1.21 -r1.22 --- server_util.pm 9 Jul 2004 07:37:58 -0000 1.21 +++ server_util.pm 14 Jul 2004 07:27:00 -0000 1.22 @@ -8,6 +8,7 @@ use File::Spec::Functions qw(canonpath catfile); use Apache::RequestRec (); +use Apache::ServerRec (); use Apache::ServerUtil (); use Apache::Process (); @@ -45,7 +46,7 @@ '__PACKAGE__->new($r)' => __PACKAGE__->new($r), ); - plan $r, tests => 11 + + plan $r, tests => 12 + (scalar keys %pools) + (scalar keys %objects); @@ -125,6 +126,9 @@ t_debug('Apache::exists_config_define'); ok Apache::exists_config_define('MODPERL2'); ok ! Apache::exists_config_define('FOO'); + + t_debug('registering method FOO'); + ok $r->server->method_register('FOO'); Apache::OK; } 1.20 +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.19 retrieving revision 1.20 diff -u -u -r1.19 -r1.20 --- Apache__ServerUtil.h 9 Jul 2004 08:01:22 -0000 1.19 +++ Apache__ServerUtil.h 14 Jul 2004 07:27:00 -0000 1.20 @@ -13,6 +13,9 @@ * limitations under the License. */ +#define mpxs_Apache__ServerRec_method_register(s, methname) \ + ap_method_register(s->process->pconf, methname); + static MP_INLINE int mpxs_Apache__ServerRec_push_handlers(pTHX_ server_rec *s, const char *name, 1.86 +6 -2 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.85 retrieving revision 1.86 diff -u -u -r1.85 -r1.86 --- apache_functions.map 5 Jul 2004 04:00:12 -0000 1.85 +++ apache_functions.map 14 Jul 2004 07:27:00 -0000 1.86 @@ -37,7 +37,7 @@ MODULE=Apache::RequestUtil ap_get_status_line - ap_method_register + MODULE=Apache::RequestUtil PACKAGE=guess >ap_finalize_request_protocol @@ -156,7 +156,11 @@ -ap_scan_script_header_err_strs -ap_scan_script_header_err_brigade -MODULE=Apache::ServerUtil PACKAGE=guess BOOT=1 +MODULE=Apache::ServerUtil PACKAGE=Apache::ServerRec BOOT=1 +~ap_method_register + int:DEFINE_method_register | | server_rec *:s, const char *:methname + +MODULE=Apache::ServerUtil PACKAGE=guess ap_add_version_component ap_error_log2stderr ?ap_replace_stderr_log 1.411 +4 -1 modperl-2.0/Changes Index: Changes =================================================================== RCS file: /home/cvs/modperl-2.0/Changes,v retrieving revision 1.410 retrieving revision 1.411 diff -u -u -r1.410 -r1.411 --- Changes 13 Jul 2004 03:59:46 -0000 1.410 +++ Changes 14 Jul 2004 07:27:00 -0000 1.411 @@ -1,4 +1,4 @@ -=head1 NAME + =head1 NAME Changes - Apache mod_perl changes logfile @@ -11,6 +11,9 @@ =over 3 =item 1.99_15-dev + +Apache::RequestUtil::method_register($s->process->pconf, 'FOO'); is +now $s->method_register('FOO') [Stas] Remove $Apache::Server::StrictPerlSections. Now, all <Perl> sections errors are fatal by default and cause server startup to