stas 2004/02/09 10:44:43
Modified: . Changes lib/Apache compat.pm lib/ModPerl WrapXS.pm todo release Log: Since Apache::SubProcess is now part of the mp2 API, add $r->cleanup_for_exec as a noop in Apache::compat. That function is no longer needed in Apache2. Revision Changes Path 1.321 +4 -0 modperl-2.0/Changes Index: Changes =================================================================== RCS file: /home/cvs/modperl-2.0/Changes,v retrieving revision 1.320 retrieving revision 1.321 diff -u -u -r1.320 -r1.321 --- Changes 9 Feb 2004 18:31:40 -0000 1.320 +++ Changes 9 Feb 2004 18:44:43 -0000 1.321 @@ -12,6 +12,10 @@ =item 1.99_13-dev +Since Apache::SubProcess is now part of the mp2 API, add +$r->cleanup_for_exec as a noop in Apache::compat. That function is no +longer needed in Apache2. [Stas] + When 'perl Makefile.PL PREFIX=/foo/bar' is used and mod_perl 1 is found, but at different prefix no longer require MP_INST_APACHE2=1. [Stas] 1.102 +4 -0 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.101 retrieving revision 1.102 diff -u -u -r1.101 -r1.102 --- compat.pm 19 Jan 2004 19:59:58 -0000 1.101 +++ compat.pm 9 Feb 2004 18:44:43 -0000 1.102 @@ -334,6 +334,10 @@ sub kill_timeout {} sub reset_timeout {} +# this function is from mp1's Apache::SubProcess 3rd party module +# which is now a part of mp2 API. this function doesn't exist in 2.0. +sub cleanup_for_exec {} + sub current_callback { return Apache::current_callback(); } 1.65 +7 -5 modperl-2.0/lib/ModPerl/WrapXS.pm Index: WrapXS.pm =================================================================== RCS file: /home/cvs/modperl-2.0/lib/ModPerl/WrapXS.pm,v retrieving revision 1.64 retrieving revision 1.65 diff -u -u -r1.64 -r1.65 --- WrapXS.pm 31 Jan 2004 10:06:59 -0000 1.64 +++ WrapXS.pm 9 Feb 2004 18:44:43 -0000 1.65 @@ -689,17 +689,19 @@ SERVER_VERSION => ['get_server_version', ''], can_stack_handlers=> [undef, - 'there is no more need for that method'], + 'there is no more need for that method in mp2'], # Apache::RequestRec soft_timeout => [undef, - 'there is no more need for that method'], + 'there is no more need for that method in mp2'], hard_timeout => [undef, - 'there is no more need for that method'], + 'there is no more need for that method in mp2'], kill_timeout => [undef, - 'there is no more need for that method'], + 'there is no more need for that method in mp2'], reset_timeout => [undef, - 'there is no more need for that method'], + 'there is no more need for that method in mp2'], + cleanup_for_exec => [undef, + 'there is no more need for that method in mp2'], send_http_header => ['content_type', ''], header_in => ['headers_in', 1.11 +0 -3 modperl-2.0/todo/release Index: release =================================================================== RCS file: /home/cvs/modperl-2.0/todo/release,v retrieving revision 1.10 retrieving revision 1.11 diff -u -u -r1.10 -r1.11 --- release 9 Feb 2004 18:31:41 -0000 1.10 +++ release 9 Feb 2004 18:44:43 -0000 1.11 @@ -114,9 +114,6 @@ http://marc.theaimsgroup.com/?l=apache-modperl-dev&m=100622977803237&w=2 http://marc.theaimsgroup.com/?t=97984528900002&r=1&w=2 -* $r->cleanup_for_exec needs to be added to Apache::compat as a noop. - Owner: stas - * ht_time() - now requires a pool, temporarily renamed format_time for 1.x ht_time compat. should we just leave as is or see if ht_time can be changed to not require a pool?