richter 2003/01/27 23:21:27
Modified: . Changes.pod Embperl.pm Makefile.PL mod_embperl.c
test.pl
Log:
apache2 fix + apache 2 port fix
Revision Changes Path
1.196 +1 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- Changes.pod 7 Jan 2003 20:42:59 -0000 1.195
+++ Changes.pod 28 Jan 2003 07:21:26 -0000 1.196
@@ -54,6 +54,7 @@
- Keep spaces and newlines in <mail:send> tag.
- Embperl::Mail now encodes all header fields that contains characters between
128 and 255. Use headerencoding parameter to turn of or tell Embperl your
charset.
+ - Fix mod_perl 2 detection when mod_perl is build with MP_INST_APACHE2.
=head1 2.0b8 (BETA) 25. Juni 2002
1.181 +2 -2 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- Embperl.pm 7 Jan 2003 20:42:59 -0000 1.180
+++ Embperl.pm 28 Jan 2003 07:21:26 -0000 1.181
@@ -46,7 +46,7 @@
@ISA = qw(Exporter DynaLoader);
-$VERSION = '2.0b9_dev-6' ;
+$VERSION = '2.0b9_dev-7' ;
if ($modperl = $ENV{MOD_PERL})
1.59 +3 -3 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- Makefile.PL 15 Nov 2002 06:17:36 -0000 1.58
+++ Makefile.PL 28 Jan 2003 07:21:26 -0000 1.59
@@ -508,12 +508,12 @@
if (!$apache && $apache_src eq '')
{
# check for mod_perl 2.0
- eval 'use Apache::BuildConfig' ;
+ eval 'use Apache2; use Apache::BuildConfig' ;
if ($@ eq '')
{
$mp2cfg = Apache::BuildConfig -> new ;
- $apache_src = $mp2cfg -> {MP_AP_PREFIX} ;
+ $apache_src = $mp2cfg -> {MP_AP_PREFIX} || $mp2cfg -> {ap_includedir} ;
print "Found mod_perl 2.0\n" ;
}
else
1.6 +5 -1 embperl/mod_embperl.c
Index: mod_embperl.c
===================================================================
RCS file: /home/cvs/embperl/mod_embperl.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_embperl.c 7 Jan 2003 20:43:00 -0000 1.5
+++ mod_embperl.c 28 Jan 2003 07:21:27 -0000 1.6
@@ -950,7 +950,11 @@
ap_table_do (embperl_AddCookie, &s, r -> headers_in, "Cookie", NULL) ;
buf[0] = '\0' ;
+#ifdef APACHE2
+ port = r -> connection -> local_addr -> port ;
+#else
port = ntohs(r -> connection -> local_addr.sin_port) ;
+#endif
#ifdef EAPI
if (ap_ctx_get (r -> connection -> client -> ctx, "ssl"))
{
1.123 +4 -1 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- test.pl 23 Dec 2002 20:47:36 -0000 1.122
+++ test.pl 28 Jan 2003 07:21:27 -0000 1.123
@@ -1286,9 +1286,11 @@
my $err = 0 ;
open F1, $f1 || die "***Cannot open $f1" ;
+ binmode (F1, ":encoding(iso-8859-1)") if ($] >= 5.008000) ;
if (!$errin)
{
open F2, $f2 || die "***Cannot open $f2" ;
+ binmode (F2, ":encoding(iso-8859-1)") if ($] >= 5.008000) ;
}
while (defined ($l1 = <F1>))
@@ -1451,6 +1453,7 @@
$response = $ua->request($request, undef, undef);
open FH, ">$ofile" ;
+ binmode (FH, ":encoding(iso-8859-1)") if ($] >= 5.008000) ;
print FH $response -> content ;
close FH ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
