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 2001/02/08 20:42:33 UTC
cvs commit: modperl-2.0/src/modules/perl modperl_callback.c modperl_config.c modperl_filter.c modperl_gtop.c modperl_interp.c
dougm 01/02/08 11:42:31
Modified: src/modules/perl modperl_callback.c modperl_config.c
modperl_filter.c modperl_gtop.c modperl_interp.c
Log:
adjust to recent apr name changes
Revision Changes Path
1.16 +2 -2 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- modperl_callback.c 2001/01/02 06:40:19 1.15
+++ modperl_callback.c 2001/02/08 19:42:02 1.16
@@ -30,8 +30,8 @@
break;
};
- apr_register_cleanup(p, (void*)handler,
- modperl_handler_cleanup, apr_null_cleanup);
+ apr_pool_cleanup_register(p, (void*)handler,
+ modperl_handler_cleanup, apr_pool_cleanup_null);
return handler;
}
1.17 +4 -4 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- modperl_config.c 2001/01/18 18:44:00 1.16
+++ modperl_config.c 2001/02/08 19:42:05 1.17
@@ -6,13 +6,13 @@
modperl_handler_t *h = modperl_handler_new(p, (void*)name,
MP_HANDLER_TYPE_CHAR);
if (!*handlers) {
- *handlers = apr_make_array(p, 1, sizeof(modperl_handler_t *));
+ *handlers = apr_array_make(p, 1, sizeof(modperl_handler_t *));
MP_TRACE_d(MP_FUNC, "created handler stack\n");
}
/* XXX parse_handler if Perl is running */
- *(modperl_handler_t **)apr_push_array(*handlers) = h;
+ *(modperl_handler_t **)apr_array_push(*handlers) = h;
MP_TRACE_d(MP_FUNC, "pushed handler: %s\n", h->name);
return NULL;
@@ -50,7 +50,7 @@
}
#define scfg_push_argv(arg) \
- *(const char **)apr_push_array(scfg->argv) = arg
+ *(const char **)apr_array_push(scfg->argv) = arg
modperl_srv_config_t *modperl_srv_config_new(apr_pool_t *p)
{
@@ -61,7 +61,7 @@
MpSrvENABLED_On(scfg); /* mod_perl enabled by default */
MpSrvHOOKS_ALL_On(scfg); /* all hooks enabled by default */
- scfg->argv = apr_make_array(p, 2, sizeof(char *));
+ scfg->argv = apr_array_make(p, 2, sizeof(char *));
scfg_push_argv((char *)ap_server_argv0);
1.4 +2 -2 modperl-2.0/src/modules/perl/modperl_filter.c
Index: modperl_filter.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- modperl_filter.c 2001/01/20 21:19:08 1.3
+++ modperl_filter.c 2001/02/08 19:42:08 1.4
@@ -6,7 +6,7 @@
const char *buf, apr_ssize_t len)
{
apr_bucket_brigade *bb = apr_brigade_create(wb->pool);
- apr_bucket *bucket = apr_bucket_create_transient(buf, len);
+ apr_bucket *bucket = apr_bucket_transient_create(buf, len);
APR_BRIGADE_INSERT_TAIL(bb, bucket);
return ap_pass_brigade(wb->filters, bb);
}
@@ -133,7 +133,7 @@
MP_INLINE static apr_status_t send_eos(ap_filter_t *f)
{
apr_bucket_brigade *bb = apr_brigade_create(f->r->pool);
- apr_bucket *b = apr_bucket_create_eos();
+ apr_bucket *b = apr_bucket_eos_create();
APR_BRIGADE_INSERT_TAIL(bb, b);
return ap_pass_brigade(f->next, bb);
}
1.5 +2 -2 modperl-2.0/src/modules/perl/modperl_gtop.c
Index: modperl_gtop.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_gtop.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- modperl_gtop.c 2000/08/14 03:10:45 1.4
+++ modperl_gtop.c 2001/02/08 19:42:11 1.5
@@ -42,8 +42,8 @@
gtop->pid = getpid();
glibtop_init();
- apr_register_cleanup(p, NULL,
- modperl_gtop_exit, apr_null_cleanup);
+ apr_pool_cleanup_register(p, NULL,
+ modperl_gtop_exit, apr_pool_cleanup_null);
return gtop;
}
1.17 +10 -9 modperl-2.0/src/modules/perl/modperl_interp.c
Index: modperl_interp.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_interp.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- modperl_interp.c 2000/08/14 03:10:45 1.16
+++ modperl_interp.c 2001/02/08 19:42:13 1.17
@@ -175,8 +175,9 @@
modperl_tipool_init(tipool);
- apr_register_cleanup(p, (void*)mip,
- modperl_interp_pool_destroy, apr_null_cleanup);
+ apr_pool_cleanup_register(p, (void*)mip,
+ modperl_interp_pool_destroy,
+ apr_pool_cleanup_null);
scfg->mip = mip;
}
@@ -209,7 +210,7 @@
if (c) {
desc = "conn_rec pool";
- (void)apr_get_userdata((void **)&interp, MP_INTERP_KEY, c->pool);
+ (void)apr_pool_userdata_get((void **)&interp, MP_INTERP_KEY, c->pool);
if (interp) {
MP_TRACE_i(MP_FUNC,
@@ -222,7 +223,7 @@
}
else if (r) {
desc = "request_rec pool";
- (void)apr_get_userdata((void **)&interp, MP_INTERP_KEY, r->pool);
+ (void)apr_pool_userdata_get((void **)&interp, MP_INTERP_KEY, r->pool);
if (interp) {
MP_TRACE_i(MP_FUNC,
@@ -232,8 +233,8 @@
}
/* might have already been set by a ConnectionHandler */
- (void)apr_get_userdata((void **)&interp, MP_INTERP_KEY,
- r->connection->pool);
+ (void)apr_pool_userdata_get((void **)&interp, MP_INTERP_KEY,
+ r->connection->pool);
if (interp) {
desc = "r->connection pool";
MP_TRACE_i(MP_FUNC,
@@ -255,9 +256,9 @@
interp = modperl_interp_get(s ? s : r->server);
++interp->num_requests; /* should only get here once per request */
- (void)apr_set_userdata((void *)interp, MP_INTERP_KEY,
- modperl_interp_unselect,
- p);
+ (void)apr_pool_userdata_set((void *)interp, MP_INTERP_KEY,
+ modperl_interp_unselect,
+ p);
MP_TRACE_i(MP_FUNC, "set interp 0x%lx in %s 0x%lx\n",
(unsigned long)interp, desc, (unsigned long)p);