You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by gs...@locus.apache.org on 2000/07/15 03:07:45 UTC
cvs commit: apache-2.0/src/lib/apr/dso/win32 dso.c
gstein 00/07/14 18:07:45
Modified: src/modules/standard mod_so.c
src/lib/apr/test testdso.c
src/lib/apr/include apr_dso.h
src/lib/apr/dso/aix dso.c
src/lib/apr/dso/beos dso.c
src/lib/apr/dso/os2 dso.c
src/lib/apr/dso/unix dso.c
src/lib/apr/dso/win32 dso.c
Log:
ap_dso_init() isn't needed. if/when a platform needs it, then
ap_initialize() can be used to init DSO support. or set up a lazy
initialization for it.
solves the questions, "when do I call it? can I call it more than once?"
Submitted by: Ben Collins-Sussman <su...@red-bean.com>
Revision Changes Path
1.22 +0 -3 apache-2.0/src/modules/standard/mod_so.c
Index: mod_so.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_so.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mod_so.c 2000/05/31 02:30:30 1.21
+++ mod_so.c 2000/07/15 01:07:42 1.22
@@ -158,9 +158,6 @@
soc = (so_server_conf *)ap_pcalloc(p, sizeof(so_server_conf));
soc->loaded_modules = ap_make_array(p, DYNAMIC_MODULE_LIMIT,
sizeof(moduleinfo));
-#ifndef NO_DLOPEN
- ap_dso_init();
-#endif
return (void *)soc;
}
1.6 +0 -6 apache-2.0/src/lib/apr/test/testdso.c
Index: testdso.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testdso.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- testdso.c 2000/05/26 16:24:10 1.5
+++ testdso.c 2000/07/15 01:07:42 1.6
@@ -31,12 +31,6 @@
exit(-1);
}
- fprintf(stdout,"Initializing DSO's.........................");
- if (ap_dso_init() != APR_SUCCESS) {
- fprintf(stderr, "Couldn't initialize DSO's !");
- exit (-1);
- }
- fprintf(stdout,"OK\n");
fprintf(stdout,"Trying to load DSO now.....................");
fflush(stdout);
if ((status = ap_dso_load(&h, filename, cont)) != APR_SUCCESS){
1.16 +0 -10 apache-2.0/src/lib/apr/include/apr_dso.h
Index: apr_dso.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_dso.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- apr_dso.h 2000/07/14 23:40:58 1.15
+++ apr_dso.h 2000/07/15 01:07:43 1.16
@@ -67,16 +67,6 @@
/*
-=head1 ap_status_t ap_dso_init(void)
-
-B<Initialize the underlying DSO library.>
-
-=cut
- */
-ap_status_t ap_dso_init(void);
-
-/*
-
=head1 ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path, ap_pool_t *ctx)
B<Load a DSO library.>
1.6 +0 -4 apache-2.0/src/lib/apr/dso/aix/dso.c
Index: dso.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/aix/dso.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dso.c 2000/06/01 01:01:12 1.5
+++ dso.c 2000/07/15 01:07:43 1.6
@@ -132,10 +132,6 @@
* add the basic "wrappers" here.
*/
-ap_status_t ap_dso_init(void){
- return APR_SUCCESS;
-}
-
ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path,
ap_pool_t *ctx)
{
1.9 +0 -4 apache-2.0/src/lib/apr/dso/beos/dso.c
Index: dso.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/beos/dso.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dso.c 2000/06/13 12:56:12 1.8
+++ dso.c 2000/07/15 01:07:43 1.9
@@ -56,10 +56,6 @@
#if APR_HAS_DSO
-ap_status_t ap_dso_init(void){
- return APR_SUCCESS;
-}
-
ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path,
ap_pool_t *ctx)
{
1.11 +0 -6 apache-2.0/src/lib/apr/dso/os2/dso.c
Index: dso.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/os2/dso.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dso.c 2000/06/01 01:01:13 1.10
+++ dso.c 2000/07/15 01:07:44 1.11
@@ -60,12 +60,6 @@
#if APR_HAS_DSO
-ap_status_t ap_dso_init()
-{
- return APR_SUCCESS;
-}
-
-
static ap_status_t dso_cleanup(void *thedso)
{
ap_dso_handle_t *dso = thedso;
1.21 +0 -4 apache-2.0/src/lib/apr/dso/unix/dso.c
Index: dso.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/unix/dso.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- dso.c 2000/06/25 22:48:18 1.20
+++ dso.c 2000/07/15 01:07:44 1.21
@@ -56,10 +56,6 @@
#if APR_HAS_DSO
-ap_status_t ap_dso_init(void){
- return APR_SUCCESS;
-}
-
ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path,
ap_pool_t *ctx)
{
1.9 +0 -4 apache-2.0/src/lib/apr/dso/win32/dso.c
Index: dso.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/win32/dso.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dso.c 2000/06/12 18:07:43 1.8
+++ dso.c 2000/07/15 01:07:45 1.9
@@ -56,10 +56,6 @@
#if APR_HAS_DSO
-ap_status_t ap_dso_init(void){
- return APR_SUCCESS;
-}
-
ap_status_t ap_dso_load(struct ap_dso_handle_t **res_handle, const char *path,
ap_pool_t *ctx)
{