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 [2/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

Propchange: perl/modperl/trunk/
------------------------------------------------------------------------------
  Merged /perl/modperl/branches/threading:r584377,594345,594347,594601,594609,594612-607681,671869,671871,671879,671881,671901,671910-671912,671923-671924,672234,672339,672737-672745,933550,940297,940303,1075807,1241583,1241983-1241984,1241987,1242010,1242050,1242068,1242858,1243509,1243554,1243647,1243679,1245916,1291304
  Merged /perl/modperl/branches/httpd24threading:r1537477-1602100

Modified: perl/modperl/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/Changes?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Thu Jun 12 09:29:09 2014
@@ -12,6 +12,29 @@ Also refer to the Apache::Test changes l
 
 =item 2.0.9-dev
 
+Make sure modperl_interp_select uses r->server rather than the passed s
+parameter to find the interpreter pool to pull an interpreter from. This
+fixes an issue with vhosts with a separate interpreter pool and runtime
+dir-config merges that used to pull the interpreter from the wrong pool.
+[Torsten Foertsch]
+
+PerlInterpScope is now more advisory. Using $(c|r)->pnotes will bind
+the current interpreter to that object for it's lifetime.
+$(c|r)->pnotes_kill() can be used to prematurely drop pnotes and
+remove this binding. [Torsten Foertsch]
+
+Now correctly invokes PerlCleanupHandlers, even if they are the only
+handler type configured for that request [Torsten Foertsch]
+
+For threaded MPMs, change interpreter managment to a new, reference-counted
+allocation model. [Torsten Foertsch]
+
+Expose modperl_interp_pool_t via ModPerl::InterpPool, modperl_tipool_t
+via ModPerl::TiPool and modperl_tipool_config_t via ModPerl::TiPoolConfig
+[Torsten Foertsch]
+
+Expose modperl_interp_t via ModPerl::Interpreter [Torsten Foertsch]
+
 Fix t/compat/apache_file.t on Windows. Apache::File->tmpfile() wants TMPDIR
 or TEMP from the environment, or else defaults to /tmp. The latter is no
 good on Windows, so make sure the environment variables are passed through.

Modified: perl/modperl/trunk/Makefile.PL
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/Makefile.PL?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/Makefile.PL (original)
+++ perl/modperl/trunk/Makefile.PL Thu Jun 12 09:29:09 2014
@@ -489,8 +489,8 @@ sub set_modperl_version {
 
     open my $fh, 'Changes';
     while (<$fh>) {
-        if (/^=item.*-(dev|rc\d+)/) {
-            $VERSION .= "-$1";
+        if (/^=item\s+\Q$VERSION\E-(\w+)/) {
+            $VERSION .= "$1";
             last;
         }
         last if /^=item/;
@@ -509,19 +509,44 @@ sub perl_version_check {
     $perl_version =~ s/5.00(\d)(?:00(\d))?/"5.$1." . ($2||0)/e;
     my $perl_threads = Apache2::Build::PERL_HAS_ITHREADS ? "w/" : "w/o";
     my $perl_string = "Using Perl $perl_version $perl_threads ithreads";
-    my $mpm = $build->mpm_name();
+    my $httpd_version = $build->httpd_version;
+    my $mpm = "";
+    my $build_threaded = 0;
+
+    # For httpd-2.4, we can't use mpm_is_threaded(), because MPMs are loadable
+    # modules. We therefore treat httpd as a whole project as threaded. It is
+    # still possible to disable threading by using MP_NO_THREADS=1
+    if ($httpd_version lt MIN_HTTPD_24_VERSION) {
+        $build_threaded = $build->mpm_is_threaded();
+        $mpm = $build->mpm_name();
+    }
+    else {
+        if ($build->{MP_NO_THREADS}) {
+            $build_threaded = 0;
+        }
+        else {
+            $build_threaded = 1;
+        }
+    }
 
     # certain mpms require perl 5.8.0+ w/ithreads
-    if ($build->mpm_is_threaded()) {
+    if ($build_threaded) {
         my @fail;
         push @fail, "Perl 5.8 or higher"
             unless $] >= 5.008;
         push @fail, "Perl built with ithreads (build perl with -Duseithreads)"
             unless Apache2::Build::PERL_HAS_ITHREADS();
         if (@fail) {
-            error "$perl_string and '$mpm' mpm httpd.",
-                "Failed requirements:",
-                join "", map {"  - $_\n"} @fail;
+            if ($httpd_version lt MIN_HTTPD_24_VERSION) {
+                error "$perl_string and '$mpm' mpm httpd.",
+                    "Failed requirements:",
+                    join "", map {"  - $_\n"} @fail;
+            }
+            else {
+                error "$perl_string and httpd-2.4.",
+                    "Failed requirements:",
+                    join "", map {"  - $_\n"} @fail;
+            }
             exit 1;
         }
     }
@@ -531,8 +556,14 @@ sub perl_version_check {
         if ($build->should_build_apache && !Apache2::Build::PERL_HAS_ITHREADS) {
             # before 5.8.2, perl_shutdown is incomplete
             if ($] < 5.008_002) {
-                error "static $mpm mpm requires a threaded ".
-                      "perl 5.6.1-5.8.1 or any perl 5.8.2+";
+                if ($httpd_version lt MIN_HTTPD_24_VERSION) {
+                    error "static $mpm mpm requires a threaded ".
+                        "perl 5.6.1-5.8.1 or any perl 5.8.2+";
+                }
+                else {
+                    error "httpd-2.4 requires a threaded ".
+                        "perl 5.6.1-5.8.1 or any perl 5.8.2+";
+                }
                 exit 1;
             }
         }
@@ -553,7 +584,7 @@ sub perl_version_check {
     if ($Config{usemultiplicity} xor $Config{useithreads}) {
         error "mod_perl does not currently support multiplicity without ".
 	      "ithreads.";
-        if ($build->mpm_is_threaded()) {
+        if ($build_threaded) {
 	    error "Please recompile Perl with -Duseithreads and ".
 	          "-Dusemultiplicity";
         } else {

Modified: perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/PerlRun.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/PerlRun.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/PerlRun.pm (original)
+++ perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/PerlRun.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/ModPerl-Registry/lib/ModPerl/PerlRunPrefork.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/PerlRunPrefork.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/PerlRunPrefork.pm (original)
+++ perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/PerlRunPrefork.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::PerlRunPrefork;
 
 use strict;

Modified: perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/Registry.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/Registry.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/Registry.pm (original)
+++ perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/Registry.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/ModPerl-Registry/lib/ModPerl/RegistryBB.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryBB.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryBB.pm (original)
+++ perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryBB.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/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm (original)
+++ perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryCooker.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/ModPerl-Registry/lib/ModPerl/RegistryLoader.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryLoader.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryLoader.pm (original)
+++ perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryLoader.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/ModPerl-Registry/lib/ModPerl/RegistryPrefork.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryPrefork.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryPrefork.pm (original)
+++ perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryPrefork.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::RegistryPrefork;
 
 use strict;

Modified: perl/modperl/trunk/ModPerl-Registry/t/206.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/206.t?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/206.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/206.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/ModPerl-Registry/t/304.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/304.t?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/304.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/304.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/ModPerl-Registry/t/404.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/404.t?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/404.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/404.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/ModPerl-Registry/t/500.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/500.t?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/500.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/500.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/ModPerl-Registry/t/bad_scripts.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/bad_scripts.t?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/bad_scripts.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/bad_scripts.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/ModPerl-Registry/t/basic.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/basic.t?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/basic.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/basic.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/ModPerl-Registry/t/bin_resp.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/bin_resp.t?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/bin_resp.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/bin_resp.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/ModPerl-Registry/t/cgi-bin/206.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/206.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/206.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/206.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 -*-
        print <<_OUT_;
 Status: 206 Partial Content
 Content-Type: text/html; charset=UTF-8

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/304.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/304.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/304.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/304.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 strict;
 use warnings FATAL => 'all';
 

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/404.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/404.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/404.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/404.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 strict;
 use warnings;
 

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

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/bin_resp_start_0.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/bin_resp_start_0.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/bin_resp_start_0.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/bin_resp_start_0.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 strict;
 use warnings FATAL => 'all';

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/cgi.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/cgi.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/cgi.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/cgi.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 CGI qw/:standard :html3/;
 
 print header(-type=>'text/html');

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

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/content_type.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/content_type.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/content_type.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/content_type.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 -*-
 my $r = shift;
 $r->content_type('text/plain');
 $r->print('ok');

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/env.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/env.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/env.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/env.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 -*-
 # test env vars
 
 print "Content-type: text/plain\n\n";

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/env_val.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/env_val.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/env_val.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/env_val.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 -*-
 # test env vars
 
 print "Content-type: text/plain\n\n";

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/exit.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/exit.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/exit.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/exit.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 -*-
 # XXX: exit should work by stopping the script, but not quitting the
 # interpreter, though it's not trivial to make an automated test since
 # what you really want to check whether the process didn't quit after

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/flush.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/flush.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/flush.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/flush.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 strict;
 use warnings FATAL => 'all';
 

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/ithreads_io_n_tie.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/ithreads_io_n_tie.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/ithreads_io_n_tie.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/ithreads_io_n_tie.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 strict;
 use warnings FATAL => 'all';
 

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/local-conf.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/local-conf.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/local-conf.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/local-conf.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 -*-
 $test_require = 'it works';
 
 1;

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/missing_headers.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/missing_headers.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/missing_headers.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/missing_headers.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 -*-
 BEGIN {
     use Apache::TestUtil;
     t_server_log_error_is_expected();

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/not_executable.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/not_executable.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/not_executable.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/not_executable.pl Thu Jun 12 09:29:09 2014
@@ -1,4 +1,5 @@
 #!perl -w
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 
 # this test should return forbidden, since it should be not-executable
 

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/nph-foo.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/nph-foo.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/nph-foo.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/nph-foo.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 -*-
 
 my $r = shift;
 

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/perlrun_decl.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/perlrun_decl.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/perlrun_decl.pm (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/perlrun_decl.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 perlrun_decl;
 
 use warnings;

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/perlrun_extload.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/perlrun_extload.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/perlrun_extload.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/perlrun_extload.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 warnings;
 use strict;
 

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/perlrun_nondecl.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/perlrun_nondecl.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/perlrun_nondecl.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/perlrun_nondecl.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 -*-
 # we use this file to test how the files w/o package declaration,
 # required from perlrun, work
 

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/prefork.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/prefork.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/prefork.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/prefork.pl Thu Jun 12 09:29:09 2014
@@ -1,4 +1,5 @@
 #!perl -w
+# please insert nothing before this line: -*- mode: cperl; cperl-indent-level: 4; cperl-continued-statement-offset: 4; indent-tabs-mode: nil -*-
 
 # test that prefork runs from the directory the script lives in
 

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/r_inherited.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/r_inherited.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/r_inherited.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/r_inherited.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 strict;
 use warnings;
 

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/redirect-cookie.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/redirect-cookie.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/redirect-cookie.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/redirect-cookie.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 -*-
 # test env vars
 
 use Apache2::URI ();

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/redirect.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/redirect.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/redirect.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/redirect.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 -*-
 # test env vars
 
 use Apache2::URI ();

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/require.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/require.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/require.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/require.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 -*-
 # test the require
 
 use Apache::Test ();

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/runtime_error.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/runtime_error.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/runtime_error.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/runtime_error.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 -*-
 BEGIN {
     use Apache::TestUtil;
     t_server_log_error_is_expected();

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/runtime_error_n_status_change.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/runtime_error_n_status_change.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/runtime_error_n_status_change.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/runtime_error_n_status_change.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 -*-
 BEGIN {
     use Apache::TestUtil;
     t_server_log_error_is_expected();

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/runtime_error_plus_body.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/runtime_error_plus_body.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/runtime_error_plus_body.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/runtime_error_plus_body.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 -*-
 BEGIN {
     use Apache::TestUtil;
     t_server_log_error_is_expected();

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

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/status_change.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/status_change.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/status_change.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/status_change.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 Apache2::Const -compile => qw(NOT_FOUND);
 
 my $r = shift;

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/syntax_error.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/syntax_error.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/syntax_error.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/syntax_error.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 -*-
 BEGIN {
     use Apache::TestUtil;
     t_server_log_error_is_expected();

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/use_error.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/use_error.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/use_error.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi-bin/use_error.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 -*-
 BEGIN {
     use Apache::TestUtil;
     t_server_log_error_is_expected();

Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/cgi.t?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi.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/ModPerl-Registry/t/closure.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/closure.t?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/closure.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/closure.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/ModPerl-Registry/t/conf/modperl_extra_startup.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/conf/modperl_extra_startup.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/conf/modperl_extra_startup.pl (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/conf/modperl_extra_startup.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 strict;
 use warnings FATAL => 'all';
 

Modified: perl/modperl/trunk/ModPerl-Registry/t/dirindex.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/dirindex.t?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/dirindex.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/dirindex.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/ModPerl-Registry/t/fatalstobrowser.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.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/ModPerl-Registry/t/flush.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/flush.t?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/flush.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/flush.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/ModPerl-Registry/t/ithreads.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/ithreads.t?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/ithreads.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/ithreads.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/ModPerl-Registry/t/nph.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/nph.t?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/nph.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/nph.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/ModPerl-Registry/t/perlrun_extload.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/perlrun_extload.t?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/perlrun_extload.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/perlrun_extload.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/ModPerl-Registry/t/prefork.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/prefork.t?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/prefork.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/prefork.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/ModPerl-Registry/t/redirect.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/redirect.t?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/redirect.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/redirect.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/ModPerl-Registry/t/regex.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/regex.t?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/regex.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/regex.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/ModPerl-Registry/t/rewrite_env.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/rewrite_env.t?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/rewrite_env.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/rewrite_env.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/ModPerl-Registry/t/special_blocks.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/special_blocks.t?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/special_blocks.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/special_blocks.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/build/config.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/build/config.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/build/config.pl (original)
+++ perl/modperl/trunk/build/config.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 strict;
 use FindBin qw($Bin);

Modified: perl/modperl/trunk/build/source_scan.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/build/source_scan.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/build/source_scan.pl (original)
+++ perl/modperl/trunk/build/source_scan.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 -*-
 #requires C::Scan 0.75+
 
 use lib qw(lib Apache-Test/lib);

Modified: perl/modperl/trunk/build/xs_generate.pl
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/build/xs_generate.pl?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/build/xs_generate.pl (original)
+++ perl/modperl/trunk/build/xs_generate.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(lib Apache-Test/lib);
 
 use Apache::TestConfig (); # needed to resolve circular use dependency

Modified: perl/modperl/trunk/lib/APR/XSLoader.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/APR/XSLoader.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/APR/XSLoader.pm (original)
+++ perl/modperl/trunk/lib/APR/XSLoader.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/lib/Apache2/Build.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Apache2/Build.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/Build.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Build.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/lib/Apache2/ParseSource.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Apache2/ParseSource.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/ParseSource.pm (original)
+++ perl/modperl/trunk/lib/Apache2/ParseSource.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/lib/Apache2/PerlSections.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Apache2/PerlSections.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/PerlSections.pm (original)
+++ perl/modperl/trunk/lib/Apache2/PerlSections.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/lib/Apache2/PerlSections/Dump.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Apache2/PerlSections/Dump.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/PerlSections/Dump.pm (original)
+++ perl/modperl/trunk/lib/Apache2/PerlSections/Dump.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/lib/Apache2/Resource.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Apache2/Resource.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/Resource.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Resource.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/lib/Apache2/SourceTables.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Apache2/SourceTables.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/SourceTables.pm (original)
+++ perl/modperl/trunk/lib/Apache2/SourceTables.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/lib/Apache2/Status.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Apache2/Status.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/Status.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Status.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/lib/Apache2/XSLoader.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Apache2/XSLoader.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/XSLoader.pm (original)
+++ perl/modperl/trunk/lib/Apache2/XSLoader.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/lib/Apache2/compat.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Apache2/compat.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/compat.pm (original)
+++ perl/modperl/trunk/lib/Apache2/compat.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/lib/Apache2/porting.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Apache2/porting.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/porting.pm (original)
+++ perl/modperl/trunk/lib/Apache2/porting.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/lib/Bundle/Apache2.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Bundle/Apache2.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Bundle/Apache2.pm (original)
+++ perl/modperl/trunk/lib/Bundle/Apache2.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/lib/ModPerl/BuildMM.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/ModPerl/BuildMM.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/ModPerl/BuildMM.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/BuildMM.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/lib/ModPerl/BuildOptions.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/ModPerl/BuildOptions.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/ModPerl/BuildOptions.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/BuildOptions.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.
@@ -264,4 +265,4 @@ GENERATE_XS    0    Generate XS code bas
 LIBNAME        0    Name of the modperl dso library (default is  mod_perl)
 COMPAT_1X      0    Compile-time mod_perl 1.0 backcompat (default is  on)
 APR_LIB        0    Lib used to build APR::* on Win32 (default is aprext)
-NONTHREADED_OK 0    Using a non-threaded perl is okay with httpd >=2.3
+NO_THREADS     0    Build mod_perl without thread support with httpd >= 2.4

Modified: perl/modperl/trunk/lib/ModPerl/CScan.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/ModPerl/CScan.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/ModPerl/CScan.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/CScan.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::CScan;
 
 require Exporter;

Modified: perl/modperl/trunk/lib/ModPerl/Code.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/ModPerl/Code.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/ModPerl/Code.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/Code.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.
@@ -142,7 +143,7 @@ my %flags = (
     Dir => [qw(NONE PARSE_HEADERS SETUP_ENV MERGE_HANDLERS GLOBAL_REQUEST UNSET)],
     Req => [qw(NONE SET_GLOBAL_REQUEST PARSE_HEADERS SETUP_ENV
                CLEANUP_REGISTERED PERL_SET_ENV_DIR PERL_SET_ENV_SRV)],
-    Interp => [qw(NONE IN_USE PUTBACK CLONED BASE)],
+    Interp => [qw(NONE IN_USE CLONED BASE)],
     Handler => [qw(NONE PARSED METHOD OBJECT ANON AUTOLOAD DYNAMIC FAKE)],
 );
 

Modified: perl/modperl/trunk/lib/ModPerl/Config.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/ModPerl/Config.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/ModPerl/Config.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/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 -*-
 # 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/lib/ModPerl/FunctionMap.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/ModPerl/FunctionMap.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/ModPerl/FunctionMap.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/FunctionMap.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/lib/ModPerl/MM.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/ModPerl/MM.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/ModPerl/MM.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/MM.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/lib/ModPerl/Manifest.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/ModPerl/Manifest.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/ModPerl/Manifest.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/Manifest.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/lib/ModPerl/ParseSource.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/ModPerl/ParseSource.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/ModPerl/ParseSource.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/ParseSource.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/lib/ModPerl/StructureMap.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/ModPerl/StructureMap.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/ModPerl/StructureMap.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/StructureMap.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/lib/ModPerl/TestReport.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/ModPerl/TestReport.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/ModPerl/TestReport.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/TestReport.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/lib/ModPerl/TestRun.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/ModPerl/TestRun.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/ModPerl/TestRun.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/TestRun.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/lib/ModPerl/TypeMap.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/ModPerl/TypeMap.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/ModPerl/TypeMap.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/TypeMap.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/lib/ModPerl/WrapXS.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/ModPerl/WrapXS.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/ModPerl/WrapXS.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/WrapXS.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/lib/mod_perl2.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/mod_perl2.pm?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/lib/mod_perl2.pm (original)
+++ perl/modperl/trunk/lib/mod_perl2.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/src/modules/perl/mod_perl.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/mod_perl.c?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/mod_perl.c (original)
+++ perl/modperl/trunk/src/modules/perl/mod_perl.c Thu Jun 12 09:29:09 2014
@@ -216,8 +216,10 @@ PerlInterpreter *modperl_startup(server_
         server_rec *base_server = modperl_global_get_server_rec();
         const char *desc = modperl_server_desc(s, p);
         if (base_server == s) {
+            MP_init_status = 1; /* temporarily reset MP_init_status */
             MP_TRACE_i(MP_FUNC,
                        "starting the parent perl for the base server", desc);
+            MP_init_status = 2;
         }
         else {
             MP_TRACE_i(MP_FUNC,
@@ -392,6 +394,7 @@ int modperl_init_vhost(server_rec *s, ap
     }
 
     PERL_SET_CONTEXT(perl);
+    modperl_thx_interp_set(perl, base_scfg->mip->parent);
 
 #endif /* USE_ITHREADS */
 
@@ -440,12 +443,12 @@ void modperl_init(server_rec *base_serve
 {
     server_rec *s;
     PerlInterpreter *base_perl;
-#ifdef MP_TRACE
+#if defined(MP_TRACE) || defined(USE_ITHREADS)
     modperl_config_srv_t *base_scfg = modperl_config_srv_get(base_server);
+#endif
 
     MP_TRACE_d_do(MpSrv_dump_flags(base_scfg,
                                    base_server->server_hostname));
-#endif /* MP_TRACE */
 
 #ifndef USE_ITHREADS
     if (modperl_threaded_mpm()) {
@@ -467,6 +470,7 @@ void modperl_init(server_rec *base_serve
     /* after other parent perls were started in vhosts, make sure that
      * the context is set to the base_perl */
     PERL_SET_CONTEXT(base_perl);
+    modperl_thx_interp_set(base_perl, base_scfg->mip->parent);
 #endif
 
 }
@@ -612,8 +616,6 @@ int modperl_hook_init(apr_pool_t *pconf,
         return OK;
     }
 
-    MP_TRACE_i(MP_FUNC, "mod_perl hook init");
-
     MP_init_status = 1; /* now starting */
 
     modperl_restart_count_inc(s);
@@ -741,7 +743,22 @@ static int modperl_hook_create_request(r
 {
     MP_dRCFG;
 
+#ifdef USE_ITHREADS
+    /* XXX: this is necessary to make modperl_interp_pool_select() work
+     * which is used at runtime only to merge dir-configs by
+     * modperl_module_config_merge().
+     *
+     * Since most requests won't need it it would be good to add some logic
+     * (cheaper logic in terms of CPU cycles) to identify those cases and
+     * avoid the hash operation.
+     */
+    MP_TRACE_i(MP_FUNC, "setting userdata MODPERL_R in pool %#lx to %lx",
+               (unsigned long)r->pool, (unsigned long)r);
+    (void)apr_pool_userdata_set((void *)r, "MODPERL_R", NULL, r->pool);
+#endif
+
     modperl_config_req_init(r, rcfg);
+    modperl_config_req_cleanup_register(r, rcfg);
 
     /* set the default for cgi header parsing On as early as possible
      * so $r->content_type in any phase after header_parser could turn
@@ -755,6 +772,12 @@ static int modperl_hook_create_request(r
 
 static int modperl_hook_post_read_request(request_rec *r)
 {
+#ifdef USE_ITHREADS
+    MP_TRACE_i(MP_FUNC, "%s %s:%d%s",
+               r->method, r->connection->local_addr->hostname,
+               r->connection->local_addr->port, r->unparsed_uri);
+#endif
+
     /* if 'PerlOptions +GlobalRequest' is outside a container */
     modperl_global_request_cfg_set(r);
 
@@ -1018,27 +1041,14 @@ static int modperl_response_handler_run(
 int modperl_response_handler(request_rec *r)
 {
     MP_dDCFG;
-#ifdef USE_ITHREADS
-    MP_dRCFG;
-#endif
     apr_status_t retval, rc;
-
-#ifdef USE_ITHREADS
-    pTHX;
-    modperl_interp_t *interp;
-#endif
+    MP_dINTERP;
 
     if (!strEQ(r->handler, "modperl")) {
         return DECLINED;
     }
 
-#ifdef USE_ITHREADS
-    interp = modperl_interp_select(r, r->connection, r->server);
-    aTHX = interp->perl;
-    if (MpInterpPUTBACK(interp)) {
-        rcfg->interp = interp;
-    }
-#endif
+    MP_INTERPa(r, r->connection, r->server);
 
     /* default is -SetupEnv, add if PerlOption +SetupEnv */
     if (MpDirSETUP_ENV(dcfg)) {
@@ -1051,13 +1061,7 @@ int modperl_response_handler(request_rec
         retval = rc;
     }
 
-#ifdef USE_ITHREADS
-    if (MpInterpPUTBACK(interp)) {
-        /* PerlInterpScope handler */
-        rcfg->interp = NULL;
-        modperl_interp_unselect(interp);
-    }
-#endif
+    MP_INTERP_PUTBACK(interp, aTHX);
 
     return retval;
 }
@@ -1068,22 +1072,13 @@ int modperl_response_handler_cgi(request
     GV *h_stdin, *h_stdout;
     apr_status_t retval, rc;
     MP_dRCFG;
-#ifdef USE_ITHREADS
-    pTHX;
-    modperl_interp_t *interp;
-#endif
+    MP_dINTERP;
 
     if (!strEQ(r->handler, "perl-script")) {
         return DECLINED;
     }
 
-#ifdef USE_ITHREADS
-    interp = modperl_interp_select(r, r->connection, r->server);
-    aTHX = interp->perl;
-    if (MpInterpPUTBACK(interp)) {
-        rcfg->interp = interp;
-    }
-#endif
+    MP_INTERPa(r, r->connection, r->server);
 
     modperl_perl_global_request_save(aTHX_ r);
 
@@ -1115,13 +1110,7 @@ int modperl_response_handler_cgi(request
     modperl_io_restore_stdout(aTHX_ h_stdout);
     FREETMPS;LEAVE;
 
-#ifdef USE_ITHREADS
-    if (MpInterpPUTBACK(interp)) {
-        /* PerlInterpScope handler */
-        modperl_interp_unselect(interp);
-        rcfg->interp = NULL;
-    }
-#endif
+    MP_INTERP_PUTBACK(interp, aTHX);
 
     /* flush output buffer after interpreter is putback */
     rc = modperl_response_finish(r);
@@ -1159,3 +1148,10 @@ module AP_MODULE_DECLARE_DATA perl_modul
     modperl_cmds,              /* table of config file commands       */
     modperl_register_hooks,    /* register hooks */
 };
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/src/modules/perl/mod_perl.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/mod_perl.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/mod_perl.h (original)
+++ perl/modperl/trunk/src/modules/perl/mod_perl.h Thu Jun 12 09:29:09 2014
@@ -198,3 +198,10 @@ APR_DECLARE_OPTIONAL_FN(modperl_interp_t
 #endif /* end of #ifdef USE_ITHREADS */
 
 #endif /*  MOD_PERL_H */
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/src/modules/perl/modperl_apache_compat.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_apache_compat.c?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_apache_compat.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_apache_compat.c Thu Jun 12 09:29:09 2014
@@ -70,3 +70,10 @@ AP_DECLARE(const char *) ap_get_server_v
 }
 
 #endif /* since-APACHE-2.3.0 */
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

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

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

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

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

Modified: perl/modperl/trunk/src/modules/perl/modperl_bucket.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_bucket.c?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_bucket.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_bucket.c Thu Jun 12 09:29:09 2014
@@ -157,3 +157,10 @@ apr_bucket *modperl_bucket_sv_create(pTH
     bucket->free = apr_bucket_free;
     return modperl_bucket_sv_make(aTHX_ bucket, sv, offset, len);
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/src/modules/perl/modperl_bucket.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_bucket.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_bucket.h (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_bucket.h Thu Jun 12 09:29:09 2014
@@ -21,3 +21,10 @@ apr_bucket *modperl_bucket_sv_create(pTH
                                      apr_off_t offset, apr_size_t len);
 
 #endif /* MODPERL_BUCKET_H */
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/src/modules/perl/modperl_callback.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_callback.c?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_callback.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_callback.c Thu Jun 12 09:29:09 2014
@@ -88,8 +88,7 @@ int modperl_callback(pTHX_ modperl_handl
                 name = handler->name;
             }
 
-            MP_TRACE_h(MP_FUNC, "[%s %s] lookup of %s failed",
-                       modperl_pid_tid(p),
+            MP_TRACE_h(MP_FUNC, "[%s] lookup of %s failed",
                        modperl_server_desc(s, p), name);
             ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
                          "lookup of '%s' failed", name);
@@ -148,10 +147,7 @@ int modperl_callback_run_handlers(int id
                                   apr_pool_t *ptemp,
                                   modperl_hook_run_mode_e run_mode)
 {
-#ifdef USE_ITHREADS
-    pTHX;
-    modperl_interp_t *interp = NULL;
-#endif
+    MP_dINTERP;
     MP_dSCFG(s);
     MP_dDCFG;
     MP_dRCFG;
@@ -184,28 +180,7 @@ int modperl_callback_run_handlers(int id
         return DECLINED;
     }
 
-#ifdef USE_ITHREADS
-    if (r && !c && modperl_interp_scope_connection(scfg)) {
-        c = r->connection;
-    }
-    if (r || c) {
-        interp = modperl_interp_select(r, c, s);
-        aTHX = interp->perl;
-    }
-    else {
-        /* Child{Init,Exit}, OpenLogs */
-        aTHX = scfg->mip->parent->perl;
-        PERL_SET_CONTEXT(aTHX);
-    }
-#endif
-
-    /* XXX: would like to do this in modperl_hook_create_request()
-     * but modperl_interp_select() is what figures out if
-     * PerlInterpScope eq handler, in which case we do not register
-     * a cleanup.  modperl_hook_create_request() is also currently always
-     * run even if modperl isn't handling any part of the request
-     */
-    modperl_config_req_cleanup_register(r, rcfg);
+    MP_INTERPa(r, c, s);
 
     switch (type) {
       case MP_HANDLER_TYPE_PER_SRV:
@@ -254,8 +229,7 @@ int modperl_callback_run_handlers(int id
 
     modperl_callback_current_callback_set(desc);
 
-    MP_TRACE_h(MP_FUNC, "[%s] running %d %s handlers",
-               modperl_pid_tid(p), av->nelts, desc);
+    MP_TRACE_h(MP_FUNC, "running %d %s handlers", av->nelts, desc);
     handlers = (modperl_handler_t **)av->elts;
 
     for (i=0; i<av->nelts; i++) {
@@ -357,8 +331,7 @@ int modperl_callback_run_handlers(int id
 
     SvREFCNT_dec((SV*)av_args);
 
-    /* PerlInterpScope handler */
-    MP_INTERP_PUTBACK(interp);
+    MP_INTERP_PUTBACK(interp, aTHX);
 
     return status;
 }
@@ -415,3 +388,10 @@ int modperl_callback_files(int idx,
                                          NULL, NULL, s,
                                          pconf, plog, ptemp, run_mode);
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/src/modules/perl/modperl_callback.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_callback.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_callback.h (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_callback.h Thu Jun 12 09:29:09 2014
@@ -66,3 +66,10 @@ int modperl_callback_files(int idx,
                            modperl_hook_run_mode_e run_mode);
 
 #endif /* MODPERL_CALLBACK_H */
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/src/modules/perl/modperl_cgi.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_cgi.c?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_cgi.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_cgi.c Thu Jun 12 09:29:09 2014
@@ -101,3 +101,10 @@ MP_INLINE int modperl_cgi_header_parse(r
 
     return status;
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/src/modules/perl/modperl_cgi.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_cgi.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_cgi.h (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_cgi.h Thu Jun 12 09:29:09 2014
@@ -36,3 +36,10 @@ MP_INLINE int modperl_cgi_header_parse(r
                                        apr_size_t *len, const char **body);
 
 #endif /* MODPERL_CGI_H */
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/src/modules/perl/modperl_cmd.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_cmd.c?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_cmd.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_cmd.c Thu Jun 12 09:29:09 2014
@@ -69,17 +69,15 @@ char *modperl_cmd_push_filter_handlers(M
      */
     if (*name == '-') {
         MP_TRACE_h(MP_FUNC,
-                   "[%s] warning: filter handler %s will be not autoloaded. "
+                   "warning: filter handler %s will be not autoloaded. "
                    "Unless the module defining this handler is explicitly "
-                   "preloaded, filter attributes will be ignored.\n",
-                   modperl_pid_tid(p), h->name);
+                   "preloaded, filter attributes will be ignored.");
     }
     else {
         MpHandlerAUTOLOAD_On(h);
         MP_TRACE_h(MP_FUNC,
-                   "[%s] filter handler %s will be autoloaded (to make "
-                   "the filter attributes available)\n",
-                   modperl_pid_tid(p), h->name);
+                   "filter handler %s will be autoloaded (to make "
+                   "the filter attributes available)", h->name);
     }
 
     if (!*handlers) {
@@ -587,6 +585,11 @@ MP_CMD_SRV_DECLARE(perldo)
                           arg, NULL);
     }
 
+#ifdef USE_ITHREADS
+    MP_TRACE_i(MP_FUNC, "using interp %lx to execute perl section:\n%s",
+               scfg->mip->parent, arg);
+#endif
+
     {
         SV *server = MP_PERLSECTIONS_SERVER_SV;
         SV *code = newSVpv(arg, 0);
@@ -862,3 +865,10 @@ MP_CMD_INTERP_POOL_IMP(min_spare);
 MP_CMD_INTERP_POOL_IMP(max_requests);
 
 #endif /* USE_ITHREADS */
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/src/modules/perl/modperl_cmd.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_cmd.h?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_cmd.h (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_cmd.h Thu Jun 12 09:29:09 2014
@@ -157,3 +157,10 @@ MP_CMD_SRV_DECLARE(interp_scope);
       OR_ALL|EXEC_ON_READ, desc )
 
 #endif /* MODPERL_CMD_H */
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

Modified: perl/modperl/trunk/src/modules/perl/modperl_common_debug.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_common_debug.c?rev=1602105&r1=1602104&r2=1602105&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_common_debug.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_common_debug.c Thu Jun 12 09:29:09 2014
@@ -17,3 +17,10 @@
 /* This file must not contain any symbols from apache/mod_perl
  *  (apr and perl are OK) */
 #include "modperl_common_includes.h"
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

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

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



Mime
View raw message