[Rt-commit] r10252 - in rt/branches/3.6-EXPERIMENTAL-ABERDEEN: . html/Elements

[audreyt at bestpractical.com]

Author: audreyt
Date: Sun Jan  6 00:52:43 2008
New Revision: 10252

Modified:
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/   (props changed)
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Elements/SetupSessionCookie
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/lib/RT/Interface/Email.pm
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/releng.cnf

Log:
 r18426 at T (orig r10129):  jesse | 2007-12-27 05:01:11 +0800
  r74208 at pinglin:  jesse | 2007-12-26 16:00:34 -0500
  RT-Ticket: 8781
  RT-Status: resolved
  RT-Update: correspond
  
  I've encountered a problem with sender identification in the mailgate. If
  a user sends an e-mail where 'Reply-To' is present but empty (i.e there is
  'Reply-To: ' in the e-mail headers), RT does not associate the e-mail
  with a RT user even if the user exists in the system and the sender
  address is specified in the 'Sender' or 'From' fields.
   - Patch from ondrasej at centrum.cz
  
 
 r18480 at T (orig r10183):  jesse | 2007-12-30 04:47:12 +0800
 3.6.6rc2
 
 
 r18528 at T (orig r10231):  jesse | 2008-01-03 22:47:40 +0800
  r74540 at pinglin:  jesse | 2008-02-11 15:31:54 +0000
  SetupSessionCookie - enable "Transaction" property for better support on 
    Oracle or File sessions (From Alexandr Ciornii)
 


Modified: rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Elements/SetupSessionCookie
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Elements/SetupSessionCookie	(original)
+++ rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Elements/SetupSessionCookie	Sun Jan  6 00:52:43 2008
@@ -76,11 +76,13 @@
     $session_properties = {
         Directory     => $RT::MasonSessionDir,
         LockDirectory => $RT::MasonSessionDir,
+        Transaction => 1
     };
 } else {
     $session_properties = {
         Handle     => $RT::Handle->dbh,
         LockHandle => $RT::Handle->dbh,
+        Transaction => 1
     };
 }
 

Modified: rt/branches/3.6-EXPERIMENTAL-ABERDEEN/lib/RT/Interface/Email.pm
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-ABERDEEN/lib/RT/Interface/Email.pm	(original)
+++ rt/branches/3.6-EXPERIMENTAL-ABERDEEN/lib/RT/Interface/Email.pm	Sun Jan  6 00:52:43 2008
@@ -396,12 +396,15 @@
     my $head = shift;
 
     #Figure out who's sending this message.
-    my $From = $head->get('Reply-To')
-        || $head->get('From')
-        || $head->get('Sender');
-    return ( ParseAddressFromHeader($From) );
-}
+    foreach my $header ('Reply-To', 'From', 'Sender') {
+        my $From = $head->get($header);
+        my ($addr, $name) = ParseAddressFromHeader($From);
+        # only return if the address is not empty
+        return ($addr, $name) if $addr;
+    }
 
+    return (undef, undef);
+}
 # }}}
 
 # {{{ ParseErrorsToAdddressFromHead

Modified: rt/branches/3.6-EXPERIMENTAL-ABERDEEN/releng.cnf
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-ABERDEEN/releng.cnf	(original)
+++ rt/branches/3.6-EXPERIMENTAL-ABERDEEN/releng.cnf	Sun Jan  6 00:52:43 2008
@@ -1,5 +1,5 @@
 PRODUCT			        = rt
-TAG			            = 3.6.6rc1
+TAG			            = 3.6.6rc2
 CANONICAL_REPO		    = svn+ssh://svn.bestpractical.com/svn/bps-public/rt/
 TAGS		            = tags/
 TRUNK	                = branches/3.6-RELEASE