cvs commit: apache-1.3/src/include compat.h conf.h
marc98/07/14 20:27:04 Modified:src/include compat.h conf.h Log: Fix up compat.h and conf.h legacy support. Revision ChangesPath 1.15 +2 -3 apache-1.3/src/include/compat.h Index: compat.h === RCS file: /export/home/cvs/apache-1.3/src/include/compat.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- compat.h 1998/07/13 11:32:34 1.14 +++ compat.h 1998/07/15 03:27:03 1.15 @@ -2,9 +2,8 @@ * compat.h -- backward compatibility header for ap_compat.h */ -#if __GNUC__ -#warning This header becomes obsolete, use ap_compat.h instead +#ifdef __GNUC__ +#warning This header is obsolete, use ap_compat.h instead #endif #include ap_compat.h - 1.226 +3 -4 apache-1.3/src/include/conf.h Index: conf.h === RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v retrieving revision 1.225 retrieving revision 1.226 diff -u -r1.225 -r1.226 --- conf.h1998/07/13 11:32:35 1.225 +++ conf.h1998/07/15 03:27:03 1.226 @@ -2,9 +2,8 @@ * conf.h -- backward compatibility header for ap_config.h */ -#if __GNUC__ -#warning This header becomes obsolete, use ap_config.h instead +#ifdef __GNUC__ +#warning This header is obsolete, use ap_config.h instead #endif -#include ap_compat.h - +#include ap_config.h
cvs commit: apache-1.3/src/include compat.h
rse 98/07/09 05:11:36 Modified:src/include compat.h Log: Add back-compat entry for ap_is_empty_table which Ben forgot last time when he renamed the define. Revision ChangesPath 1.13 +1 -0 apache-1.3/src/include/compat.h Index: compat.h === RCS file: /export/home/cvs/apache-1.3/src/include/compat.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- compat.h 1998/07/04 16:07:26 1.12 +++ compat.h 1998/07/09 12:11:35 1.13 @@ -174,6 +174,7 @@ #define invoke_handler ap_invoke_handler #define is_default_portap_is_default_port #define is_directory ap_is_directory +#define is_empty_table ap_is_empty_table #define is_fnmatch ap_is_fnmatch #define is_initial_req ap_is_initial_req #define is_matchexpap_is_matchexp
cvs commit: apache-1.3/src/include compat.h
jim 98/06/29 12:06:19 Modified:src/include compat.h Log: Be backwards compatible Revision ChangesPath 1.11 +2 -0 apache-1.3/src/include/compat.h Index: compat.h === RCS file: /export/home/cvs/apache-1.3/src/include/compat.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- compat.h 1998/05/28 22:09:46 1.10 +++ compat.h 1998/06/29 19:06:18 1.11 @@ -176,6 +176,7 @@ #define is_fnmatch ap_is_fnmatch #define is_initial_req ap_is_initial_req #define is_matchexpap_is_matchexp +#define is_table_empty ap_is_table_empty #define is_url ap_is_url #define keepalive_timeout ap_keepalive_timeout #define kill_cleanup ap_kill_cleanup @@ -379,6 +380,7 @@ #define table_add ap_table_add #define table_addn ap_table_addn #define table_do ap_table_do +#define table_elts ap_table_elts #define table_get ap_table_get #define table_mergeap_table_merge #define table_mergen ap_table_mergen
cvs commit: apache-1.3/src/include compat.h
coar98/05/06 05:23:40 Modified:src/include compat.h Log: Argh.. inserted out of order. Revision ChangesPath 1.7 +1 -1 apache-1.3/src/include/compat.h Index: compat.h === RCS file: /export/home/cvs/apache-1.3/src/include/compat.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- compat.h 1998/05/06 10:49:02 1.6 +++ compat.h 1998/05/06 12:23:40 1.7 @@ -198,8 +198,8 @@ #define make_sub_pool ap_make_sub_pool #define make_table ap_make_table #define matches_request_vhost ap_matches_request_vhost -#define md5ap_md5 #define max_requests_per_child ap_max_requests_per_child +#define md5ap_md5 #define meets_conditions ap_meets_conditions #define merge_per_dir_configs ap_merge_per_dir_configs #define month_snames ap_month_snames
cvs commit: apache-1.3/src/include compat.h
rse 98/04/13 03:32:28 Modified:src/os/win32 os.h src/os/unix os.h os.c src/os/bs2000 os.h os.c src/modules/standard mod_so.c mod_cgi.c src/main http_core.c src/include compat.h Log: Manual DSO cleanup after renaming: - renamed remaining os_ stuff in os/unix/ and os/bs2000/ to ap_ variants - merged the ap_dso_ non-HPUX-specific #defines and the HPUX-specific functions - moved the FreeBSD-underscore hack from mod_so (where it was badly placed because it is a low-level stuff) to the dlsym() call in os/unix/os.c (where is is placed better because _there_ is the os-specific stuff) - some minor cleanups to os.h - additions to compat.h Revision ChangesPath 1.16 +5 -5 apache-1.3/src/os/win32/os.h Index: os.h === RCS file: /export/home/cvs/apache-1.3/src/os/win32/os.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- os.h 1998/04/11 12:01:06 1.15 +++ os.h 1998/04/13 10:32:23 1.16 @@ -101,8 +101,8 @@ /* Abstractions for dealing with shared object files (DLLs on Win32). * These are used by mod_so.c */ -#define os_dl_module_handle_type HINSTANCE -#define os_dl_load(l) LoadLibraryEx(l, NULL, LOAD_WITH_ALTERED_SEARCH_PATH) -#define os_dl_unload(l) FreeLibrary(l) -#define os_dl_sym(h,s) GetProcAddress(h,s) -#define os_dl_error() /* for now */ +#define ap_dso_handle_t HINSTANCE +#define ap_dso_load(l) LoadLibraryEx(l, NULL, LOAD_WITH_ALTERED_SEARCH_PATH) +#define ap_dso_unload(l) FreeLibrary(l) +#define ap_dso_sym(h,s) GetProcAddress(h,s) +#define ap_dso_error() /* for now */ 1.20 +26 -32apache-1.3/src/os/unix/os.h Index: os.h === RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- os.h 1998/04/12 15:49:28 1.19 +++ os.h 1998/04/13 10:32:23 1.20 @@ -80,55 +80,49 @@ #endif /* - * Abstraction layer for dynamic loading of modules (mod_so.c) + * Abstraction layer for loading + * Apache modules under run-time via + * dynamic shared object (DSO) mechanism */ -#if defined(LINUX) || defined(__FreeBSD__) || defined(SOLARIS2) || \ -defined(__bsdi__) || defined(IRIX) || defined(SVR4) || defined(OSF1) -# define HAVE_DLFCN_H 1 +#if defined(HPUX) || defined(HPUX10) +#define HAVE_DL_H 1 #endif -#if defined(__FreeBSD__) -# define NEED_UNDERSCORE_SYM +#if defined(LINUX) || defined(__FreeBSD__) || defined(SOLARIS2) || \ +defined(__bsdi__) || defined(IRIX) || defined(SVR4) || defined(OSF1) +#define HAVE_DLFCN_H 1 #endif - /* OSes that don't support dlopen */ -#if defined(UW) || defined(ULTRIX) || defined(HPUX) || defined(HPUX10) -# define NO_DL +#ifdef HAVE_DL_H +#include dl.h #endif - /* Start of real module */ #ifdef HAVE_DLFCN_H -# include dlfcn.h +#include dlfcn.h #else -void * dlopen (const char * __filename, int __flag); -const char * dlerror (void); -void * dlsym (void *, const char *); -int dlclose (void *); +void *dlopen(const char *, int); +int dlclose(void *); +void *dlsym(void *, const char *); +const char *dlerror(void); #endif -#ifndef RTLD_NOW -/* - * probably on an older system that doesn't support RTLD_NOW or RTLD_LAZY. +/* probably on an older system that doesn't support RTLD_NOW or RTLD_LAZY. * The below define is a lie since we are really doing RTLD_LAZY since the * system doesn't support RTLD_NOW. */ -# define RTLD_NOW 1 +#ifndef RTLD_NOW +#define RTLD_NOW 1 #endif -#if defined(HPUX) || defined(HPUX10) -#include dl.h -#define os_dl_module_handle_type void * -void *os_dl_load(char *path); -void os_dl_unload(void *handle); -void *os_dl_sym(void *handle, char *symname); -char *os_dl_error(void); -#else -#define os_dl_module_handle_type void * -#define os_dl_load(l) dlopen(l, RTLD_NOW) -#define os_dl_unload(l) dlclose(l) -#define os_dl_sym(h,s) dlsym(h,s) -#define os_dl_error() dlerror() +#if defined(__FreeBSD__) +#define DLSYM_NEEDS_UNDERSCORE #endif + +#define ap_dso_handle_t void * +void * ap_dso_load(const char *); +voidap_dso_unload(void *); +void * ap_dso_sym(void *, const char *); +const char *ap_dso_error(void); #endif /* !APACHE_OS_H */ 1.8 +31 -15apache-1.3/src/os/unix/os.c Index: os.c === RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- os.c 1998/04/12 15:49:28
cvs commit: apache-1.3/src/include compat.h
rse 98/04/11 05:02:37 Added: src/include compat.h Log: This is the new backward-compatibility header containing the defines for the old symbols. Revision ChangesPath 1.1 apache-1.3/src/include/compat.h Index: compat.h === /* ** compat.h -- Apache Backward Compatibility ** ** INCLUDE THIS HEADER FILE ONLY IF YOU REALLY NEED ** BACKWARD COMPATIBILITY TO OLD APACHE RESOURCES. */ #ifndef APACHE_COMPAT_H #define APACHE_COMPAT_H /* * Mapping of Apache 1.2 global symbols to the * namespace conflict free variants used in Apache 1.3 */ #define MD5Final ap_MD5Final #define MD5Initap_MD5Init #define MD5Update ap_MD5Update #define acquire_mutex ap_acquire_mutex #define add_cgi_vars ap_add_cgi_vars #define add_common_varsap_add_common_vars #define add_module ap_add_module #define add_named_module ap_add_named_module #define add_per_dir_conf ap_add_per_dir_conf #define add_per_url_conf ap_add_per_url_conf #define allow_options ap_allow_options #define allow_overridesap_allow_overrides #define apapi_get_server_built ap_get_server_built #define apapi_get_server_version ap_get_server_version #define aplog_errorap_log_error #define append_arrays ap_append_arrays #define array_cat ap_array_cat #define auth_name ap_auth_name #define auth_type ap_auth_type #define basic_http_header ap_basic_http_header #define bclose ap_bclose #define bcreateap_bcreate #define bfilbufap_bfilbuf #define bfilenoap_bfileno #define bflsbufap_bflsbuf #define bflush ap_bflush #define bgetoptap_bgetopt #define bgets ap_bgets #define bhalfduplexap_bhalfduplex #define bind_address ap_bind_address #define block_alarms ap_block_alarms #define blookc ap_blookc #define bnonblock ap_bnonblock #define bonerror ap_bonerror #define bprintfap_bprintf #define bpushfdap_bpushfd #define bputs ap_bputs #define bread ap_bread #define bsetflag ap_bsetflag #define bsetoptap_bsetopt #define bskiplfap_bskiplf #define bvputs ap_bvputs #define bwrite ap_bwrite #define bytes_in_free_blocks ap_bytes_in_free_blocks #define bytes_in_pool ap_bytes_in_pool #define call_exec ap_call_exec #define can_exec ap_can_exec #define cfg_closefile ap_cfg_closefile #define cfg_getc ap_cfg_getc #define cfg_getlineap_cfg_getline #define chdir_file ap_chdir_file #define check_access ap_check_access #define check_alarmap_check_alarm #define check_auth ap_check_auth #define check_cmd_context ap_check_cmd_context #define check_user_id ap_check_user_id #define checkmask ap_checkmask #define child_exit_modules ap_child_exit_modules #define child_init_modules ap_child_init_modules #define child_terminateap_child_terminate #define cleanup_for_exec ap_cleanup_for_exec #define clear_module_list ap_clear_module_list #define clear_pool ap_clear_pool #define clear_tableap_clear_table #define close_piped_logap_close_piped_log #define construct_server ap_construct_server #define construct_url ap_construct_url #define copy_array ap_copy_array #define copy_array_hdr ap_copy_array_hdr #define copy_table ap_copy_table #define core_reorder_directories ap_core_reorder_directories #define coredump_dir ap_coredump_dir #define count_dirs ap_count_dirs #define create_environment ap_create_environment #define create_mutex ap_create_mutex #define create_per_dir_config ap_create_per_dir_config #define
