dougm 02/03/24 15:01:33 Modified: . Changes STATUS src/modules/perl mod_perl.c mod_perl.h perl_util.c Log: Submitted by: Tatsuhiko Miyagawa <[EMAIL PROTECTED]> Reviewed by: dougm PERL5LIB support now properly unshifts paths into @INC rather than push Revision Changes Path 1.636 +3 -0 modperl/Changes Index: Changes =================================================================== RCS file: /home/cvs/modperl/Changes,v retrieving revision 1.635 retrieving revision 1.636 diff -u -r1.635 -r1.636 --- Changes 24 Mar 2002 22:51:04 -0000 1.635 +++ Changes 24 Mar 2002 23:01:33 -0000 1.636 @@ -10,6 +10,9 @@ =item 1.26_01-dev +PERL5LIB support now properly unshifts paths into @INC rather than push +[Tatsuhiko Miyagawa <[EMAIL PROTECTED]>] + do not clear symbol tables within a package in perl_clear_symtab() used by directive handler extensions [Stephen Clouse <[EMAIL PROTECTED]>] 1.12 +1 -7 modperl/STATUS Index: STATUS =================================================================== RCS file: /home/cvs/modperl/STATUS,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- STATUS 24 Mar 2002 22:51:04 -0000 1.11 +++ STATUS 24 Mar 2002 23:01:33 -0000 1.12 @@ -1,5 +1,5 @@ mod_perl 1.3 STATUS: - Last modified at [$Date: 2002/03/24 22:51:04 $] + Last modified at [$Date: 2002/03/24 23:01:33 $] Release: @@ -37,12 +37,6 @@ Report: http://marc.theaimsgroup.com/?l=apache-modperl-dev&m=98278446807561&w=2 Status: patch available - - * PERL5LIB should unshift @INC instead of push - Report: http://marc.theaimsgroup.com/?l=apache-modperl-dev&m=100434522809036&w=2 - Status: - patch available - Needs Patch or Further Investigation 1.143 +2 -2 modperl/src/modules/perl/mod_perl.c Index: mod_perl.c =================================================================== RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- mod_perl.c 24 Mar 2002 18:22:56 -0000 1.142 +++ mod_perl.c 24 Mar 2002 23:01:33 -0000 1.143 @@ -747,7 +747,7 @@ #endif #ifdef APACHE_PERL5LIB - perl_incpush(APACHE_PERL5LIB); + perl_inc_unshift(APACHE_PERL5LIB); #else av_push(GvAV(incgv), newSVpv(server_root_relative(p,""),0)); av_push(GvAV(incgv), newSVpv(server_root_relative(p,"lib/perl"),0)); @@ -1412,7 +1412,7 @@ char *path = (char *)table_get(r->subprocess_env, "PERL5LIB"); if (path) { - perl_incpush(path); + perl_inc_unshift(path); MP_INCPUSH_on(cld); } } 1.113 +1 -1 modperl/src/modules/perl/mod_perl.h Index: mod_perl.h =================================================================== RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.h,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- mod_perl.h 24 Mar 2002 20:57:23 -0000 1.112 +++ mod_perl.h 24 Mar 2002 23:01:33 -0000 1.113 @@ -1179,7 +1179,7 @@ void mod_perl_init_ids(void); int perl_eval_ok(server_rec *s); int perl_sv_is_http_code(SV *sv, int *status); -void perl_incpush(char *s); +void perl_inc_unshift(char *s); SV *mod_perl_sv_name(SV *svp); void mod_perl_mark_where(char *where, SV *sub); 1.47 +3 -2 modperl/src/modules/perl/perl_util.c Index: perl_util.c =================================================================== RCS file: /home/cvs/modperl/src/modules/perl/perl_util.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- perl_util.c 17 Apr 2001 21:30:02 -0000 1.46 +++ perl_util.c 24 Mar 2002 23:01:33 -0000 1.47 @@ -785,7 +785,7 @@ #define PERLLIB_SEP ':' #endif -void perl_incpush(char *p) +void perl_inc_unshift(char *p) { if(!p) return; @@ -803,7 +803,8 @@ sv_setpv(libdir, p); p = Nullch; } - av_push(GvAV(incgv), libdir); + av_unshift(GvAV(incgv), 1); + av_store(GvAV(incgv), 0, libdir); } }