dougm 02/05/18 18:05:30
Modified: xs/maps apache_functions.map apache_structures.map
apr_functions.map apr_structures.map apr_types.map
Log:
add some newish functions/types, remove some that no longer exist
Revision Changes Path
1.50 +41 -5 modperl-2.0/xs/maps/apache_functions.map
Index: apache_functions.map
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/maps/apache_functions.map,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- apache_functions.map 14 May 2002 01:14:19 -0000 1.49
+++ apache_functions.map 19 May 2002 01:05:30 -0000 1.50
@@ -45,6 +45,11 @@
ap_method_register
>ap_method_registry_init
>ap_process_request_internal
+?ap_get_mime_headers
+>ap_rgetline_core
+?ap_get_request_note
+?ap_register_request_note
+ ap_set_content_type
#MODULE=Apache::RequestConfig
ap_document_root
@@ -54,11 +59,21 @@
>MODULE=Apache::Core
ap_basic_http_header
- ap_dechunk_filter
ap_http_filter
ap_send_http_options
ap_send_http_trace
ap_response_code_string
+ ap_add_file_conf
+ ap_add_per_dir_conf
+ ap_add_per_url_conf
+ ap_limit_section
+ ap_setup_make_content_type
+
+>MODULE=Apache::Listen
+ ap_set_listenbacklog
+ ap_set_listener
+ ap_set_send_buffer_size
+ ap_setup_listeners
MODULE=Apache::SubRequest PACKAGE=Apache::RequestRec
?ap_sub_req_output_filter
@@ -115,6 +130,7 @@
ap_allow_methods | mpxs_ | ...
ap_allow_options
ap_allow_overrides
+ ap_allow_standard_methods
ap_get_remote_logname
SV *:ap_requires | mpxs_
ap_satisfies
@@ -136,10 +152,12 @@
-ap_scan_script_header_err
-ap_scan_script_header_err_core
-ap_scan_script_header_err_strs
+-ap_scan_script_header_err_brigade
MODULE=Apache::ServerUtil PACKAGE=guess BOOT=1
ap_add_version_component
ap_error_log2stderr
+?ap_replace_stderr_log
#MODULE=Apache::ServerConfig
ap_exists_config_define
@@ -200,6 +218,11 @@
PACKAGE=guess
~ap_add_output_filter
~ap_add_input_filter
+-ap_add_input_filter_handle
+-ap_get_input_filter_handle
+-ap_add_output_filter_handle
+-ap_get_output_filter_handle
+>ap_add_ouput_filters_by_type
ap_get_brigade | | \
filter, bucket, mode=AP_MODE_READBYTES, \
block=APR_BLOCK_READ, \
@@ -212,7 +235,7 @@
!ap_save_brigade
ap_filter_flush
ap_fflush
- ap_fputstrs
+-ap_fputstrs
int:DEFINE_ap_fputs | | \
ap_filter_t *:f, apr_bucket_brigade *:bb, const char *:str
-ap_fprintf
@@ -258,6 +281,10 @@
ap_escape_html
#escape_uri
ap_os_escape_path
+!ap_explode_recent_gmt
+!ap_explode_recent_localtime
+!ap_recent_ctime
+!ap_recent_rfc822_date
MODULE=Apache::URI PACKAGE=guess
char *:ap_unescape_url | mpxs_ | SV *:url
@@ -327,14 +354,19 @@
!MODULE=Apache::Scoreboard
ap_exists_scoreboard_image
- ap_sync_scoreboard_image
-ap_update_child_status
-ap_time_process_request
-ap_create_scoreboard
ap_cleanup_scoreboard
ap_increment_counts
- ap_get_parent_scoreboard
- ap_get_servers_scoreboard
+ ap_calc_scoreboard_size
+ ap_create_sb_handle
+ ap_get_scoreboard_global
+ ap_get_scoreboard_process
+ ap_get_scoreboard_worker
+>ap_init_scoreboard
+>ap_reopen_scoreboard
+ ap_update_child_status_from_indexes
!MODULE=Apache::Hooks
ap_location_walk
@@ -344,6 +376,8 @@
ap_hook_auth_checker
ap_hook_check_user_id
ap_hook_child_init
+>ap_hook_create_connection
+>ap_hook_get_create_connection
ap_hook_default_port
ap_hook_fixups
ap_hook_handler
@@ -405,6 +439,7 @@
ap_run_child_init
?ap_run_default_port
?ap_run_http_method
+>ap_run_create_connection
>ap_run_pre_connection
>ap_run_process_connection
ap_run_post_read_request
@@ -482,3 +517,4 @@
ap_mpm_set_pidfile
ap_mpm_set_scoreboard
?ap_show_mpm
+ ap_listen_pre_config
1.14 +6 -2 modperl-2.0/xs/maps/apache_structures.map
Index: apache_structures.map
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/maps/apache_structures.map,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- apache_structures.map 9 Apr 2002 16:45:20 -0000 1.13
+++ apache_structures.map 19 May 2002 01:05:30 -0000 1.14
@@ -1,6 +1,6 @@
########## Apache structures ##########
-IGNORE: ap_LINK_ ap_filter_func ap_bucket_error
+IGNORE: ap_LINK_ ap_filter_func ap_bucket_error ap_listen_rec core_net_rec
<request_rec>
pool
@@ -28,7 +28,6 @@
bytes_sent
mtime
> chunked
-> boundary
> range
> clength
remaining
@@ -58,11 +57,14 @@
args
~ finfo
~ parsed_uri
+ used_path_info
per_dir_config
request_config
! htaccess
output_filters
input_filters
+ proto_output_filters
+ proto_input_filters
? eos_sent
</request_rec>
@@ -114,6 +116,7 @@
notes
input_filters
output_filters
+ sbh
bucket_alloc
</conn_rec>
@@ -201,6 +204,7 @@
!<ap_unix_identity_t>
uid
gid
+ userdir
</ap_unix_identity_t>
!<unixd_config_rec>
1.39 +106 -66 modperl-2.0/xs/maps/apr_functions.map
Index: apr_functions.map
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/maps/apr_functions.map,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- apr_functions.map 14 May 2002 01:32:50 -0000 1.38
+++ apr_functions.map 19 May 2002 01:05:30 -0000 1.39
@@ -12,17 +12,20 @@
apr_poll_setup
!MODULE=APR::Time
- apr_ansi_time_to_apr_time
-apr_ctime
apr_implode_time
-apr_time_now
-apr_sleep
apr_rfc822_date
apr_strftime
- apr_explode_gmt
apr_implode_gmt
apr_explode_localtime
apr_explode_time
+ apr_time_ansi_put
+ apr_time_exp_get
+ apr_time_exp_gmt
+ apr_time_exp_lt
+ apr_time_exp_tz
MODULE=APR::Date
-apr_date_checkmask
@@ -69,6 +72,7 @@
apr_sockaddr_ip_set
apr_sockaddr_port_set
apr_port_t:apr_sockaddr_port_get | mpxs_ | sockaddr
+ apr_sockaddr_equal
MODULE=APR::Brigade
apr_brigade_create | mpxs_ | SV *:CLASS, p, list | new
@@ -85,6 +89,9 @@
apr_brigade_puts
-apr_brigade_putc
!apr_brigade_cleanup
+?apr_brigade_flatten
+?apr_brigade_pflatten
+?apr_brigade_split_line
mpxs_APR__Brigade_first #APR_BRIGADE_FIRST
mpxs_APR__Brigade_last #APR_BRIGADE_LAST
mpxs_APR__Brigade_prev #APR_BUCKET_PREV
@@ -104,10 +111,15 @@
bucket, SV *:buffer, block=APR_BLOCK_READ | read
#modperl_bucket_sv_create
mpxs_APR__Bucket_new | | classname, sv, offset=0, len=0
+ >apr_bucket_alloc
+ >apr_bucket_alloc_create
+ >apr_bucket_alloc_destroy
+ >apr_bucket_free
!apr_bucket_copy_notimpl
!apr_bucket_shared_copy
apr_bucket_eos_create
!apr_bucket_file_create
+ !apr_bucket_file_enable_mmap
apr_bucket_flush_create
!apr_bucket_heap_create
!apr_bucket_immortal_create
@@ -140,12 +152,15 @@
-apr_pool_num_bytes | | p, recurse=0 #only available with -DAPR_POOL_DEBUG
apr_pool_cleanup_for_exec
apr_pool_clear
+>apr_pool_clear_debug
apr_pool_destroy
+>apr_pool_destroy_debug
apr_pool_t *:DEFINE_new | mpxs_apr_pool_create | SV *:obj
+-apr_pool_create_ex
+>apr_pool_create_ex_debug
apr_pool_userdata_get
apr_pool_userdata_set
->apr_pool_alloc_init
->apr_pool_alloc_term
+-apr_pool_userdata_setn
apr_pool_cleanup_kill
apr_pool_cleanup_run
-apr_pool_cleanup_null
@@ -153,6 +168,8 @@
apr_pool_sub_make
apr_pool_note_subprocess
-apr_palloc
+>apr_palloc_debug
+>apr_pcalloc_debug
-apr_pcalloc
-apr_pmemdup
apr_pool_child_cleanup_set
@@ -160,20 +177,46 @@
apr_pool_get_parent
apr_pool_is_ancestor
-apr_pool_set_abort
-
-!MODULE=APR::Lock
-!apr_lock_child_init
- apr_lock_t *:apr_lock_create | mpxs_ | \
- SV *:CLASS, pool, type=0, mech=APR_LOCK_DEFAULT, scope=1,
fname="lock.file" | new
--apr_lock_destroy
- apr_lock_DESTROY | | lock
- apr_lock_data_get
- apr_lock_data_set
- apr_lock_acquire
- apr_lock_release
- apr_lock_acquire_rw
--apr_lock_create_np
- apr_lock_tryacquire
+>apr_pool_initialize
+>apr_pool_terminate
+ apr_pool_tag
+
+-MODULE=APR::Allocator
+ apr_allocator_alloc
+ apr_allocator_create
+ apr_allocator_destroy
+ apr_allocator_free
+ apr_allocator_get_mutex
+ apr_allocator_get_mutex
+ apr_allocator_get_owner
+ apr_allocator_set_mutex
+ apr_allocator_set_owner
+
+-MODULE=APR::Atomic
+ apr_atomic_add
+ apr_atomic_cas
+ apr_atomic_dec
+ apr_atomic_inc
+ apr_atomic_init
+ apr_atomic_set
+
+!MODULE=APR::GlobalMutex
+ apr_global_mutex_child_init
+ apr_global_mutex_create
+ apr_global_mutex_destroy
+ apr_global_mutex_lock
+ apr_global_mutex_pool_get
+ apr_global_mutex_trylock
+ apr_global_mutex_unlock
+
+!MODULE=APR::ProcMutex
+ apr_proc_mutex_child_init
+ apr_proc_mutex_create
+ apr_proc_mutex_destroy
+ apr_proc_mutex_lock
+ apr_proc_mutex_pool_get
+ apr_proc_mutex_trylock
+ apr_proc_mutex_unlock
MODULE=APR::Table
apr_table_clear
@@ -200,6 +243,11 @@
mpxs_APR__Table_EXISTS
!MODULE=APR::File
+-apr_file_append
+-apr_file_attrs_set
+-apr_file_copy
+-apr_file_dup2
+ apr_file_mktemp
-apr_file_open
-apr_file_close
-apr_file_namedpipe_create
@@ -254,8 +302,10 @@
apr_is_fnmatch
-apr_psprintf
-apr_pstrcat
+-apr_pstrcatv
-apr_pstrdup
-apr_pstrndup
+-apr_pstrmemdup
-apr_pvsprintf
apr_strnatcasecmp
apr_strnatcmp
@@ -268,6 +318,9 @@
MODULE=APR::String
SV *:apr_strfsize | mpxs_APR__String_strfsize | size | format_size
+!MODULE=APR::StrMatch
+ apr_strmatch_precompile
+
!MODULE=APR::ProcAttr
apr_procattr_create
apr_procattr_child_err_set
@@ -291,6 +344,14 @@
-apr_proc_other_child_check
-apr_proc_wait_all_procs
+!MODULE=APR::ThreadMutex
+ apr_thread_mutex_create
+ apr_thread_mutex_destroy
+ apr_thread_mutex_lock
+ apr_thread_mutex_trylock
+ apr_thread_mutex_unlock
+ apr_thread_mutex_pool_get
+
-MODULE=APR::Thread
apr_thread_create
apr_thread_data_get
@@ -298,11 +359,6 @@
apr_thread_detach
apr_thread_exit
apr_thread_join
- apr_thread_mutex_create
- apr_thread_mutex_destroy
- apr_thread_mutex_lock
- apr_thread_mutex_trylock
- apr_thread_mutex_unlock
apr_thread_once
apr_thread_once_init
apr_thread_pool_get
@@ -314,6 +370,8 @@
apr_thread_cond_destroy
apr_thread_cond_signal
apr_thread_cond_wait
+ apr_thread_cond_pool_get
+ apr_thread_cond_timedwait
-MODULE=APR::ThreadRWLock
apr_thread_rwlock_create
@@ -323,6 +381,7 @@
apr_thread_rwlock_trywrlock
apr_thread_rwlock_unlock
apr_thread_rwlock_wrlock
+ apr_thread_rwlock_pool_get
-MODULE=APR::ThreadKey
apr_threadkey_data_get
@@ -337,6 +396,10 @@
apr_threadattr_detach_set
apr_threadattr_detach_get
+!MODULE=APR::Version
+ apr_version
+ apr_version_string
+
-MODULE=APR::DBM
apr_dbm_close
apr_dbm_delete
@@ -346,8 +409,10 @@
apr_dbm_freedatum
apr_dbm_geterror
apr_dbm_get_usednames
+ apr_dbm_get_usednames_ex
apr_dbm_nextkey
apr_dbm_open
+ apr_dbm_open_ex
apr_dbm_store
-MODULE=APR::SDBM
@@ -362,37 +427,6 @@
apr_sdbm_store
apr_sdbm_unlock
--MODULE=APR::SMS
- apr_sms_blocks_create
- apr_sms_calloc
- apr_sms_cleanup_register
- apr_sms_cleanup_run
- apr_sms_cleanup_run_type
- apr_sms_cleanup_unregister
- apr_sms_cleanup_unregister_type
- apr_sms_destroy
- apr_sms_free
- apr_sms_get_abort
- apr_sms_get_identity
- apr_sms_get_parent
- apr_sms_is_ancestor
- apr_sms_lock
- apr_sms_malloc
- apr_sms_realloc
- apr_sms_reset
- apr_sms_set_abort
- apr_sms_std_create
- apr_sms_thread_register
- apr_sms_thread_unregister
- apr_sms_threads_create
- apr_sms_threads_create_ex
- apr_sms_tracking_create
- apr_sms_trivial_create
- apr_sms_trivial_create_ex
- apr_sms_unlock
- apr_sms_userdata_get
- apr_sms_userdata_set
-
-MODULE=APR::Dir
apr_dir_close
apr_dir_open
@@ -418,6 +452,7 @@
apr_strerror | MPXS_ | statcode
!MODULE=APR::General
+-apr_app_initialize
-apr_initialize
-apr_terminate
-apr_terminate2
@@ -428,7 +463,7 @@
!apr_signal_get_description
-apr_signal_init
-apr_setup_signal_thread
- apr_signal_thread
+!apr_signal_thread
MODULE=APR::UUID
apr_uuid_format | MPXS_ | uuid
@@ -446,10 +481,11 @@
apr_optional_hook_get
!MODULE=APR::User
- apr_get_groupname
+ apr_group_name_get
apr_get_home_directory
apr_get_username
apr_get_userid
+ apr_get_groupid
apr_current_userid
MODULE=APR::NetLib
@@ -468,20 +504,20 @@
apr_getopt_init
!MODULE=APR::Shm
- apr_shm_name_get
- apr_shm_name_set
- apr_shm_open
- apr_shm_avail
- apr_shm_calloc
+ apr_shm_create
apr_shm_destroy
- apr_shm_free
- apr_shm_init
- apr_shm_malloc
+ apr_shm_attach
+ apr_shm_detach
+ apr_shm_baseaddr_get
+ apr_shm_size_get
+ apr_shm_pool_get
!MODULE=APR::Hash
+ apr_hash_copy
apr_hash_count
apr_hash_first
apr_hash_get
+ apr_hash_merge
apr_hash_next
apr_hash_set
apr_hash_this
@@ -546,6 +582,7 @@
apr_mmap_create
apr_mmap_delete
apr_mmap_offset
+ apr_mmap_dup
!MODULE=APR::Xlate
apr_xlate_close
@@ -559,7 +596,6 @@
apr_os_exp_time_get
apr_os_file_get
apr_os_imp_time_get
- apr_os_lock_get
apr_os_sock_get
apr_os_thread_get
apr_os_threadkey_get
@@ -568,7 +604,6 @@
apr_os_exp_time_put
apr_os_file_put
apr_os_imp_time_put
- apr_os_lock_put
apr_os_sock_put
apr_os_thread_put
apr_os_threadkey_put
@@ -576,3 +611,8 @@
apr_os_dso_handle_put
apr_os_thread_current
apr_os_thread_equal
+ apr_os_global_mutex_get
+ apr_os_proc_mutex_get
+ apr_os_proc_mutex_put
+ apr_os_shm_get
+ apr_os_shm_put
1.8 +10 -5 modperl-2.0/xs/maps/apr_structures.map
Index: apr_structures.map
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/maps/apr_structures.map,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- apr_structures.map 10 Mar 2002 00:11:50 -0000 1.7
+++ apr_structures.map 19 May 2002 01:05:30 -0000 1.8
@@ -2,8 +2,9 @@
IGNORE: apr_pool_t apr_os_ apr_vformatter_buff_t apr_pool_t \
apr_table_t apr_in_addr_t apr_bucket_ apr_md5_ctx_t apr_sha1_ctx_t \
-apr_md4_ctx_t apr_sdbm_datum_t \
-apr_uuid_t apr_datum_t apr_mmap_t apr_hdtr_t apr_ipsubnet_t
+apr_md4_ctx_t apr_sdbm_datum_t apr_memnode_t \
+apr_uuid_t apr_datum_t apr_mmap_t apr_hdtr_t apr_ipsubnet_t \
+apr_strmatch_pattern apr_version_t
#buckets
@@ -23,11 +24,12 @@
length
start
data
- sms
+> free
+> list
</apr_bucket>
!<apr_finfo_t>
- cntxt
+ pool
valid
protection
filetype
@@ -94,13 +96,15 @@
!<apr_table_entry_t>
key
val
+> key_checksum
</apr_table_entry_t>
#getopt
!<apr_getopt_t>
- cont
-- err
+- errfn
+ errarg
ind
- opt
- reset
@@ -116,6 +120,7 @@
name
- optch
- has_arg
+ description
</apr_getopt_option_t>
#XML
1.16 +0 -8 modperl-2.0/xs/maps/apr_types.map
Index: apr_types.map
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/maps/apr_types.map,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- apr_types.map 9 Apr 2002 17:00:14 -0000 1.15
+++ apr_types.map 19 May 2002 01:05:30 -0000 1.16
@@ -2,7 +2,6 @@
struct apr_xlate_t | UNDEFINED
struct apr_pool_t | APR::Pool
-struct apr_sms_t | UNDEFINED
apr_abortfunc_t | UNDEFINED
#socket stuff
@@ -91,13 +90,8 @@
apr_hash_index_t | APR::HashIndex
#lock stuff
-apr_os_lock_t | NOTIMPL
-#struct apr_lock_t | APR::Lock
apr_locktype_e | IV
apr_lockmech_e | IV
-apr_lockscope_e | IV
-apr_readerwriter_e | IV
-apr_lockmech_e_np | IV
#thread stuff
struct apr_threadkey_t | UNDEFINED
@@ -116,8 +110,6 @@
apr_sigfunc_t | UNDEFINED
#shared memory stuff
-struct apr_shm_name_t | UNDEFINED
-struct apr_shmem_t | UNDEFINED
struct apr_mmap_t | APR::Mmap
#xml stuff
