This is an automated email from the git hooks/post-receive script.

ntyni pushed a commit to branch master
in repository libapache2-mod-perl2.

commit 3be1b0d600cf51d737283bc20a9577c74f9df964
Merge: 91e77bc 9861476
Author: Niko Tyni <nt...@debian.org>
Date:   Wed May 13 23:33:44 2015 +0300

    Merge branch 'upstream'

 Apache-Reload/Changes                              |    5 +
 Apache-Reload/Makefile.PL                          |   37 +-
 Apache-Reload/RELEASE                              |   40 +-
 Apache-Reload/lib/Apache/Reload.pm                 |    2 +-
 Apache-Reload/lib/Apache2/Reload.pm                |    2 +-
 Apache-Reload/t/conf/extra.conf.in                 |    3 -
 Apache-Reload/t/lib/Apache2/TestReload.pm          |    2 +-
 .../Apache-TestItSelf/Apache-TestMe/Changes        |   21 -
 .../Apache-TestItSelf/Apache-TestMe/Makefile.PL    |  221 --
 Apache-Test/Apache-TestItSelf/Apache-TestMe/README |    5 -
 .../Apache-TestItSelf/Apache-TestMe/t/TEST.PL      |   37 -
 .../Apache-TestMe/t/basic/hello.t                  |   20 -
 .../Apache-TestMe/t/basic/vhost.t                  |    7 -
 .../Apache-TestMe/t/conf/extra.conf.in             |   16 -
 .../Apache-TestMe/t/conf/modperl_extra.pl          |    2 -
 .../Apache-TestMe/t/response/TestBasic/Hello.pm    |   19 -
 .../Apache-TestMe/t/response/TestBasic/Vhost.pm    |   28 -
 Apache-Test/Apache-TestItSelf/Changes              |   27 -
 Apache-Test/Apache-TestItSelf/Makefile.PL          |   40 -
 Apache-Test/Apache-TestItSelf/README               |   73 -
 Apache-Test/Apache-TestItSelf/lib/MyTest/Util.pm   |  160 --
 .../sample/testitself_conf_apache_test_core.pl     |   44 -
 .../sample/testitself_conf_mp2_core.pl             |   43 -
 .../sample/testitself_conf_mp2_modules.pl          |   43 -
 Apache-Test/Apache-TestItSelf/t/TEST.PL            |  123 -
 Apache-Test/Apache-TestItSelf/t/httpd_arg.t        |  117 -
 Apache-Test/Apache-TestItSelf/t/interactive.t      |  158 -
 Apache-Test/Apache-TestItSelf/t/minmaxclients.t    |  101 -
 Apache-Test/Changes                                |    7 +
 Apache-Test/MANIFEST                               |   72 -
 Apache-Test/META.yml                               |   18 -
 Apache-Test/Makefile.PL                            |   20 +-
 Apache-Test/RELEASE                                |    8 +-
 Apache-Test/lib/Apache/Test.pm                     |   24 +-
 Apache-Test/lib/Apache/TestConfig.pm               |   10 +-
 Apache-Test/lib/Apache/TestSSLCA.pm                |    5 +-
 Apache-Test/lib/Apache/TestServer.pm               |   18 +-
 Apache-Test/lib/Apache/TestUtil.pm                 |    2 +-
 Apache-Test/t/log_watch_for_broken_lines.t         |    2 +-
 Apache-Test/t/sok.t                                |   12 +-
 Changes                                            |    8 +-
 MANIFEST                                           | 1064 +++++++
 META.yml                                           |    3 +-
 Makefile.PL                                        |   29 +-
 ModPerl-Registry/Makefile.PL                       |    2 +-
 ModPerl-Registry/t/cgi-bin/206.pl                  |    0
 ModPerl-Registry/t/cgi-bin/304.pl                  |    0
 ModPerl-Registry/t/cgi-bin/404.pl                  |    0
 ModPerl-Registry/t/cgi-bin/basic.pl                |    0
 ModPerl-Registry/t/cgi-bin/bin_resp_start_0.pl     |    0
 ModPerl-Registry/t/cgi-bin/cgi.pl                  |    0
 ModPerl-Registry/t/cgi-bin/closure.pl              |    0
 ModPerl-Registry/t/cgi-bin/content_type.pl         |    0
 ModPerl-Registry/t/cgi-bin/env.pl                  |    0
 ModPerl-Registry/t/cgi-bin/env_val.pl              |    0
 ModPerl-Registry/t/cgi-bin/exit.pl                 |    0
 ModPerl-Registry/t/cgi-bin/flush.pl                |    0
 ModPerl-Registry/t/cgi-bin/ithreads_io_n_tie.pl    |    0
 ModPerl-Registry/t/cgi-bin/missing_headers.pl      |    0
 ModPerl-Registry/t/cgi-bin/nph-foo.pl              |    0
 ModPerl-Registry/t/cgi-bin/perlrun_extload.pl      |    0
 ModPerl-Registry/t/cgi-bin/prefork.pl              |    0
 ModPerl-Registry/t/cgi-bin/r_inherited.pl          |    0
 ModPerl-Registry/t/cgi-bin/redirect-cookie.pl      |    0
 ModPerl-Registry/t/cgi-bin/redirect.pl             |    0
 ModPerl-Registry/t/cgi-bin/require.pl              |    0
 ModPerl-Registry/t/cgi-bin/runtime_error.pl        |    0
 .../t/cgi-bin/runtime_error_n_status_change.pl     |    0
 .../t/cgi-bin/runtime_error_plus_body.pl           |    0
 ModPerl-Registry/t/cgi-bin/send_headers.html       |    0
 ModPerl-Registry/t/cgi-bin/special_blocks.pl       |    0
 ModPerl-Registry/t/cgi-bin/status_change.pl        |    0
 ModPerl-Registry/t/cgi-bin/syntax_error.pl         |    0
 ModPerl-Registry/t/cgi-bin/use_error.pl            |    0
 README                                             |   13 +-
 RELEASE                                            |   14 +-
 STATUS                                             |    2 +-
 bin/mp2bug                                         |    0
 build/make_rpm_spec                                |    0
 build/win32_fetch_apxs                             |    0
 lib/Apache2/Build.pm                               |   36 +-
 lib/ModPerl/BuildMM.pm                             |    3 +-
 lib/ModPerl/BuildOptions.pm                        |   53 +-
 lib/ModPerl/Code.pm                                |   49 +-
 lib/ModPerl/DummyVersions.pm                       |  171 ++
 lib/ModPerl/Manifest.pm                            |    6 +-
 lib/ModPerl/MapUtil.pm                             |    2 +-
 lib/ModPerl/MethodLookup.pm                        | 3035 ++++++++++++++++++++
 lib/ModPerl/WrapXS.pm                              |   20 +-
 build/make_rpm_spec => mod_perl.spec               |   70 +-
 patches/c-scan.pat                                 |   16 -
 patches/link-hack.pat                              |   46 -
 src/modules/perl/modperl_common_log.c              |    2 +
 src/modules/perl/modperl_interp.c                  |   15 +-
 src/modules/perl/modperl_interp.h                  |    2 +
 src/modules/perl/modperl_perl_includes.h           |    2 +-
 src/modules/perl/modperl_util.c                    |    2 +-
 t/api/access2.t                                    |    3 +-
 t/api/access2_24.t                                 |    3 +-
 t/apr-ext/perlio.t                                 |  242 --
 t/hooks/authen_digest.t                            |    2 +-
 t/htdocs/includes-registry/cgipm.pl                |    0
 t/htdocs/includes-registry/test.pl                 |    0
 t/htdocs/includes-registry/test.spl                |    0
 t/perl/ithreads.t                                  |   17 -
 t/perl/ithreads2.t                                 |   26 -
 t/perl/ithreads3.t                                 |   36 -
 t/protocol/TestProtocol/eliza.pm                   |   47 -
 t/protocol/eliza.t                                 |   34 -
 t/response/TestAPI/access2.pm                      |    2 -
 t/response/TestPerl/ithreads.pm                    |  103 -
 t/response/TestPerl/ithreads3.pm                   |  109 -
 t/response/TestPerl/ithreads_args.pm               |   33 -
 t/response/TestPerl/ithreads_eval.pm               |   51 -
 util/apr_arg_check.pl                              |    0
 util/apr_pool_check.pl                             |    0
 util/cvsize.pl                                     |    0
 util/getdiff.pl                                    |    0
 util/methodlookup_check.pl                         |    0
 util/perl_bloat.pl                                 |    0
 util/source_stats.pl                               |    0
 xs/APR/APR/Makefile.PL                             |    2 +-
 xs/APR/aprext/Makefile.PL                          |    2 +-
 xs/APR/aprext/modperl_dummy.c                      |   72 +-
 xs/ModPerl/Const/Makefile.PL                       |    2 +-
 xs/maps/apache2_functions.map                      |    2 +-
 xs/tables/current/ModPerl/FunctionTable.pm         |   18 +
 xs/tables/current24/ModPerl/FunctionTable.pm       |   38 +
 128 files changed, 4667 insertions(+), 2436 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-perl/packages/libapache2-mod-perl2.git

_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

Reply via email to