Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~ignacio-nin/percona-server/5.6-bug1183610 into lp:percona-server/5.6

  1. 5.6-bug1183610
  2. Merge into 5.6
Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 360
Proposed branch: lp:~ignacio-nin/percona-server/5.6-bug1183610
Merge into: lp:percona-server/5.6
Diff against target: 11 lines (+1/-1)
1 file modified
Percona-Server/vio/viossl.c (+1/-1)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.6-bug1183610
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+166525@code.launchpad.net

Description of the change

Port fix for bug #1183610 from 5.5.

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/vio/viossl.c'
2--- Percona-Server/vio/viossl.c 2013-05-12 06:24:46 +0000
3+++ Percona-Server/vio/viossl.c 2013-05-30 15:26:45 +0000
4@@ -327,7 +327,7 @@
5 SSL_clear(ssl);
6 SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout);
7 SSL_set_fd(ssl, sd);
8-#ifndef HAVE_YASSL
9+#if !defined(HAVE_YASSL) && defined(SSL_OP_NO_COMPRESSION)
10 SSL_set_options(ssl, SSL_OP_NO_COMPRESSION);
11 #endif
12

Subscribers

People subscribed via source and target branches