perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From steve...@apache.org
Subject svn commit: r1602105 [7/7] - in /perl/modperl/trunk: ./ ModPerl-Registry/lib/ModPerl/ ModPerl-Registry/t/ ModPerl-Registry/t/cgi-bin/ ModPerl-Registry/t/conf/ build/ lib/ lib/APR/ lib/Apache2/ lib/Apache2/PerlSections/ lib/Bundle/ lib/ModPerl/ src/modu...
Date Thu, 12 Jun 2014 09:29:19 GMT
Modified: perl/modperl/trunk/t/response/TestPerl/ithreads.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/t/response/TestPerl/ithreads.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/t/response/TestPerl/ithreads.pm (original)
+++ perl/modperl/trunk/t/response/TestPerl/ithreads.pm Thu Jun 12 09:29:09 2014
@@ -1,3 +1,4 @@
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 package TestPerl::ithreads;
 
 use strict;

Modified: perl/modperl/trunk/t/response/TestPerl/ithreads_args.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/t/response/TestPerl/ithreads_args.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/t/response/TestPerl/ithreads_args.pm (original)
+++ perl/modperl/trunk/t/response/TestPerl/ithreads_args.pm Thu Jun 12 09:29:09 2014
@@ -1,3 +1,4 @@
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 package TestPerl::ithreads_args;
 
 # reproducing a bug in perl ithreads: [perl #34342]

Modified: perl/modperl/trunk/t/response/TestPerl/ithreads_eval.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/t/response/TestPerl/ithreads_eval.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/t/response/TestPerl/ithreads_eval.pm (original)
+++ perl/modperl/trunk/t/response/TestPerl/ithreads_eval.pm Thu Jun 12 09:29:09 2014
@@ -1,3 +1,4 @@
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 package TestPerl::ithreads_eval;
 
 # reproducing a bug in perl ithreads: [perl #34341]

Modified: perl/modperl/trunk/t/response/TestPerl/signals.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/t/response/TestPerl/signals.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/t/response/TestPerl/signals.pm (original)
+++ perl/modperl/trunk/t/response/TestPerl/signals.pm Thu Jun 12 09:29:09 2014
@@ -1,3 +1,4 @@
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 package TestPerl::signals;
 
 use strict;

Modified: perl/modperl/trunk/t/response/TestUser/rewrite.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/t/response/TestUser/rewrite.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/t/response/TestUser/rewrite.pm (original)
+++ perl/modperl/trunk/t/response/TestUser/rewrite.pm Thu Jun 12 09:29:09 2014
@@ -1,3 +1,4 @@
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 package TestUser::rewrite;
 
 # test here the technique of rewriting the URI namespace and

Modified: perl/modperl/trunk/t/response/TestVhost/config.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/t/response/TestVhost/config.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/t/response/TestVhost/config.pm (original)
+++ perl/modperl/trunk/t/response/TestVhost/config.pm Thu Jun 12 09:29:09 2014
@@ -1,3 +1,4 @@
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 package TestVhost::config;
 
 # Test whether under threaded mpms (and not) a vhost with 'PerlOptions

Modified: perl/modperl/trunk/t/response/TestVhost/log.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/t/response/TestVhost/log.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/t/response/TestVhost/log.pm (original)
+++ perl/modperl/trunk/t/response/TestVhost/log.pm Thu Jun 12 09:29:09 2014
@@ -1,3 +1,4 @@
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 package TestVhost::log;
 
 # testing that the warn and other logging functions are writing into

Modified: perl/modperl/trunk/t/user/rewrite.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/t/user/rewrite.t?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/t/user/rewrite.t (original)
+++ perl/modperl/trunk/t/user/rewrite.t Thu Jun 12 09:29:09 2014
@@ -1,3 +1,4 @@
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 use strict;
 use warnings FATAL => 'all';
 

Modified: perl/modperl/trunk/t/vhost/config.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/t/vhost/config.t?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/t/vhost/config.t (original)
+++ perl/modperl/trunk/t/vhost/config.t Thu Jun 12 09:29:09 2014
@@ -1,3 +1,4 @@
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 # the handler is configured in modperl_extra.pl via
 # Apache2::ServerUtil->server->add_config
 

Modified: perl/modperl/trunk/t/vhost/log.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/t/vhost/log.t?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/t/vhost/log.t (original)
+++ perl/modperl/trunk/t/vhost/log.t Thu Jun 12 09:29:09 2014
@@ -1,3 +1,4 @@
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 use Apache::TestUtil;
 use Apache::TestRequest 'GET_BODY_ASSERT';
 

Modified: perl/modperl/trunk/util/apr_arg_check.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/util/apr_arg_check.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/util/apr_arg_check.pl (original)
+++ perl/modperl/trunk/util/apr_arg_check.pl Thu Jun 12 09:29:09 2014
@@ -1,4 +1,5 @@
 #!/usr/bin/perl -w
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 
 use lib qw(lib);
 

Modified: perl/modperl/trunk/util/apr_pool_check.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/util/apr_pool_check.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/util/apr_pool_check.pl (original)
+++ perl/modperl/trunk/util/apr_pool_check.pl Thu Jun 12 09:29:09 2014
@@ -1,4 +1,5 @@
 #!/usr/bin/perl -w
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 
 #check which apr_ functions do not have access to a pool
 

Modified: perl/modperl/trunk/util/cvsize.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/util/cvsize.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/util/cvsize.pl (original)
+++ perl/modperl/trunk/util/cvsize.pl Thu Jun 12 09:29:09 2014
@@ -1,4 +1,5 @@
 #!/usr/bin/perl -w
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 
 #get an idea of how much space the XS interface will eat
 #build/source_scan.pl must be run first

Modified: perl/modperl/trunk/util/getdiff.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/util/getdiff.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/util/getdiff.pl (original)
+++ perl/modperl/trunk/util/getdiff.pl Thu Jun 12 09:29:09 2014
@@ -1,4 +1,5 @@
 #!/usr/bin/perl -w
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 
 # this script creates a diff against SVN
 # and against /dev/null for all files in ARGV

Modified: perl/modperl/trunk/util/methodlookup_check.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/util/methodlookup_check.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/util/methodlookup_check.pl (original)
+++ perl/modperl/trunk/util/methodlookup_check.pl Thu Jun 12 09:29:09 2014
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 
 # this script checks whether all XS methods are known to ModPerl::MethodLookup
 

Modified: perl/modperl/trunk/util/perl_bloat.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/util/perl_bloat.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/util/perl_bloat.pl (original)
+++ perl/modperl/trunk/util/perl_bloat.pl Thu Jun 12 09:29:09 2014
@@ -1,4 +1,5 @@
 #!/usr/bin/perl -w
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 
 # perlbloat.pl 'some perlcode' 'more perl code'
 # perlbloat.pl Foo/Bar.pm Bar/Tar.pm

Modified: perl/modperl/trunk/util/sizeof.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/util/sizeof.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/util/sizeof.pl (original)
+++ perl/modperl/trunk/util/sizeof.pl Thu Jun 12 09:29:09 2014
@@ -1,3 +1,4 @@
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 #calculate structure sizes listed in pod/modperl_sizeof.pod via sizeof()
 
 use strict;

Modified: perl/modperl/trunk/util/source_stats.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/util/source_stats.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/util/source_stats.pl (original)
+++ perl/modperl/trunk/util/source_stats.pl Thu Jun 12 09:29:09 2014
@@ -1,4 +1,5 @@
 #!/usr/bin/perl -w
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 
 use lib qw(lib);
 

Modified: perl/modperl/trunk/util/xs_check.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/util/xs_check.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/util/xs_check.pl (original)
+++ perl/modperl/trunk/util/xs_check.pl Thu Jun 12 09:29:09 2014
@@ -1,3 +1,4 @@
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 use lib qw(Apache-Test/lib lib xs/tables/current);
 
 use strict;

Modified: perl/modperl/trunk/xs/APR/APR/APR.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/APR/APR.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/APR/APR.pm (original)
+++ perl/modperl/trunk/xs/APR/APR/APR.pm Thu Jun 12 09:29:09 2014
@@ -1,3 +1,4 @@
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.

Modified: perl/modperl/trunk/xs/APR/Base64/APR__Base64.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/Base64/APR__Base64.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/Base64/APR__Base64.h (original)
+++ perl/modperl/trunk/xs/APR/Base64/APR__Base64.h Thu Jun 12 09:29:09 2014
@@ -55,3 +55,10 @@ MP_STATIC XS(MPXS_apr_base64_decode)
 
     mpxs_set_targ(mpxs_apr_base64_decode, ST(0));
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/APR/Brigade/APR__Brigade.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/Brigade/APR__Brigade.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/Brigade/APR__Brigade.h (original)
+++ perl/modperl/trunk/xs/APR/Brigade/APR__Brigade.h Thu Jun 12 09:29:09 2014
@@ -171,3 +171,10 @@ void mpxs_APR__Brigade_destroy(pTHX_ apr
 {
     MP_RUN_CROAK(apr_brigade_destroy(bb), "APR::Brigade::destroy");
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/APR/Bucket/APR__Bucket.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/Bucket/APR__Bucket.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/Bucket/APR__Bucket.h (original)
+++ perl/modperl/trunk/xs/APR/Bucket/APR__Bucket.h Thu Jun 12 09:29:09 2014
@@ -122,3 +122,10 @@ apr_status_t mpxs_APR__Bucket_setaside(p
 
     return rc;
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/APR/BucketAlloc/APR__BucketAlloc.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/BucketAlloc/APR__BucketAlloc.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/BucketAlloc/APR__BucketAlloc.h (original)
+++ perl/modperl/trunk/xs/APR/BucketAlloc/APR__BucketAlloc.h Thu Jun 12 09:29:09 2014
@@ -27,3 +27,10 @@ SV *mpxs_APR__BucketAlloc_new(pTHX_ SV *
     mpxs_add_pool_magic(ba_sv, p_sv);
     return ba_sv;
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/APR/Const/Const.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/Const/Const.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/Const/Const.pm (original)
+++ perl/modperl/trunk/xs/APR/Const/Const.pm Thu Jun 12 09:29:09 2014
@@ -1,3 +1,4 @@
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.

Modified: perl/modperl/trunk/xs/APR/Error/APR__Error.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/Error/APR__Error.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/Error/APR__Error.h (original)
+++ perl/modperl/trunk/xs/APR/Error/APR__Error.h Thu Jun 12 09:29:09 2014
@@ -15,3 +15,10 @@
  */
 
 #define mpxs_APR__Error_strerror(rc) modperl_error_strerror(aTHX_ rc)
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/APR/Finfo/APR__Finfo.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/Finfo/APR__Finfo.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/Finfo/APR__Finfo.h (original)
+++ perl/modperl/trunk/xs/APR/Finfo/APR__Finfo.h Thu Jun 12 09:29:09 2014
@@ -30,3 +30,10 @@ SV *mpxs_APR__Finfo_stat(pTHX_ const cha
 
     return finfo_sv;
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/APR/IpSubnet/APR__IpSubnet.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/IpSubnet/APR__IpSubnet.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/IpSubnet/APR__IpSubnet.h (original)
+++ perl/modperl/trunk/xs/APR/IpSubnet/APR__IpSubnet.h Thu Jun 12 09:29:09 2014
@@ -28,3 +28,10 @@ SV *mpxs_apr_ipsubnet_create(pTHX_ SV *c
     mpxs_add_pool_magic(ipsub_sv, p_sv);
     return ipsub_sv;
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/APR/Lock/APR__Lock.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/Lock/APR__Lock.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/Lock/APR__Lock.h (original)
+++ perl/modperl/trunk/xs/APR/Lock/APR__Lock.h Thu Jun 12 09:29:09 2014
@@ -13,3 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/APR/OS/APR__OS.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/OS/APR__OS.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/OS/APR__OS.h (original)
+++ perl/modperl/trunk/xs/APR/OS/APR__OS.h Thu Jun 12 09:29:09 2014
@@ -22,3 +22,10 @@ static MP_INLINE unsigned long mpxs_APR_
     return 0;
 #endif
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/APR/PerlIO/PerlIO.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/PerlIO/PerlIO.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/PerlIO/PerlIO.pm (original)
+++ perl/modperl/trunk/xs/APR/PerlIO/PerlIO.pm Thu Jun 12 09:29:09 2014
@@ -1,3 +1,4 @@
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -21,7 +22,7 @@ our $VERSION = '0.009000';
 
 # The PerlIO layer is available only since 5.8.0 (5.7.2@13534)
 use Config;
-use constant PERLIO_LAYERS_ARE_ENABLED => $Config{useperlio} && $] >= 5.00703;
+use constant PERLIO_LAYERS_ARE_ENABLED => $Config{useperlio} && $] >= 5.007003;
 
 use APR ();
 use APR::XSLoader ();

Modified: perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.c?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.c (original)
+++ perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.c Thu Jun 12 09:29:09 2014
@@ -624,3 +624,10 @@ void modperl_apr_perlio_init(pTHX)
 }
 
 #endif /* PERLIO_LAYERS */
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.h (original)
+++ perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.h Thu Jun 12 09:29:09 2014
@@ -74,3 +74,10 @@ APR_DECLARE_OPTIONAL_FN(SV *,
 #endif /* MP_SOURCE_SCAN */
 
 #endif /* MODPERL_APR_PERLIO_H */
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/APR/Pool/APR__Pool.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/Pool/APR__Pool.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/Pool/APR__Pool.h (original)
+++ perl/modperl/trunk/xs/APR/Pool/APR__Pool.h Thu Jun 12 09:29:09 2014
@@ -77,6 +77,8 @@ APR_OPTIONAL_FN_TYPE(modperl_thx_interp_
          * there are no more references, in which case                  \
          * the interpreter will be putback into the mip                 \
          */                                                             \
+        MP_TRACE_i(MP_FUNC, "DO: calling interp_unselect(0x%lx)",       \
+                   acct->interp);					\
         (void)modperl_opt_interp_unselect(acct->interp);                \
     }                                                                   \
 } STMT_END
@@ -100,6 +102,8 @@ APR_OPTIONAL_FN_TYPE(modperl_thx_interp_
     if (modperl_opt_thx_interp_get) {                                   \
         if ((acct->interp = modperl_opt_thx_interp_get(aTHX))) {        \
             acct->interp->refcnt++;                                     \
+            MP_TRACE_i(MP_FUNC, "TO: (0x%lx)->refcnt incremented to %ld",   \
+                       acct->interp, acct->interp->refcnt);                 \
         }                                                               \
     }                                                                   \
 } STMT_END
@@ -313,6 +317,7 @@ static apr_status_t mpxs_cleanup_run(voi
          * there are no more references, in which case
          * the interpreter will be putback into the mip
          */
+        MP_TRACE_i(MP_FUNC, "calling interp_unselect(0x%lx)", cdata->interp);
         (void)modperl_opt_interp_unselect(cdata->interp);
     }
 #endif
@@ -344,6 +349,8 @@ static MP_INLINE void mpxs_apr_pool_clea
     if (modperl_opt_thx_interp_get) {
         if ((data->interp = modperl_opt_thx_interp_get(data->perl))) {
             data->interp->refcnt++;
+            MP_TRACE_i(MP_FUNC, "(0x%lx)->refcnt incremented to %ld",
+                       data->interp, data->interp->refcnt);
         }
     }
 #endif
@@ -382,3 +389,10 @@ static MP_INLINE void mpxs_apr_pool_DEST
         apr_pool_destroy(p);
     }
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/APR/SockAddr/APR__SockAddr.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/SockAddr/APR__SockAddr.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/SockAddr/APR__SockAddr.h (original)
+++ perl/modperl/trunk/xs/APR/SockAddr/APR__SockAddr.h Thu Jun 12 09:29:09 2014
@@ -23,3 +23,10 @@ mpxs_apr_sockaddr_ip_get(pTHX_ apr_socka
 
     return addr;
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/APR/Socket/APR__Socket.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/Socket/APR__Socket.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/Socket/APR__Socket.h (original)
+++ perl/modperl/trunk/xs/APR/Socket/APR__Socket.h Thu Jun 12 09:29:09 2014
@@ -125,3 +125,10 @@ static MP_INLINE int mpxs_APR__Socket_fi
     return s;
 }
 #endif
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/APR/Status/APR__Status.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/Status/APR__Status.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/Status/APR__Status.h (original)
+++ perl/modperl/trunk/xs/APR/Status/APR__Status.h Thu Jun 12 09:29:09 2014
@@ -23,3 +23,10 @@
 #define mpxs_APR__Status_is_ECONNABORTED APR_STATUS_IS_ECONNABORTED
 #define mpxs_APR__Status_is_ECONNRESET   APR_STATUS_IS_ECONNRESET
 #define mpxs_APR__Status_is_TIMEUP       APR_STATUS_IS_TIMEUP
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/APR/String/APR__String.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/String/APR__String.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/String/APR__String.h (original)
+++ perl/modperl/trunk/xs/APR/String/APR__String.h Thu Jun 12 09:29:09 2014
@@ -23,3 +23,10 @@ SV *mpxs_APR__String_strfsize(pTHX_ apr_
 
     return newSVpvn(buff, 4);
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/APR/Table/APR__Table.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/Table/APR__Table.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/Table/APR__Table.h (original)
+++ perl/modperl/trunk/xs/APR/Table/APR__Table.h Thu Jun 12 09:29:09 2014
@@ -232,3 +232,10 @@ MP_STATIC XS(MPXS_apr_table_get)
     });
 
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/APR/ThreadMutex/APR__ThreadMutex.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/ThreadMutex/APR__ThreadMutex.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/ThreadMutex/APR__ThreadMutex.h (original)
+++ perl/modperl/trunk/xs/APR/ThreadMutex/APR__ThreadMutex.h Thu Jun 12 09:29:09 2014
@@ -28,3 +28,10 @@ SV *mpxs_apr_thread_mutex_create(pTHX_ S
     mpxs_add_pool_magic(mutex_sv, p_sv);
     return mutex_sv;
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/APR/ThreadRWLock/APR__ThreadRWLock.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/ThreadRWLock/APR__ThreadRWLock.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/ThreadRWLock/APR__ThreadRWLock.h (original)
+++ perl/modperl/trunk/xs/APR/ThreadRWLock/APR__ThreadRWLock.h Thu Jun 12 09:29:09 2014
@@ -27,3 +27,10 @@ SV *mpxs_apr_thread_rwlock_create(pTHX_ 
     mpxs_add_pool_magic(rwlock_sv, p_sv);
     return rwlock_sv;
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/APR/URI/APR__URI.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/URI/APR__URI.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/URI/APR__URI.h (original)
+++ perl/modperl/trunk/xs/APR/URI/APR__URI.h Thu Jun 12 09:29:09 2014
@@ -93,3 +93,10 @@ SV *mpxs_APR__URI_rpath(pTHX_ apr_uri_t 
     }
     return (SV *)NULL;
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/APR/UUID/APR__UUID.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/UUID/APR__UUID.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/UUID/APR__UUID.h (original)
+++ perl/modperl/trunk/xs/APR/UUID/APR__UUID.h Thu Jun 12 09:29:09 2014
@@ -49,3 +49,10 @@ MP_STATIC XS(MPXS_apr_uuid_format)
 }
 
 #define apr_uuid_DESTROY(uuid) safefree(uuid)
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/APR/Util/APR__Util.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/Util/APR__Util.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/Util/APR__Util.h (original)
+++ perl/modperl/trunk/xs/APR/Util/APR__Util.h Thu Jun 12 09:29:09 2014
@@ -19,3 +19,10 @@ static MP_INLINE int mpxs_apr_password_v
 {
     return apr_password_validate(passwd, hash) == APR_SUCCESS;
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/APR/aprext/modperl_dummy.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/aprext/modperl_dummy.c?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/aprext/modperl_dummy.c (original)
+++ perl/modperl/trunk/xs/APR/aprext/modperl_dummy.c Thu Jun 12 09:29:09 2014
@@ -30,3 +30,22 @@ module AP_MODULE_DECLARE_DATA perl_modul
     NULL,              /* table of config file commands       */
     NULL,    /* register hooks */
 };
+
+/* FIXME: These functions are called from modperl_trace() in libaprext.lib
+ * but are normally defined in mod_perl.c which can't be included.
+ */
+
+int modperl_is_running(void)
+{
+    return 0;
+}
+
+int modperl_threads_started(void)
+{
+    return 0;
+}
+
+int modperl_threaded_mpm(void)
+{
+    return 0;
+}

Modified: perl/modperl/trunk/xs/Apache2/Access/Apache2__Access.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/Access/Apache2__Access.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/Access/Apache2__Access.h (original)
+++ perl/modperl/trunk/xs/Apache2/Access/Apache2__Access.h Thu Jun 12 09:29:09 2014
@@ -166,3 +166,10 @@ int mpxs_Apache2__RequestRec_allow_overr
     return MP_HTTPD_OVERRIDE_OPTS_DEFAULT;
 #endif
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/Apache2/CmdParms/Apache2__CmdParms.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/CmdParms/Apache2__CmdParms.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/CmdParms/Apache2__CmdParms.h (original)
+++ perl/modperl/trunk/xs/Apache2/CmdParms/Apache2__CmdParms.h Thu Jun 12 09:29:09 2014
@@ -46,3 +46,10 @@ int mpxs_Apache2__CmdParms_override_opts
     return MP_HTTPD_OVERRIDE_OPTS_DEFAULT;
 #endif
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/Apache2/Command/Apache2__Command.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/Command/Apache2__Command.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/Command/Apache2__Command.h (original)
+++ perl/modperl/trunk/xs/Apache2/Command/Apache2__Command.h Thu Jun 12 09:29:09 2014
@@ -16,3 +16,10 @@
 
 #define mpxs_Apache2__Command_next(cmd) \
 (++cmd, ((cmd && cmd->name) ? cmd : NULL))
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/Apache2/Connection/Apache2__Connection.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/Connection/Apache2__Connection.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/Connection/Apache2__Connection.h (original)
+++ perl/modperl/trunk/xs/Apache2/Connection/Apache2__Connection.h Thu Jun 12 09:29:09 2014
@@ -40,3 +40,10 @@ const char *mpxs_Apache2__Connection_get
 {
     return ap_get_remote_host(c, (void *)dir_config, type, NULL);
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/Apache2/ConnectionUtil/Apache2__ConnectionUtil.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/ConnectionUtil/Apache2__ConnectionUtil.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/ConnectionUtil/Apache2__ConnectionUtil.h (original)
+++ perl/modperl/trunk/xs/Apache2/ConnectionUtil/Apache2__ConnectionUtil.h Thu Jun 12 09:29:09 2014
@@ -24,6 +24,27 @@ SV *mpxs_Apache2__Connection_pnotes(pTHX
     if (!ccfg) {
         return &PL_sv_undef;
     }
-    
-    return modperl_pnotes(aTHX_ &ccfg->pnotes, key, val, NULL, c);
+
+    return modperl_pnotes(aTHX_ &ccfg->pnotes, key, val, c->pool);
 }
+
+static MP_INLINE
+void mpxs_Apache2__Connection_pnotes_kill(pTHX_ conn_rec *c)
+{
+    MP_dCCFG;
+
+    modperl_config_con_init(c, ccfg);
+
+    if (!ccfg) {
+        return;
+    }
+
+    modperl_pnotes_kill(&ccfg->pnotes);
+}
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/Apache2/Const/Const.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/Const/Const.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/Const/Const.pm (original)
+++ perl/modperl/trunk/xs/Apache2/Const/Const.pm Thu Jun 12 09:29:09 2014
@@ -1,3 +1,4 @@
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.

Modified: perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h (original)
+++ perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h Thu Jun 12 09:29:09 2014
@@ -195,3 +195,10 @@ MP_STATIC XS(MPXS_Apache2__Directive_loo
         }
     });
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/Apache2/Filter/Apache2__Filter.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/Filter/Apache2__Filter.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/Filter/Apache2__Filter.h (original)
+++ perl/modperl/trunk/xs/Apache2/Filter/Apache2__Filter.h Thu Jun 12 09:29:09 2014
@@ -196,8 +196,9 @@ static MP_INLINE SV *mpxs_Apache2__Filte
         }
 
 #ifdef USE_ITHREADS
-        if (!ctx->perl) {
-            ctx->perl = aTHX;
+        if (!ctx->interp) {
+            ctx->interp = modperl_thx_interp_get(aTHX);
+            MP_INTERP_REFCNT_inc(ctx->interp);
         }
 #endif
         ctx->data = SvREFCNT_inc(data);
@@ -366,3 +367,10 @@ apr_status_t mpxs_Apache2__Filter_pass_b
 
     return rc;
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/Apache2/Log/Apache2__Log.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/Log/Apache2__Log.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/Log/Apache2__Log.h (original)
+++ perl/modperl/trunk/xs/Apache2/Log/Apache2__Log.h Thu Jun 12 09:29:09 2014
@@ -338,3 +338,10 @@ MP_STATIC XS(MPXS_Apache2__Log_log_error
 
     XSRETURN_EMPTY;
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/Apache2/MPM/Apache2__MPM.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/MPM/Apache2__MPM.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/MPM/Apache2__MPM.h (original)
+++ perl/modperl/trunk/xs/Apache2/MPM/Apache2__MPM.h Thu Jun 12 09:29:09 2014
@@ -58,3 +58,10 @@ static void mpxs_Apache2__MPM_BOOT(pTHX)
     newCONSTSUB(PL_defstash, "Apache2::MPM::show",
                 newSVpv(ap_show_mpm(), 0));
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/Apache2/Module/Apache2__Module.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/Module/Apache2__Module.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/Module/Apache2__Module.h (original)
+++ perl/modperl/trunk/xs/Apache2/Module/Apache2__Module.h Thu Jun 12 09:29:09 2014
@@ -96,3 +96,10 @@ static MP_INLINE void mpxs_Apache2__Modu
 
     return;
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/Apache2/RequestIO/Apache2__RequestIO.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/RequestIO/Apache2__RequestIO.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/RequestIO/Apache2__RequestIO.h (original)
+++ perl/modperl/trunk/xs/Apache2/RequestIO/Apache2__RequestIO.h Thu Jun 12 09:29:09 2014
@@ -386,3 +386,10 @@ apr_status_t mpxs_Apache2__RequestRec_se
 
     return rc;
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/Apache2/RequestRec/Apache2__RequestRec.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/RequestRec/Apache2__RequestRec.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/RequestRec/Apache2__RequestRec.h (original)
+++ perl/modperl/trunk/xs/Apache2/RequestRec/Apache2__RequestRec.h Thu Jun 12 09:29:09 2014
@@ -146,3 +146,10 @@ const char *mpxs_Apache2__RequestRec_han
 
     return RETVAL;
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/Apache2/RequestUtil/Apache2__RequestUtil.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/RequestUtil/Apache2__RequestUtil.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/RequestUtil/Apache2__RequestUtil.h (original)
+++ perl/modperl/trunk/xs/Apache2/RequestUtil/Apache2__RequestUtil.h Thu Jun 12 09:29:09 2014
@@ -212,7 +212,19 @@ SV *mpxs_Apache2__RequestRec_pnotes(pTHX
         return &PL_sv_undef;
     }
 
-    return modperl_pnotes(aTHX_ &rcfg->pnotes, key, val, r, NULL);
+    return modperl_pnotes(aTHX_ &rcfg->pnotes, key, val, r->pool);
+}
+
+static MP_INLINE
+void mpxs_Apache2__RequestRec_pnotes_kill(pTHX_ request_rec *r)
+{
+    MP_dRCFG;
+
+    if (!rcfg) {
+        return;
+    }
+
+    modperl_pnotes_kill(&rcfg->pnotes);
 }
 
 #define mpxs_Apache2__RequestRec_dir_config(r, key, sv_val) \
@@ -401,3 +413,9 @@ apr_status_t mpxs_ap_register_auth_provi
                                           callback2, type);
 }
 
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/Apache2/Response/Apache2__Response.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/Response/Apache2__Response.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/Response/Apache2__Response.h (original)
+++ perl/modperl/trunk/xs/Apache2/Response/Apache2__Response.h Thu Jun 12 09:29:09 2014
@@ -39,3 +39,10 @@ mpxs_Apache2__RequestRec_set_last_modifi
     }
     ap_set_last_modified(r);
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/Apache2/ServerUtil/Apache2__ServerUtil.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/ServerUtil/Apache2__ServerUtil.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/ServerUtil/Apache2__ServerUtil.h (original)
+++ perl/modperl/trunk/xs/Apache2/ServerUtil/Apache2__ServerUtil.h Thu Jun 12 09:29:09 2014
@@ -219,3 +219,9 @@ int mpxs_Apache2__ServerRec_loglevel(pTH
 }
 #endif
 
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/Apache2/SubProcess/Apache2__SubProcess.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/SubProcess/Apache2__SubProcess.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/SubProcess/Apache2__SubProcess.h (original)
+++ perl/modperl/trunk/xs/Apache2/SubProcess/Apache2__SubProcess.h Thu Jun 12 09:29:09 2014
@@ -216,3 +216,10 @@ MP_STATIC XS(MPXS_modperl_spawn_proc_pro
 
     PUTBACK;
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/Apache2/SubRequest/Apache2__SubRequest.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/SubRequest/Apache2__SubRequest.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/SubRequest/Apache2__SubRequest.h (original)
+++ perl/modperl/trunk/xs/Apache2/SubRequest/Apache2__SubRequest.h Thu Jun 12 09:29:09 2014
@@ -31,3 +31,10 @@ static MP_INLINE int mpxs_ap_run_sub_req
 
     return ap_run_sub_req(r);
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/Apache2/URI/Apache2__URI.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/URI/Apache2__URI.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/URI/Apache2__URI.h (original)
+++ perl/modperl/trunk/xs/Apache2/URI/Apache2__URI.h Thu Jun 12 09:29:09 2014
@@ -38,3 +38,10 @@ static MP_INLINE char *mpxs_ap_unescape_
 
     return SvPVX(url);
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/Apache2/Util/Apache2__Util.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/Util/Apache2__Util.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/Util/Apache2__Util.h (original)
+++ perl/modperl/trunk/xs/Apache2/Util/Apache2__Util.h Thu Jun 12 09:29:09 2014
@@ -16,3 +16,10 @@
 
 #define TIME_NOW apr_time_now()
 #define DEFAULT_TIME_FORMAT "%a, %d %b %Y %H:%M:%S %Z"
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/ModPerl/Const/Const.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/ModPerl/Const/Const.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/ModPerl/Const/Const.pm (original)
+++ perl/modperl/trunk/xs/ModPerl/Const/Const.pm Thu Jun 12 09:29:09 2014
@@ -1,3 +1,4 @@
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.

Modified: perl/modperl/trunk/xs/ModPerl/Global/ModPerl__Global.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/ModPerl/Global/ModPerl__Global.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/ModPerl/Global/ModPerl__Global.h (original)
+++ perl/modperl/trunk/xs/ModPerl/Global/ModPerl__Global.h Thu Jun 12 09:29:09 2014
@@ -60,3 +60,10 @@ MP_INLINE int mpxs_ModPerl__Global_speci
     return mpxs_special_list_do(aTHX_ name, package,
                                 modperl_perl_global_avcv_register);
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/ModPerl/Util/ModPerl__Util.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/ModPerl/Util/ModPerl__Util.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/ModPerl/Util/ModPerl__Util.h (original)
+++ perl/modperl/trunk/xs/ModPerl/Util/ModPerl__Util.h Thu Jun 12 09:29:09 2014
@@ -40,3 +40,10 @@ static MP_INLINE void mpxs_ModPerl__Util
     modperl_package_unload(aTHX_ pkg)
 
 /* ModPerl::Util::exit lives in mod_perl.so, see modperl_perl.c */
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/maps/modperl_functions.map
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/maps/modperl_functions.map?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/maps/modperl_functions.map (original)
+++ perl/modperl/trunk/xs/maps/modperl_functions.map Thu Jun 12 09:29:09 2014
@@ -40,6 +40,7 @@ MODULE=Apache2::RequestUtil   PACKAGE=gu
  mpxs_Apache2__RequestRec_location
  mpxs_Apache2__RequestRec_as_string
  mpxs_Apache2__RequestRec_pnotes | | r, key=(SV *)NULL, val=(SV *)NULL
+ mpxs_Apache2__RequestRec_pnotes_kill | | r
  mpxs_Apache2__RequestRec_add_config | | r, lines, override=MP_HTTPD_OVERRIDE_HTACCESS, path=NULL, override_options=MP_HTTPD_OVERRIDE_OPTS_UNSET
  mpxs_Apache2__RequestRec_document_root | | r, new_root=(SV *)NULL
  mpxs_Apache2__RequestRec_child_terminate
@@ -105,6 +106,7 @@ MODULE=Apache2::Connection
 
 MODULE=Apache2::ConnectionUtil   PACKAGE=guess
  mpxs_Apache2__Connection_pnotes | | c, key=(SV *)NULL, val=(SV *)NULL
+ mpxs_Apache2__Connection_pnotes_kill | | c
 
 MODULE=Apache2::Filter
  modperl_filter_attributes | MPXS_ | ... | MODIFY_CODE_ATTRIBUTES
@@ -172,3 +174,10 @@ MODULE=Apache2::MPM    PACKAGE=Apache2::
 
 MODULE=Apache2::Access   PACKAGE=guess
  mpxs_Apache2__RequestRec_allow_override_opts
+
+#_if_ do {use Apache2::Build; Apache2::Build::PERL_HAS_ITHREADS}
+
+MODULE=ModPerl::Interpreter
+ mpxs_ModPerl__Interpreter_current | | class=Nullsv
+
+#_end_

Modified: perl/modperl/trunk/xs/maps/modperl_types.map
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/maps/modperl_types.map?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/maps/modperl_types.map (original)
+++ perl/modperl/trunk/xs/maps/modperl_types.map Thu Jun 12 09:29:09 2014
@@ -1,6 +1,16 @@
 ##########  mod_perl types  ##########
 
-struct modperl_filter_t | Apache2::OutputFilter
+struct modperl_filter_t        | Apache2::OutputFilter
+
+#_if_ do {use Apache2::Build; Apache2::Build::PERL_HAS_ITHREADS}
+
+struct modperl_interp_t        | ModPerl::Interpreter
+struct modperl_interp_pool_t   | ModPerl::InterpPool
+struct modperl_tipool_t        | ModPerl::TiPool
+struct modperl_tipool_config_t | ModPerl::TiPoolConfig
+PerlInterpreter *              | IV
+
+#_end_
 
 ##########  Perl types  ##########
 

Modified: perl/modperl/trunk/xs/modperl_xs_util.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/modperl_xs_util.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/modperl_xs_util.h (original)
+++ perl/modperl/trunk/xs/modperl_xs_util.h Thu Jun 12 09:29:09 2014
@@ -158,3 +158,10 @@
 
 
 #endif /* MODPERL_XS_H */
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/xs/tables/current/APR/FunctionTable.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/tables/current/APR/FunctionTable.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/tables/current/APR/FunctionTable.pm (original)
+++ perl/modperl/trunk/xs/tables/current/APR/FunctionTable.pm Thu Jun 12 09:29:09 2014
@@ -1,3 +1,4 @@
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 package APR::FunctionTable;
 
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

Modified: perl/modperl/trunk/xs/tables/current/Apache2/ConstantsTable.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/tables/current/Apache2/ConstantsTable.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/tables/current/Apache2/ConstantsTable.pm (original)
+++ perl/modperl/trunk/xs/tables/current/Apache2/ConstantsTable.pm Thu Jun 12 09:29:09 2014
@@ -1,3 +1,4 @@
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 package Apache2::ConstantsTable;
 
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

Modified: perl/modperl/trunk/xs/tables/current/Apache2/FunctionTable.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/tables/current/Apache2/FunctionTable.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/tables/current/Apache2/FunctionTable.pm (original)
+++ perl/modperl/trunk/xs/tables/current/Apache2/FunctionTable.pm Thu Jun 12 09:29:09 2014
@@ -1,3 +1,4 @@
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 package Apache2::FunctionTable;
 
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

Modified: perl/modperl/trunk/xs/tables/current/Apache2/StructureTable.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/tables/current/Apache2/StructureTable.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/tables/current/Apache2/StructureTable.pm (original)
+++ perl/modperl/trunk/xs/tables/current/Apache2/StructureTable.pm Thu Jun 12 09:29:09 2014
@@ -1,3 +1,4 @@
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 package Apache2::StructureTable;
 
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -3333,6 +3334,126 @@ $Apache2::StructureTable = [
         'name' => 'suexec_enabled'
       }
     ]
+  },
+  {
+    'type' => 'modperl_interp_t',
+    'elts' => [
+      {
+        'type' => 'modperl_interp_pool_t *',
+        'name' => 'mip'
+      },
+      {
+        'type' => 'PerlInterpreter *',
+        'name' => 'perl'
+      },
+      {
+        'type' => 'int',
+        'name' => 'num_requests'
+      },
+      {
+        'type' => 'U8',
+        'name' => 'flags'
+      },
+      {
+        'type' => 'modperl_config_con_t *',
+        'name' => 'ccfg'
+      },
+      {
+        'type' => 'int',
+        'name' => 'refcnt'
+      },
+      {
+        'type' => 'unsigned long',
+        'name' => 'tid'
+      }
+    ]
+  },
+  {
+    'type' => 'modperl_interp_pool_t',
+    'elts' => [
+      {
+        'type' => 'server_rec *',
+        'name' => 'server'
+      },
+      {
+        'type' => 'modperl_tipool_t *',
+        'name' => 'tipool'
+      },
+      {
+        'type' => 'modperl_tipool_config_t *',
+        'name' => 'tipool_cfg'
+      },
+      {
+        'type' => 'modperl_interp_t *',
+        'name' => 'parent'
+      }
+    ]
+  },
+  {
+    'type' => 'modperl_tipool_t',
+    'elts' => [
+      {
+        'type' => 'perl_mutex',
+        'name' => 'tiplock'
+      },
+      {
+        'type' => 'perl_cond',
+        'name' => 'available'
+      },
+      {
+        'type' => 'modperl_list_t *',
+        'name' => 'idle'
+      },
+      {
+        'type' => 'modperl_list_t *',
+        'name' => 'busy'
+      },
+      {
+        'type' => 'int',
+        'name' => 'in_use'
+      },
+      {
+        'type' => 'int',
+        'name' => 'size'
+      },
+      {
+        'type' => 'void *',
+        'name' => 'data'
+      },
+      {
+        'type' => 'modperl_tipool_config_t *',
+        'name' => 'cfg'
+      },
+      {
+        'type' => 'modperl_tipool_vtbl_t *',
+        'name' => 'func'
+      }
+    ]
+  },
+  {
+    'type' => 'modperl_tipool_config_t',
+    'elts' => [
+      {
+        'type' => 'int',
+        'name' => 'start'
+      },
+      {
+        'type' => 'int',
+        'name' => 'min_spare'
+      },
+      {
+        'type' => 'int',
+        'name' => 'max_spare'
+      },
+      {
+        'type' => 'int',
+        'name' => 'max'
+      },
+      {
+        'type' => 'int',
+        'name' => 'max_requests'
+      }
+    ]
   }
 ];
 

Modified: perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm (original)
+++ perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm Thu Jun 12 09:29:09 2014
@@ -1,3 +1,4 @@
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 package ModPerl::FunctionTable;
 
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -4424,19 +4425,6 @@ $ModPerl::FunctionTable = [
     ]
   },
   {
-    'return_type' => 'char *',
-    'name' => 'modperl_pid_tid',
-    'attr' => [
-      '__inline__'
-    ],
-    'args' => [
-      {
-        'type' => 'apr_pool_t *',
-        'name' => 'p'
-      }
-    ]
-  },
-  {
     'return_type' => 'SV *',
     'name' => 'modperl_pnotes',
     'args' => [
@@ -4460,7 +4448,17 @@ $ModPerl::FunctionTable = [
         'type' => 'request_rec *',
         'name' => 'r'
       }
-    ]    
+    ]
+  },
+  {
+    'return_type' => 'void',
+    'name' => 'modperl_pnotes_kill',
+    'args' => [
+      {
+        'type' => 'void *',
+        'name' => 'cl_data'
+      }
+    ]
   },
   {
     'return_type' => 'int',
@@ -6321,6 +6319,20 @@ $ModPerl::FunctionTable = [
     ]
   },
   {
+    'return_type' => 'void',
+    'name' => 'mpxs_Apache2__Connection_pnotes_kill',
+    'args' => [
+      {
+        'type' => 'PerlInterpreter *',
+        'name' => 'my_perl'
+      },
+      {
+        'type' => 'conn_rec *',
+        'name' => 'c'
+      }
+    ]
+  },
+  {
     'return_type' => 'SV *',
     'name' => 'mpxs_Apache2__Directive_as_hash',
     'attr' => [
@@ -7128,6 +7140,20 @@ $ModPerl::FunctionTable = [
     ]
   },
   {
+    'return_type' => 'void',
+    'name' => 'mpxs_Apache2__RequestRec_pnotes_kill',
+    'args' => [
+      {
+        'type' => 'PerlInterpreter *',
+        'name' => 'my_perl'
+      },
+      {
+        'type' => 'request_rec *',
+        'name' => 'r'
+      }
+    ]
+  },
+  {
     'return_type' => 'SV *',
     'name' => 'mpxs_Apache2__RequestRec_print',
     'args' => [
@@ -8255,6 +8281,24 @@ $ModPerl::FunctionTable = [
         'name' => 'func'
       }
     ]
+  },
+  {
+    'return_type' => 'modperl_interp_t *',
+    'name' => 'mpxs_ModPerl__Interpreter_current',
+    'attr' => [
+      'static',
+      '__inline__'
+    ],
+    'args' => [
+      {
+        'type' => 'PerlInterpreter *',
+        'name' => 'my_perl'
+      },
+      {
+        'type' => 'SV *',
+        'name' => 'class'
+      }
+    ]
   }
 ];
 

Modified: perl/modperl/trunk/xs/tables/current24/Apache2/StructureTable.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/tables/current24/Apache2/StructureTable.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/tables/current24/Apache2/StructureTable.pm (original)
+++ perl/modperl/trunk/xs/tables/current24/Apache2/StructureTable.pm Thu Jun 12 09:29:09 2014
@@ -5341,6 +5341,126 @@ $Apache2::StructureTable = [
         'name' => 'suexec_disabled_reason'
       }
     ]
+  },
+  {
+    'type' => 'modperl_interp_t',
+    'elts' => [
+      {
+        'type' => 'modperl_interp_pool_t *',
+        'name' => 'mip'
+      },
+      {
+        'type' => 'PerlInterpreter *',
+        'name' => 'perl'
+      },
+      {
+        'type' => 'int',
+        'name' => 'num_requests'
+      },
+      {
+        'type' => 'U8',
+        'name' => 'flags'
+      },
+      {
+        'type' => 'modperl_config_con_t *',
+        'name' => 'ccfg'
+      },
+      {
+        'type' => 'int',
+        'name' => 'refcnt'
+      },
+      {
+        'type' => 'unsigned long',
+        'name' => 'tid'
+      }
+    ]
+  },
+  {
+    'type' => 'modperl_interp_pool_t',
+    'elts' => [
+      {
+        'type' => 'server_rec *',
+        'name' => 'server'
+      },
+      {
+        'type' => 'modperl_tipool_t *',
+        'name' => 'tipool'
+      },
+      {
+        'type' => 'modperl_tipool_config_t *',
+        'name' => 'tipool_cfg'
+      },
+      {
+        'type' => 'modperl_interp_t *',
+        'name' => 'parent'
+      }
+    ]
+  },
+  {
+    'type' => 'modperl_tipool_t',
+    'elts' => [
+      {
+        'type' => 'perl_mutex',
+        'name' => 'tiplock'
+      },
+      {
+        'type' => 'perl_cond',
+        'name' => 'available'
+      },
+      {
+        'type' => 'modperl_list_t *',
+        'name' => 'idle'
+      },
+      {
+        'type' => 'modperl_list_t *',
+        'name' => 'busy'
+      },
+      {
+        'type' => 'int',
+        'name' => 'in_use'
+      },
+      {
+        'type' => 'int',
+        'name' => 'size'
+      },
+      {
+        'type' => 'void *',
+        'name' => 'data'
+      },
+      {
+        'type' => 'modperl_tipool_config_t *',
+        'name' => 'cfg'
+      },
+      {
+        'type' => 'modperl_tipool_vtbl_t *',
+        'name' => 'func'
+      }
+    ]
+  },
+  {
+    'type' => 'modperl_tipool_config_t',
+    'elts' => [
+      {
+        'type' => 'int',
+        'name' => 'start'
+      },
+      {
+        'type' => 'int',
+        'name' => 'min_spare'
+      },
+      {
+        'type' => 'int',
+        'name' => 'max_spare'
+      },
+      {
+        'type' => 'int',
+        'name' => 'max'
+      },
+      {
+        'type' => 'int',
+        'name' => 'max_requests'
+      }
+    ]
   }
 ];
 

Modified: perl/modperl/trunk/xs/tables/current24/ModPerl/FunctionTable.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/tables/current24/ModPerl/FunctionTable.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/xs/tables/current24/ModPerl/FunctionTable.pm (original)
+++ perl/modperl/trunk/xs/tables/current24/ModPerl/FunctionTable.pm Thu Jun 12 09:29:09 2014
@@ -4476,19 +4476,6 @@ $ModPerl::FunctionTable = [
     ]
   },
   {
-    'return_type' => 'char *',
-    'name' => 'modperl_pid_tid',
-    'attr' => [
-      '__inline__'
-    ],
-    'args' => [
-      {
-        'type' => 'apr_pool_t *',
-        'name' => 'p'
-      }
-    ]
-  },
-  {
     'return_type' => 'SV *',
     'name' => 'modperl_pnotes',
     'args' => [
@@ -8558,6 +8545,24 @@ $ModPerl::FunctionTable = [
         'name' => 'func'
       }
     ]
+  },
+  {
+    'return_type' => 'modperl_interp_t *',
+    'name' => 'mpxs_ModPerl__Interpreter_current',
+    'attr' => [
+      'static',
+      '__inline__'
+    ],
+    'args' => [
+      {
+        'type' => 'PerlInterpreter *',
+        'name' => 'my_perl'
+      },
+      {
+        'type' => 'SV *',
+        'name' => 'class'
+      }
+    ]
   }
 ];
 



Mime
View raw message