← Back to branch summary

~ubuntu-branches/ubuntu/edgy/libapache2-mod-perl2/edgy

« back to all changes in this revision

Viewing changes to src/modules/perl/mod_perl.c

  • Committer: Bazaar Package Importer
  • Author(s): Adam Conrad
  • Date: 2006-03-24 02:48:44 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20060324024844-73oxqkcj2jmlmh2t
Tags: 2.0.2-2build1
Fake sync to bring in new upstream bugfixes, UVF exception by mdz.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/perl/mod_perl.c
271
271
    PL_reentrant_buffer->_crypt_struct.current_saltbits = 0;
272
272
#endif
273
273
 
 
274
    /* We need to reset $0 to argv[0] (httpd) since perl_parse() will
 
275
     * have set it to '-e'. Being magic-aware ensures that some
 
276
     * OS-specific magic will happen (i.e. setproctitle() on *BSDs)
 
277
     */
 
278
    PL_origalen = strlen(argv[0]) + 1;
 
279
    sv_setpv_mg(get_sv("0",0), argv[0]);
 
280
 
274
281
    perl_run(perl);
275
282
 
276
283
#ifdef USE_ITHREADS
695
702
    }
696
703
#endif
697
704
 
 
705
#if PERL_REVISION == 5 && PERL_VERSION < 9
 
706
#define MP_PERL_VERSION_STAMP "Perl/v%vd"
 
707
#else
 
708
#define MP_PERL_VERSION_STAMP "Perl/%" SVf
 
709
#endif
 
710
    
698
711
    ap_add_version_component(pconf, MP_VERSION_STRING);
699
712
    ap_add_version_component(pconf,
700
 
                             Perl_form(aTHX_ "Perl/v%vd", PL_patchlevel));
 
713
                             Perl_form(aTHX_ MP_PERL_VERSION_STAMP,
 
714
                                       PL_patchlevel));
 
715
 
701
716
    modperl_mgv_hash_handlers(pconf, s);
702
717
    modperl_modglobal_hash_keys(aTHX);
703
718
    modperl_env_hash_keys(aTHX);