Copied: perl/modperl/branches/apache2-rename-unstable/xs/maps/apache2_functions.map (from r156220, perl/modperl/branches/apache2-rename-unstable/xs/maps/apache_functions.map) URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/maps/apache2_functions.map?view=diff&rev=156466&p1=perl/modperl/branches/apache2-rename-unstable/xs/maps/apache_functions.map&r1=156220&p2=perl/modperl/branches/apache2-rename-unstable/xs/maps/apache2_functions.map&r2=156466 ============================================================================== --- perl/modperl/branches/apache2-rename-unstable/xs/maps/apache_functions.map (original) +++ perl/modperl/branches/apache2-rename-unstable/xs/maps/apache2_functions.map Mon Mar 7 15:51:14 2005 @@ -2,12 +2,12 @@ #keywords: # MODULE = the module name -# e.g. Apache::Connection -> Apache/Connection.{pm,xs} +# e.g. Apache2::Connection -> Apache2/Connection.{pm,xs} # # PACKAGE = the package name functions belong to, defaults to MODULE # value of 'guess' indicates that package name should be # guessed based on first argument found that maps to a Perl class -# fallsback on the prefix (ap_ -> Apache, apr_ -> APR) +# fallsback on the prefix (ap_ -> Apache2, apr_ -> APR) # # PREFIX = prefix to be stripped # defaults to PACKAGE, converted to C name convention, e.g. @@ -21,9 +21,9 @@ # if the dispatch name is just a prefix (mpxs_, MPXS_) # the C function name is appended to it # the return type can be specified before the C function name, -# defaults to return_type in {Apache,ModPerl}::FunctionTable +# defaults to return_type in {Apache2,ModPerl}::FunctionTable -# the argspec defaults to arguments in {Apache,ModPerl}::FunctionTable +# the argspec defaults to arguments in {Apache2,ModPerl}::FunctionTable # argument types can be specified to override those in the FunctionTable # default values can be specified, e.g. arg=default_value # argspec of '...' indicates passthru, calling the function with @@ -35,10 +35,10 @@ # for details see: %ModPerl::MapUtil::disabled_map # in lib/ModPerl/MapUtil.pm -MODULE=Apache::RequestUtil +MODULE=Apache2::RequestUtil ap_get_status_line -MODULE=Apache::RequestUtil PACKAGE=guess +MODULE=Apache2::RequestUtil PACKAGE=guess ap_psignature | | r, prefix >ap_finalize_request_protocol ap_default_type @@ -54,13 +54,13 @@ ?ap_register_request_note ~ap_set_content_type -#MODULE=Apache::RequestConfig +#MODULE=Apache2::RequestConfig ~ap_document_root ap_get_limit_req_body ?ap_get_limit_xml_body >ap_core_translate ->MODULE=Apache::Core +>MODULE=Apache2::Core ap_basic_http_header ap_http_filter ap_send_http_options @@ -72,13 +72,13 @@ ap_limit_section ap_setup_make_content_type ->MODULE=Apache::Listen +>MODULE=Apache2::Listen ap_set_listenbacklog ap_set_listener ap_set_send_buffer_size ap_setup_listeners -MODULE=Apache::SubRequest PACKAGE=Apache::RequestRec +MODULE=Apache2::SubRequest PACKAGE=Apache2::RequestRec ?ap_sub_req_output_filter >ap_set_sub_req_protocol -ap_finalize_sub_req_protocol @@ -96,11 +96,11 @@ subrequest_rec *:ap_sub_req_method_uri | | \ r, method, new_uri, next_filter=r->proto_output_filters | lookup_method_uri -PACKAGE=Apache::SubRequest ISA=Apache::RequestRec +PACKAGE=Apache2::SubRequest ISA=Apache2::RequestRec ap_destroy_sub_req | | r | DESTROY ap_run_sub_req | mpxs_ | | run -MODULE=Apache::RequestIO PACKAGE=Apache::RequestRec +MODULE=Apache2::RequestIO PACKAGE=Apache2::RequestRec ap_discard_request_body !ap_getline ap_get_client_block | mpxs_ | r, SV *:buffer, bufsiz @@ -114,7 +114,7 @@ ap_rvputs | mpxs_ | ... | puts -ap_vrprintf -MODULE=Apache::Response PACKAGE=guess +MODULE=Apache2::Response PACKAGE=guess ap_make_etag | | r, force_weak=0 ap_set_content_length | | r, length=r->finfo.csize ap_set_etag @@ -128,7 +128,7 @@ -ap_set_last_modified ap_custom_response -MODULE=Apache::Access PACKAGE=Apache::RequestRec +MODULE=Apache2::Access PACKAGE=Apache2::RequestRec ap_allow_methods | mpxs_ | ... ap_allow_options ap_allow_overrides @@ -137,16 +137,16 @@ SV *:ap_requires | mpxs_ ap_satisfies -#MODULE=Apache::Auth - mpxs_Apache__RequestRec_auth_name | | r, name=NULL - mpxs_Apache__RequestRec_auth_type | | r, type=NULL +#MODULE=Apache2::Auth + mpxs_Apache2__RequestRec_auth_name | | r, name=NULL + mpxs_Apache2__RequestRec_auth_type | | r, type=NULL ap_get_basic_auth_pw | MPXS_ | r ap_note_auth_failure ap_note_basic_auth_failure ap_note_digest_auth_failure ap_some_auth_required -!MODULE=Apache::ScriptUtil PACKAGE=guess +!MODULE=Apache2::ScriptUtil PACKAGE=guess ap_add_cgi_vars ap_add_common_vars ap_create_environment @@ -156,21 +156,21 @@ -ap_scan_script_header_err_strs -ap_scan_script_header_err_brigade -MODULE=Apache::ServerUtil PACKAGE=Apache::ServerRec BOOT=1 +MODULE=Apache2::ServerUtil PACKAGE=Apache2::ServerRec BOOT=1 ~ap_method_register int:DEFINE_method_register | | server_rec *:s, const char *:methname ~add_version_component void:DEFINE_add_version_component | | server_rec *:s, const char *:component -MODULE=Apache::ServerUtil PACKAGE=Apache::ServerUtil +MODULE=Apache2::ServerUtil PACKAGE=Apache2::ServerUtil ap_exists_config_define ap_server_root_relative | | p, fname="" -MODULE=Apache::ServerUtil PACKAGE=guess +MODULE=Apache2::ServerUtil PACKAGE=guess ap_error_log2stderr ?ap_replace_stderr_log -#MODULE=Apache::ServerConfig +#MODULE=Apache2::ServerConfig #XXX: thought this might be useful #however it is not exported on win32 !ap_get_local_host @@ -179,14 +179,14 @@ ~ap_server_root -MODULE=Apache::Connection PACKAGE=guess +MODULE=Apache2::Connection PACKAGE=guess #XXX: thought this might be useful for protocol modules #however it is not exported on win32 !ap_read_request >ap_update_vhost_given_ip - mpxs_Apache__Connection_get_remote_host | | c, type=REMOTE_NAME, dir_config=NULL + mpxs_Apache2__Connection_get_remote_host | | c, type=REMOTE_NAME, dir_config=NULL -MODULE=Apache::Log PACKAGE=guess +MODULE=Apache2::Log PACKAGE=guess ?ap_log_assert ~ap_log_error -ap_log_perror @@ -194,10 +194,10 @@ >ap_open_stderr_log >ap_open_logs -PACKAGE=Apache::Log PREFIX=ap_ +PACKAGE=Apache2::Log PREFIX=ap_ ap_log_pid -MODULE=Apache::Module +MODULE=Apache2::Module module *:DEFINE_top_module -ap_add_loaded_module -ap_add_module @@ -211,14 +211,14 @@ >ap_show_directives >ap_show_modules >ap_register_hooks - mpxs_Apache__Module_loaded - mpxs_Apache__Module_add + mpxs_Apache2__Module_loaded + mpxs_Apache2__Module_add #ap_get_module_config - mpxs_Apache__Module_get_config | | pmodule, s, v=NULL - mpxs_Apache__Module_ap_api_major_version - mpxs_Apache__Module_ap_api_minor_version + mpxs_Apache2__Module_get_config | | pmodule, s, v=NULL + mpxs_Apache2__Module_ap_api_major_version + mpxs_Apache2__Module_ap_api_minor_version -MODULE=Apache::Directive +MODULE=Apache2::Directive ap_directive_t *:DEFINE_conftree !ap_add_node !ap_build_config @@ -226,7 +226,7 @@ !ap_walk_config >ap_process_config_tree -MODULE=Apache::Filter PACKAGE=guess +MODULE=Apache2::Filter PACKAGE=guess ~ap_add_output_filter ~ap_add_input_filter -ap_add_input_filter_handle @@ -235,12 +235,12 @@ -ap_get_output_filter_handle >ap_add_ouput_filters_by_type ~ap_get_brigade - mpxs_Apache__Filter_get_brigade | | \ + mpxs_Apache2__Filter_get_brigade | | \ f, bb, mode=AP_MODE_READBYTES, \ block=APR_BLOCK_READ, \ readbytes=8192 ~ap_pass_brigade - mpxs_Apache__Filter_pass_brigade + mpxs_Apache2__Filter_pass_brigade !ap_register_input_filter !ap_register_output_filter -ap_remove_output_filter @@ -248,7 +248,7 @@ !ap_save_brigade ap_filter_flush ~ap_fflush - mpxs_Apache__Filter_fflush + mpxs_Apache2__Filter_fflush -ap_fputstrs #int:DEFINE_ap_fputs | | \ # ap_filter_t *:f, apr_bucket_brigade *:bb, const char *:str @@ -258,15 +258,15 @@ >ap_content_length_filter >ap_old_write_filter -!MODULE=Apache::Bucket +!MODULE=Apache2::Bucket ap_bucket_error_create ap_bucket_error_make -!MODULE=Apache::Base64 +!MODULE=Apache2::Base64 ap_pbase64decode ap_pbase64encode -!MODULE=Apache::ConfigFile +!MODULE=Apache2::ConfigFile ap_cfg_closefile ap_cfg_getc ap_cfg_getline @@ -278,7 +278,7 @@ >ap_parse_htaccess >ap_process_resource_config -MODULE=Apache::Command +MODULE=Apache2::Command command_rec *:DEFINE_next | | command_rec *:cmd -ap_soak_end_container -ap_set_int_slot @@ -288,7 +288,7 @@ -ap_set_string_slot_lower -ap_set_deprecated -MODULE=Apache::Util +MODULE=Apache2::Util ap_ht_time | | p, t=TIME_NOW, fmt=DEFAULT_TIME_FORMAT, gmt=1 !ap_rfc1413 !ap_escape_html | | s, p @@ -299,18 +299,18 @@ !ap_recent_ctime !ap_recent_rfc822_date -MODULE=Apache::URI PACKAGE=guess +MODULE=Apache2::URI PACKAGE=guess ap_parse_uri ap_construct_url | | r, uri=r->uri, p=r->pool ap_construct_server | | r, hostname=ap_get_server_name(r), \ port=ap_get_server_port(r), p=r->pool -PACKAGE=Apache::URI +PACKAGE=Apache2::URI char *:ap_unescape_url | mpxs_ | SV *:url -PACKAGE=Apache::RequestRec - mpxs_Apache__RequestRec_parsed_uri +PACKAGE=Apache2::RequestRec + mpxs_Apache2__RequestRec_parsed_uri -!MODULE=Apache::StringUtil PACKAGE=guess +!MODULE=Apache2::StringUtil PACKAGE=guess ap_count_dirs ap_escape_path_segment ap_escape_quotes @@ -349,7 +349,7 @@ ap_stripprefix -ap_str_tolower -!MODULE=Apache::MethodList +!MODULE=Apache2::MethodList ap_clear_method_list -ap_copy_method_list ap_make_method_list @@ -361,11 +361,11 @@ ap_method_name_of ap_method_number_of -!MODULE=Apache::PipedLog +!MODULE=Apache2::PipedLog ap_close_piped_log ap_open_piped_log -!MODULE=Apache::Scoreboard +!MODULE=Apache2::Scoreboard ap_exists_scoreboard_image -ap_update_child_status -ap_time_process_request @@ -381,7 +381,7 @@ >ap_reopen_scoreboard ap_update_child_status_from_indexes -!MODULE=Apache::Hooks +!MODULE=Apache2::Hooks ap_location_walk ap_directory_walk ap_file_walk @@ -442,7 +442,7 @@ -ap_hook_get_translate_name -ap_hook_get_type_checker -MODULE=Apache::HookRun PACKAGE=guess +MODULE=Apache2::HookRun PACKAGE=guess -ap_run_get_suexec_identity -ap_run_optional_fn_retrieve >ap_run_pre_config @@ -475,20 +475,20 @@ ap_invoke_handler ap_die | | r, type -!MODULE=Apache::MD5 +!MODULE=Apache2::MD5 ap_md5 ap_md5_binary ap_md5contextTo64 ap_md5digest --MODULE=Apache::Regexp +-MODULE=Apache2::Regexp ap_pregcomp ap_pregfree ap_pregsub ap_regerror ap_regexec -!MODULE=Apache::VHost +!MODULE=Apache2::VHost -ap_set_name_virtual_host -ap_fini_vhost_config -ap_init_vhost_config @@ -497,16 +497,16 @@ -ap_update_vhost_from_headers -ap_fixup_virtual_hosts -!MODULE=Apache::HTTPCore +!MODULE=Apache2::HTTPCore >ap_process_request >ap_make_content_type >ap_core_reorder_directories >ap_index_of_response -!MODULE=Apache::XML +!MODULE=Apache2::XML ap_xml_parse_input -MODULE=Apache::MPM PACKAGE=Apache::MPM BOOT=1 +MODULE=Apache2::MPM PACKAGE=Apache2::MPM BOOT=1 ~ap_mpm_query ~ap_show_mpm >ap_mpm_run
Copied: perl/modperl/branches/apache2-rename-unstable/xs/maps/apache2_types.map (from r156220, perl/modperl/branches/apache2-rename-unstable/xs/maps/apache_types.map) URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/maps/apache2_types.map?view=diff&rev=156466&p1=perl/modperl/branches/apache2-rename-unstable/xs/maps/apache_types.map&r1=156220&p2=perl/modperl/branches/apache2-rename-unstable/xs/maps/apache2_types.map&r2=156466 ============================================================================== --- perl/modperl/branches/apache2-rename-unstable/xs/maps/apache_types.map (original) +++ perl/modperl/branches/apache2-rename-unstable/xs/maps/apache2_types.map Mon Mar 7 15:51:14 2005 @@ -1,28 +1,28 @@ ########## Apache types ########## -struct server_rec | Apache::ServerRec -struct server_addr_rec | Apache::ServerAddr -struct conn_rec | Apache::Connection -struct request_rec | Apache::RequestRec -struct subrequest_rec | Apache::SubRequest -struct process_rec | Apache::Process -struct ap_method_list_t | Apache::MethodList -struct piped_log | Apache::PipedLog +struct server_rec | Apache2::ServerRec +struct server_addr_rec | Apache2::ServerAddr +struct conn_rec | Apache2::Connection +struct request_rec | Apache2::RequestRec +struct subrequest_rec | Apache2::SubRequest +struct process_rec | Apache2::Process +struct ap_method_list_t | Apache2::MethodList +struct piped_log | Apache2::PipedLog -struct module | Apache::Module -struct module_struct | Apache::Module +struct module | Apache2::Module +struct module_struct | Apache2::Module ap_conn_keepalive_e | IV #config stuff -struct command_rec | Apache::Command +struct command_rec | Apache2::Command enum cmd_how | IV cmd_func | UNDEFINED -struct cmd_parms | Apache::CmdParms -struct ap_configfile_t | Apache::ConfigFile +struct cmd_parms | Apache2::CmdParms +struct ap_configfile_t | Apache2::ConfigFile struct htaccess_result | UNDEFINED -struct ap_directive_t | Apache::Directive -struct ap_conf_vector_t | Apache::ConfVector +struct ap_directive_t | Apache2::Directive +struct ap_conf_vector_t | Apache2::ConfVector #system-ish stuff ap_mgmt_type_e | IV @@ -34,9 +34,9 @@ ap_unix_identity_t | UNDEFINED #filters -struct ap_filter_t | Apache::Filter -struct ap_filter_rec_t | Apache::FilterRec -ap_filter_type | Apache::FilterType +struct ap_filter_t | Apache2::Filter +struct ap_filter_rec_t | Apache2::FilterRec +ap_filter_type | Apache2::FilterType ap_filter_func | UNDEFINED ap_out_filter_func | UNDEFINED ap_in_filter_func | UNDEFINED Modified: perl/modperl/branches/apache2-rename-unstable/xs/maps/apr_functions.map URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/maps/apr_functions.map?view=diff&r1=156465&r2=156466 ============================================================================== --- perl/modperl/branches/apache2-rename-unstable/xs/maps/apr_functions.map (original) +++ perl/modperl/branches/apache2-rename-unstable/xs/maps/apr_functions.map Mon Mar 7 15:51:14 2005 @@ -594,7 +594,7 @@ mpxs_APR__URI_rpath apr_uri_port_of_scheme -!MODULE=Apache::XML +!MODULE=Apache2::XML apr_text_append apr_xml_parser_create apr_xml_parser_feed Modified: perl/modperl/branches/apache2-rename-unstable/xs/maps/modperl_functions.map URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/maps/modperl_functions.map?view=diff&r1=156465&r2=156466 ============================================================================== --- perl/modperl/branches/apache2-rename-unstable/xs/maps/modperl_functions.map (original) +++ perl/modperl/branches/apache2-rename-unstable/xs/maps/modperl_functions.map Mon Mar 7 15:51:14 2005 @@ -14,141 +14,141 @@ mpxs_ModPerl__Global_special_list_clear mpxs_ModPerl__Global_special_list_register -MODULE=Apache::RequestRec PACKAGE=Apache::RequestRec - mpxs_Apache__RequestRec_content_type | | r, type=Nullsv - mpxs_Apache__RequestRec_proxyreq | | r, val=Nullsv - mpxs_Apache__RequestRec_subprocess_env | | r, key=NULL, val=Nullsv - mpxs_Apache__RequestRec_finfo | | r, finfo=NULL - mpxs_Apache__RequestRec_handler | | ... - mpxs_Apache__RequestRec_content_languages | | r, languages=Nullsv - -MODULE=Apache::RequestUtil PACKAGE=guess - mpxs_Apache__RequestRec_push_handlers - mpxs_Apache__RequestRec_set_handlers - mpxs_Apache__RequestRec_get_handlers - mpxs_Apache__RequestRec_is_perl_option_enabled - mpxs_Apache__RequestRec_location - mpxs_Apache__RequestRec_as_string - mpxs_Apache__RequestRec_pnotes | | r, key=Nullsv, val=Nullsv - mpxs_Apache__RequestRec_add_config | | r, lines, override=OR_AUTHCFG - mpxs_Apache__RequestRec_document_root | | r, new_root=Nullsv - mpxs_Apache__RequestRec_child_terminate +MODULE=Apache2::RequestRec PACKAGE=Apache2::RequestRec + mpxs_Apache2__RequestRec_content_type | | r, type=Nullsv + mpxs_Apache2__RequestRec_proxyreq | | r, val=Nullsv + mpxs_Apache2__RequestRec_subprocess_env | | r, key=NULL, val=Nullsv + mpxs_Apache2__RequestRec_finfo | | r, finfo=NULL + mpxs_Apache2__RequestRec_handler | | ... + mpxs_Apache2__RequestRec_content_languages | | r, languages=Nullsv + +MODULE=Apache2::RequestUtil PACKAGE=guess + mpxs_Apache2__RequestRec_push_handlers + mpxs_Apache2__RequestRec_set_handlers + mpxs_Apache2__RequestRec_get_handlers + mpxs_Apache2__RequestRec_is_perl_option_enabled + mpxs_Apache2__RequestRec_location + mpxs_Apache2__RequestRec_as_string + mpxs_Apache2__RequestRec_pnotes | | r, key=Nullsv, val=Nullsv + mpxs_Apache2__RequestRec_add_config | | r, lines, override=OR_AUTHCFG + mpxs_Apache2__RequestRec_document_root | | r, new_root=Nullsv + mpxs_Apache2__RequestRec_child_terminate #protocol module helpers - mpxs_Apache__RequestRec_location_merge - mpxs_Apache__RequestRec_set_basic_credentials - mpxs_Apache__RequestRec_no_cache | | r, flag=Nullsv -PACKAGE=Apache::RequestRec - mpxs_Apache__RequestRec_new | | classname, c, base_pool_sv=Nullsv + mpxs_Apache2__RequestRec_location_merge + mpxs_Apache2__RequestRec_set_basic_credentials + mpxs_Apache2__RequestRec_no_cache | | r, flag=Nullsv +PACKAGE=Apache2::RequestRec + mpxs_Apache2__RequestRec_new | | classname, c, base_pool_sv=Nullsv SV *:DEFINE_dir_config | | request_rec *:r, char *:key=NULL, SV *:sv_val=Nullsv SV *:DEFINE_slurp_filename | | request_rec *:r, int:tainted=1 -PACKAGE=Apache - mpxs_Apache_request | | classname, svr=Nullsv +PACKAGE=Apache2 + mpxs_Apache2_request | | classname, svr=Nullsv -MODULE=Apache::RequestIO PACKAGE=Apache::RequestRec +MODULE=Apache2::RequestIO PACKAGE=Apache2::RequestRec SV *:DEFINE_TIEHANDLE | | SV *:stashsv, SV *:sv=Nullsv SV *:DEFINE_PRINT | | ... apr_size_t:DEFINE_PRINTF | | ... SV *:DEFINE_BINMODE | | request_rec *:r SV *:DEFINE_CLOSE | | request_rec *:r SV *:DEFINE_UNTIE | | request_rec *:r, int:refcnt - mpxs_Apache__RequestRec_sendfile | | r, filename=r->filename, offset=0, len=0 - mpxs_Apache__RequestRec_read | | r, buffer, len, offset=0 + mpxs_Apache2__RequestRec_sendfile | | r, filename=r->filename, offset=0, len=0 + mpxs_Apache2__RequestRec_read | | r, buffer, len, offset=0 SV *:DEFINE_READ | | request_rec *:r, SV *:buffer, apr_size_t:len, apr_off_t:offset=0 - mpxs_Apache__RequestRec_write | | r, buffer, len=-1, offset=0 - mpxs_Apache__RequestRec_print | | ... + mpxs_Apache2__RequestRec_write | | r, buffer, len=-1, offset=0 + mpxs_Apache2__RequestRec_print | | ... apr_size_t:DEFINE_WRITE | | \ request_rec *:r, SV *:buffer, apr_size_t:len=-1, apr_off_t:offset=0 - mpxs_Apache__RequestRec_rflush | | ... - mpxs_Apache__RequestRec_GETC - mpxs_Apache__RequestRec_OPEN | | SV *:self, SV *:arg1, SV *:arg2=Nullsv - mpxs_Apache__RequestRec_FILENO + mpxs_Apache2__RequestRec_rflush | | ... + mpxs_Apache2__RequestRec_GETC + mpxs_Apache2__RequestRec_OPEN | | SV *:self, SV *:arg1, SV *:arg2=Nullsv + mpxs_Apache2__RequestRec_FILENO -MODULE=Apache::Response PACKAGE=Apache::RequestRec +MODULE=Apache2::Response PACKAGE=Apache2::RequestRec DEFINE_send_cgi_header | | request_rec *:r, SV *:buffer - mpxs_Apache__RequestRec_set_last_modified | | r, mtime=0 + mpxs_Apache2__RequestRec_set_last_modified | | r, mtime=0 -MODULE=Apache::ServerUtil PACKAGE=guess - mpxs_Apache__ServerRec_push_handlers - mpxs_Apache__ServerRec_set_handlers - mpxs_Apache__ServerRec_get_handlers - mpxs_Apache__ServerRec_is_perl_option_enabled - mpxs_Apache__ServerRec_add_config +MODULE=Apache2::ServerUtil PACKAGE=guess + mpxs_Apache2__ServerRec_push_handlers + mpxs_Apache2__ServerRec_set_handlers + mpxs_Apache2__ServerRec_get_handlers + mpxs_Apache2__ServerRec_is_perl_option_enabled + mpxs_Apache2__ServerRec_add_config -MODULE=Apache::ServerUtil PACKAGE=Apache::ServerRec +MODULE=Apache2::ServerUtil PACKAGE=Apache2::ServerRec SV *:DEFINE_dir_config | | server_rec *:s, char *:key=NULL, SV *:sv_val=Nullsv -MODULE=Apache::ServerUtil PACKAGE=Apache::ServerUtil - mpxs_Apache__ServerUtil_server_shutdown_cleanup_register | | cv, arg=Nullsv +MODULE=Apache2::ServerUtil PACKAGE=Apache2::ServerUtil + mpxs_Apache2__ServerUtil_server_shutdown_cleanup_register | | cv, arg=Nullsv int:DEFINE_restart_count -PACKAGE=Apache +PACKAGE=Apache2 server_rec *:DEFINE_server | | SV *:classname=Nullsv -MODULE=Apache::Connection - mpxs_Apache__Connection_client_socket | | c, s=NULL +MODULE=Apache2::Connection + mpxs_Apache2__Connection_client_socket | | c, s=NULL -MODULE=Apache::Filter +MODULE=Apache2::Filter modperl_filter_attributes | MPXS_ | ... | MODIFY_CODE_ATTRIBUTES - mpxs_Apache__Filter_print | | ... - mpxs_Apache__Filter_read | | ... - mpxs_Apache__Filter_seen_eos | | ... - mpxs_Apache__Filter_ctx | | filter, data=Nullsv - mpxs_Apache__Filter_remove | | ... + mpxs_Apache2__Filter_print | | ... + mpxs_Apache2__Filter_read | | ... + mpxs_Apache2__Filter_seen_eos | | ... + mpxs_Apache2__Filter_ctx | | filter, data=Nullsv + mpxs_Apache2__Filter_remove | | ... SV *:DEFINE_TIEHANDLE | | SV *:stashsv, SV *:sv=Nullsv apr_size_t:DEFINE_PRINT | | ... -MODULE=Apache::Filter PACKAGE=Apache::RequestRec - mpxs_Apache__RequestRec_add_input_filter - mpxs_Apache__RequestRec_add_output_filter - -MODULE=Apache::Filter PACKAGE=Apache::Connection - mpxs_Apache__Connection_add_input_filter - mpxs_Apache__Connection_add_output_filter - -MODULE=Apache::Log PACKAGE=Apache::Log BOOT=1 - -DEFINE_error | MPXS_Apache__Log_dispatch | ... -DEFINE_emerg | MPXS_Apache__Log_dispatch | ... -DEFINE_alert | MPXS_Apache__Log_dispatch | ... -DEFINE_warn | MPXS_Apache__Log_dispatch | ... -DEFINE_notice | MPXS_Apache__Log_dispatch | ... -DEFINE_info | MPXS_Apache__Log_dispatch | ... -DEFINE_debug | MPXS_Apache__Log_dispatch | ... -DEFINE_crit | MPXS_Apache__Log_dispatch | ... -DEFINE_LOG_MARK | MPXS_Apache__Log_LOG_MARK | ... +MODULE=Apache2::Filter PACKAGE=Apache2::RequestRec + mpxs_Apache2__RequestRec_add_input_filter + mpxs_Apache2__RequestRec_add_output_filter + +MODULE=Apache2::Filter PACKAGE=Apache2::Connection + mpxs_Apache2__Connection_add_input_filter + mpxs_Apache2__Connection_add_output_filter + +MODULE=Apache2::Log PACKAGE=Apache2::Log BOOT=1 + +DEFINE_error | MPXS_Apache2__Log_dispatch | ... +DEFINE_emerg | MPXS_Apache2__Log_dispatch | ... +DEFINE_alert | MPXS_Apache2__Log_dispatch | ... +DEFINE_warn | MPXS_Apache2__Log_dispatch | ... +DEFINE_notice | MPXS_Apache2__Log_dispatch | ... +DEFINE_info | MPXS_Apache2__Log_dispatch | ... +DEFINE_debug | MPXS_Apache2__Log_dispatch | ... +DEFINE_crit | MPXS_Apache2__Log_dispatch | ... +DEFINE_LOG_MARK | MPXS_Apache2__Log_LOG_MARK | ... -PACKAGE=Apache::RequestRec +PACKAGE=Apache2::RequestRec SV *:DEFINE_log | | SV *:obj -DEFINE_log_rerror | MPXS_Apache__Log_log_xerror | ... -DEFINE_log_error | MPXS_Apache__Log_log_error | ... -DEFINE_warn | MPXS_Apache__Log_log_error | ... +DEFINE_log_rerror | MPXS_Apache2__Log_log_xerror | ... +DEFINE_log_error | MPXS_Apache2__Log_log_error | ... +DEFINE_warn | MPXS_Apache2__Log_log_error | ... DEFINE_log_reason | modperl_log_reason | request_rec *:r, char *:msg, char *:file=r->uri -PACKAGE=Apache::ServerRec +PACKAGE=Apache2::ServerRec SV *:DEFINE_log | | SV *:obj -DEFINE_log_serror | MPXS_Apache__Log_log_xerror | ... -DEFINE_log_error | MPXS_Apache__Log_log_error | ... -DEFINE_warn | MPXS_Apache__Log_log_error | ... +DEFINE_log_serror | MPXS_Apache2__Log_log_xerror | ... +DEFINE_log_error | MPXS_Apache2__Log_log_error | ... +DEFINE_warn | MPXS_Apache2__Log_log_error | ... -MODULE=Apache::SubProcess PACKAGE=Apache::RequestRec +MODULE=Apache2::SubProcess PACKAGE=Apache2::RequestRec # ap_subprocess_ won't work modperl_spawn_proc_prog | MPXS_ | ... | spawn_proc_prog -MODULE=Apache::Directive - mpxs_Apache__Directive_as_string - mpxs_Apache__Directive_as_hash - DEFINE_lookup | MPXS_Apache__Directive_lookup | ... +MODULE=Apache2::Directive + mpxs_Apache2__Directive_as_string + mpxs_Apache2__Directive_as_hash + DEFINE_lookup | MPXS_Apache2__Directive_lookup | ... -MODULE=Apache::CmdParms +MODULE=Apache2::CmdParms ap_check_cmd_context ap_method_is_limited - mpxs_Apache__CmdParms_info - mpxs_Apache__CmdParms_add_config + mpxs_Apache2__CmdParms_info + mpxs_Apache2__CmdParms_add_config -MODULE=Apache::MPM PACKAGE=Apache::MPM BOOT=1 - mpxs_Apache__MPM_query +MODULE=Apache2::MPM PACKAGE=Apache2::MPM BOOT=1 + mpxs_Apache2__MPM_query Modified: perl/modperl/branches/apache2-rename-unstable/xs/maps/modperl_types.map URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/maps/modperl_types.map?view=diff&r1=156465&r2=156466 ============================================================================== --- perl/modperl/branches/apache2-rename-unstable/xs/maps/modperl_types.map (original) +++ perl/modperl/branches/apache2-rename-unstable/xs/maps/modperl_types.map Mon Mar 7 15:51:14 2005 @@ -1,6 +1,6 @@ ########## mod_perl types ########## -struct modperl_filter_t | Apache::OutputFilter +struct modperl_filter_t | Apache2::OutputFilter ########## Perl types ########## Modified: perl/modperl/branches/apache2-rename-unstable/xs/modperl_xs_util.h URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/modperl_xs_util.h?view=diff&r1=156465&r2=156466 ============================================================================== --- perl/modperl/branches/apache2-rename-unstable/xs/modperl_xs_util.h (original) +++ perl/modperl/branches/apache2-rename-unstable/xs/modperl_xs_util.h Mon Mar 7 15:51:14 2005 @@ -24,9 +24,9 @@ #define mp_xs_sv2_APR__Table(sv) \ (apr_table_t *)modperl_hash_tied_object(aTHX_ "APR::Table", sv) -#define mpxs_Apache__RequestRec_pool(r) r->pool -#define mpxs_Apache__Connection_pool(c) c->pool -#define mpxs_Apache__URI_pool(u) ((modperl_uri_t *)u)->pool +#define mpxs_Apache2__RequestRec_pool(r) r->pool +#define mpxs_Apache2__Connection_pool(c) c->pool +#define mpxs_Apache2__URI_pool(u) ((modperl_uri_t *)u)->pool #define mpxs_APR__URI_pool(u) ((modperl_uri_t *)u)->pool #ifndef dAX Modified: perl/modperl/branches/apache2-rename-unstable/xs/tables/current/Apache2/ConstantsTable.pm URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/tables/current/Apache2/ConstantsTable.pm?view=diff&r1=156220&r2=156466 ============================================================================== --- perl/modperl/branches/apache2-rename-unstable/xs/tables/current/Apache2/ConstantsTable.pm (original) +++ perl/modperl/branches/apache2-rename-unstable/xs/tables/current/Apache2/ConstantsTable.pm Mon Mar 7 15:51:14 2005 @@ -1,4 +1,4 @@ -package Apache::ConstantsTable; +package Apache2::ConstantsTable; # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # ! WARNING: generated by Apache::ParseSource/0.02 @@ -6,13 +6,13 @@ # ! do NOT edit, any changes will be lost ! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -$Apache::ConstantsTable = { +$Apache2::ConstantsTable = { 'ModPerl' => { 'common' => [ 'MODPERL_RC_EXIT' ] }, - 'Apache' => { + 'Apache2' => { 'types' => [ 'DIR_MAGIC_TYPE' ], Modified: perl/modperl/branches/apache2-rename-unstable/xs/tables/current/Apache2/FunctionTable.pm URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/tables/current/Apache2/FunctionTable.pm?view=diff&r1=156220&r2=156466 ============================================================================== --- perl/modperl/branches/apache2-rename-unstable/xs/tables/current/Apache2/FunctionTable.pm (original) +++ perl/modperl/branches/apache2-rename-unstable/xs/tables/current/Apache2/FunctionTable.pm Mon Mar 7 15:51:14 2005 @@ -1,4 +1,4 @@ -package Apache::FunctionTable; +package Apache2::FunctionTable; # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # ! WARNING: generated by Apache::ParseSource/0.02 @@ -6,7 +6,7 @@ # ! do NOT edit, any changes will be lost ! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -$Apache::FunctionTable = [ +$Apache2::FunctionTable = [ { 'return_type' => 'void', 'name' => 'ap_add_file_conf', Modified: perl/modperl/branches/apache2-rename-unstable/xs/tables/current/Apache2/StructureTable.pm URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/tables/current/Apache2/StructureTable.pm?view=diff&r1=156220&r2=156466 ============================================================================== --- perl/modperl/branches/apache2-rename-unstable/xs/tables/current/Apache2/StructureTable.pm (original) +++ perl/modperl/branches/apache2-rename-unstable/xs/tables/current/Apache2/StructureTable.pm Mon Mar 7 15:51:14 2005 @@ -1,4 +1,4 @@ -package Apache::StructureTable; +package Apache2::StructureTable; # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # ! WARNING: generated by Apache::ParseSource/0.02 @@ -6,7 +6,7 @@ # ! do NOT edit, any changes will be lost ! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -$Apache::StructureTable = [ +$Apache2::StructureTable = [ { 'type' => 'ap_HOOK_access_checker_t', 'elts' => [] Modified: perl/modperl/branches/apache2-rename-unstable/xs/tables/current/ModPerl/FunctionTable.pm URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/tables/current/ModPerl/FunctionTable.pm?view=diff&r1=156465&r2=156466 ============================================================================== --- perl/modperl/branches/apache2-rename-unstable/xs/tables/current/ModPerl/FunctionTable.pm (original) +++ perl/modperl/branches/apache2-rename-unstable/xs/tables/current/ModPerl/FunctionTable.pm Mon Mar 7 15:51:14 2005 @@ -1574,7 +1574,7 @@ }, { 'return_type' => 'const char **', - 'name' => 'modperl_constants_group_lookup_apache', + 'name' => 'modperl_constants_group_lookup_apache2', 'args' => [ { 'type' => 'const char *', @@ -1604,7 +1604,7 @@ }, { 'return_type' => 'SV *', - 'name' => 'modperl_constants_lookup_apache', + 'name' => 'modperl_constants_lookup_apache2', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6074,7 +6074,7 @@ }, { 'return_type' => 'void', - 'name' => 'mpxs_Apache__CmdParms_add_config', + 'name' => 'mpxs_Apache2__CmdParms_add_config', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6092,7 +6092,7 @@ }, { 'return_type' => 'SV *', - 'name' => 'mpxs_Apache__CmdParms_info', + 'name' => 'mpxs_Apache2__CmdParms_info', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6106,7 +6106,7 @@ }, { 'return_type' => 'void', - 'name' => 'mpxs_Apache__Connection_add_input_filter', + 'name' => 'mpxs_Apache2__Connection_add_input_filter', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6124,7 +6124,7 @@ }, { 'return_type' => 'void', - 'name' => 'mpxs_Apache__Connection_add_output_filter', + 'name' => 'mpxs_Apache2__Connection_add_output_filter', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6142,7 +6142,7 @@ }, { 'return_type' => 'apr_socket_t *', - 'name' => 'mpxs_Apache__Connection_client_socket', + 'name' => 'mpxs_Apache2__Connection_client_socket', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6160,7 +6160,7 @@ }, { 'return_type' => 'const char *', - 'name' => 'mpxs_Apache__Connection_get_remote_host', + 'name' => 'mpxs_Apache2__Connection_get_remote_host', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6182,7 +6182,7 @@ }, { 'return_type' => 'SV *', - 'name' => 'mpxs_Apache__Directive_as_hash', + 'name' => 'mpxs_Apache2__Directive_as_hash', 'attr' => [ 'static', '__inline__' @@ -6200,7 +6200,7 @@ }, { 'return_type' => 'SV *', - 'name' => 'mpxs_Apache__Directive_as_string', + 'name' => 'mpxs_Apache2__Directive_as_string', 'attr' => [ 'static', '__inline__' @@ -6218,7 +6218,7 @@ }, { 'return_type' => 'SV *', - 'name' => 'mpxs_Apache__Filter_ctx', + 'name' => 'mpxs_Apache2__Filter_ctx', 'attr' => [ 'static', '__inline__' @@ -6240,7 +6240,7 @@ }, { 'return_type' => 'apr_status_t', - 'name' => 'mpxs_Apache__Filter_fflush', + 'name' => 'mpxs_Apache2__Filter_fflush', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6258,7 +6258,7 @@ }, { 'return_type' => 'apr_status_t', - 'name' => 'mpxs_Apache__Filter_get_brigade', + 'name' => 'mpxs_Apache2__Filter_get_brigade', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6288,7 +6288,7 @@ }, { 'return_type' => 'apr_status_t', - 'name' => 'mpxs_Apache__Filter_pass_brigade', + 'name' => 'mpxs_Apache2__Filter_pass_brigade', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6306,7 +6306,7 @@ }, { 'return_type' => 'apr_size_t', - 'name' => 'mpxs_Apache__Filter_print', + 'name' => 'mpxs_Apache2__Filter_print', 'attr' => [ 'static', '__inline__' @@ -6332,7 +6332,7 @@ }, { 'return_type' => 'apr_size_t', - 'name' => 'mpxs_Apache__Filter_read', + 'name' => 'mpxs_Apache2__Filter_read', 'attr' => [ 'static', '__inline__' @@ -6358,7 +6358,7 @@ }, { 'return_type' => 'void', - 'name' => 'mpxs_Apache__Filter_remove', + 'name' => 'mpxs_Apache2__Filter_remove', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6380,7 +6380,7 @@ }, { 'return_type' => 'SV *', - 'name' => 'mpxs_Apache__Filter_seen_eos', + 'name' => 'mpxs_Apache2__Filter_seen_eos', 'attr' => [ 'static', '__inline__' @@ -6406,7 +6406,7 @@ }, { 'return_type' => 'void', - 'name' => 'mpxs_Apache__Log_BOOT', + 'name' => 'mpxs_Apache2__Log_BOOT', 'attr' => [ 'static' ], @@ -6419,7 +6419,7 @@ }, { 'return_type' => 'SV *', - 'name' => 'mpxs_Apache__Log_log', + 'name' => 'mpxs_Apache2__Log_log', 'attr' => [ 'static' ], @@ -6440,7 +6440,7 @@ }, { 'return_type' => 'void', - 'name' => 'mpxs_Apache__MPM_BOOT', + 'name' => 'mpxs_Apache2__MPM_BOOT', 'attr' => [ 'static' ], @@ -6453,7 +6453,7 @@ }, { 'return_type' => 'SV *', - 'name' => 'mpxs_Apache__MPM_query', + 'name' => 'mpxs_Apache2__MPM_query', 'attr' => [ 'static', '__inline__' @@ -6475,7 +6475,7 @@ }, { 'return_type' => 'void', - 'name' => 'mpxs_Apache__Module_add', + 'name' => 'mpxs_Apache2__Module_add', 'attr' => [ 'static', '__inline__' @@ -6497,7 +6497,7 @@ }, { 'return_type' => 'int', - 'name' => 'mpxs_Apache__Module_ap_api_major_version', + 'name' => 'mpxs_Apache2__Module_ap_api_major_version', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6511,7 +6511,7 @@ }, { 'return_type' => 'int', - 'name' => 'mpxs_Apache__Module_ap_api_minor_version', + 'name' => 'mpxs_Apache2__Module_ap_api_minor_version', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6525,7 +6525,7 @@ }, { 'return_type' => 'SV *', - 'name' => 'mpxs_Apache__Module_get_config', + 'name' => 'mpxs_Apache2__Module_get_config', 'attr' => [ 'static', '__inline__' @@ -6551,7 +6551,7 @@ }, { 'return_type' => 'int', - 'name' => 'mpxs_Apache__Module_loaded', + 'name' => 'mpxs_Apache2__Module_loaded', 'attr' => [ 'static', '__inline__' @@ -6569,7 +6569,7 @@ }, { 'return_type' => 'int', - 'name' => 'mpxs_Apache__RequestRec_FILENO', + 'name' => 'mpxs_Apache2__RequestRec_FILENO', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6583,7 +6583,7 @@ }, { 'return_type' => 'SV *', - 'name' => 'mpxs_Apache__RequestRec_GETC', + 'name' => 'mpxs_Apache2__RequestRec_GETC', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6597,7 +6597,7 @@ }, { 'return_type' => 'int', - 'name' => 'mpxs_Apache__RequestRec_OPEN', + 'name' => 'mpxs_Apache2__RequestRec_OPEN', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6619,7 +6619,7 @@ }, { 'return_type' => 'void', - 'name' => 'mpxs_Apache__RequestRec_add_config', + 'name' => 'mpxs_Apache2__RequestRec_add_config', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6641,7 +6641,7 @@ }, { 'return_type' => 'void', - 'name' => 'mpxs_Apache__RequestRec_add_input_filter', + 'name' => 'mpxs_Apache2__RequestRec_add_input_filter', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6659,7 +6659,7 @@ }, { 'return_type' => 'void', - 'name' => 'mpxs_Apache__RequestRec_add_output_filter', + 'name' => 'mpxs_Apache2__RequestRec_add_output_filter', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6677,7 +6677,7 @@ }, { 'return_type' => 'SV *', - 'name' => 'mpxs_Apache__RequestRec_as_string', + 'name' => 'mpxs_Apache2__RequestRec_as_string', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6691,7 +6691,7 @@ }, { 'return_type' => 'const char *', - 'name' => 'mpxs_Apache__RequestRec_auth_name', + 'name' => 'mpxs_Apache2__RequestRec_auth_name', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6709,7 +6709,7 @@ }, { 'return_type' => 'const char *', - 'name' => 'mpxs_Apache__RequestRec_auth_type', + 'name' => 'mpxs_Apache2__RequestRec_auth_type', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6727,7 +6727,7 @@ }, { 'return_type' => 'void', - 'name' => 'mpxs_Apache__RequestRec_child_terminate', + 'name' => 'mpxs_Apache2__RequestRec_child_terminate', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6741,7 +6741,7 @@ }, { 'return_type' => 'SV *', - 'name' => 'mpxs_Apache__RequestRec_content_languages', + 'name' => 'mpxs_Apache2__RequestRec_content_languages', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6759,7 +6759,7 @@ }, { 'return_type' => 'const char *', - 'name' => 'mpxs_Apache__RequestRec_content_type', + 'name' => 'mpxs_Apache2__RequestRec_content_type', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6777,7 +6777,7 @@ }, { 'return_type' => 'const char *', - 'name' => 'mpxs_Apache__RequestRec_document_root', + 'name' => 'mpxs_Apache2__RequestRec_document_root', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6795,7 +6795,7 @@ }, { 'return_type' => 'apr_finfo_t *', - 'name' => 'mpxs_Apache__RequestRec_finfo', + 'name' => 'mpxs_Apache2__RequestRec_finfo', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6813,7 +6813,7 @@ }, { 'return_type' => 'SV *', - 'name' => 'mpxs_Apache__RequestRec_get_handlers', + 'name' => 'mpxs_Apache2__RequestRec_get_handlers', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6831,7 +6831,7 @@ }, { 'return_type' => 'const char *', - 'name' => 'mpxs_Apache__RequestRec_handler', + 'name' => 'mpxs_Apache2__RequestRec_handler', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6853,7 +6853,7 @@ }, { 'return_type' => 'int', - 'name' => 'mpxs_Apache__RequestRec_is_perl_option_enabled', + 'name' => 'mpxs_Apache2__RequestRec_is_perl_option_enabled', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6871,7 +6871,7 @@ }, { 'return_type' => 'char *', - 'name' => 'mpxs_Apache__RequestRec_location', + 'name' => 'mpxs_Apache2__RequestRec_location', 'args' => [ { 'type' => 'request_rec *', @@ -6881,7 +6881,7 @@ }, { 'return_type' => 'int', - 'name' => 'mpxs_Apache__RequestRec_location_merge', + 'name' => 'mpxs_Apache2__RequestRec_location_merge', 'args' => [ { 'type' => 'request_rec *', @@ -6895,7 +6895,7 @@ }, { 'return_type' => 'SV *', - 'name' => 'mpxs_Apache__RequestRec_new', + 'name' => 'mpxs_Apache2__RequestRec_new', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6917,7 +6917,7 @@ }, { 'return_type' => 'int', - 'name' => 'mpxs_Apache__RequestRec_no_cache', + 'name' => 'mpxs_Apache2__RequestRec_no_cache', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6935,7 +6935,7 @@ }, { 'return_type' => 'apr_uri_t *', - 'name' => 'mpxs_Apache__RequestRec_parsed_uri', + 'name' => 'mpxs_Apache2__RequestRec_parsed_uri', 'args' => [ { 'type' => 'request_rec *', @@ -6945,7 +6945,7 @@ }, { 'return_type' => 'SV *', - 'name' => 'mpxs_Apache__RequestRec_pnotes', + 'name' => 'mpxs_Apache2__RequestRec_pnotes', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6967,7 +6967,7 @@ }, { 'return_type' => 'SV *', - 'name' => 'mpxs_Apache__RequestRec_print', + 'name' => 'mpxs_Apache2__RequestRec_print', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -6989,7 +6989,7 @@ }, { 'return_type' => 'int', - 'name' => 'mpxs_Apache__RequestRec_proxyreq', + 'name' => 'mpxs_Apache2__RequestRec_proxyreq', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -7007,7 +7007,7 @@ }, { 'return_type' => 'int', - 'name' => 'mpxs_Apache__RequestRec_push_handlers', + 'name' => 'mpxs_Apache2__RequestRec_push_handlers', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -7029,7 +7029,7 @@ }, { 'return_type' => 'SV *', - 'name' => 'mpxs_Apache__RequestRec_read', + 'name' => 'mpxs_Apache2__RequestRec_read', 'attr' => [ 'static' ], @@ -7058,7 +7058,7 @@ }, { 'return_type' => 'void', - 'name' => 'mpxs_Apache__RequestRec_rflush', + 'name' => 'mpxs_Apache2__RequestRec_rflush', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -7080,7 +7080,7 @@ }, { 'return_type' => 'apr_status_t', - 'name' => 'mpxs_Apache__RequestRec_sendfile', + 'name' => 'mpxs_Apache2__RequestRec_sendfile', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -7106,7 +7106,7 @@ }, { 'return_type' => 'void', - 'name' => 'mpxs_Apache__RequestRec_set_basic_credentials', + 'name' => 'mpxs_Apache2__RequestRec_set_basic_credentials', 'args' => [ { 'type' => 'request_rec *', @@ -7124,7 +7124,7 @@ }, { 'return_type' => 'int', - 'name' => 'mpxs_Apache__RequestRec_set_handlers', + 'name' => 'mpxs_Apache2__RequestRec_set_handlers', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -7146,7 +7146,7 @@ }, { 'return_type' => '', - 'name' => 'mpxs_Apache__RequestRec_set_last_modified', + 'name' => 'mpxs_Apache2__RequestRec_set_last_modified', 'args' => [ { 'type' => 'request_rec *', @@ -7160,7 +7160,7 @@ }, { 'return_type' => 'SV *', - 'name' => 'mpxs_Apache__RequestRec_subprocess_env', + 'name' => 'mpxs_Apache2__RequestRec_subprocess_env', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -7182,7 +7182,7 @@ }, { 'return_type' => 'apr_size_t', - 'name' => 'mpxs_Apache__RequestRec_write', + 'name' => 'mpxs_Apache2__RequestRec_write', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -7208,7 +7208,7 @@ }, { 'return_type' => 'void', - 'name' => 'mpxs_Apache__ServerRec_add_config', + 'name' => 'mpxs_Apache2__ServerRec_add_config', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -7226,7 +7226,7 @@ }, { 'return_type' => 'SV *', - 'name' => 'mpxs_Apache__ServerRec_get_handlers', + 'name' => 'mpxs_Apache2__ServerRec_get_handlers', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -7244,7 +7244,7 @@ }, { 'return_type' => 'int', - 'name' => 'mpxs_Apache__ServerRec_is_perl_option_enabled', + 'name' => 'mpxs_Apache2__ServerRec_is_perl_option_enabled', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -7262,7 +7262,7 @@ }, { 'return_type' => 'int', - 'name' => 'mpxs_Apache__ServerRec_push_handlers', + 'name' => 'mpxs_Apache2__ServerRec_push_handlers', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -7284,7 +7284,7 @@ }, { 'return_type' => 'int', - 'name' => 'mpxs_Apache__ServerRec_set_handlers', + 'name' => 'mpxs_Apache2__ServerRec_set_handlers', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -7306,7 +7306,7 @@ }, { 'return_type' => 'void', - 'name' => 'mpxs_Apache__ServerUtil_BOOT', + 'name' => 'mpxs_Apache2__ServerUtil_BOOT', 'attr' => [ 'static' ], @@ -7319,7 +7319,7 @@ }, { 'return_type' => 'void', - 'name' => 'mpxs_Apache__ServerUtil_server_shutdown_cleanup_register', + 'name' => 'mpxs_Apache2__ServerUtil_server_shutdown_cleanup_register', 'args' => [ { 'type' => 'PerlInterpreter *', @@ -7337,7 +7337,7 @@ }, { 'return_type' => 'request_rec *', - 'name' => 'mpxs_Apache_request', + 'name' => 'mpxs_Apache2_request', 'args' => [ { 'type' => 'PerlInterpreter *',
