stas 2002/12/31 19:45:55
Modified: src/modules/perl modperl_callback.c modperl_config.c
modperl_handler.c
. Changes STATUS
Log:
Enable PerlPreConnectionHandler
Revision Changes Path
1.51 +4 -1 modperl-2.0/src/modules/perl/modperl_callback.c
Index: modperl_callback.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_callback.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- modperl_callback.c 23 May 2002 05:55:35 -0000 1.50
+++ modperl_callback.c 1 Jan 2003 03:45:54 -0000 1.51
@@ -153,6 +153,7 @@
modperl_env_request_populate(aTHX_ r);
}
break;
+ case MP_HANDLER_TYPE_PRE_CONNECTION:
case MP_HANDLER_TYPE_CONNECTION:
modperl_handler_make_args(aTHX_ &av_args,
"Apache::Connection", c, NULL);
@@ -220,7 +221,9 @@
int modperl_callback_pre_connection(int idx, conn_rec *c, void *csd)
{
- return DECLINED; /*XXX*/
+ return modperl_callback_run_handlers(idx, MP_HANDLER_TYPE_PRE_CONNECTION,
+ NULL, c, c->base_server,
+ NULL, NULL, NULL);
}
void modperl_callback_process(int idx, apr_pool_t *p, server_rec *s)
1.61 +3 -0 modperl-2.0/src/modules/perl/modperl_config.c
Index: modperl_config.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_config.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- modperl_config.c 12 Dec 2002 10:05:08 -0000 1.60
+++ modperl_config.c 1 Jan 2003 03:45:54 -0000 1.61
@@ -254,6 +254,9 @@
for (i=0; i < MP_HANDLER_NUM_PROCESS; i++) {
merge_handlers(MpSrvMERGE_HANDLERS, handlers_process[i]);
}
+ for (i=0; i < MP_HANDLER_NUM_PRE_CONNECTION; i++) {
+ merge_handlers(MpSrvMERGE_HANDLERS, handlers_pre_connection[i]);
+ }
for (i=0; i < MP_HANDLER_NUM_CONNECTION; i++) {
merge_handlers(MpSrvMERGE_HANDLERS, handlers_connection[i]);
}
1.15 +5 -0 modperl-2.0/src/modules/perl/modperl_handler.c
Index: modperl_handler.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_handler.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- modperl_handler.c 6 Dec 2002 07:58:21 -0000 1.14
+++ modperl_handler.c 1 Jan 2003 03:45:54 -0000 1.15
@@ -220,6 +220,11 @@
}
set_desc(per_srv);
break;
+ case MP_HANDLER_TYPE_PRE_CONNECTION:
+ avp = &scfg->handlers_pre_connection[idx];
+ check_modify(connection);
+ set_desc(connection);
+ break;
case MP_HANDLER_TYPE_CONNECTION:
avp = &scfg->handlers_connection[idx];
check_modify(connection);
1.91 +2 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- Changes 30 Dec 2002 01:11:28 -0000 1.90
+++ Changes 1 Jan 2003 03:45:54 -0000 1.91
@@ -10,6 +10,8 @@
=item 1.99_08-dev
+Enable PerlPreConnectionHandler [Stas]
+
Support the Host: request header in Apache::TestClient [Stas]
restore the ModPerl::RegistryLoader::new() method for backwards
1.27 +8 -9 modperl-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/modperl-2.0/STATUS,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- STATUS 13 Dec 2002 09:58:29 -0000 1.26
+++ STATUS 1 Jan 2003 03:45:54 -0000 1.27
@@ -117,14 +117,6 @@
Open Issues or Core Enhancements:
---------------------------------
-* PerlPreConnectionHandler's modperl_callback_pre_connection is not
- implemented
-
- Report:
- Status: ???
-
-----
-
* Apache::Log compat issues:
Apache->warn, Apache::warn, Apache::Server->warn and
@@ -166,6 +158,13 @@
Report: Philippe M. Chiasson <[EMAIL PROTECTED]>
Status: Philippe M. Chiasson <[EMAIL PROTECTED]> is working on it
+
+----
+
+* PerlPreConnectionHandler is implemented, but the 'void *csd' arg in
+ the callback is ignored
+
+ Status: no hurry
----
