geoff 2004/02/29 19:57:34
Modified: src/modules/perl mod_perl.c mod_perl.h
Log:
now that Perl*Handlers run APR_HOOK_REALLY_FIRST by default,
make sure that +GlobalRequest logic comes really really first
Revision Changes Path
1.209 +2 -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.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- mod_perl.c 13 Feb 2004 14:58:05 -0000 1.208
+++ mod_perl.c 1 Mar 2004 03:57:34 -0000 1.209
@@ -714,10 +714,10 @@
NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_post_read_request(modperl_hook_post_read_request,
- NULL, NULL, APR_HOOK_FIRST);
+ NULL, NULL, MODPERL_HOOK_REALLY_REALLY_FIRST);
ap_hook_header_parser(modperl_hook_header_parser,
- NULL, NULL, APR_HOOK_FIRST);
+ NULL, NULL, MODPERL_HOOK_REALLY_REALLY_FIRST);
ap_hook_child_init(modperl_hook_child_init,
NULL, NULL, APR_HOOK_FIRST);
1.62 +4 -0 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.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- mod_perl.h 22 Sep 2003 17:43:41 -0000 1.61
+++ mod_perl.h 1 Mar 2004 03:57:34 -0000 1.62
@@ -75,6 +75,7 @@
#include "modperl_perl.h"
#include "modperl_svptr_table.h"
#include "modperl_module.h"
+#include "modperl_apache.h"
int modperl_init_vhost(server_rec *s, apr_pool_t *p,
server_rec *base_server);
@@ -107,5 +108,8 @@
typedef void MP_FUNC_T(modperl_table_modify_t) (apr_table_t *,
const char *,
const char *);
+
+/* we need to hook a few internal things before APR_HOOK_REALLY_FIRST */
+#define MODPERL_HOOK_REALLY_REALLY_FIRST (-20)
#endif /* MOD_PERL_H */
