Author: stevehay
Date: Thu Oct 31 08:51:23 2013
New Revision: 1537408
URL: http://svn.apache.org/r1537408
Log:
Merged revision(s) 1528836-1528881 from perl/modperl/trunk:
Fix t/api/err_headers_out.t with HTTP::Headers > 6.00. Patch from Rolando
<roloswo...@gmail.com>.
........
Fix t/compat/apache_file.t on Windows.
........
Modified:
perl/modperl/branches/httpd24/ (props changed)
perl/modperl/branches/httpd24/Changes
perl/modperl/branches/httpd24/t/api/err_headers_out.t
perl/modperl/branches/httpd24/t/conf/extra.conf.in
Propchange: perl/modperl/branches/httpd24/
------------------------------------------------------------------------------
Merged /perl/modperl/trunk:r1528836-1528881
Modified: perl/modperl/branches/httpd24/Changes
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/httpd24/Changes?rev=1537408&r1=1537407&r2=1537408&view=diff
==============================================================================
--- perl/modperl/branches/httpd24/Changes (original)
+++ perl/modperl/branches/httpd24/Changes Thu Oct 31 08:51:23 2013
@@ -12,6 +12,14 @@ Also refer to the Apache::Test changes l
=item 2.0.9-dev
+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.
+(TEMP should be set to something suitable on Windows.) [Steve Hay]
+
+Fix t/api/err_headers_out.t with HTTP::Headers > 6.00. [Rolando
+<roloswo...@gmail.com>]
+
Fix the build with VC++ and dmake (rather than nmake) on Windows. The
Makefile generated by Apache2::Build uses shell commands for the manifest
file, but neglected to tell dmake to use the shell. [Steve Hay]
Modified: perl/modperl/branches/httpd24/t/api/err_headers_out.t
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/httpd24/t/api/err_headers_out.t?rev=1537408&r1=1537407&r2=1537408&view=diff
==============================================================================
--- perl/modperl/branches/httpd24/t/api/err_headers_out.t (original)
+++ perl/modperl/branches/httpd24/t/api/err_headers_out.t Thu Oct 31 08:51:23
2013
@@ -25,7 +25,7 @@ my $location = '/TestAPI__err_headers_ou
local $HTTP::Headers::TRANSLATE_UNDERSCORE=
$HTTP::Headers::TRANSLATE_UNDERSCORE;
undef $HTTP::Headers::TRANSLATE_UNDERSCORE
- if defined HTTP::Headers->VERSION and HTTP::Headers->VERSION==6.00;
+ if defined HTTP::Headers->VERSION and HTTP::Headers->VERSION >= 6.00;
ok t_cmp $res->header('X-err_headers_out'), "err_headers_out",
"X-err_headers_out: made it";
@@ -50,7 +50,7 @@ my $location = '/TestAPI__err_headers_ou
local $HTTP::Headers::TRANSLATE_UNDERSCORE=
$HTTP::Headers::TRANSLATE_UNDERSCORE;
undef $HTTP::Headers::TRANSLATE_UNDERSCORE
- if defined HTTP::Headers->VERSION and HTTP::Headers->VERSION==6.00;
+ if defined HTTP::Headers->VERSION and HTTP::Headers->VERSION >= 6.00;
ok t_cmp $res->header('X-err_headers_out'), "err_headers_out",
"X-err_headers_out: made it";
Modified: perl/modperl/branches/httpd24/t/conf/extra.conf.in
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/httpd24/t/conf/extra.conf.in?rev=1537408&r1=1537407&r2=1537408&view=diff
==============================================================================
--- perl/modperl/branches/httpd24/t/conf/extra.conf.in (original)
+++ perl/modperl/branches/httpd24/t/conf/extra.conf.in Thu Oct 31 08:51:23 2013
@@ -94,10 +94,14 @@ PerlModule TestExit::FromPerlModule
PerlResponseHandler Apache2::Status
</Location>
-# for TestApache2::util
+# for TestApache::util
PerlPassEnv LC_CTYPE
PerlPassEnv LC_TIME
+# for TestCompat::apache_file
+PerlPassEnv TMPDIR
+PerlPassEnv TEMP
+
# see t/filter/out_apache.t
<VirtualHost filter_out_apache>
<IfModule mod_include.c>
