[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

SF.net SVN: ledger-smb:[5230] branches/1.3

Revision: 5230
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5230&view=rev
Author:   einhverfr
Date:     2012-11-21 15:22:30 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Corrected error handling on errors thrown by LedgerSMB->new() in fcgi environments

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB.pm
    branches/1.3/lsmb-request.pl

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2012-11-21 12:47:32 UTC (rev 5229)
+++ branches/1.3/Changelog	2012-11-21 15:22:30 UTC (rev 5230)
@@ -2,6 +2,9 @@
 Initial Release:  Monday, Oct 12 2011
 Supported Presently
 
+Changelog for 1.3.25
+* Fixed internal server errors on LedgerSMB->error() during new() (Chris T)
+
 Changelog for 1.3.24
 * Fixed error in msgid for "Add Language" (Havard S, h/t Robert C)
 * Moved Makefile.PL to version_from to reduce errors (Chris T, h/t Robert C)

Modified: branches/1.3/LedgerSMB.pm
===================================================================
--- branches/1.3/LedgerSMB.pm	2012-11-21 12:47:32 UTC (rev 5229)
+++ branches/1.3/LedgerSMB.pm	2012-11-21 15:22:30 UTC (rev 5230)
@@ -238,6 +238,7 @@
 
     $type = "" unless defined $type;
     $argstr = "" unless defined $argstr;
+warn 'breakpoint:' . __LINE__;
 
     $logger->debug("Begin called from \$filename=$filename \$line=$line \$type=$type \$argstr=$argstr ref argstr=".ref $argstr);
 
@@ -949,7 +950,7 @@
         print
           qq|<body><h2 class="error">Error!</h2> <p><b>$self->{msg}</b></body>|;
 
-        exit;
+        die;
 
     }
     else {
@@ -1102,7 +1103,7 @@
            . "\n" . 
           $locale->text('More information has been reported in the error logs'));
        $dbh->rollback;
-       exit;
+       die;
    }
    $self->error($dbh->state . ":" . $dbh->errstr);
 }

Modified: branches/1.3/lsmb-request.pl
===================================================================
--- branches/1.3/lsmb-request.pl	2012-11-21 12:47:32 UTC (rev 5229)
+++ branches/1.3/lsmb-request.pl	2012-11-21 15:22:30 UTC (rev 5230)
@@ -48,6 +48,7 @@
 $logger->debug("getting new LedgerSMB");
 
 my $request = new LedgerSMB;
+warn 'breakpoint:' . __LINE__;
 
 $logger->debug("Got \$request=$request");
 $logger->trace("\$request=".Data::Dumper::Dumper($request));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.