Merge branch 'hotfix/3261'

weierophinney · weierophinney · commit 835b63148472 · 2013-01-02T12:28:00.000-06:00
Close zendframework/zendframework#3261
diff --git a/src/Transport/Sendmail.php b/src/Transport/Sendmail.php
@@ -244,15 +244,15 @@ protected function prepareParameters(Mail\Message $message)
 
         $sender = $message->getSender();
         if ($sender instanceof AddressInterface) {
-            $parameters .= ' -r ' . $sender->getEmail();
+            $parameters .= ' -f ' . $sender->getEmail();
             return $parameters;
         }
 
         $from = $message->getFrom();
         if (count($from)) {
             $from->rewind();
             $sender      = $from->current();
-            $parameters .= ' -r ' . $sender->getEmail();
+            $parameters .= ' -f ' . $sender->getEmail();
             return $parameters;
         }
 
diff --git a/test/Transport/SendmailTest.php b/test/Transport/SendmailTest.php
@@ -89,7 +89,7 @@ public function testReceivesMailArtifactsOnUnixSystems()
         $this->assertContains("From: zf-devteam@zend.com,\r\n Matthew <matthew@zend.com>\r\n", $this->additional_headers);
         $this->assertContains("X-Foo-Bar: Matthew\r\n", $this->additional_headers);
         $this->assertContains("Sender: Ralph Schindler <ralph.schindler@zend.com>\r\n", $this->additional_headers);
-        $this->assertEquals('-R hdrs -r ralph.schindler@zend.com', $this->additional_parameters);
+        $this->assertEquals('-R hdrs -f ralph.schindler@zend.com', $this->additional_parameters);
     }
 
     public function testReceivesMailArtifactsOnWindowsSystems()

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function testReceivesMailArtifactsOnUnixSystems()`
`89`	`89`	`$this->assertContains("From: [email protected],\r\n Matthew <[email protected]>\r\n", $this->additional_headers);`
`90`	`90`	`$this->assertContains("X-Foo-Bar: Matthew\r\n", $this->additional_headers);`
`91`	`91`	`$this->assertContains("Sender: Ralph Schindler <[email protected]>\r\n", $this->additional_headers);`
`92`		`- $this->assertEquals('-R hdrs -r [email protected]', $this->additional_parameters);`
	`92`	`+ $this->assertEquals('-R hdrs -f [email protected]', $this->additional_parameters);`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`public function testReceivesMailArtifactsOnWindowsSystems()`