Hi,
A few months ago I proposed a patch (With Gunter Knauf's help) that
would make my module mod_rpaf compile on Win32 and netware. It used
the ap_update_vhost_from_headers function which wasn't correctly
exported for it to compile. I proposed a patch to make that work,
but was told that it would be nice to get the rest of the functions
from httpd.exp exported to. So here is my first take at it (finally):
Notes:
I've deliberatly left out the XML_ space.
Some functions were a bit tricky:
ap_dummy_mutex
ap_listeners
ap_os_is_path_absolute
ap_prelinked_modules
ap_preloaded_modules
ap_rfc1413_timeout
ap_scoreboard_image
ap_signal
ap_slack
ap_sys_siglist
ap_util_init
ap_util_uri_init
The rest of the functions should be exported now. Anyone care to take
a look if they're all done right?
Are there any more platforms it need to be done for?
--
Thomas Eibner <http://thomas.eibner.dk/> DnsZone <http://dnszone.org/>
mod_pointer <http://stderr.net/mod_pointer>
Index: src/ApacheCore.def
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/ApacheCore.def,v
retrieving revision 1.28
diff -u -r1.28 ApacheCore.def
--- src/ApacheCore.def 2000/12/27 21:45:11 1.28
+++ src/ApacheCore.def 2001/12/21 14:04:03
@@ -389,3 +389,54 @@
ap_stripprefix @380
ap_os_dso_load @381
ap_os_dso_error @382
+ ap_update_vhost_from_headers @383
+ ap_update_vhost_given_ip @384
+ ap_set_name_virtual_host @385
+ ap_parse_vhost_addrs @386
+ ap_fini_vhost_config @387
+ ap_init_vhost_config @388
+ ap_check_access @389
+ ap_check_auth @390
+ ap_check_user_id @391
+ ap_translate_name @392
+ ap_find_types @393
+ ap_run_fixups @394
+ ap_invoke_handler @395
+ ap_log_transaction @396
+ ap_header_parse @397
+ ap_run_post_read_request @398
+ ap_single_module_configure @399
+ ap_init_modules @400
+ ap_child_init_modules @401
+ ap_child_exit_modules @402
+ ap_setup_prelinked_modules @403
+ ap_show_directives @404
+ ap_show_modules @405
+ ap_parse_htaccess @406
+ ap_process_resource_config @407
+ ap_create_request_config @408
+ ap_merge_per_dir_configs @409
+ ap_bind_address @410
+ ap_core_reorder_directories @411
+ ap_coredump_dir @412
+ ap_force_library_loading @413
+ ap_get_local_host @414
+ ap_get_virthost_addr @415
+ ap_init_alloc @416
+ ap_keepalive_timeout @417
+ ap_listenbacklog @418
+ ap_lock_fname @419
+ ap_log_pid @420
+ ap_open_logs @421
+ ap_process_request @422
+ ap_read_config @423
+ ap_read_request @423
+ ap_response_code_string @424
+ ap_rfc1413 @425
+ ap_send_http_options @426
+ ap_server_config_defines @427
+ ap_server_post_read_config @428
+ ap_server_pre_read_config @429
+ ap_set_callback_and_alarm @430
+ ap_set_sub_req_protocol @431
+ ap_update_child_status @432
Index: src/os/netware/ApacheCore.imp
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/os/netware/ApacheCore.imp,v
retrieving revision 1.9
diff -u -r1.9 ApacheCore.imp
--- src/os/netware/ApacheCore.imp 2001/08/13 21:40:45 1.9
+++ src/os/netware/ApacheCore.imp 2001/12/21 14:12:37
@@ -362,4 +362,55 @@
ap_os_canonical_filename,
ap_os_http_method,
os_readdir,
- os_opendir
+ os_opendir,
+ ap_update_vhost_from_headers,
+ ap_update_vhost_given_ip,
+ ap_set_name_virtual_host,
+ ap_parse_vhost_addrs,
+ ap_fini_vhost_config,
+ ap_init_vhost_config,
+ ap_check_access,
+ ap_check_auth,
+ ap_check_user_id,
+ ap_translate_name,
+ ap_find_types,
+ ap_run_fixups,
+ ap_invoke_handler,
+ ap_log_transaction,
+ ap_header_parse,
+ ap_run_post_read_request,
+ ap_single_module_configure,
+ ap_init_modules,
+ ap_child_init_modules,
+ ap_child_exit_modules,
+ ap_setup_prelinked_modules,
+ ap_show_directives,
+ ap_show_modules,
+ ap_parse_htaccess,
+ ap_process_resource_config,
+ ap_create_request_config,
+ ap_merge_per_dir_configs,
+ ap_bind_address,
+ ap_core_reorder_directories,
+ ap_coredump_dir,
+ ap_force_library_loading,
+ ap_get_local_host,
+ ap_get_virthost_addr,
+ ap_init_alloc,
+ ap_keepalive_timeout,
+ ap_listenbacklog,
+ ap_lock_fname,
+ ap_log_pid,
+ ap_open_logs,
+ ap_process_request,
+ ap_read_config,
+ ap_read_request,
+ ap_response_code_string,
+ ap_rfc1413,
+ ap_send_http_options,
+ ap_server_config_defines,
+ ap_server_post_read_config,
+ ap_server_pre_read_config,
+ ap_set_callback_and_alarm,
+ ap_set_sub_req_protocol,
+ ap_update_child_status,
Index: src/main/alloc.c
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/main/alloc.c,v
retrieving revision 1.123
diff -u -r1.123 alloc.c
--- src/main/alloc.c 2001/01/15 17:04:55 1.123
+++ src/main/alloc.c 2001/12/21 14:08:50
@@ -502,7 +502,7 @@
}
#endif
-pool *ap_init_alloc(void)
+API_EXPORT(pool *) ap_init_alloc(void)
{
#ifdef POOL_DEBUG
char s;
Index: src/include/ap_alloc.h
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/include/ap_alloc.h,v
retrieving revision 1.75
diff -u -r1.75 ap_alloc.h
--- src/include/ap_alloc.h 2001/02/03 20:14:49 1.75
+++ src/include/ap_alloc.h 2001/12/21 14:04:36
@@ -92,7 +92,7 @@
typedef struct pool pool;
typedef struct pool ap_pool;
-pool * ap_init_alloc(void); /* Set up everything */
+API_EXPORT(pool *) ap_init_alloc(void); /* Set up everything */
void ap_cleanup_alloc(void);
API_EXPORT(pool *) ap_make_sub_pool(pool *); /* All pools are subpools of
permanent_pool */
API_EXPORT(void) ap_destroy_pool(pool *);
Index: src/include/http_conf_globals.h
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/include/http_conf_globals.h,v
retrieving revision 1.46
diff -u -r1.46 http_conf_globals.h
--- src/include/http_conf_globals.h 2001/07/13 07:32:35 1.46
+++ src/include/http_conf_globals.h 2001/12/21 14:05:13
@@ -82,14 +82,14 @@
extern API_VAR_EXPORT int ap_max_requests_per_child;
extern API_VAR_EXPORT int ap_threads_per_child;
extern API_VAR_EXPORT int ap_excess_requests_per_child;
-extern struct in_addr ap_bind_address;
+extern API_VAR_EXPORT struct in_addr ap_bind_address;
extern listen_rec *ap_listeners;
extern API_VAR_EXPORT int ap_daemons_to_start;
extern API_VAR_EXPORT int ap_daemons_min_free;
extern API_VAR_EXPORT int ap_daemons_max_free;
extern API_VAR_EXPORT int ap_daemons_limit;
extern API_VAR_EXPORT int ap_suexec_enabled;
-extern int ap_listenbacklog;
+extern API_VAR_EXPORT int ap_listenbacklog;
#ifdef SO_ACCEPTFILTER
extern int ap_acceptfilter;
#endif
@@ -98,7 +98,7 @@
extern API_VAR_EXPORT char *ap_pid_fname;
extern API_VAR_EXPORT char *ap_scoreboard_fname;
-extern char *ap_lock_fname;
+extern API_VAR_EXPORT char *ap_lock_fname;
extern API_VAR_EXPORT char *ap_server_argv0;
extern enum server_token_type ap_server_tokens;
@@ -113,14 +113,14 @@
extern API_VAR_EXPORT char ap_server_confname[MAX_STRING_LEN];
/* for -C, -c and -D switches */
-extern array_header *ap_server_pre_read_config;
-extern array_header *ap_server_post_read_config;
-extern array_header *ap_server_config_defines;
+extern API_VAR_EXPORT array_header *ap_server_pre_read_config;
+extern API_VAR_EXPORT array_header *ap_server_post_read_config;
+extern API_VAR_EXPORT array_header *ap_server_config_defines;
/* We want this to have the least chance of being corrupted if there
* is some memory corruption, so we allocate it statically.
*/
-extern char ap_coredump_dir[MAX_STRING_LEN];
+extern API_VAR_EXPORT char ap_coredump_dir[MAX_STRING_LEN];
#ifdef __cplusplus
}
Index: src/main/http_config.c
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/main/http_config.c,v
retrieving revision 1.160
diff -u -r1.160 http_config.c
--- src/main/http_config.c 2001/06/22 12:43:54 1.160
+++ src/main/http_config.c 2001/12/21 14:09:32
@@ -155,7 +155,7 @@
return (void *) conf_vector;
}
-void *
+CORE_EXPORT(void *)
ap_merge_per_dir_configs(pool *p, void *base, void *new)
{
void **conf_vector = (void **) ap_palloc(p, sizeof(void *) * total_modules);
@@ -210,7 +210,7 @@
}
}
-void *ap_create_request_config(pool *p)
+CORE_EXPORT(void *) ap_create_request_config(pool *p)
{
return create_empty_config(p);
}
@@ -376,37 +376,37 @@
return run_all ? OK : DECLINED;
}
-int ap_translate_name(request_rec *r)
+API_EXPORT(int) ap_translate_name(request_rec *r)
{
return run_method(r, offsets_into_method_ptrs.translate_handler, 0);
}
-int ap_check_access(request_rec *r)
+API_EXPORT(int) ap_check_access(request_rec *r)
{
return run_method(r, offsets_into_method_ptrs.access_checker, 1);
}
-int ap_find_types(request_rec *r)
+API_EXPORT(int) ap_find_types(request_rec *r)
{
return run_method(r, offsets_into_method_ptrs.type_checker, 0);
}
-int ap_run_fixups(request_rec *r)
+API_EXPORT(int) ap_run_fixups(request_rec *r)
{
return run_method(r, offsets_into_method_ptrs.fixer_upper, 1);
}
-int ap_log_transaction(request_rec *r)
+API_EXPORT(int) ap_log_transaction(request_rec *r)
{
return run_method(r, offsets_into_method_ptrs.logger, 1);
}
-int ap_header_parse(request_rec *r)
+API_EXPORT(int) ap_header_parse(request_rec *r)
{
return run_method(r, offsets_into_method_ptrs.header_parser, 1);
}
-int ap_run_post_read_request(request_rec *r)
+API_EXPORT(int) ap_run_post_read_request(request_rec *r)
{
return run_method(r, offsets_into_method_ptrs.post_read_request, 1);
}
@@ -416,12 +416,12 @@
* separate from check_access to make catching some config errors easier.
*/
-int ap_check_user_id(request_rec *r)
+API_EXPORT(int) ap_check_user_id(request_rec *r)
{
return run_method(r, offsets_into_method_ptrs.ap_check_user_id, 0);
}
-int ap_check_auth(request_rec *r)
+API_EXPORT(int) ap_check_auth(request_rec *r)
{
return run_method(r, offsets_into_method_ptrs.auth_checker, 0);
}
@@ -485,7 +485,7 @@
ph->hr.handler = NULL;
}
-int ap_invoke_handler(request_rec *r)
+API_EXPORT(int) ap_invoke_handler(request_rec *r)
{
fast_handler_rec *handp;
const char *handler;
@@ -696,7 +696,7 @@
*m = NULL;
}
-void ap_setup_prelinked_modules(void)
+API_EXPORT(void) ap_setup_prelinked_modules(void)
{
module **m;
module **m2;
@@ -1206,7 +1206,7 @@
return strcmp(f1->fname,f2->fname);
}
-void ap_process_resource_config(server_rec *s, char *fname, pool *p, pool *ptemp)
+CORE_EXPORT(void) ap_process_resource_config(server_rec *s, char *fname, pool *p,
+pool *ptemp)
{
const char *errmsg;
cmd_parms parms;
@@ -1318,7 +1318,7 @@
ap_cfg_closefile(parms.config_file);
}
-int ap_parse_htaccess(void **result, request_rec *r, int override,
+CORE_EXPORT(int) ap_parse_htaccess(void **result, request_rec *r, int override,
const char *d, const char *access_name)
{
configfile_t *f = NULL;
@@ -1574,7 +1574,7 @@
}
-server_rec *ap_read_config(pool *p, pool *ptemp, char *confname)
+API_EXPORT(server_rec *) ap_read_config(pool *p, pool *ptemp, char *confname)
{
server_rec *s = init_server_config(p);
@@ -1597,7 +1597,7 @@
return s;
}
-void ap_single_module_configure(pool *p, server_rec *s, module *m)
+API_EXPORT(void) ap_single_module_configure(pool *p, server_rec *s, module *m)
{
if (m->create_server_config)
ap_set_module_config(s->module_config, m,
@@ -1607,7 +1607,7 @@
(*m->create_dir_config)(p, NULL));
}
-void ap_init_modules(pool *p, server_rec *s)
+API_EXPORT(void) ap_init_modules(pool *p, server_rec *s)
{
module *m;
@@ -1618,7 +1618,7 @@
init_handlers(p);
}
-void ap_child_init_modules(pool *p, server_rec *s)
+API_EXPORT(void) ap_child_init_modules(pool *p, server_rec *s)
{
module *m;
@@ -1627,7 +1627,7 @@
(*m->child_init) (s, p);
}
-void ap_child_exit_modules(pool *p, server_rec *s)
+API_EXPORT(void) ap_child_exit_modules(pool *p, server_rec *s)
{
module *m;
@@ -1722,7 +1722,7 @@
* the directive arguments, in what module they are handled, and in
* what parts of the configuration they are allowed. Used for httpd -L.
*/
-void ap_show_directives(void)
+API_EXPORT(void) ap_show_directives(void)
{
const command_rec *pc;
int n;
@@ -1737,7 +1737,7 @@
}
/* Show the preloaded module names. Used for httpd -l. */
-void ap_show_modules(void)
+API_EXPORT(void) ap_show_modules(void)
{
int n;
Index: src/include/http_config.h
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/include/http_config.h,v
retrieving revision 1.106
diff -u -r1.106 http_config.h
--- src/include/http_config.h 2001/01/15 17:04:32 1.106
+++ src/include/http_config.h 2001/12/21 14:06:02
@@ -346,33 +346,33 @@
/* For mod_so.c... */
-void ap_single_module_configure(pool *p, server_rec *s, module *m);
+API_EXPORT(void) ap_single_module_configure(pool *p, server_rec *s, module *m);
/* For http_main.c... */
-server_rec *ap_read_config(pool *conf_pool, pool *temp_pool, char *config_name);
-void ap_init_modules(pool *p, server_rec *s);
-void ap_child_init_modules(pool *p, server_rec *s);
-void ap_child_exit_modules(pool *p, server_rec *s);
-void ap_setup_prelinked_modules(void);
-void ap_show_directives(void);
-void ap_show_modules(void);
+API_EXPORT(server_rec *) ap_read_config(pool *conf_pool, pool *temp_pool, char
+*config_name);
+API_EXPORT(void) ap_init_modules(pool *p, server_rec *s);
+API_EXPORT(void) ap_child_init_modules(pool *p, server_rec *s);
+API_EXPORT(void) ap_child_exit_modules(pool *p, server_rec *s);
+API_EXPORT(void) ap_setup_prelinked_modules(void);
+API_EXPORT(void) ap_show_directives(void);
+API_EXPORT(void) ap_show_modules(void);
void ap_cleanup_method_ptrs(void);
/* For http_request.c... */
-void *ap_create_request_config(pool *p);
+CORE_EXPORT(void *) ap_create_request_config(pool *p);
CORE_EXPORT(void *) ap_create_per_dir_config(pool *p);
-void *ap_merge_per_dir_configs(pool *p, void *base, void *new);
+CORE_EXPORT(void *) ap_merge_per_dir_configs(pool *p, void *base, void *new);
/* For http_core.c... (<Directory> command and virtual hosts) */
-int ap_parse_htaccess(void **result, request_rec *r, int override,
+CORE_EXPORT(int) ap_parse_htaccess(void **result, request_rec *r, int override,
const char *path, const char *access_name);
CORE_EXPORT(const char *) ap_init_virtual_host(pool *p, const char *hostname,
server_rec *main_server, server_rec **);
-void ap_process_resource_config(server_rec *s, char *fname, pool *p, pool *ptemp);
+CORE_EXPORT(void) ap_process_resource_config(server_rec *s, char *fname, pool *p,
+pool *ptemp);
/* ap_check_cmd_context() definitions: */
API_EXPORT(const char *) ap_check_cmd_context(cmd_parms *cmd, unsigned forbidden);
@@ -389,16 +389,16 @@
/* Module-method dispatchers, also for http_request.c */
-int ap_translate_name(request_rec *);
-int ap_check_access(request_rec *); /* check access on non-auth basis */
-int ap_check_user_id(request_rec *); /* obtain valid username from client auth */
-int ap_check_auth(request_rec *); /* check (validated) user is authorized here */
-int ap_find_types(request_rec *); /* identify MIME type */
-int ap_run_fixups(request_rec *); /* poke around for other metainfo, etc.... */
-int ap_invoke_handler(request_rec *);
-int ap_log_transaction(request_rec *r);
-int ap_header_parse(request_rec *);
-int ap_run_post_read_request(request_rec *);
+API_EXPORT(int) ap_translate_name(request_rec *);
+API_EXPORT(int) ap_check_access(request_rec *); /* check access on non-auth
+basis */
+API_EXPORT(int) ap_check_user_id(request_rec *); /* obtain valid username from
+client auth */
+API_EXPORT(int) ap_check_auth(request_rec *); /* check (validated) user is
+authorized here */
+API_EXPORT(int) ap_find_types(request_rec *); /* identify MIME type */
+API_EXPORT(int) ap_run_fixups(request_rec *); /* poke around for other metainfo,
+etc.... */
+API_EXPORT(int) ap_invoke_handler(request_rec *);
+API_EXPORT(int) ap_log_transaction(request_rec *r);
+API_EXPORT(int) ap_header_parse(request_rec *);
+API_EXPORT(int) ap_run_post_read_request(request_rec *);
/* for mod_perl */
Index: src/main/http_core.c
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/main/http_core.c,v
retrieving revision 1.299
diff -u -r1.299 http_core.c
--- src/main/http_core.c 2001/11/16 01:32:20 1.299
+++ src/main/http_core.c 2001/12/21 14:09:48
@@ -457,7 +457,7 @@
return a->orig_index - b->orig_index;
}
-void ap_core_reorder_directories(pool *p, server_rec *s)
+CORE_EXPORT(void) ap_core_reorder_directories(pool *p, server_rec *s)
{
core_server_config *sconf;
array_header *sec;
@@ -577,7 +577,7 @@
* modules).
*/
-char *ap_response_code_string(request_rec *r, int error_index)
+API_EXPORT(char *) ap_response_code_string(request_rec *r, int error_index)
{
core_dir_config *conf;
Index: src/include/http_core.h
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/include/http_core.h,v
retrieving revision 1.64
diff -u -r1.64 http_core.h
--- src/include/http_core.h 2001/03/09 10:10:20 1.64
+++ src/include/http_core.h 2001/12/21 14:06:22
@@ -172,7 +172,7 @@
* the code that cares really is in http_core.c. Also, another accessor.
*/
-char *ap_response_code_string (request_rec *r, int error_index);
+API_EXPORT(char *) ap_response_code_string (request_rec *r, int error_index);
extern API_VAR_EXPORT module core_module;
@@ -333,7 +333,7 @@
} core_server_config;
/* for http_config.c */
-void ap_core_reorder_directories(pool *, server_rec *);
+CORE_EXPORT(void) ap_core_reorder_directories(pool *, server_rec *);
/* for mod_perl */
CORE_EXPORT(void) ap_add_per_dir_conf (server_rec *s, void *dir_config);
Index: src/main/http_log.c
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/main/http_log.c,v
retrieving revision 1.89
diff -u -r1.89 http_log.c
--- src/main/http_log.c 2001/01/15 17:04:59 1.89
+++ src/main/http_log.c 2001/12/21 14:10:10
@@ -251,7 +251,7 @@
}
}
-void ap_open_logs(server_rec *s_main, pool *p)
+API_EXPORT(void) ap_open_logs(server_rec *s_main, pool *p)
{
server_rec *virt, *q;
int replace_stderr;
@@ -508,7 +508,7 @@
va_end(args);
}
-void ap_log_pid(pool *p, char *fname)
+API_EXPORT(void) ap_log_pid(pool *p, char *fname)
{
FILE *pid_file;
struct stat finfo;
Index: src/include/http_log.h
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/include/http_log.h,v
retrieving revision 1.37
diff -u -r1.37 http_log.h
--- src/include/http_log.h 2001/01/15 17:04:33 1.37
+++ src/include/http_log.h 2001/12/21 14:06:36
@@ -105,7 +105,7 @@
#define APLOG_MARK __FILE__,__LINE__
-void ap_open_logs (server_rec *, pool *p);
+API_EXPORT(void) ap_open_logs (server_rec *, pool *p);
/* The two primary logging functions, ap_log_error and ap_log_rerror,
* use a printf style format string to build the log message. It is
@@ -123,7 +123,7 @@
__attribute__((format(printf,5,6)));
API_EXPORT(void) ap_error_log2stderr (server_rec *);
-void ap_log_pid (pool *p, char *fname);
+API_EXPORT(void) ap_log_pid (pool *p, char *fname);
/* These are for legacy code, new code should use ap_log_error,
* or ap_log_rerror.
*/
Index: src/main/http_main.c
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/main/http_main.c,v
retrieving revision 1.564
diff -u -r1.564 http_main.c
--- src/main/http_main.c 2001/12/21 00:51:44 1.564
+++ src/main/http_main.c 2001/12/21 14:10:32
@@ -234,7 +234,7 @@
#endif
int ap_thread_count = 0;
API_VAR_EXPORT int ap_standalone=0;
-int ap_configtestonly=0;
+API_VAR_EXPORT int ap_configtestonly=0;
int ap_docrootcheck=1;
API_VAR_EXPORT uid_t ap_user_id=0;
API_VAR_EXPORT char *ap_user_name=NULL;
@@ -247,16 +247,16 @@
API_VAR_EXPORT int ap_excess_requests_per_child=0;
API_VAR_EXPORT char *ap_pid_fname=NULL;
API_VAR_EXPORT char *ap_scoreboard_fname=NULL;
-char *ap_lock_fname;
+API_VAR_EXPORT char *ap_lock_fname;
API_VAR_EXPORT char *ap_server_argv0=NULL;
-struct in_addr ap_bind_address;
+API_VAR_EXPORT struct in_addr ap_bind_address;
API_VAR_EXPORT int ap_daemons_to_start=0;
API_VAR_EXPORT int ap_daemons_min_free=0;
API_VAR_EXPORT int ap_daemons_max_free=0;
API_VAR_EXPORT int ap_daemons_limit=0;
-time_t ap_restart_time=0;
+API_VAR_EXPORT time_t ap_restart_time=0;
API_VAR_EXPORT int ap_suexec_enabled = 0;
-int ap_listenbacklog=0;
+API_VAR_EXPORT int ap_listenbacklog=0;
struct accept_mutex_methods_s {
void (*child_init)(pool *p);
@@ -309,11 +309,11 @@
API_VAR_EXPORT char ap_server_root[MAX_STRING_LEN]="";
API_VAR_EXPORT char ap_server_confname[MAX_STRING_LEN]="";
-char ap_coredump_dir[MAX_STRING_LEN];
+API_VAR_EXPORT char ap_coredump_dir[MAX_STRING_LEN];
-array_header *ap_server_pre_read_config;
-array_header *ap_server_post_read_config;
-array_header *ap_server_config_defines;
+API_VAR_EXPORT array_header *ap_server_pre_read_config;
+API_VAR_EXPORT array_header *ap_server_post_read_config;
+API_VAR_EXPORT array_header *ap_server_config_defines;
/* *Non*-shared http_main globals... */
@@ -1577,7 +1577,7 @@
}
#endif
-unsigned int ap_set_callback_and_alarm(void (*fn) (int), int x)
+API_EXPORT_NONSTD(unsigned int) ap_set_callback_and_alarm(void (*fn) (int), int x)
{
unsigned int old;
@@ -1670,7 +1670,7 @@
-void ap_keepalive_timeout(char *name, request_rec *r)
+API_EXPORT(void) ap_keepalive_timeout(char *name, request_rec *r)
{
unsigned int to;
#ifdef NETWARE
@@ -2547,7 +2547,7 @@
exit(code);
}
-int ap_update_child_status(int child_num, int status, request_rec *r)
+API_EXPORT(int) ap_update_child_status(int child_num, int status, request_rec *r)
{
int old_status;
short_score *ss;
@@ -3106,7 +3106,7 @@
static int volatile shutdown_pending;
static int volatile restart_pending;
static int volatile is_graceful;
-ap_generation_t volatile ap_my_generation=0;
+API_VAR_EXPORT ap_generation_t volatile ap_my_generation=0;
#ifdef WIN32
/*
Index: src/include/http_main.h
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/include/http_main.h,v
retrieving revision 1.37
diff -u -r1.37 http_main.h
--- src/include/http_main.h 2001/09/04 18:15:15 1.37
+++ src/include/http_main.h 2001/12/21 14:06:54
@@ -116,16 +116,16 @@
API_EXPORT(void) ap_start_shutdown(void);
API_EXPORT(void) ap_start_restart(int);
API_EXPORT(void) ap_hard_timeout(char *, request_rec *);
-void ap_keepalive_timeout(char *, request_rec *);
+API_EXPORT(void) ap_keepalive_timeout(char *, request_rec *);
API_EXPORT(void) ap_soft_timeout(char *, request_rec *);
API_EXPORT(void) ap_kill_timeout(request_rec *);
API_EXPORT(void) ap_reset_timeout(request_rec *);
API_EXPORT(void) ap_child_terminate(request_rec *r);
API_EXPORT(void) ap_sync_scoreboard_image(void);
-int ap_update_child_status(int child_num, int status, request_rec *r);
+API_EXPORT(int) ap_update_child_status(int child_num, int status, request_rec *r);
void ap_time_process_request(int child_num, int status);
-unsigned int ap_set_callback_and_alarm(void (*fn) (int), int x);
+API_EXPORT_NONSTD(unsigned int) ap_set_callback_and_alarm(void (*fn) (int), int x);
API_EXPORT(int) ap_check_alarm(void);
void setup_signal_names(char *prefix);
Index: src/main/http_protocol.c
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.301
diff -u -r1.301 http_protocol.c
--- src/main/http_protocol.c 2001/06/22 12:43:54 1.301
+++ src/main/http_protocol.c 2001/12/21 14:10:49
@@ -1073,7 +1073,7 @@
ap_overlap_tables(r->headers_in, tmp_headers, AP_OVERLAP_TABLES_MERGE);
}
-request_rec *ap_read_request(conn_rec *conn)
+API_EXPORT(request_rec *) ap_read_request(conn_rec *conn)
{
request_rec *r;
pool *p;
@@ -1234,7 +1234,7 @@
* *someone* has to set the protocol-specific fields...
*/
-void ap_set_sub_req_protocol(request_rec *rnew, const request_rec *r)
+API_EXPORT(void) ap_set_sub_req_protocol(request_rec *rnew, const request_rec *r)
{
rnew->the_request = r->the_request; /* Keep original request-line */
@@ -1260,7 +1260,7 @@
rnew->main = (request_rec *) r;
}
-void ap_finalize_sub_req_protocol(request_rec *sub)
+API_EXPORT(void) ap_finalize_sub_req_protocol(request_rec *sub)
{
SET_BYTES_SENT(sub->main);
}
@@ -1588,7 +1588,7 @@
return OK;
}
-int ap_send_http_options(request_rec *r)
+API_EXPORT(int) ap_send_http_options(request_rec *r)
{
const long int zero = 0L;
Index: src/include/http_protocol.h
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/include/http_protocol.h,v
retrieving revision 1.53
diff -u -r1.53 http_protocol.h
--- src/include/http_protocol.h 2001/01/15 17:04:35 1.53
+++ src/include/http_protocol.h 2001/12/21 14:07:12
@@ -70,7 +70,7 @@
/* Read a request and fill in the fields. */
-request_rec *ap_read_request(conn_rec *c);
+API_EXPORT(request_rec *) ap_read_request(conn_rec *c);
/* Send a single HTTP header field */
@@ -91,7 +91,7 @@
/* Send the response to special method requests */
API_EXPORT(int) ap_send_http_trace(request_rec *r);
-int ap_send_http_options(request_rec *r);
+API_EXPORT(int) ap_send_http_options(request_rec *r);
/* Finish up stuff after a request */
@@ -205,8 +205,8 @@
* Also, a wrapup function to keep the internal accounting straight.
*/
-void ap_set_sub_req_protocol(request_rec *rnew, const request_rec *r);
-void ap_finalize_sub_req_protocol(request_rec *sub_r);
+API_EXPORT(void) ap_set_sub_req_protocol(request_rec *rnew, const request_rec *r);
+API_EXPORT(void) ap_finalize_sub_req_protocol(request_rec *sub_r);
/* This is also useful for putting sub_reqs and internal_redirects together */
Index: src/main/http_request.c
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/main/http_request.c,v
retrieving revision 1.163
diff -u -r1.163 http_request.c
--- src/main/http_request.c 2001/11/16 18:15:16 1.163
+++ src/main/http_request.c 2001/12/21 14:11:08
@@ -1314,7 +1314,7 @@
ap_finalize_request_protocol(r);
}
-void ap_process_request(request_rec *r)
+API_EXPORT(void) ap_process_request(request_rec *r)
{
int old_stat;
Index: src/include/http_request.h
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/include/http_request.h,v
retrieving revision 1.30
diff -u -r1.30 http_request.h
--- src/include/http_request.h 2001/01/15 17:04:35 1.30
+++ src/include/http_request.h 2001/12/21 14:07:29
@@ -107,7 +107,7 @@
#ifdef CORE_PRIVATE
/* Function called by main.c to handle first-level request */
-void ap_process_request(request_rec *);
+API_EXPORT(void) ap_process_request(request_rec *);
API_EXPORT(void) ap_die(int type, request_rec *r);
#endif
Index: src/main/http_vhost.c
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/main/http_vhost.c,v
retrieving revision 1.30
diff -u -r1.30 http_vhost.c
--- src/main/http_vhost.c 2001/02/24 10:09:46 1.30
+++ src/main/http_vhost.c 2001/12/21 14:11:25
@@ -149,7 +149,7 @@
/* called at the beginning of the config */
-void ap_init_vhost_config(pool *p)
+API_EXPORT(void) ap_init_vhost_config(pool *p)
{
memset(iphash_table, 0, sizeof(iphash_table));
default_list = NULL;
@@ -242,7 +242,7 @@
/* parse the <VirtualHost> addresses */
-const char *ap_parse_vhost_addrs(pool *p, const char *hostname, server_rec *s)
+API_EXPORT(const char *) ap_parse_vhost_addrs(pool *p, const char *hostname,
+server_rec *s)
{
server_addr_rec **addrs;
const char *err;
@@ -268,7 +268,7 @@
}
-const char *ap_set_name_virtual_host (cmd_parms *cmd, void *dummy, char *arg)
+API_EXPORT(const char *) ap_set_name_virtual_host (cmd_parms *cmd, void *dummy, char
+*arg)
{
/* use whatever port the main server has at this point */
return get_addresses(cmd->pool, arg, &name_vhost_list_tail,
@@ -530,7 +530,7 @@
}
/* compile the tables and such we need to do the run-time vhost lookups */
-void ap_fini_vhost_config(pool *p, server_rec *main_s)
+API_EXPORT(void) ap_fini_vhost_config(pool *p, server_rec *main_s)
{
server_addr_rec *sar;
int has_default_vhost_addr;
@@ -946,7 +946,7 @@
}
-void ap_update_vhost_from_headers(request_rec *r)
+API_EXPORT(void) ap_update_vhost_from_headers(request_rec *r)
{
/* must set this for HTTP/1.1 support */
if (r->hostname || (r->hostname = ap_table_get(r->headers_in, "Host"))) {
@@ -967,7 +967,7 @@
/* Called for a new connection which has a known local_addr. Note that the
* new connection is assumed to have conn->server == main server.
*/
-void ap_update_vhost_given_ip(conn_rec *conn)
+API_EXPORT(void) ap_update_vhost_given_ip(conn_rec *conn)
{
ipaddr_chain *trav;
unsigned port = ntohs(conn->local_addr.sin_port);
Index: src/include/http_vhost.h
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/include/http_vhost.h,v
retrieving revision 1.13
diff -u -r1.13 http_vhost.h
--- src/include/http_vhost.h 2001/01/15 17:04:37 1.13
+++ src/include/http_vhost.h 2001/12/21 14:07:45
@@ -64,24 +64,24 @@
#endif
/* called before any config is read */
-void ap_init_vhost_config(pool *p);
+API_EXPORT(void) ap_init_vhost_config(pool *p);
/* called after the config has been read */
-void ap_fini_vhost_config(pool *p, server_rec *main_server);
+API_EXPORT(void) ap_fini_vhost_config(pool *p, server_rec *main_server);
/* handle addresses in <VirtualHost> statement */
-const char *ap_parse_vhost_addrs(pool *p, const char *hostname, server_rec *s);
+API_EXPORT(const char *) ap_parse_vhost_addrs(pool *p, const char *hostname,
+server_rec *s);
/* handle NameVirtualHost directive */
-const char *ap_set_name_virtual_host (cmd_parms *cmd, void *dummy, char *arg);
+API_EXPORT(const char *) ap_set_name_virtual_host (cmd_parms *cmd, void *dummy, char
+*arg);
/* given an ip address only, give our best guess as to what vhost it is */
-void ap_update_vhost_given_ip(conn_rec *conn);
+API_EXPORT(void) ap_update_vhost_given_ip(conn_rec *conn);
/* The above is never enough, and this is always called after the headers
* have been read. It may change r->server.
*/
-void ap_update_vhost_from_headers(request_rec *r);
+API_EXPORT(void) ap_update_vhost_from_headers(request_rec *r);
/* return 1 if the host:port matches any of the aliases of r->server
* return 0 otherwise
Index: src/include/httpd.h
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/include/httpd.h,v
retrieving revision 1.349
diff -u -r1.349 httpd.h
--- src/include/httpd.h 2001/10/09 03:59:38 1.349
+++ src/include/httpd.h 2001/12/21 14:07:59
@@ -1139,8 +1139,8 @@
API_EXPORT(int) ap_checkconv_in(struct request_rec *r); /* for uploads */
#endif /*#ifdef CHARSET_EBCDIC*/
-char *ap_get_local_host(pool *);
-unsigned long ap_get_virthost_addr(char *hostname, unsigned short *port);
+API_EXPORT(char *) ap_get_local_host(pool *);
+API_EXPORT(unsigned long) ap_get_virthost_addr(char *hostname, unsigned short *port);
extern API_VAR_EXPORT time_t ap_restart_time;
Index: src/main/rfc1413.c
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/main/rfc1413.c,v
retrieving revision 1.36
diff -u -r1.36 rfc1413.c
--- src/main/rfc1413.c 2001/01/15 17:05:04 1.36
+++ src/main/rfc1413.c 2001/12/21 14:11:46
@@ -235,7 +235,7 @@
}
/* rfc1413 - return remote user name, given socket structures */
-char *ap_rfc1413(conn_rec *conn, server_rec *srv)
+API_EXPORT(char *) ap_rfc1413(conn_rec *conn, server_rec *srv)
{
static char user[RFC1413_USERLEN + 1]; /* XXX */
static char *result;
Index: src/include/rfc1413.h
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/include/rfc1413.h,v
retrieving revision 1.15
diff -u -r1.15 rfc1413.h
--- src/include/rfc1413.h 2001/01/15 17:04:38 1.15
+++ src/include/rfc1413.h 2001/12/21 14:08:21
@@ -63,7 +63,7 @@
extern "C" {
#endif
-extern char *ap_rfc1413(conn_rec *conn, server_rec *srv);
+API_EXPORT(extern char *) ap_rfc1413(conn_rec *conn, server_rec *srv);
#ifdef __cplusplus
}
Index: src/main/util.c
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/main/util.c,v
retrieving revision 1.199
diff -u -r1.199 util.c
--- src/main/util.c 2001/07/25 13:25:18 1.199
+++ src/main/util.c 2001/12/21 14:12:06
@@ -1962,7 +1962,7 @@
* Parses a host of the form <address>[:port]
* :port is permitted if 'port' is not NULL
*/
-unsigned long ap_get_virthost_addr(char *w, unsigned short *ports)
+API_EXPORT(unsigned long) ap_get_virthost_addr(char *w, unsigned short *ports)
{
struct hostent *hep;
unsigned long my_addr;
@@ -2028,7 +2028,7 @@
return ap_pstrdup(a, (void *) p->h_name);
}
-char *ap_get_local_host(pool *a)
+API_EXPORT(char *) ap_get_local_host(pool *a)
{
#ifndef MAXHOSTNAMELEN
#define MAXHOSTNAMELEN 256
