rse 98/04/06 01:04:26
Modified: src/test/rename README apapi.h apapi.h.mk apapi_compat.h
apapi_compat.h.mk rename.cf rename.cf.update
Log:
Update of the rename stuff for more correct symbol decision.
Now its a lot better.
Revision Changes Path
1.3 +33 -1 apache-1.3/src/test/rename/README
Index: README
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/test/rename/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README 1998/04/06 06:20:39 1.2
+++ README 1998/04/06 08:04:23 1.3
@@ -2,7 +2,39 @@
This stuff is only temporary.
It is used for the global symbol renaming in the Apache 1.3 sources.
It replaces identifiers in our C source files according to
-the rename.cf file.
+the rename.cf file.
+
+====================================================================
+
+The proposed steps for this big change are:
+
+ 1. Roy: - tag PRE_AP_PREFIX_RENAME
+ - make rename
+ - compile entire server (without the back-compat)
+ - check symbols
+ - check operation of server
+ - compile entire server with the back-compat
+ - check symbols
+ - check operation of server
+ - commit
+ - tag POST_AP_PREFIX_RENAME
+
+ 2. Ralf: - tag PRE_AP_PREFIX_RENAME_CLEANUP
+ - manually change exported module structure symbols for
+ mod_abc_def.c from def_abc_module to APM_abc_def (where APM_
is
+ the prefix in rename.cf) and adjust/simplify src/Configure,
+ mod_so.c accordingly etc.
+ - completely remove HIDE stuff because that's then obsolete
+ - compile entire server (without the back-compat)
+ - check symbols
+ - check operation of server
+ - compile entire server with the back-compat
+ - check symbols
+ - check operation of server
+ - commit
+ - tag POST_AP_PREFIX_RENAME_CLEANUP
+
+====================================================================
This can be used directly by everyone:
(but finally only by Roy!)
1.2 +1 -236 apache-1.3/src/test/rename/apapi.h
Index: apapi.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/test/rename/apapi.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apapi.h 1998/04/03 06:20:10 1.1
+++ apapi.h 1998/04/06 08:04:23 1.2
@@ -1,236 +1 @@
-/*
-** apapi.h -- Apache API prototypes
-*/
-
-#ifndef APAPI_H
-#define APAPI_H
-
-extern void ap_MD5Final(unsigned char digest[16], AP_MD5_CTX * context);
-extern void ap_MD5Init(AP_MD5_CTX * context);
-extern ;
-extern void ap_add_cgi_vars(request_rec *r);
-extern void ap_add_common_vars(request_rec *r);
-extern void ap_add_module(module *m);
-extern int ap_add_named_module(const char *name);
-extern int ap_allow_options (request_rec *r);
-extern int ap_allow_overrides (request_rec *r);
-extern ;
-extern void ap_array_cat(array_header *dst, const array_header *src);
-extern char * ap_auth_name (request_rec *r);
-extern char * ap_auth_type (request_rec *r);
-extern void ap_basic_http_header(request_rec *r);
-extern int ap_bclose(BUFF *fb);
-extern BUFF * ap_bcreate(pool *p, int flags);
-extern int ap_bfilbuf(BUFF *fb);
-extern int ap_bfileno(BUFF *fb, int direction);
-extern int ap_bflsbuf(int c, BUFF *fb);
-extern int ap_bflush(BUFF *fb);
-extern int ap_bgetopt(BUFF *fb, int optname, void *optval);
-extern int ap_bgets(char *buff, int n, BUFF *fb);
-extern void ap_bhalfduplex(BUFF *fb);
-extern void ap_block_alarms();
-extern int ap_blookc(char *buff, BUFF *fb);
-extern int ap_bnonblock(BUFF *fb, int direction);
-extern void ap_bonerror(BUFF *fb, void (*error);
-extern void ap_bpushfd(BUFF *fb, int fd_in, int fd_out);
-extern int ap_bputs(const char *x, BUFF *fb);
-extern int ap_bread(BUFF *fb, void *buf, int nbyte);
-extern int ap_bsetflag(BUFF *fb, int flag, int value);
-extern int ap_bsetopt(BUFF *fb, int optname, const void *optval);
-extern int ap_bskiplf(BUFF *fb);
-extern int ap_bwrite(BUFF *fb, const void *buf, int nbyte);
-extern long ap_bytes_in_free_blocks(void);
-extern long ap_bytes_in_pool(pool *p);
-extern int ap_call_exec(request_rec *r, char *argv0, char **env, int
shellcmd);
-extern int ap_can_exec(const struct stat *finfo);
-extern int ap_cfg_closefile(configfile_t *fp);
-extern int ap_cfg_getc(configfile_t *cfp);
-extern int ap_cfg_getline(char *buf, size_t bufsize, configfile_t *cfp);
-extern void ap_chdir_file(const char *file);
-extern const char * ap_check_cmd_context(cmd_parms *cmd, unsigned forbidden);
-extern int ap_checkmask(const char *data, const char *mask);
-extern void ap_child_terminate(request_rec *r);
-extern void ap_cleanup_for_exec(void);
-extern void ap_clear_module_list();
-extern void ap_clear_pool(struct pool *a);
-extern void ap_clear_table(table *t);
-extern void ap_close_piped_log (piped_log *pl);
-/* prototype for `ap_construct_server' cannot be found */
-extern char * ap_construct_url(pool *p, const char *uri, const request_rec
*r);
-extern array_header * ap_copy_array(pool *p, const array_header *arr);
-extern array_header * ap_copy_array_hdr(pool *p, const array_header *arr);
-extern table * ap_copy_table(pool *p, const table *t);
-extern int ap_count_dirs(const char *path);
-extern char ** ap_create_environment(pool *p, table *t);
-extern void * ap_create_per_dir_config(pool *p);
-extern unsigned short ap_default_port_for_request(const request_rec *r);
-extern unsigned short ap_default_port_for_scheme(const char *scheme_str);
-extern char * ap_default_type (request_rec *r);
-extern void ap_destroy_pool(pool *a);
-extern void ap_destroy_sub_req(request_rec *r);
-extern int ap_discard_request_body(request_rec *r);
-extern char * ap_document_root (request_rec *r);
-extern int ap_each_byterange(request_rec *r, long *offset, long *length);
-extern void ap_error_log2stderr (server_rec *s);
-extern char * ap_escape_html(pool *p, const char *s);
-extern char * ap_escape_path_segment(pool *p, const char *segment);
-extern char * ap_escape_shell_cmd(pool *p, const char *str);
-extern int ap_exists_scoreboard_image(void);
-extern int ap_find_last_token(pool *p, const char *line, const char *tok);
-extern module * ap_find_linked_module(const char *name);
-extern const char * ap_find_module_name(module *m);
-extern int ap_find_path_info(const char *uri, const char *path_info);
-extern pool * ap_find_pool(const void *ts);
-extern int ap_find_token(pool *p, const char *line, const char *tok);
-extern int ap_get_basic_auth_pw(request_rec *r, char **pw);
-extern long ap_get_client_block(request_rec *r, char *buffer, int bufsiz);
-extern struct tm * ap_get_gmtoff(int *tz);
-extern void * ap_get_module_config(void *conf_vector, module *m);
-extern const char * ap_get_remote_host(conn_rec *conn, void *dir_config, int
type);
-extern const char * ap_get_remote_logname(request_rec *r);
-extern const char * ap_get_server_name(const request_rec *r);
-extern unsigned ap_get_server_port(const request_rec *r);
-extern char * ap_get_time();
-extern char * ap_get_token(pool *p, char **accept_line, int accept_white);
-extern void ap_getparents(char *name);
-extern char * ap_getword(pool *atrans, const char **line, char stop);
-extern char * ap_getword_conf(pool *p, const char **line);
-extern char * ap_getword_conf_nc(pool *p, char **line);
-extern char * ap_getword_nc(pool *atrans, char **line, char stop);
-extern char * ap_getword_nulls(pool *atrans, const char **line, char stop);
-extern char * ap_getword_nulls_nc(pool *atrans, char **line, char stop);
-extern char * ap_getword_white(pool *atrans, const char **line);
-extern char * ap_getword_white_nc(pool *atrans, char **line);
-extern char * ap_gm_timestr_822(pool *p, time_t sec);
-extern gid_t ap_gname2id(const char *name);
-extern void ap_hard_timeout(char *name, request_rec *r);
-extern char * ap_ht_time(pool *p, time_t t, const char *fmt, int gmt);
-extern int ap_ind(const char *s, char c);
-extern int ap_index_of_response(int status);
-extern void ap_internal_redirect(const char *new_uri, request_rec *r);
-extern void ap_internal_redirect_handler(const char *new_uri, request_rec
*r);
-extern int ap_is_directory(const char *path);
-extern int ap_is_initial_req(request_rec *r);
-extern int ap_is_matchexp(const char *str);
-extern int ap_is_url(const char *u);
-extern void ap_kill_cleanup(pool *p, void *data, void (*cleanup);
-extern void ap_kill_cleanups_for_fd(pool *p, int fd);
-extern void ap_kill_cleanups_for_socket(pool *p, int sock);
-extern void ap_kill_timeout(request_rec *dummy);
-extern void ap_log_assert (const char *szExp, const char *szFile, int nLine);
-extern void ap_log_error (const char *err, server_rec *s);
-extern void ap_log_printf (const server_rec *s, const char *fmt, ...);
-extern void ap_log_reason (const char *reason, const char *file, request_rec
*r);
-/* prototype for `ap_log_unixerr' cannot be found */
-extern array_header * ap_make_array(pool *p, int nelts, int elt_size);
-extern char * ap_make_dirstr(pool *p, const char *s, int n);
-extern char * ap_make_dirstr_parent(pool *p, const char *s);
-extern char * ap_make_dirstr_prefix(char *d, const char *s, int n);
-extern ;
-extern struct pool * ap_make_sub_pool(struct pool *p);
-extern table * ap_make_table(pool *p, int nelts);
-extern ;
-extern int ap_meets_conditions(request_rec *r);
-extern void ap_no2slash(char *name);
-extern void ap_note_auth_failure(request_rec *r);
-extern void ap_note_basic_auth_failure(request_rec *r);
-extern void ap_note_cleanups_for_fd(pool *p, int fd);
-extern void ap_note_cleanups_for_file(pool *p, FILE *fp);
-extern void ap_note_cleanups_for_socket(pool *p, int fd);
-extern void ap_note_digest_auth_failure(request_rec *r);
-extern void ap_note_subprocess(pool *a, int pid, enum kill_conditions how);
-extern piped_log * ap_open_piped_log (pool *p, const char *program);
-extern char * ap_os_escape_path(pool *p, const char *path, int partial);
-extern table * ap_overlay_tables(pool *p, const table *overlay, const table
*base);
-extern void * ap_palloc(struct pool *a, int reqsize);
-extern time_t ap_parseHTTPdate(const char *date);
-extern int ap_parse_uri_components(pool *p, const char *uri, uri_components
*uptr);
-extern int ap_parse_hostinfo_components(pool *p, const char *hostinfo,
uri_components *uptr);
-extern void * ap_pcalloc(struct pool *a, int size);
-/* prototype for `ap_pcfg_open_custom' cannot be found */
-extern configfile_t * ap_pcfg_openfile(pool *p, const char *name);
-extern void ap_pclosedir(pool *p, DIR * d);
-extern int ap_pclosef(pool *a, int fd);
-extern int ap_pclosesocket(pool *a, int sock);
-extern struct hostent * ap_pduphostent(pool *p, struct hostent *hp);
-extern int ap_pfclose(pool *a, FILE *fd);
-extern FILE * ap_pfdopen(pool *a, int fd, const char *mode);
-extern FILE * ap_pfopen(pool *a, const char *name, const char *mode);
-extern struct hostent * ap_pgethostbyname(pool *p, const char *hostname);
-extern int ap_pool_is_ancestor(pool *a, pool *b);
-extern void ap_pool_join(pool *p, pool *sub);
-extern DIR * ap_popendir(pool *p, const char *name);
-extern int ap_popenf(pool *a, const char *name, int flg, int mode);
-extern regex_t * ap_pregcomp(pool *p, const char *pattern, int cflags);
-extern void ap_pregfree(pool *p, regex_t * reg);
-/* prototype for `ap_pregsub' cannot be found */
-extern const char * ap_psignature(const char *prefix, request_rec *r);
-extern int ap_psocket(pool *p, int domain, int type, int protocol);
-extern char * ap_pstrdup(struct pool *a, const char *s);
-extern char * ap_pstrndup(struct pool *a, const char *s, int n);
-extern char * ap_pvsprintf(pool *p, const char *fmt, va_list ap);
-extern void * ap_push_array(array_header *arr);
-extern time_t ap_rationalize_mtime(request_rec *r, time_t mtime);
-extern void ap_register_cleanup(pool *p, void *data, void (*plain_cleanup);
-extern void ap_remove_module(module *m);
-extern array_header * ap_requires (request_rec *r);
-extern void ap_reset_timeout(request_rec *r);
-extern int ap_rflush(request_rec *r);
-extern int ap_rind(const char *s, char c);
-extern int ap_rprintf(request_rec *r, const char *fmt,...);
-extern int ap_rputc(int c, request_rec *r);
-extern int ap_rputs(const char *str, request_rec *r);
-extern void ap_run_cleanup(pool *p, void *data, void (*cleanup);
-extern int ap_run_sub_req(request_rec *r);
-extern int ap_rwrite(const void *buf, int nbyte, request_rec *r);
-extern int ap_satisfies (request_rec *r);
-extern int ap_scan_script_header_err(request_rec *r, FILE *f, char *buffer);
-extern ;
-extern long ap_send_fb(BUFF *fb, request_rec *r);
-extern long ap_send_fb_length(BUFF *fb, request_rec *r, long length);
-extern long ap_send_fd(FILE *f, request_rec *r);
-extern long ap_send_fd_length(FILE *f, request_rec *r, long length);
-extern void ap_send_http_header(request_rec *r);
-extern ;
-extern void ap_send_size(size_t size, request_rec *r);
-extern char * ap_server_root_relative(pool *p, char *file);
-extern int ap_set_byterange(request_rec *r);
-extern int ap_set_content_length(request_rec *r, long clength);
-extern void ap_set_etag(request_rec *r);
-extern int ap_set_keepalive(request_rec *r);
-extern void ap_set_last_modified(request_rec *r);
-extern void ap_set_module_config(void *conf_vector, module *m, void *val);
-extern int ap_setup_client_block(request_rec *r, int read_policy);
-extern int ap_should_client_block(request_rec *r);
-extern void ap_soft_timeout(char *name, request_rec *r);
-extern int ap_some_auth_required(request_rec *r);
-extern int ap_spawn_child_err(pool *p, int (*func);
-extern int ap_spawn_child_err_buff(pool *p, int (*func);
-extern const char * ap_srm_command_loop(cmd_parms *parms, void *config);
-extern void ap_str_tolower(char *str);
-extern int ap_strcasecmp_match(const char *str, const char *exp);
-extern int ap_strcmp_match(const char *str, const char *exp);
-extern ;
-extern ;
-extern void ap_sync_scoreboard_image();
-extern void ap_table_add(table *t, const char *key, const char *val);
-extern void ap_table_addn(table *t, const char *key, const char *val);
-extern char * ap_table_get(const table *t, const char *key);
-extern void ap_table_merge(table *t, const char *key, const char *val);
-extern void ap_table_mergen(table *t, const char *key, const char *val);
-extern void ap_table_set(table *t, const char *key, const char *val);
-extern void ap_table_setn(table *t, const char *key, const char *val);
-extern void ap_table_unset(table *t, const char *key);
-extern time_t ap_tm2sec(const struct tm * t);
-extern uid_t ap_uname2id(const char *name);
-extern void ap_unblock_alarms();
-extern int ap_unescape_url(char *url);
-extern char * ap_unparse_uri_components(pool *p, const uri_components *uptr,
unsigned flags);
-extern time_t ap_update_mtime(request_rec *r, time_t dependency_mtime);
-extern char * ap_uudecode(pool *p, const char *bufcoded);
-extern int ap_vbprintf(BUFF *fb, const char *fmt, va_list ap);
-extern const char * ap_get_server_built();
-extern const char * ap_get_server_version();
-extern void ap_log_error (const char *err, server_rec *s);
-
-#endif /* APAPI_H */
+NEED MORE WORK!
1.2 +12 -7 apache-1.3/src/test/rename/apapi.h.mk
Index: apapi.h.mk
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/test/rename/apapi.h.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apapi.h.mk 1998/04/03 06:20:11 1.1
+++ apapi.h.mk 1998/04/06 08:04:23 1.2
@@ -27,6 +27,8 @@
print HDR <<'EOT';
/*
** apapi.h -- Apache API prototypes
+**
+** THIS IS NOT COMPLETE BECAUSE IT NEEDS MANUAL FIXUP!
*/
#ifndef APAPI_H
@@ -39,14 +41,17 @@
if (($s1, $old, $s2, $new, $s3) = ($l =~
m|^(\s*)(\S+)(\s+)(\S+)(\s*)$|)) {
if ($new =~ m|^API_|) {
$new =~ s|^API_|ap_|;
- $pt = &func_prototype($new);
- if ($pt eq '') {
- print STDERR "Sorry, prototype for `$new'
cannot be found\n";
- print HDR "/* prototype for `$new' cannot be
found */\n";
- }
- else {
+ if ($pt eq '') {
+ print STDERR "Sorry, prototype for `$new' cannot be
determined automatically\n";
+ print HDR "/* prototype for `$new' cannot be automatically
determined */\n";
+ }
+ elsif ($pt eq 'extern ;') {
+ print STDERR "Sorry, prototype for `$new' cannot be
determined automatically\n";
+ print HDR "/* prototype for `$new' cannot be automatically
determined */\n";
+ }
+ else {
print HDR "$pt\n";
- }
+ }
}
}
}
1.2 +24 -44 apache-1.3/src/test/rename/apapi_compat.h
Index: apapi_compat.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/test/rename/apapi_compat.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apapi_compat.h 1998/04/03 06:20:11 1.1
+++ apapi_compat.h 1998/04/06 08:04:23 1.2
@@ -44,12 +44,14 @@
#define blookc ap_blookc
#define bnonblock ap_bnonblock
#define bonerror ap_bonerror
+#define bprintf ap_bprintf
#define bpushfd ap_bpushfd
#define bputs ap_bputs
#define bread ap_bread
#define bsetflag ap_bsetflag
#define bsetopt ap_bsetopt
#define bskiplf ap_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
@@ -59,6 +61,7 @@
#define cfg_getc ap_cfg_getc
#define cfg_getline ap_cfg_getline
#define chdir_file ap_chdir_file
+#define check_alarm ap_check_alarm
#define check_cmd_context ap_check_cmd_context
#define checkmask ap_checkmask
#define child_terminate ap_child_terminate
@@ -75,6 +78,7 @@
#define count_dirs ap_count_dirs
#define create_environment ap_create_environment
#define create_per_dir_config ap_create_per_dir_config
+#define day_snames ap_day_snames
#define default_port_for_request ap_default_port_for_request
#define default_port_for_scheme ap_default_port_for_scheme
#define default_type ap_default_type
@@ -94,6 +98,7 @@
#define find_path_info ap_find_path_info
#define find_pool ap_find_pool
#define find_token ap_find_token
+#define fnmatch ap_fnmatch
#define get_basic_auth_pw ap_get_basic_auth_pw
#define get_client_block ap_get_client_block
#define get_gmtoff ap_get_gmtoff
@@ -122,6 +127,7 @@
#define internal_redirect ap_internal_redirect
#define internal_redirect_handler ap_internal_redirect_handler
#define is_directory ap_is_directory
+#define is_fnmatch ap_is_fnmatch
#define is_initial_req ap_is_initial_req
#define is_matchexp ap_is_matchexp
#define is_url ap_is_url
@@ -130,7 +136,7 @@
#define kill_cleanups_for_socket ap_kill_cleanups_for_socket
#define kill_timeout ap_kill_timeout
#define log_assert ap_log_assert
-#define log_error ap_log_error
+#define log_error ap_log_error_old
#define log_printf ap_log_printf
#define log_reason ap_log_reason
#define log_unixerr ap_log_unixerr
@@ -143,6 +149,7 @@
#define make_table ap_make_table
#define matches_request_vhost ap_matches_request_vhost
#define meets_conditions ap_meets_conditions
+#define month_snames ap_month_snames
#define no2slash ap_no2slash
#define note_auth_failure ap_note_auth_failure
#define note_basic_auth_failure ap_note_basic_auth_failure
@@ -151,12 +158,14 @@
#define note_cleanups_for_socket ap_note_cleanups_for_socket
#define note_digest_auth_failure ap_note_digest_auth_failure
#define note_subprocess ap_note_subprocess
+#define null_cleanup ap_null_cleanup
#define open_piped_log ap_open_piped_log
#define os_escape_path ap_os_escape_path
#define overlay_tables ap_overlay_tables
#define palloc ap_palloc
#define parseHTTPdate ap_parseHTTPdate
#define parse_hostinfo_components ap_parse_hostinfo_components
+#define parse_uri ap_parse_uri
#define parse_uri_components ap_parse_uri_components
#define pcalloc ap_pcalloc
#define pcfg_open_custom ap_pcfg_open_custom
@@ -178,12 +187,15 @@
#define pregsub ap_pregsub
#define psignature ap_psignature
#define psocket ap_psocket
+#define psprintf ap_psprintf
+#define pstrcat ap_pstrcat
#define pstrdup ap_pstrdup
#define pstrndup ap_pstrndup
#define push_array ap_push_array
#define pvsprintf ap_pvsprintf
#define rationalize_mtime ap_rationalize_mtime
#define register_cleanup ap_register_cleanup
+#define register_other_child ap_register_other_child
#define remove_module ap_remove_module
#define requires ap_requires
#define reset_timeout ap_reset_timeout
@@ -194,6 +206,7 @@
#define rputs ap_rputs
#define run_cleanup ap_run_cleanup
#define run_sub_req ap_run_sub_req
+#define rvputs ap_rvputs
#define rwrite ap_rwrite
#define satisfies ap_satisfies
#define scan_script_header_err ap_scan_script_header_err
@@ -202,6 +215,7 @@
#define send_fb_length ap_send_fb_length
#define send_fd ap_send_fd
#define send_fd_length ap_send_fd_length
+#define send_header_field ap_send_header_field
#define send_http_header ap_send_http_header
#define send_mmap ap_send_mmap
#define send_size ap_send_size
@@ -209,9 +223,13 @@
#define set_byterange ap_set_byterange
#define set_content_length ap_set_content_length
#define set_etag ap_set_etag
+#define set_file_slot ap_set_file_slot
+#define set_flag_slot ap_set_flag_slot
#define set_keepalive ap_set_keepalive
#define set_last_modified ap_set_last_modified
#define set_module_config ap_set_module_config
+#define set_string_slot ap_set_string_slot
+#define set_string_slot_lower ap_set_string_slot_lower
#define setup_client_block ap_setup_client_block
#define should_client_block ap_should_client_block
#define soft_timeout ap_soft_timeout
@@ -227,6 +245,7 @@
#define sync_scoreboard_image ap_sync_scoreboard_image
#define table_add ap_table_add
#define table_addn ap_table_addn
+#define table_do ap_table_do
#define table_get ap_table_get
#define table_merge ap_table_merge
#define table_mergen ap_table_mergen
@@ -238,14 +257,15 @@
#define unblock_alarms ap_unblock_alarms
#define unescape_url ap_unescape_url
#define unparse_uri_components ap_unparse_uri_components
+#define unregister_other_child ap_unregister_other_child
#define update_mtime ap_update_mtime
#define uudecode ap_uudecode
#define vbprintf ap_vbprintf
/*
- * Mapping of Apache 1.2 symbols to
- * Apache 1.3 symbols which are
- * _NO LONGER PART OF THE API_
+ * Mapping of symbols which are private
+ * to Apache httpd and should not be considered
+ * part of the public API
*/
#ifdef APAPI_STRICT
@@ -253,10 +273,7 @@
#define add_per_dir_conf DO_NOT_USE_add_per_dir_conf
#define add_per_url_conf DO_NOT_USE_add_per_url_conf
#define bind_address DO_NOT_USE_bind_address
-#define bprintf DO_NOT_USE_bprintf
-#define bvputs DO_NOT_USE_bvputs
#define check_access DO_NOT_USE_check_access
-#define check_alarm DO_NOT_USE_check_alarm
#define check_auth DO_NOT_USE_check_auth
#define check_user_id DO_NOT_USE_check_user_id
#define child_exit_modules DO_NOT_USE_child_exit_modules
@@ -268,7 +285,6 @@
#define daemons_max_free DO_NOT_USE_daemons_max_free
#define daemons_min_free DO_NOT_USE_daemons_min_free
#define daemons_to_start DO_NOT_USE_daemons_to_start
-#define day_snames DO_NOT_USE_day_snames
#define die DO_NOT_USE_die
#define dummy_mutex DO_NOT_USE_dummy_mutex
#define excess_requests_per_child DO_NOT_USE_excess_requests_per_child
@@ -278,7 +294,6 @@
#define find_command_in_modules DO_NOT_USE_find_command_in_modules
#define find_types DO_NOT_USE_find_types
#define fini_vhost_config DO_NOT_USE_fini_vhost_config
-#define fnmatch DO_NOT_USE_fnmatch
#define force_library_loading DO_NOT_USE_force_library_loading
#define get_local_host DO_NOT_USE_get_local_host
#define get_virthost_addr DO_NOT_USE_get_virthost_addr
@@ -290,7 +305,6 @@
#define init_vhost_config DO_NOT_USE_init_vhost_config
#define init_virtual_host DO_NOT_USE_init_virtual_host
#define invoke_handler DO_NOT_USE_invoke_handler
-#define is_fnmatch DO_NOT_USE_is_fnmatch
#define keepalive_timeout DO_NOT_USE_keepalive_timeout
#define limit_section DO_NOT_USE_limit_section
#define listenbacklog DO_NOT_USE_listenbacklog
@@ -300,12 +314,9 @@
#define log_transaction DO_NOT_USE_log_transaction
#define max_requests_per_child DO_NOT_USE_max_requests_per_child
#define merge_per_dir_configs DO_NOT_USE_merge_per_dir_configs
-#define month_snames DO_NOT_USE_month_snames
-#define null_cleanup DO_NOT_USE_null_cleanup
#define open_logs DO_NOT_USE_open_logs
#define os_is_path_absolute DO_NOT_USE_os_is_path_absolute
#define parse_htaccess DO_NOT_USE_parse_htaccess
-#define parse_uri DO_NOT_USE_parse_uri
#define parse_vhost_addrs DO_NOT_USE_parse_vhost_addrs
#define pid_fname DO_NOT_USE_pid_fname
#define process_request DO_NOT_USE_process_request
@@ -344,22 +355,17 @@
#define proxy_send_fb DO_NOT_USE_proxy_send_fb
#define proxy_send_headers DO_NOT_USE_proxy_send_headers
#define proxyerror DO_NOT_USE_proxyerror
-#define psprintf DO_NOT_USE_psprintf
-#define pstrcat DO_NOT_USE_pstrcat
#define read_config DO_NOT_USE_read_config
#define read_request DO_NOT_USE_read_request
-#define register_other_child DO_NOT_USE_register_other_child
#define response_code_string DO_NOT_USE_response_code_string
#define restart_time DO_NOT_USE_restart_time
#define rfc1413 DO_NOT_USE_rfc1413
#define rfc1413_timeout DO_NOT_USE_rfc1413_timeout
#define run_fixups DO_NOT_USE_run_fixups
#define run_post_read_request DO_NOT_USE_run_post_read_request
-#define rvputs DO_NOT_USE_rvputs
#define scoreboard_fname DO_NOT_USE_scoreboard_fname
#define scoreboard_image DO_NOT_USE_scoreboard_image
#define send_error_response DO_NOT_USE_send_error_response
-#define send_header_field DO_NOT_USE_send_header_field
#define send_http_options DO_NOT_USE_send_http_options
#define send_http_trace DO_NOT_USE_send_http_trace
#define server_argv0 DO_NOT_USE_server_argv0
@@ -368,11 +374,7 @@
#define server_pre_read_config DO_NOT_USE_server_pre_read_config
#define server_root DO_NOT_USE_server_root
#define set_callback_and_alarm DO_NOT_USE_set_callback_and_alarm
-#define set_file_slot DO_NOT_USE_set_file_slot
-#define set_flag_slot DO_NOT_USE_set_flag_slot
#define set_name_virtual_host DO_NOT_USE_set_name_virtual_host
-#define set_string_slot DO_NOT_USE_set_string_slot
-#define set_string_slot_lower DO_NOT_USE_set_string_slot_lower
#define set_sub_req_protocol DO_NOT_USE_set_sub_req_protocol
#define setup_prelinked_modules DO_NOT_USE_setup_prelinked_modules
#define show_directives DO_NOT_USE_show_directives
@@ -381,11 +383,9 @@
#define start_restart DO_NOT_USE_start_restart
#define start_shutdown DO_NOT_USE_start_shutdown
#define suexec_enabled DO_NOT_USE_suexec_enabled
-#define table_do DO_NOT_USE_table_do
#define threads_per_child DO_NOT_USE_threads_per_child
#define time_process_request DO_NOT_USE_time_process_request
#define translate_name DO_NOT_USE_translate_name
-#define unregister_other_child DO_NOT_USE_unregister_other_child
#define update_child_status DO_NOT_USE_update_child_status
#define update_vhost_from_headers DO_NOT_USE_update_vhost_from_headers
#define update_vhost_given_ip DO_NOT_USE_update_vhost_given_ip
@@ -399,10 +399,7 @@
#define add_per_dir_conf apx_add_per_dir_conf
#define add_per_url_conf apx_add_per_url_conf
#define bind_address apx_bind_address
-#define bprintf apx_bprintf
-#define bvputs apx_bvputs
#define check_access apx_check_access
-#define check_alarm apx_check_alarm
#define check_auth apx_check_auth
#define check_user_id apx_check_user_id
#define child_exit_modules apx_child_exit_modules
@@ -414,7 +411,6 @@
#define daemons_max_free apx_daemons_max_free
#define daemons_min_free apx_daemons_min_free
#define daemons_to_start apx_daemons_to_start
-#define day_snames apx_day_snames
#define die apx_die
#define dummy_mutex apx_dummy_mutex
#define excess_requests_per_child apx_excess_requests_per_child
@@ -424,7 +420,6 @@
#define find_command_in_modules apx_find_command_in_modules
#define find_types apx_find_types
#define fini_vhost_config apx_fini_vhost_config
-#define fnmatch apx_fnmatch
#define force_library_loading apx_force_library_loading
#define get_local_host apx_get_local_host
#define get_virthost_addr apx_get_virthost_addr
@@ -436,7 +431,6 @@
#define init_vhost_config apx_init_vhost_config
#define init_virtual_host apx_init_virtual_host
#define invoke_handler apx_invoke_handler
-#define is_fnmatch apx_is_fnmatch
#define keepalive_timeout apx_keepalive_timeout
#define limit_section apx_limit_section
#define listenbacklog apx_listenbacklog
@@ -446,12 +440,9 @@
#define log_transaction apx_log_transaction
#define max_requests_per_child apx_max_requests_per_child
#define merge_per_dir_configs apx_merge_per_dir_configs
-#define month_snames apx_month_snames
-#define null_cleanup apx_null_cleanup
#define open_logs apx_open_logs
#define os_is_path_absolute apx_os_is_path_absolute
#define parse_htaccess apx_parse_htaccess
-#define parse_uri apx_parse_uri
#define parse_vhost_addrs apx_parse_vhost_addrs
#define pid_fname apx_pid_fname
#define process_request apx_process_request
@@ -490,22 +481,17 @@
#define proxy_send_fb apx_proxy_send_fb
#define proxy_send_headers apx_proxy_send_headers
#define proxyerror apx_proxyerror
-#define psprintf apx_psprintf
-#define pstrcat apx_pstrcat
#define read_config apx_read_config
#define read_request apx_read_request
-#define register_other_child apx_register_other_child
#define response_code_string apx_response_code_string
#define restart_time apx_restart_time
#define rfc1413 apx_rfc1413
#define rfc1413_timeout apx_rfc1413_timeout
#define run_fixups apx_run_fixups
#define run_post_read_request apx_run_post_read_request
-#define rvputs apx_rvputs
#define scoreboard_fname apx_scoreboard_fname
#define scoreboard_image apx_scoreboard_image
#define send_error_response apx_send_error_response
-#define send_header_field apx_send_header_field
#define send_http_options apx_send_http_options
#define send_http_trace apx_send_http_trace
#define server_argv0 apx_server_argv0
@@ -514,11 +500,7 @@
#define server_pre_read_config apx_server_pre_read_config
#define server_root apx_server_root
#define set_callback_and_alarm apx_set_callback_and_alarm
-#define set_file_slot apx_set_file_slot
-#define set_flag_slot apx_set_flag_slot
#define set_name_virtual_host apx_set_name_virtual_host
-#define set_string_slot apx_set_string_slot
-#define set_string_slot_lower apx_set_string_slot_lower
#define set_sub_req_protocol apx_set_sub_req_protocol
#define setup_prelinked_modules apx_setup_prelinked_modules
#define show_directives apx_show_directives
@@ -527,11 +509,9 @@
#define start_restart apx_start_restart
#define start_shutdown apx_start_shutdown
#define suexec_enabled apx_suexec_enabled
-#define table_do apx_table_do
#define threads_per_child apx_threads_per_child
#define time_process_request apx_time_process_request
#define translate_name apx_translate_name
-#define unregister_other_child apx_unregister_other_child
#define update_child_status apx_update_child_status
#define update_vhost_from_headers apx_update_vhost_from_headers
#define update_vhost_given_ip apx_update_vhost_given_ip
1.2 +3 -3 apache-1.3/src/test/rename/apapi_compat.h.mk
Index: apapi_compat.h.mk
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/test/rename/apapi_compat.h.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apapi_compat.h.mk 1998/04/03 06:20:12 1.1
+++ apapi_compat.h.mk 1998/04/06 08:04:24 1.2
@@ -57,9 +57,9 @@
print FP <<'EOT';
/*
- * Mapping of Apache 1.2 symbols to
- * Apache 1.3 symbols which are
- * _NO LONGER PART OF THE API_
+ * Mapping of symbols which are private
+ * to Apache httpd and should not be considered
+ * part of the public API
*/
#ifdef APAPI_STRICT
1.2 +61 -61 apache-1.3/src/test/rename/rename.cf
Index: rename.cf
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/test/rename/rename.cf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rename.cf 1998/04/03 06:20:12 1.1
+++ rename.cf 1998/04/06 08:04:24 1.2
@@ -45,7 +45,7 @@
server_confname APX_server_confname
server_post_read_config APX_server_post_read_config
server_pre_read_config APX_server_pre_read_config
-server_root APX_server_root
+server_root API_server_root
standalone APX_standalone
threads_per_child APX_threads_per_child
user_id APX_user_id
@@ -53,9 +53,9 @@
# DATA
suexec_enabled APX_suexec_enabled
-day_snames APX_day_snames
+day_snames API_day_snames
dummy_mutex APX_dummy_mutex
-month_snames APX_month_snames
+month_snames API_month_snames
rfc1413_timeout APX_rfc1413_timeout
scoreboard_image APX_scoreboard_image
@@ -63,43 +63,43 @@
# these need a change in mod_so and a change to the name guessing in
# the src/Configure script plus changes to the embedded
# "Name:" C comments inside the module source files
-#access_module APM_access_module
-#action_module APM_action_module
-#agent_log_module APM_agent_log_module
-#alias_module APM_alias_module
-#anon_auth_module APM_anon_auth_module
-#asis_module APM_asis_module
-#auth_module APM_auth_module
-#autoindex_module APM_autoindex_module
-#cern_meta_module APM_cern_meta_module
-#cgi_module APM_cgi_module
-#config_log_module APM_config_log_module
-#core_module APM_core_module
-#db_auth_module APM_db_auth_module
-#dbm_auth_module APM_dbm_auth_module
-#digest_module APM_digest_module
-#dir_module APM_dir_module
-#env_module APM_env_module
-#example_module APM_example_module
-#expires_module APM_expires_module
-#headers_module APM_headers_module
-#imap_module APM_imap_module
-#includes_module APM_includes_module
-#info_module APM_info_module
-#mime_magic_module APM_mime_magic_module
-#mime_module APM_mime_module
-#negotiation_module APM_negotiation_module
-#proxy_module APM_proxy_module
-#referer_log_module APM_referer_log_module
-#rewrite_module APM_rewrite_module
-#setenvif_module APM_setenvif_module
-#so_module APM_so_module
-#speling_module APM_speling_module
-#status_module APM_status_module
-#top_module APM_top_module
-#unique_id_module APM_unique_id_module
-#userdir_module APM_userdir_module
-#usertrack_module APM_usertrack_module
+#access_module APM_access
+#action_module APM_action
+#alias_module APM_alias
+#auth_module APM_auth
+#anon_auth_module APM_auth_anon
+#db_auth_module APM_auth_db
+#dbm_auth_module APM_auth_dbm
+#asis_module APM_asis
+#autoindex_module APM_autoindex
+#cern_meta_module APM_cern_meta
+#cgi_module APM_cgi
+#core_module APM_core
+#digest_module APM_digest
+#dir_module APM_dir
+#env_module APM_env
+#example_module APM_example
+#expires_module APM_expires
+#headers_module APM_headers
+#imap_module APM_imap
+#includes_module APM_includes
+#info_module APM_info
+#mime_magic_module APM_mime_magic
+#mime_module APM_mime
+#negotiation_module APM_negotiation
+#proxy_module APM_proxy
+#config_log_module APM_log_config
+#referer_log_module APM_log_referer
+#agent_log_module APM_log_agent
+#rewrite_module APM_rewrite
+#setenvif_module APM_setenvif
+#so_module APM_so
+#speling_module APM_speling
+#status_module APM_status
+#top_module APM_top
+#unique_id_module APM_unique_id
+#userdir_module APM_userdir
+#usertrack_module APM_usertrack
# DATA
# these two require also a (trivial) change in Configure
@@ -138,12 +138,12 @@
bonerror API_bonerror
bpushfd API_bpushfd
bputs API_bputs
-bprintf APX_bprintf
+bprintf API_bprintf
bread API_bread
bsetflag API_bsetflag
bsetopt API_bsetopt
bskiplf API_bskiplf
-bvputs APX_bvputs
+bvputs API_bvputs
bwrite API_bwrite
bytes_in_free_blocks API_bytes_in_free_blocks
bytes_in_pool API_bytes_in_pool
@@ -154,7 +154,7 @@
cfg_getline API_cfg_getline
chdir_file API_chdir_file
check_access APX_check_access
-check_alarm APX_check_alarm
+check_alarm API_check_alarm
check_auth APX_check_auth
check_cmd_context API_check_cmd_context
check_user_id APX_check_user_id
@@ -203,7 +203,7 @@
find_token API_find_token
find_types APX_find_types
fini_vhost_config APX_fini_vhost_config
-fnmatch APX_fnmatch
+fnmatch API_fnmatch
force_library_loading APX_force_library_loading
get_basic_auth_pw API_get_basic_auth_pw
get_client_block API_get_client_block
@@ -242,7 +242,7 @@
internal_redirect_handler API_internal_redirect_handler
invoke_handler APX_invoke_handler
is_directory API_is_directory
-is_fnmatch APX_is_fnmatch
+is_fnmatch API_is_fnmatch
is_initial_req API_is_initial_req
is_matchexp API_is_matchexp
is_url API_is_url
@@ -276,16 +276,14 @@
note_cleanups_for_socket API_note_cleanups_for_socket
note_digest_auth_failure API_note_digest_auth_failure
note_subprocess API_note_subprocess
-null_cleanup APX_null_cleanup
+null_cleanup API_null_cleanup
open_logs APX_open_logs
open_piped_log API_open_piped_log
-os_escape_path API_os_escape_path
-os_is_path_absolute APX_os_is_path_absolute
overlay_tables API_overlay_tables
palloc API_palloc
parseHTTPdate API_parseHTTPdate
parse_htaccess APX_parse_htaccess
-parse_uri APX_parse_uri
+parse_uri API_parse_uri
parse_uri_components API_parse_uri_components
parse_hostinfo_components API_parse_hostinfo_components
parse_vhost_addrs APX_parse_vhost_addrs
@@ -345,17 +343,17 @@
proxyerror APX_proxyerror
psignature API_psignature
psocket API_psocket
-pstrcat APX_pstrcat
+pstrcat API_pstrcat
pstrdup API_pstrdup
pstrndup API_pstrndup
-psprintf APX_psprintf
+psprintf API_psprintf
pvsprintf API_pvsprintf
push_array API_push_array
rationalize_mtime API_rationalize_mtime
read_config APX_read_config
read_request APX_read_request
register_cleanup API_register_cleanup
-register_other_child APX_register_other_child
+register_other_child API_register_other_child
remove_module API_remove_module
requires API_requires
reset_timeout API_reset_timeout
@@ -370,7 +368,7 @@
run_fixups APX_run_fixups
run_post_read_request APX_run_post_read_request
run_sub_req API_run_sub_req
-rvputs APX_rvputs
+rvputs API_rvputs
rwrite API_rwrite
satisfies API_satisfies
scan_script_header_err API_scan_script_header_err
@@ -380,7 +378,7 @@
send_fb_length API_send_fb_length
send_fd API_send_fd
send_fd_length API_send_fd_length
-send_header_field APX_send_header_field
+send_header_field API_send_header_field
send_http_header API_send_http_header
send_http_options APX_send_http_options
send_http_trace APX_send_http_trace
@@ -391,14 +389,14 @@
set_callback_and_alarm APX_set_callback_and_alarm
set_content_length API_set_content_length
set_etag API_set_etag
-set_file_slot APX_set_file_slot
-set_flag_slot APX_set_flag_slot
+set_file_slot API_set_file_slot
+set_flag_slot API_set_flag_slot
set_keepalive API_set_keepalive
set_last_modified API_set_last_modified
set_module_config API_set_module_config
set_name_virtual_host APX_set_name_virtual_host
-set_string_slot APX_set_string_slot
-set_string_slot_lower APX_set_string_slot_lower
+set_string_slot API_set_string_slot
+set_string_slot_lower API_set_string_slot_lower
set_sub_req_protocol APX_set_sub_req_protocol
setup_client_block API_setup_client_block
setup_prelinked_modules APX_setup_prelinked_modules
@@ -420,7 +418,7 @@
sync_scoreboard_image API_sync_scoreboard_image
table_add API_table_add
table_addn API_table_addn
-table_do APX_table_do
+table_do API_table_do
table_get API_table_get
table_merge API_table_merge
table_mergen API_table_mergen
@@ -434,7 +432,7 @@
unblock_alarms API_unblock_alarms
unescape_url API_unescape_url
unparse_uri_components API_unparse_uri_components
-unregister_other_child APX_unregister_other_child
+unregister_other_child API_unregister_other_child
update_child_status APX_update_child_status
update_mtime API_update_mtime
update_vhost_from_headers APX_update_vhost_from_headers
@@ -445,8 +443,10 @@
vbprintf API_vbprintf
# specials
-apapi_get_server_built API_get_server_built
+apapi_get_server_built API_get_server_built
apapi_get_server_version API_get_server_version
aplog_error API_log_error
log_error API_log_error_old
+os_escape_path API_escape_path
+os_is_path_absolute API_is_path_absolute
1.2 +2 -1 apache-1.3/src/test/rename/rename.cf.update
Index: rename.cf.update
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/test/rename/rename.cf.update,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rename.cf.update 1998/04/03 06:20:12 1.1
+++ rename.cf.update 1998/04/06 08:04:24 1.2
@@ -13,7 +13,8 @@
my ($func) = @_;
$rc = join('', `lid -f $id --key=token --result=grep $func`);
- if ($rc =~ m|\.c:\d+:\s*API_EXPORT\(|s) {
+ if ( $rc =~ m|\.c:\d+:\s*API_EXPORT(_NONSTD)?\(|s
+ or $rc =~ m|\.c:\d+:\s*API_VAR_EXPORT\s+|s) {
return 1;
}
return 0;
