cvs commit: modperl-2.0 Makefile.PL
stas01/09/10 00:00:56 Modified:.Makefile.PL Log: - define APACHE_PREFIX/APACHE_LIBDIR Makefile vars for install target re-use - install libmodperl.so if built with MP_USE_DSO=1 Revision ChangesPath 1.38 +15 -3 modperl-2.0/Makefile.PL Index: Makefile.PL === RCS file: /home/cvs/modperl-2.0/Makefile.PL,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- Makefile.PL 2001/08/08 16:38:07 1.37 +++ Makefile.PL 2001/09/10 07:00:56 1.38 @@ -23,9 +23,11 @@ NAME => 'mod_perl', VERSION => $VERSION, macro => { -MODPERL_SRC => $code->path, -PERL => $build->perl_config('perlpath'), -MOD_INSTALL => ModPerl::MM::mod_install(), +MODPERL_SRC => $code->path, +PERL => $build->perl_config('perlpath'), +MOD_INSTALL => ModPerl::MM::mod_install(), +APACHE_PREFIX => $build->apxs('-q' => 'prefix'), +APACHE_LIBDIR => $build->apxs('-q' => 'libexecdir'), }, clean => { FILES => "@{ clean_files() }", @@ -193,6 +195,8 @@ package MY; +use Config; + sub MY::top_targets { my $self = shift; my $string = $self->MM::top_targets; @@ -239,6 +243,14 @@ sub MY::post_initialize { my $self = shift; + +# install libmodperl.so, MODPERL_LIB is not known here yet +if (exists $build->{MP_USE_DSO} && $build->{MP_USE_DSO}) { +my $MODPERL_LIB = join '.', $build->{MP_LIBNAME}, $Config{dlext}; +$self->{PM}->{"src/modules/perl/$MODPERL_LIB"} = +"\$(APACHE_LIBDIR)/$MODPERL_LIB"; +} + #up one from the Apache2/ subdir #so it can be found for 'use Apache2 ()' $self->{PM}->{'lib/Apache2.pm'} = "blib/lib/Apache2.pm";
cvs commit: modperl-2.0/xs/maps apache_types.map apr_functions.map apr_types.map
dougm 01/09/09 23:42:52 Modified:xs/maps apache_types.map apr_functions.map apr_types.map Log: adjust map updates so we compile again Revision ChangesPath 1.6 +3 -3 modperl-2.0/xs/maps/apache_types.map Index: apache_types.map === RCS file: /home/cvs/modperl-2.0/xs/maps/apache_types.map,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- apache_types.map 2001/09/10 05:35:10 1.5 +++ apache_types.map 2001/09/10 06:42:51 1.6 @@ -26,9 +26,9 @@ ap_mgmt_type_e | IV ap_mgmt_value | UNDEFINED ap_scoreboard_e | IV -struct process_score| Apache::ScoreboardProcess -struct worker_score | Apache::ScoreboardWorker -struct ap_pod_t | Apache::POD +struct process_score| UNDEFINED +struct worker_score | UNDEFINED +struct ap_pod_t | UNDEFINED ap_unix_identity_t | UNDEFINED #filters 1.18 +1 -1 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.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- apr_functions.map 2001/09/10 04:56:13 1.17 +++ apr_functions.map 2001/09/10 06:42:51 1.18 @@ -172,7 +172,7 @@ apr_lock_acquire apr_lock_release apr_lock_acquire_rw - apr_lock_create_np +-apr_lock_create_np apr_lock_tryacquire MODULE=APR::Table 1.9 +1 -1 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.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- apr_types.map 2001/09/10 05:35:10 1.8 +++ apr_types.map 2001/09/10 06:42:51 1.9 @@ -43,7 +43,7 @@ #crypto stuff struct apr_md5_ctx_t| APR::MD5 -struct apr_md4_ctx_t| APR::MD4 +struct apr_md4_ctx_t| UNDEFINED struct apr_sha1_ctx_t | APR::SHA1 #getopt
cvs commit: modperl-2.0/xs/maps apache_structures.map apr_structures.map
dougm 01/09/09 22:49:04 Modified:xs/maps apache_structures.map apr_structures.map Log: update structure maps wrt current httpd-2.0 Revision ChangesPath 1.9 +22 -1 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.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- apache_structures.map 2001/09/08 18:26:46 1.8 +++ apache_structures.map 2001/09/10 05:49:04 1.9 @@ -54,6 +54,7 @@ unparsed_uri uri filename + canonical_filename path_info args ~ finfo @@ -107,6 +108,7 @@ aborted keepalive ? double_reverse +> keepalives local_ip local_host id @@ -114,7 +116,6 @@ notes input_filters output_filters - remain ! @@ -240,3 +241,23 @@ context err_directive + +! + description + name + vtype + v + + +! + s_value + i_value + h_value + + +! + pod_in + pod_out + p + sa + 1.6 +5 -2 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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- apr_structures.map2001/08/19 17:33:32 1.5 +++ apr_structures.map2001/09/10 05:49:04 1.6 @@ -2,6 +2,7 @@ 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 #buckets @@ -22,6 +23,7 @@ length start data + sms ! @@ -55,6 +57,7 @@ addr_str_len ipaddr_ptr next + family ! @@ -81,7 +84,7 @@ #generic data structures ! -> cont +> pool > elt_size nelts > nalloc @@ -129,7 +132,7 @@ attr last_child ns_scope - private + priv
cvs commit: modperl-2.0/xs/maps apache_types.map apr_types.map
dougm 01/09/09 22:35:10 Modified:lib/ModPerl TypeMap.pm xs/maps apache_types.map apr_types.map Log: update type maps wrt current httpd-2.0 Revision ChangesPath 1.9 +1 -1 modperl-2.0/lib/ModPerl/TypeMap.pm Index: TypeMap.pm === RCS file: /home/cvs/modperl-2.0/lib/ModPerl/TypeMap.pm,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- TypeMap.pm2001/06/22 04:09:15 1.8 +++ TypeMap.pm2001/09/10 05:35:10 1.9 @@ -48,7 +48,7 @@ if ($type =~ s/^struct\s+(.*)/$1/) { push @aliases, - $type, "$type *", "const $type *", + $type, "const $type", "$type *", "const $type *", "struct $type *", "const struct $type *", "$type **"; 1.5 +5 -0 modperl-2.0/xs/maps/apache_types.map Index: apache_types.map === RCS file: /home/cvs/modperl-2.0/xs/maps/apache_types.map,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- apache_types.map 2001/05/22 20:58:02 1.4 +++ apache_types.map 2001/09/10 05:35:10 1.5 @@ -23,7 +23,12 @@ struct ap_conf_vector_t | Apache::ConfVector #system-ish stuff +ap_mgmt_type_e | IV +ap_mgmt_value | UNDEFINED ap_scoreboard_e | IV +struct process_score| Apache::ScoreboardProcess +struct worker_score | Apache::ScoreboardWorker +struct ap_pod_t | Apache::POD ap_unix_identity_t | UNDEFINED #filters 1.8 +11 -0 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.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- apr_types.map 2001/08/19 17:33:32 1.7 +++ apr_types.map 2001/09/10 05:35:10 1.8 @@ -2,6 +2,8 @@ struct apr_xlate_t | UNDEFINED struct apr_pool_t | APR::Pool +struct apr_sms_t| UNDEFINED +apr_abortfunc_t | UNDEFINED #socket stuff struct apr_sockaddr_t | APR::SockAddr @@ -29,6 +31,7 @@ apr_bucket_heap | UNDEFINED apr_bucket_mmap | UNDEFINED apr_bucket_refcount | UNDEFINED +apr_bucket_list | UNDEFINED #apr_bucket_simple | UNDEFINED #apr_bucket_shared | UNDEFINED @@ -40,6 +43,7 @@ #crypto stuff struct apr_md5_ctx_t| APR::MD5 +struct apr_md4_ctx_t| APR::MD4 struct apr_sha1_ctx_t | APR::SHA1 #getopt @@ -49,6 +53,7 @@ #dso struct apr_dso_handle_t | UNDEFINED struct apr_dso_handle_sym_t | UNDEFINED +struct apr_os_dso_handle_t| UNDEFINED #file stuff struct apr_file_t| UNDEFINED @@ -89,6 +94,8 @@ struct apr_lock_t| APR::Lock apr_locktype_e | IV apr_lockscope_e | IV +apr_readerwriter_e | IV +apr_lockmech_e_np| IV #thread stuff struct apr_threadkey_t | UNDEFINED @@ -97,6 +104,8 @@ struct apr_thread_t | UNDEFINED apr_thread_start_t | UNDEFINED struct apr_threadattr_t | UNDEFINED +struct apr_thread_mutex_t| UNDEFINED +struct apr_thread_once_t | UNDEFINED #signal stuff apr_signum_t | UNDEFINED @@ -141,3 +150,5 @@ #dbm stuff apr_datum_t| NOTIMPL #sdbm struct apr_dbm_t | NOTIMPL #sdbm +struct apr_sdbm_t | NOTIMPL +struct apr_sdbm_datum_t| NOTIMPL
cvs commit: modperl-2.0/xs/maps apache_functions.map apr_functions.map
dougm 01/09/09 21:56:14 Modified:xs/maps apache_functions.map apr_functions.map Log: update function maps wrt current httpd-2.0 Revision ChangesPath 1.29 +73 -6 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.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- apache_functions.map 2001/09/08 18:26:46 1.28 +++ apache_functions.map 2001/09/10 04:56:13 1.29 @@ -36,7 +36,6 @@ MODULE=Apache::RequestUtil PACKAGE=guess >ap_finalize_request_protocol -?ap_default_port_for_request ap_default_type ap_get_server_name ap_get_server_port @@ -44,6 +43,9 @@ ap_get_status_line ap_is_initial_req mpxs_Apache__RequestRec_no_cache + ap_method_register +>ap_method_registry_init +>ap_process_request_internal #MODULE=Apache::RequestConfig ap_document_root @@ -51,12 +53,22 @@ ?ap_get_limit_xml_body >ap_core_translate +>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 + MODULE=Apache::SubRequest PACKAGE=Apache::RequestRec ?ap_sub_req_output_filter >ap_set_sub_req_protocol -ap_finalize_sub_req_protocol ap_internal_redirect | | r, new_uri ap_internal_redirect_handler | | r, new_uri + ap_internal_fast_redirect + ap_sub_req_lookup_dirent subrequest_rec *:ap_sub_req_lookup_file | | \ r, new_file, next_filter=NULL | lookup_file @@ -144,7 +156,6 @@ ap_get_remote_host ap_read_request >ap_update_vhost_given_ip - ap_new_connection MODULE=Apache::Log PACKAGE=guess ?ap_log_assert @@ -191,6 +202,7 @@ ap_register_input_filter ap_register_output_filter ap_remove_output_filter + ap_remove_input_filter !ap_save_brigade ap_filter_flush ap_fflush @@ -218,7 +230,6 @@ ap_pcfg_open_custom ap_pcfg_openfile >ap_read_config ->ap_create_request_config >ap_merge_per_dir_configs >ap_create_conn_config >ap_parse_htaccess @@ -228,14 +239,15 @@ command_rec *:DEFINE_next | | command_rec *:cmd ap_check_cmd_context ap_soak_end_container +-ap_set_int_slot -ap_set_file_slot -ap_set_flag_slot -ap_set_string_slot -ap_set_string_slot_lower +-ap_set_deprecated MODULE=Apache::Util ap_ht_time - ap_parseHTTPdate !ap_rfc1413 ap_escape_html #escape_uri @@ -249,7 +261,6 @@ mpxs_Apache__RequestRec_parsed_uri !MODULE=Apache::StringUtil PACKAGE=guess - ap_checkmask ap_count_dirs ap_escape_path_segment ap_escape_quotes @@ -313,8 +324,13 @@ -ap_create_scoreboard ap_cleanup_scoreboard ap_increment_counts + ap_get_parent_scoreboard + ap_get_servers_scoreboard !MODULE=Apache::Hooks + ap_location_walk + ap_directory_walk + ap_file_walk ap_hook_access_checker ap_hook_auth_checker ap_hook_check_user_id @@ -335,7 +351,40 @@ ap_hook_process_connection ap_hook_translate_name ap_hook_type_checker + ap_hook_quick_handler + ap_hook_map_to_storage + ap_hook_create_request + ap_hook_error_log +>ap_hook_pre_mpm -ap_hook_get_suexec_identity +-ap_hook_get_access_checker +-ap_hook_get_auth_checker +-ap_hook_get_check_user_id +-ap_hook_get_child_init +-ap_hook_get_create_request +-ap_hook_get_default_port +-ap_hook_get_error_log +-ap_hook_get_fixups +-ap_hook_get_get_mgmt_items +-ap_hook_get_get_suexec_identity +-ap_hook_get_handler +-ap_hook_get_header_parser +-ap_hook_get_http_method +-ap_hook_get_insert_filter +-ap_hook_get_log_transaction +-ap_hook_get_map_to_storage +-ap_hook_get_mgmt_items +-ap_hook_get_open_logs +-ap_hook_get_optional_fn_retrieve +-ap_hook_get_post_config +-ap_hook_get_post_read_request +-ap_hook_get_pre_config +-ap_hook_get_pre_connection +-ap_hook_get_pre_mpm +-ap_hook_get_process_connection +-ap_hook_get_quick_handler +-ap_hook_get_translate_name +-ap_hook_get_type_checker MODULE=Apache::HookRun PACKAGE=guess -ap_run_get_suexec_identity @@ -359,7 +408,13 @@ ap_run_fixups ap_run_handler ap_run_log_transaction - ap_run_rewrite_args +>ap_run_rewrite_args + ap_run_create_request + ap_run_error_log +>ap_run_get_mgmt_items + ap_run_map_to_storage +>ap_run_pre_mpm + ap_run_quick_handler ap_invoke_handler ap_die @@ -406,3 +461,15 @@ ap_gname2id ap_uname2id ap_lingering_close + ap_mpm_pod_check + ap_mpm_pod_close + ap_mpm_pod_killpg + ap_mpm_pod_open + ap_mpm_pod_signal + ap_mpm_set_accept_lock_mech + ap_mpm_set_coredumpdir + ap_mpm_set_lockfile + ap_mpm_set_max_requests + ap_mpm_set_pidfile + ap_mpm_set_scoreboard +?ap_show_mpm
cvs commit: modperl-2.0/src/modules/perl mod_perl.c
dougm 01/09/09 21:43:03 Modified:lib/ModPerl WrapXS.pm src/modules/perl mod_perl.c Added: lib/ModPerl XSLoader.pm Log: do not bootstrap xs libs outside of httpd Revision ChangesPath 1.20 +2 -2 modperl-2.0/lib/ModPerl/WrapXS.pm Index: WrapXS.pm === RCS file: /home/cvs/modperl-2.0/lib/ModPerl/WrapXS.pm,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- WrapXS.pm 2001/06/26 16:26:51 1.19 +++ WrapXS.pm 2001/09/10 04:43:02 1.20 @@ -488,9 +488,9 @@ package $module; $isa -use XSLoader (); +use ModPerl::XSLoader (); our \$VERSION = '0.01'; -XSLoader::load __PACKAGE__; +ModPerl::XSLoader::load __PACKAGE__; $code 1.1 modperl-2.0/lib/ModPerl/XSLoader.pm Index: XSLoader.pm === package ModPerl::XSLoader; use strict; use warnings FATAL => 'all'; use XSLoader (); BEGIN { unless (defined &BOOTSTRAP) { *BOOTSTRAP = sub () { 0 }; } } sub load { return unless BOOTSTRAP; XSLoader::load(@_); } 1; 1.64 +10 -1 modperl-2.0/src/modules/perl/mod_perl.c Index: mod_perl.c === RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.c,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- mod_perl.c2001/08/30 05:15:51 1.63 +++ mod_perl.c2001/09/10 04:43:03 1.64 @@ -24,6 +24,15 @@ } #endif +static void my_xs_init(pTHX) +{ +xs_init(aTHX); /* see modperl_xsinit.c */ + +newCONSTSUB(PL_defstash, +"ModPerl::XSLoader::BOOTSTRAP", +newSViv(1)); +} + PerlInterpreter *modperl_startup(server_rec *s, apr_pool_t *p) { MP_dSCFG(s); @@ -56,7 +65,7 @@ PL_perl_destruct_level = 2; } #endif -status = perl_parse(perl, xs_init, argc, argv, NULL); +status = perl_parse(perl, my_xs_init, argc, argv, NULL); if (status) { perror("perl_parse");
cvs commit: modperl Changes Makefile.PL
dougm 01/09/09 14:56:46 Modified:.Changes Makefile.PL Log: warn if Perl is configured with -Duseshrplib and a libperl.so is found in a place where it should not be, example: /lib /usr/lib or /usr/local/lib Revision ChangesPath 1.622 +3 -0 modperl/Changes Index: Changes === RCS file: /home/cvs/modperl/Changes,v retrieving revision 1.621 retrieving revision 1.622 diff -u -r1.621 -r1.622 --- Changes 2001/09/09 18:48:47 1.621 +++ Changes 2001/09/09 21:56:46 1.622 @@ -10,6 +10,9 @@ =item 1.26_01-dev +warn if Perl is configured with -Duseshrplib and a libperl.so is found +in a place where it should not be, example: /lib /usr/lib or /usr/local/lib + fix potential segv in Apache::URI->rpath [Vyacheslav Zamyatin <[EMAIL PROTECTED]>] 1.196 +29 -0 modperl/Makefile.PL Index: Makefile.PL === RCS file: /home/cvs/modperl/Makefile.PL,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- Makefile.PL 2001/07/17 15:54:05 1.195 +++ Makefile.PL 2001/09/09 21:56:46 1.196 @@ -2410,6 +2410,7 @@ malloc_check(); uselargefiles_check(); dynaloader_check(); +shrplib_check(); if ($USE_APXS and $Config{libs} =~ /($thrlib)/) { my $lib = $1; @@ -2560,4 +2561,32 @@ /* Added by Wayne Scott EOF +} + +sub shrplib_check { +return unless $Config{'useshrplib'} and + $Config{'useshrplib'} eq 'define'; + +my $libperl = $Config{'libperl'} || 'libperl.so'; + +for my $dir (qw(/lib /usr/lib /usr/local/lib)) { +next unless -e "$dir/$libperl"; + +my $coredir = "$Config{'archlibexp'}/CORE"; +my $corelib = "$coredir/$libperl"; + +phat_warn(<
cvs commit: modperl-site/embperl CVS.pod.1.html Changes.pod.1.html
richter 01/09/09 12:04:39 Modified:embperl CVS.pod.1.html Changes.pod.1.html Log: Embperl Webpages - Changes Revision ChangesPath 1.23 +1 -1 modperl-site/embperl/CVS.pod.1.html Index: CVS.pod.1.html === RCS file: /home/cvs/modperl-site/embperl/CVS.pod.1.html,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- CVS.pod.1.html2001/08/15 19:23:04 1.22 +++ CVS.pod.1.html2001/09/09 19:04:38 1.23 @@ -157,7 +157,7 @@ There is a CVS mailing list for Embperl (This is CVS - not a list for asking questions about Embperl!!!). This list receives all changes which are commited to the CVS. If you want to know what's going on -which Embperl, you can subscribe by sending a mail to [EMAIL PROTECTED] +which Embperl, you can subscribe by sending a mail to [EMAIL PROTECTED] with subscribe in the body. [HOME] [CONTENT] [PREV (CVS - Content)] 1.227 +1 -1 modperl-site/embperl/Changes.pod.1.html Index: Changes.pod.1.html === RCS file: /home/cvs/modperl-site/embperl/Changes.pod.1.html,v retrieving revision 1.226 retrieving revision 1.227 diff -u -r1.226 -r1.227 --- Changes.pod.1.html2001/09/08 13:24:14 1.226 +++ Changes.pod.1.html2001/09/09 19:04:38 1.227 @@ -21,7 +21,7 @@ [HOME] [CONTENT] [PREV (Revision History - Content)] [NEXT (1.3.3 (RELEASE) 6. Juni 2001)] -Last Update: Sat Sep 8 15:27:19 2001 (MET) +Last Update: Sun Sep 9 21:08:01 2001 (MET) NOTE: This version is only available via "CVS"
cvs commit: modperl/src/modules/perl URI.xs
dougm 01/09/09 11:48:47 Modified:.Changes src/modules/perl URI.xs Log: fix potential segv in Apache::URI->rpath Submitted by: Vyacheslav Zamyatin <[EMAIL PROTECTED]> Reviewed by: dougm Revision ChangesPath 1.621 +3 -0 modperl/Changes Index: Changes === RCS file: /home/cvs/modperl/Changes,v retrieving revision 1.620 retrieving revision 1.621 diff -u -r1.620 -r1.621 --- Changes 2001/08/26 18:29:55 1.620 +++ Changes 2001/09/09 18:48:47 1.621 @@ -10,6 +10,9 @@ =item 1.26_01-dev +fix potential segv in Apache::URI->rpath +[Vyacheslav Zamyatin <[EMAIL PROTECTED]>] + require URI::URL to work with newer libwww-perl allow overriding of container directive handlers using the func parameter 1.7 +5 -2 modperl/src/modules/perl/URI.xs Index: URI.xs === RCS file: /home/cvs/modperl/src/modules/perl/URI.xs,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- URI.xs2000/04/10 14:07:07 1.6 +++ URI.xs2001/09/09 18:48:47 1.7 @@ -91,8 +91,11 @@ if(set > 0) RETVAL = newSVpv(uri->uri.path, set); } -else -RETVAL = newSVpv(uri->uri.path, 0); +else { +if (uri->uri.path) { +RETVAL = newSVpv(uri->uri.path, 0); +} +} OUTPUT: RETVAL