Avoid unnecessary fragmentation.

(cherry picked from commit 80ccc66d7eedb2d06050130c77c482ae1584199a)

diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index 373285885c7cdd73e404086d79a37381091ba8bc..bb9be8ad65d73efebdfdd0c94a7cc240bdd3b717 100644 (file)
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -313,9 +313,10 @@ int dtls1_do_write(SSL *s, int type)
                                s->init_off -= DTLS1_HM_HEADER_LENGTH;
                                s->init_num += DTLS1_HM_HEADER_LENGTH;
 
-                               /* write atleast DTLS1_HM_HEADER_LENGTH bytes */
-                               if ( len <= DTLS1_HM_HEADER_LENGTH)  
-                                       len += DTLS1_HM_HEADER_LENGTH;
+                               if ( s->init_num > curr_mtu)
+                                       len = curr_mtu;
+                               else
+                                       len = s->init_num;
                                }
 
                        dtls1_fix_message_header(s, frag_off,