[532] in BarnOwl Developers
[D-O-H] r651 - in trunk: . owl/perl/modules
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:07:09 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Sun, 4 Mar 2007 23:21:57 -0500 (EST)
Author: nelhage
Date: 2007-03-04 23:21:56 -0500 (Sun, 04 Mar 2007)
New Revision: 651
Modified:
trunk/
trunk/owl/perl/modules/jabber.pl
Log:
r19333@phanatique: nelhage | 2007-03-04 23:14:24 -0500
Don't load jabber.pl if we detect IO::Socket::SSL 0.97
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-debian-local/trunk:1713
bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:19195
+ bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:19333
Modified: trunk/owl/perl/modules/jabber.pl
===================================================================
--- trunk/owl/perl/modules/jabber.pl 2007-03-03 20:04:06 UTC (rev 650)
+++ trunk/owl/perl/modules/jabber.pl 2007-03-05 04:21:56 UTC (rev 651)
@@ -1,14 +1,26 @@
# -*- mode: cperl; cperl-indent-level: 4; indent-tabs-mode: nil -*-
-package BarnOwl::Jabber;
use warnings;
use strict;
+package BarnOwl::Jabber;
+
use Authen::SASL qw(Perl);
use Net::Jabber;
use Net::Jabber::MUC;
use Net::DNS;
use Getopt::Long;
+BEGIN {
+ if(eval {require IO::Socket::SSL;}) {
+ if($IO::Socket::SSL::VERSION eq "0.97") {
+ BarnOwl::error("You are using IO::Socket:SSL 0.97, which \n" .
+ "contains bugs causing it not to work with barnowl's jabber.pl. We \n" .
+ "recommend updating to the latest IO::Socket::SSL from CPAN. \n");
+ die("Not loading jabber.pl\n");
+ }
+ }
+}
+
no warnings 'redefine';
################################################################################
