[interchange-cvs] interchange - heins modified 3 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Tue Mar 28 12:05:07 EST 2006
User: heins
Date: 2006-03-28 17:05:07 GMT
Modified: dist/src/mod_perl2 Tag: STABLE_5_4-branch README
Modified: dist/src/mod_perl2/Interchange Tag: STABLE_5_4-branch
Modified: Link.pm
Added: dist/src/mod_perl2/Interchange Tag: STABLE_5_4-branch
Added: Link.pm.mod_perl-1.999_21_and_before
Log:
* Add Interchange::Link patches from devel.
Revision Changes Path
No revision
No revision
1.2.2.1 +9 -4 interchange/dist/src/mod_perl2/README
rev 1.2.2.1, prev_rev 1.2
Index: README
===================================================================
RCS file: /var/cvs/interchange/dist/src/mod_perl2/README,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- README 29 Jun 2004 05:48:41 -0000 1.2
+++ README 28 Mar 2006 17:05:07 -0000 1.2.2.1
@@ -7,7 +7,7 @@
change
VERSION
- $Revision: 1.2 $
+ $Revision: 1.2.2.1 $
SYNOPSIS
<Location /foundation>
@@ -57,6 +57,11 @@
mkdir -p /usr/lib/httpd/perl/Interchange
cp Link.pm /usr/lib/httpd/perl/Interchange
+ If you have mod_perl2 1.999_21 or earlier, you should instead do:
+
+ mkdir -p /usr/lib/httpd/perl/Interchange
+ cp Link.pm.mod_perl-1.999_21_and_before /usr/lib/httpd/perl/Interchange
+
Then you provide a startup script that tells mod_perl where its
libraries are:
@@ -105,7 +110,7 @@
Note that your file permissions for the socket file need to allow
the Apache User uid to read and write it. This usually means "Sock-
etPerms 0666" or in interchange.cfg. You can also do "SocketPerms
- 0666" if you set the group of the containing directory to the
+ 0660" if you set the group of the containing directory to the
Apache Group value, and change the directory permissions to enable
the setgid bit. (That is accomplished with "chmod g+s <direc-
tory>".)
@@ -271,7 +276,7 @@
COPYRIGHT AND LICENSE
Copyright (C) 1996-2002 Red Hat, Inc.
- Copyright (C) 2002-2004 Interchange Development Group
+ Copyright (C) 2002-2005 Interchange Development Group
This program is free software. You can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -285,4 +290,4 @@
-perl v5.8.4 2004-06-29 Interchange::Link(3)
+perl v5.8.8 2006-03-28 Interchange::Link(3)
No revision
No revision
1.8.2.1 +24 -16 interchange/dist/src/mod_perl2/Interchange/Link.pm
rev 1.8.2.1, prev_rev 1.8
Index: Link.pm
===================================================================
RCS file: /var/cvs/interchange/dist/src/mod_perl2/Interchange/Link.pm,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- Link.pm 8 Nov 2005 18:14:44 -0000 1.8
+++ Link.pm 28 Mar 2006 17:05:07 -0000 1.8.2.1
@@ -2,7 +2,7 @@
# Interchange::Link -- mod_perl 1.99/2.0 module for linking to Interchange
#
-# $Id: Link.pm,v 1.8 2005/11/08 18:14:44 jon Exp $
+# $Id: Link.pm,v 1.8.2.1 2006/03/28 17:05:07 mheins Exp $
#
# Copyright (C) 2002-2005 Interchange Development Group
# Copyright (C) 1996-2002 Red Hat, Inc.
@@ -23,14 +23,17 @@
package Interchange::Link;
+
use strict;
use ModPerl::Registry;
use ModPerl::Code;
-use Apache::Const;
-require Apache::Connection;
-require Apache::RequestRec;
-require Apache::RequestIO;
-require Apache::RequestUtil;
+#use Apache::Const;
+use Apache2::Const;
+use Apache2::ServerRec ();
+require Apache2::Connection;
+require Apache2::RequestRec;
+require Apache2::RequestIO;
+require Apache2::RequestUtil;
use Socket;
$ENV{PATH} = "/bin:/usr/bin";
@@ -45,7 +48,7 @@
=head1 VERSION
-$Revision: 1.8 $
+$Revision: 1.8.2.1 $
=head1 SYNOPSIS
@@ -99,6 +102,11 @@
mkdir -p /usr/lib/httpd/perl/Interchange
cp Link.pm /usr/lib/httpd/perl/Interchange
+If you have mod_perl2 1.999_21 or earlier, you should instead do:
+
+ mkdir -p /usr/lib/httpd/perl/Interchange
+ cp Link.pm.mod_perl-1.999_21_and_before /usr/lib/httpd/perl/Interchange
+
Then you provide a startup script that tells mod_perl where its
libraries are:
@@ -339,7 +347,7 @@
my $s = $r->server;
my $location = $r->location;
- return $config{$location} if $config{$location} && !($s->is_virtual);
+ return $config{$location} if $config{$location} && !($s->is_virtual());
#warn "Getting location $location\n";
@@ -490,7 +498,7 @@
for(@$ord) {
#warn "checking for OrdinaryFile $_\n";
next unless $uri =~ $_;
- $global_status = Apache::DECLINED;
+ $global_status = Apache2::Const::DECLINED;
return undef;
}
}
@@ -502,7 +510,7 @@
$r->headers_out->{Status} = '404 Not found';
$r->content_type('text/html');
#warn "dropping request for $uri\n";
- $global_status = Apache::NOT_FOUND;
+ $global_status = Apache2::Const::NOT_FOUND;
return undef;
}
}
@@ -669,7 +677,7 @@
$ok or do {
server_not_running($r);
- return Apache::OK;
+ return Apache2::Const::OK;
};
my $former = select SOCK;
@@ -730,12 +738,12 @@
#warn "Doing redirect\n";
$r->content_type($set_content);
close (SOCK) or die "close: $!\n";
- return Apache::REDIRECT;
+ return Apache2::Const::REDIRECT;
}
elsif($set_status =~ /^404/) {
#warn "404 not found status\n";
close (SOCK) or die "close: $!\n";
- return Apache::OK;
+ return Apache2::Const::OK;
}
elsif($set_status eq 'httpd_deliver') {
$deliver_object = $set_status;
@@ -754,11 +762,11 @@
$r->content_type('text/html');
if(! -e $fn) {
$r->headers_out->{Status} = '404 Not found';
- return Apache::NOT_FOUND;
+ return Apache2::Const::NOT_FOUND;
}
else {
$r->headers_out->{Status} = '403 Permission denied';
- return Apache::FORBIDDEN;
+ return Apache2::Const::FORBIDDEN;
}
}
@@ -784,7 +792,7 @@
}
#warn "Returning OK\n";
- return Apache::OK;
+ return Apache2::Const::OK;
}
1;
No revision
No revision
1.1.2.1 +2 -2 interchange/dist/src/mod_perl2/Interchange/Link.pm.mod_perl-1.999_21_and_before
rev 1.1.2.1, prev_rev 1.1
Index: Link.pm.mod_perl-1.999_21_and_before
===================================================================
RCS file: /var/cvs/interchange/dist/src/mod_perl2/Interchange/Link.pm.mod_perl-1.999_21_and_before,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- Link.pm.mod_perl-1.999_21_and_before 28 Mar 2006 17:02:47 -0000 1.1
+++ Link.pm.mod_perl-1.999_21_and_before 28 Mar 2006 17:05:07 -0000 1.1.2.1
@@ -2,7 +2,7 @@
# Interchange::Link -- mod_perl 1.99/2.0 module for linking to Interchange
#
-# $Id: Link.pm.mod_perl-1.999_21_and_before,v 1.1 2006/03/28 17:02:47 mheins Exp $
+# $Id: Link.pm.mod_perl-1.999_21_and_before,v 1.1.2.1 2006/03/28 17:05:07 mheins Exp $
#
# Copyright (C) 2002-2005 Interchange Development Group
# Copyright (C) 1996-2002 Red Hat, Inc.
@@ -45,7 +45,7 @@
=head1 VERSION
-$Revision: 1.1 $
+$Revision: 1.1.2.1 $
=head1 SYNOPSIS
More information about the interchange-cvs
mailing list