cvs commit: modperl-2.0/t/response/TestApache compat2.pm
dougm 2002/06/03 11:27:03
Modified:lib/Apache compat.pm
t/response/TestApache compat2.pm
Log:
add $r-is_main compat method
Revision ChangesPath
1.59 +2 -0 modperl-2.0/lib/Apache/compat.pm
Index: compat.pm
===
RCS file: /home/cvs/modperl-2.0/lib/Apache/compat.pm,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- compat.pm 3 Jun 2002 18:23:16 - 1.58
+++ compat.pm 3 Jun 2002 18:27:03 - 1.59
-321,6 +321,8
$r-send_fd_length($fh, -1);
}
+sub is_main { !shift-main }
+
package Apache::File;
use Fcntl ();
1.15 +4 -1 modperl-2.0/t/response/TestApache/compat2.pm
Index: compat2.pm
===
RCS file: /home/cvs/modperl-2.0/t/response/TestApache/compat2.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- compat2.pm30 May 2002 04:05:06 - 1.14
+++ compat2.pm3 Jun 2002 18:27:03 - 1.15
-24,7 +24,7
sub handler {
my $r = shift;
-plan $r, tests = 45;
+plan $r, tests = 46;
$r-send_http_header('text/plain');
-230,6 +230,9
my $t_class = ref $t;
ok t_cmp('APR::Table', $t_class, Apache::Table-new);
+
+ok t_cmp(!$r-main, $r-is_main,
+ '$r-is_main');
#note these are not actually part of the tests
#since i think on platforms where crypt is not supported,
cvs commit: modperl-2.0/src/modules/perl mod_perl.c mod_perl.h
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 ChangesPath
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.c30 May 2002 23:35:02 - 1.120
+++ mod_perl.c3 Jun 2002 23:41:18 - 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.h31 May 2002 15:41:11 - 1.43
+++ mod_perl.h3 Jun 2002 23:41:18 - 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);
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 2002/06/03 16:46:44
Modified:xs/tables/current/ModPerl FunctionTable.pm
Log:
need to update pre_config hook namechange for win32 .def
Revision ChangesPath
1.71 +2 -2 modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm
Index: FunctionTable.pm
===
RCS file: /home/cvs/modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- FunctionTable.pm 30 May 2002 02:33:48 - 1.70
+++ FunctionTable.pm 3 Jun 2002 23:46:44 - 1.71
-3232,8 +3232,8
]
},
{
-'return_type' = 'void',
-'name' = 'modperl_pre_config_handler',
+'return_type' = 'int',
+'name' = 'modperl_hook_pre_config',
'args' = [
{
'type' = 'apr_pool_t *',
cvs commit: modperl-2.0/todo api.txt
dougm 2002/06/03 17:44:24
Modified:lib/Apache compat.pm
t/response/TestApache compat2.pm
todo api.txt
Log:
add Apache-define compat method
Revision ChangesPath
1.60 +5 -0 modperl-2.0/lib/Apache/compat.pm
Index: compat.pm
===
RCS file: /home/cvs/modperl-2.0/lib/Apache/compat.pm,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- compat.pm 3 Jun 2002 18:27:03 - 1.59
+++ compat.pm 4 Jun 2002 00:44:23 - 1.60
-99,6 +99,11
return Symbol::gensym();
}
+sub define {
+shift if _ == 2;
+exists_config_define(_);
+}
+
package Apache::Constants;
use Apache::Const ();
1.16 +5 -1 modperl-2.0/t/response/TestApache/compat2.pm
Index: compat2.pm
===
RCS file: /home/cvs/modperl-2.0/t/response/TestApache/compat2.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- compat2.pm3 Jun 2002 18:27:03 - 1.15
+++ compat2.pm4 Jun 2002 00:44:23 - 1.16
-24,7 +24,7
sub handler {
my $r = shift;
-plan $r, tests = 46;
+plan $r, tests = 47;
$r-send_http_header('text/plain');
-233,6 +233,10
ok t_cmp(!$r-main, $r-is_main,
'$r-is_main');
+
+ok t_cmp(Apache::exists_config_define('MODPERL2'),
+ Apache-define('MODPERL2'),
+ 'Apache-define');
#note these are not actually part of the tests
#since i think on platforms where crypt is not supported,
1.24 +0 -4 modperl-2.0/todo/api.txt
Index: api.txt
===
RCS file: /home/cvs/modperl-2.0/todo/api.txt,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- api.txt 25 May 2002 17:49:03 - 1.23
+++ api.txt 4 Jun 2002 00:44:23 - 1.24
-40,10 +40,6
1.x ht_time compat. should we just leave as is or see if ht_time can
be changed to not require a pool?
-Apache-define:
-exists as Apache::exists_config_define, which should stay,
-Apache::compat could implement a wrapper.
-
$r-document_root:
cannot currently be modified. requires locking since it is part of
the per-server config structure which is shared between threads
