dougm 2002/06/03 16:41:18 Modified: src/modules/perl mod_perl.c mod_perl.h Log: add MODPERL2 config define, as if the server had been started with -DMODPERL2 Revision Changes Path 1.121 +10 -2 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.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- mod_perl.c 30 May 2002 23:35:02 -0000 1.120 +++ mod_perl.c 3 Jun 2002 23:41:18 -0000 1.121 @@ -422,12 +422,17 @@ return OK; } -void modperl_pre_config_handler(apr_pool_t *p, apr_pool_t *plog, - apr_pool_t *ptemp) +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) = "MODPERL2"; + /* XXX: htf can we have PerlPreConfigHandler * without first configuring mod_perl ? */ + + return OK; } static int modperl_hook_pre_connection(conn_rec *c, void *csd) @@ -520,6 +525,9 @@ void modperl_register_hooks(apr_pool_t *p) { + ap_hook_pre_config(modperl_hook_pre_config, + NULL, NULL, APR_HOOK_MIDDLE); + ap_hook_open_logs(modperl_hook_init, NULL, NULL, APR_HOOK_MIDDLE); 1.44 +2 -2 modperl-2.0/src/modules/perl/mod_perl.h Index: mod_perl.h =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.h,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- mod_perl.h 31 May 2002 15:41:11 -0000 1.43 +++ mod_perl.h 3 Jun 2002 23:41:18 -0000 1.44 @@ -64,8 +64,8 @@ void modperl_init(server_rec *s, apr_pool_t *p); int modperl_hook_init(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s); -void modperl_pre_config_handler(apr_pool_t *p, apr_pool_t *plog, - apr_pool_t *ptemp); +int modperl_hook_pre_config(apr_pool_t *p, apr_pool_t *plog, + apr_pool_t *ptemp); void modperl_register_hooks(apr_pool_t *p); apr_pool_t *modperl_server_pool(void); PerlInterpreter *modperl_startup(server_rec *s, apr_pool_t *p);