stas 01/12/31 04:16:37
Modified: xs/tables/current/Apache ConstantsTable.pm FunctionTable.pm
StructureTable.pm
xs/tables/current/ModPerl FunctionTable.pm
Log:
sync to the latest httpd/apr
Revision Changes Path
1.20 +10 -1 modperl-2.0/xs/tables/current/Apache/ConstantsTable.pm
Index: ConstantsTable.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/tables/current/Apache/ConstantsTable.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ConstantsTable.pm 15 Dec 2001 23:51:43 -0000 1.19
+++ ConstantsTable.pm 31 Dec 2001 12:16:37 -0000 1.20
@@ -2,7 +2,7 @@
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Sat Dec 15 15:39:22 2001
+# ! Mon Dec 31 20:02:32 2001
# ! do NOT edit, any changes will be lost !
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -221,6 +221,13 @@
'APR_POLLHUP',
'APR_POLLNVAL'
],
+ 'lockmech' => [
+ 'APR_LOCK_FCNTL',
+ 'APR_LOCK_FLOCK',
+ 'APR_LOCK_SYSVSEM',
+ 'APR_LOCK_PROC_PTHREAD',
+ 'APR_LOCK_DEFAULT'
+ ],
'limit' => [
'APR_LIMIT_CPU',
'APR_LIMIT_MEM',
@@ -347,6 +354,8 @@
'APR_ENETUNREACH',
'APR_EFTYPE',
'APR_EPIPE',
+ 'APR_EXDEV',
+ 'APR_ENOTEMPTY',
'APR_END'
],
'common' => [
1.29 +508 -60 modperl-2.0/xs/tables/current/Apache/FunctionTable.pm
Index: FunctionTable.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/tables/current/Apache/FunctionTable.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- FunctionTable.pm 15 Dec 2001 23:51:43 -0000 1.28
+++ FunctionTable.pm 31 Dec 2001 12:16:37 -0000 1.29
@@ -2,7 +2,7 @@
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Sat Dec 15 15:39:32 2001
+# ! Mon Dec 31 19:58:28 2001
# ! do NOT edit, any changes will be lost !
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -347,6 +347,11 @@
},
{
'return_type' => 'int',
+ 'name' => 'ap_calc_scoreboard_size',
+ 'args' => []
+ },
+ {
+ 'return_type' => 'int',
'name' => 'ap_cfg_closefile',
'args' => [
{
@@ -555,6 +560,28 @@
},
{
'return_type' => 'void',
+ 'name' => 'ap_create_sb_handle',
+ 'args' => [
+ {
+ 'type' => 'void **',
+ 'name' => 'new_handle'
+ },
+ {
+ 'type' => 'apr_pool_t *',
+ 'name' => 'p'
+ },
+ {
+ 'type' => 'int',
+ 'name' => 'child_num'
+ },
+ {
+ 'type' => 'int',
+ 'name' => 'thread_num'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'void',
'name' => 'ap_create_scoreboard',
'args' => [
{
@@ -2197,12 +2224,8 @@
'name' => 'ap_increment_counts',
'args' => [
{
- 'type' => 'int',
- 'name' => 'child_num'
- },
- {
- 'type' => 'int',
- 'name' => 'thread_num'
+ 'type' => 'void *',
+ 'name' => 'sbh'
},
{
'type' => 'request_rec *',
@@ -2236,6 +2259,11 @@
},
{
'return_type' => 'void',
+ 'name' => 'ap_init_scoreboard',
+ 'args' => []
+ },
+ {
+ 'return_type' => 'void',
'name' => 'ap_init_vhost_config',
'args' => [
{
@@ -3866,6 +3894,10 @@
{
'type' => 'int',
'name' => 'conn_id'
+ },
+ {
+ 'type' => 'void *',
+ 'name' => 'sbh'
}
]
},
@@ -3906,24 +3938,24 @@
'name' => 'level'
},
{
- 'type' => 'apr_status_t status',
- 'name' => 'arg3'
+ 'type' => 'apr_status_t',
+ 'name' => 'status'
},
{
'type' => 'const server_rec *',
'name' => 's'
},
{
- 'type' => 'const request_rec *r',
- 'name' => 'arg5'
+ 'type' => 'const request_rec *',
+ 'name' => 'r'
},
{
'type' => 'apr_pool_t *',
'name' => 'pool'
},
{
- 'type' => 'const char *errstr',
- 'name' => 'arg7'
+ 'type' => 'const char *',
+ 'name' => 'errstr'
}
]
},
@@ -4979,6 +5011,24 @@
'name' => 'ap_update_child_status',
'args' => [
{
+ 'type' => 'void *',
+ 'name' => 'sbh'
+ },
+ {
+ 'type' => 'int',
+ 'name' => 'status'
+ },
+ {
+ 'type' => 'request_rec *',
+ 'name' => 'r'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'int',
+ 'name' => 'ap_update_child_status_from_indexes',
+ 'args' => [
+ {
'type' => 'int',
'name' => 'child_num'
},
@@ -7938,33 +7988,7 @@
'name' => 'scope'
},
{
- 'type' => 'const char *',
- 'name' => 'fname'
- },
- {
- 'type' => 'apr_pool_t *',
- 'name' => 'pool'
- }
- ]
- },
- {
- 'return_type' => 'apr_status_t',
- 'name' => 'apr_lock_create_np',
- 'args' => [
- {
- 'type' => 'apr_lock_t **',
- 'name' => 'lock'
- },
- {
- 'type' => 'apr_locktype_e',
- 'name' => 'type'
- },
- {
- 'type' => 'apr_lockscope_e',
- 'name' => 'scope'
- },
- {
- 'type' => 'apr_lockmech_e_np',
+ 'type' => 'apr_lockmech_e',
'name' => 'mech'
},
{
@@ -9212,6 +9236,20 @@
},
{
'return_type' => 'void',
+ 'name' => 'apr_pool_tag',
+ 'args' => [
+ {
+ 'type' => 'apr_pool_t *',
+ 'name' => 'pool'
+ },
+ {
+ 'type' => 'const char *',
+ 'name' => 'tag'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'void',
'name' => 'apr_pool_terminate',
'args' => []
},
@@ -9371,25 +9409,7 @@
'name' => 'fname'
},
{
- 'type' => 'apr_pool_t *',
- 'name' => 'pool'
- }
- ]
- },
- {
- 'return_type' => 'apr_status_t',
- 'name' => 'apr_proc_mutex_create_np',
- 'args' => [
- {
- 'type' => 'apr_proc_mutex_t **',
- 'name' => 'mutex'
- },
- {
- 'type' => 'const char *',
- 'name' => 'fname'
- },
- {
- 'type' => 'apr_lockmech_e_np',
+ 'type' => 'apr_lockmech_e',
'name' => 'mech'
},
{
@@ -10423,6 +10443,420 @@
]
},
{
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_sms_blocks_create',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t **',
+ 'name' => 'sms'
+ },
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'pms'
+ },
+ {
+ 'type' => 'apr_size_t',
+ 'name' => 'block_size'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'void *',
+ 'name' => 'apr_sms_calloc',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
+ },
+ {
+ 'type' => 'apr_size_t',
+ 'name' => 'size'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_sms_cleanup_register',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
+ },
+ {
+ 'type' => 'apr_int32_t',
+ 'name' => 'type'
+ },
+ {
+ 'type' => 'const void *',
+ 'name' => 'data'
+ },
+ {
+ 'type' => 'apr_status_t (*cleanup_fn)(void *)',
+ 'name' => 'arg3'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_sms_cleanup_run',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
+ },
+ {
+ 'type' => 'apr_int32_t',
+ 'name' => 'type'
+ },
+ {
+ 'type' => 'const void *',
+ 'name' => 'data'
+ },
+ {
+ 'type' => 'apr_status_t (*cleanup)(void *)',
+ 'name' => 'arg3'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_sms_cleanup_run_type',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
+ },
+ {
+ 'type' => 'apr_int32_t',
+ 'name' => 'type'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_sms_cleanup_unregister',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
+ },
+ {
+ 'type' => 'apr_int32_t',
+ 'name' => 'type'
+ },
+ {
+ 'type' => 'const void *',
+ 'name' => 'data'
+ },
+ {
+ 'type' => 'apr_status_t (*cleanup)(void *)',
+ 'name' => 'arg3'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_sms_cleanup_unregister_type',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
+ },
+ {
+ 'type' => 'apr_int32_t',
+ 'name' => 'type'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_sms_destroy',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_sms_free',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
+ },
+ {
+ 'type' => 'void *',
+ 'name' => 'mem'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_abortfunc_t',
+ 'name' => 'apr_sms_get_abort',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'const char *',
+ 'name' => 'apr_sms_get_identity',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_sms_t *',
+ 'name' => 'apr_sms_get_parent',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_sms_is_ancestor',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'a'
+ },
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'b'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_sms_lock',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'void *',
+ 'name' => 'apr_sms_malloc',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
+ },
+ {
+ 'type' => 'apr_size_t',
+ 'name' => 'size'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'void *',
+ 'name' => 'apr_sms_realloc',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
+ },
+ {
+ 'type' => 'void *',
+ 'name' => 'mem'
+ },
+ {
+ 'type' => 'apr_size_t',
+ 'name' => 'size'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_sms_reset',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'void',
+ 'name' => 'apr_sms_set_abort',
+ 'args' => [
+ {
+ 'type' => 'apr_abortfunc_t',
+ 'name' => 'abortfunc'
+ },
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_sms_std_create',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t **',
+ 'name' => 'sms'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_sms_threads_create',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t **',
+ 'name' => 'sms'
+ },
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'pms'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_sms_threads_create_ex',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t **',
+ 'name' => 'sms'
+ },
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'pms'
+ },
+ {
+ 'type' => 'apr_size_t',
+ 'name' => 'min_alloc'
+ },
+ {
+ 'type' => 'apr_size_t',
+ 'name' => 'min_free'
+ },
+ {
+ 'type' => 'apr_size_t',
+ 'name' => 'max_free'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_sms_tracking_create',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t **',
+ 'name' => 'mem_sys'
+ },
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'pms'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_sms_trivial_create',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t **',
+ 'name' => 'sms'
+ },
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'pms'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_sms_trivial_create_ex',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t **',
+ 'name' => 'sms'
+ },
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'pms'
+ },
+ {
+ 'type' => 'apr_size_t',
+ 'name' => 'min_alloc'
+ },
+ {
+ 'type' => 'apr_size_t',
+ 'name' => 'min_free'
+ },
+ {
+ 'type' => 'apr_size_t',
+ 'name' => 'max_free'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_sms_unlock',
+ 'args' => [
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_sms_userdata_get',
+ 'args' => [
+ {
+ 'type' => 'void **',
+ 'name' => 'data'
+ },
+ {
+ 'type' => 'const char *',
+ 'name' => 'key'
+ },
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_sms_userdata_set',
+ 'args' => [
+ {
+ 'type' => 'const void *',
+ 'name' => 'data'
+ },
+ {
+ 'type' => 'const char *',
+ 'name' => 'key'
+ },
+ {
+ 'type' => 'apr_status_t (*cleanup)(void*)',
+ 'name' => 'arg2'
+ },
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
+ }
+ ]
+ },
+ {
'return_type' => 'int',
'name' => 'apr_snprintf',
'args' => [
@@ -10445,6 +10879,20 @@
]
},
{
+ 'return_type' => 'int',
+ 'name' => 'apr_sockaddr_equal',
+ 'args' => [
+ {
+ 'type' => 'const apr_sockaddr_t *',
+ 'name' => 'addr1'
+ },
+ {
+ 'type' => 'const apr_sockaddr_t *',
+ 'name' => 'addr2'
+ }
+ ]
+ },
+ {
'return_type' => 'apr_status_t',
'name' => 'apr_sockaddr_info_get',
'args' => [
@@ -11238,7 +11686,7 @@
'name' => 'thd'
},
{
- 'type' => 'apr_status_t *',
+ 'type' => 'apr_status_t',
'name' => 'retval'
}
]
1.26 +15 -3 modperl-2.0/xs/tables/current/Apache/StructureTable.pm
Index: StructureTable.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/tables/current/Apache/StructureTable.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- StructureTable.pm 15 Dec 2001 23:51:43 -0000 1.25
+++ StructureTable.pm 31 Dec 2001 12:16:37 -0000 1.26
@@ -2,7 +2,7 @@
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Sat Dec 15 15:39:35 2001
+# ! Mon Dec 31 19:58:29 2001
# ! do NOT edit, any changes will be lost !
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -1100,6 +1100,10 @@
]
},
{
+ 'type' => 'ap_walk_cache_type',
+ 'elts' => []
+ },
+ {
'type' => 'apr_abortfunc_t',
'elts' => []
},
@@ -1136,7 +1140,7 @@
'type' => 'apr_bucket',
'elts' => [
{
- 'type' => '_ANON 62',
+ 'type' => '_ANON 86',
'name' => 'link'
},
{
@@ -1618,7 +1622,7 @@
'elts' => []
},
{
- 'type' => 'apr_lockmech_e_np',
+ 'type' => 'apr_lockmech_e',
'elts' => []
},
{
@@ -1965,6 +1969,10 @@
'elts' => []
},
{
+ 'type' => 'apr_sms_t',
+ 'elts' => []
+ },
+ {
'type' => 'apr_sockaddr_t',
'elts' => [
{
@@ -2508,6 +2516,10 @@
{
'type' => 'ap_filter_t *',
'name' => 'output_filters'
+ },
+ {
+ 'type' => 'void *',
+ 'name' => 'sbh'
}
]
},
1.55 +9 -14 modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm
Index: FunctionTable.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- FunctionTable.pm 18 Dec 2001 01:55:52 -0000 1.54
+++ FunctionTable.pm 31 Dec 2001 12:16:37 -0000 1.55
@@ -2,7 +2,7 @@
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Mon Dec 17 17:56:17 2001
+# ! Mon Dec 31 20:02:48 2001
# ! do NOT edit, any changes will be lost !
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -3346,6 +3346,10 @@
],
'args' => [
{
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
+ },
+ {
'type' => 'request_rec *',
'name' => 'r'
},
@@ -3460,19 +3464,6 @@
]
},
{
- 'return_type' => 'int',
- 'name' => 'modperl_test_run',
- 'attr' => [
- 'static'
- ],
- 'args' => [
- {
- 'type' => 'int',
- 'name' => 'foo'
- }
- ]
- },
- {
'return_type' => 'void',
'name' => 'modperl_tipool_add',
'args' => [
@@ -5060,6 +5051,10 @@
{
'type' => 'apr_locktype_e',
'name' => 'type'
+ },
+ {
+ 'type' => 'apr_lockmech_e',
+ 'name' => 'mech'
},
{
'type' => 'apr_lockscope_e',
