WordPress.org

Make WordPress Core

Opened 3 years ago

Closed 3 years ago

#21074 closed defect (bug) (fixed)

Merge safe_mode change in PHPMailer from upstream

Reported by: nacin Owned by: bpetty
Milestone: 3.6 Priority: normal
Severity: normal Version: 3.4
Component: Mail Keywords: has-patch commit
Focuses: Cc:

Description

See #20970.

Merge in the activity from http://code.google.com/a/apache-extras.org/p/phpmailer/issues/detail?id=68 into 3.5, if it is not the same as [21128].

Attachments (9)

21074.01.diff (2.8 KB) - added by cnorris23 3 years ago.
21074-phpmailer-5.2.2-beta1.patch (48.3 KB) - added by bpetty 3 years ago.
21074-phpmailer-5.2.2-beta2.patch (53.9 KB) - added by bpetty 3 years ago.
21074-phpmailer-5.2.2-beta2-r21841.patch (53.6 KB) - added by bpetty 3 years ago.
21074-phpmailer-5.2.2-rc1-r22121.patch (64.9 KB) - added by bpetty 3 years ago.
21074-phpmailer-5.2.2-rc2-r22509.patch​ (66.4 KB) - added by bpetty 3 years ago.
Refreshed patch based on PHPMailer 5.2.2-rc2 release.
21074-phpmailer-5.2.2-rc2-r22509.patch (66.4 KB) - added by bpetty 3 years ago.
Refreshed patch based on PHPMailer 5.2.2-rc2 release.
21074-phpmailer-5.2.2-r23022.patch (81.5 KB) - added by bpetty 3 years ago.
Refreshed patch based on PHPMailer 5.2.2 release.
21074-phpmailer-5.2.4-r23500.patch (82.9 KB) - added by bpetty 3 years ago.

Download all attachments as: .zip

Change History (29)

comment:1 @bpetty3 years ago

  • Cc bpetty added
  • Owner set to bpetty
  • Status changed from new to accepted

@cnorris233 years ago

comment:3 @cnorris233 years ago

  • Keywords has-patch added

comment:4 @nacin3 years ago

Doesn't work. It calls mail_passthru() as if it is a function, rather than a method. Reporting this (and some code duplication) upstream.

comment:6 @bpetty3 years ago

As long as we don't have an imminent release here, this should wait for the official PHPMailer 5.2.2 release with these changes anyway (even if it didn't have problems).

comment:7 @bpetty3 years ago

21074-phpmailer-5.2.2-beta1.patch is a direct copy of class-phpmailer.php and class-smtp.php from the official PHPMailer 5.2.2-beta1 release.

This should be used for testing while we still have some time to wait on official 5.2.2 since this is planned to be applied for 3.5.

comment:8 @bpetty3 years ago

Updated patch with PHPMailer 5.2.2-beta2.

comment:10 @bpetty3 years ago

Working on update for minor bug in latest patch....

comment:11 @bpetty3 years ago

Fixed WP-specific filename changes from upstream.

comment:12 @nacin3 years ago

  • Keywords commit added

comment:13 @nacin3 years ago

Are we sure that PHPMailer 5.2.2 will actually be out by, say, the end of October? I don't have a lot of confidence at the moment when it comes to the stability of this project's pre-release versions (see the report and 3rd comment here), nor, given the glacially slow life cycle of that project, do I know if we can count on a final release before next year.

comment:14 @bpetty3 years ago

Given the current releases of beta1 on Jul 13th, beta2 on Aug 17th, and that the changelog already lists 5.2.2 next in the changelog (see changelog.txt), I'm fairly confident that this will hit in the next few weeks.

You did mention that we can still just revert back to current 5.2.1 (and our custom fixes to it) before RC if it's not released, even if there are no problems found with 5.2.2-beta2. Just keep this ticket open as a reminder on the 3.5 milestone just in case.

Also note that beta2 contains the fix for #11988, not just the upsteam safe_mode fix btw.

comment:15 @bpetty3 years ago

Refreshed patch based on PHPMailer 5.2.2-rc1 released on September 28th.

comment:16 @nacin3 years ago

  • Milestone changed from 3.5 to Future Release

We are running latest + a patch. Punting and can be brought back for 3.6 assuming 5.2.2 is released by then.

@bpetty3 years ago

Refreshed patch based on PHPMailer 5.2.2-rc2 release.

@bpetty3 years ago

Refreshed patch based on PHPMailer 5.2.2-rc2 release.

comment:17 @bpetty3 years ago

Ignore that first one, some odd whitespace characters slipped into the filename somehow.

@bpetty3 years ago

Refreshed patch based on PHPMailer 5.2.2 release.

comment:18 @bpetty3 years ago

  • Milestone changed from Future Release to 3.6

comment:19 @bpetty3 years ago

Refreshed patch based on PHPMailer 5.2.4 release.

comment:20 @nacin3 years ago

  • Resolution set to fixed
  • Status changed from accepted to closed

In 23522:

Update to PHPMailer 5.2.4. props bpetty. fixes #21074.

Note: See TracTickets for help on using tickets.