You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by do...@apache.org on 2002/11/23 23:56:21 UTC

cvs commit: modperl-2.0/src/modules/perl mod_perl.c

dougm       2002/11/23 14:56:21

  Modified:    .        Changes
               src/modules/perl mod_perl.c
  Log:
  fix <IfDefine MODPERL2> support
  
  Revision  Changes    Path
  1.60      +2 -0      modperl-2.0/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Changes,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- Changes	23 Nov 2002 22:35:06 -0000	1.59
  +++ Changes	23 Nov 2002 22:56:21 -0000	1.60
  @@ -10,6 +10,8 @@
   
   =item 1.99_08-dev
   
  +fix <IfDefine MODPERL2> support
  +
   default AuthType to Basic if not set in $r->get_basic_auth_pw()
   [Philippe M. Chiasson <go...@cpan.org>]
   
  
  
  
  1.144     +4 -4      modperl-2.0/src/modules/perl/mod_perl.c
  
  Index: mod_perl.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.c,v
  retrieving revision 1.143
  retrieving revision 1.144
  diff -u -r1.143 -r1.144
  --- mod_perl.c	7 Oct 2002 02:35:18 -0000	1.143
  +++ mod_perl.c	23 Nov 2002 22:56:21 -0000	1.144
  @@ -456,10 +456,6 @@
   int modperl_hook_pre_config(apr_pool_t *p, apr_pool_t *plog,
                               apr_pool_t *ptemp)
   {
  -    /* for <IfDefine MODPERL2> and Apache->define("MODPERL2") */
  -    *(char **)apr_array_push(ap_server_config_defines) =
  -        apr_pstrdup(p, "MODPERL2");
  -
       /* XXX: htf can we have PerlPreConfigHandler
        * without first configuring mod_perl ?
        */
  @@ -564,6 +560,10 @@
   
   void modperl_register_hooks(apr_pool_t *p)
   {
  +    /* for <IfDefine MODPERL2> and Apache->define("MODPERL2") */
  +    *(char **)apr_array_push(ap_server_config_defines) =
  +        apr_pstrdup(p, "MODPERL2");
  +
       ap_hook_pre_config(modperl_hook_pre_config,
                          NULL, NULL, APR_HOOK_MIDDLE);